Browse Source

Override removed edge case handed in db.

master
MagicBot 2 years ago
parent
commit
294f8fe02b
  1. 7
      src/engine/gameManager/BuildingManager.java
  2. 9
      src/engine/objects/Contract.java

7
src/engine/gameManager/BuildingManager.java

@ -51,13 +51,6 @@ public enum BuildingManager { @@ -51,13 +51,6 @@ public enum BuildingManager {
for (int i = 1; i <= numOfSlots; i++) {
// Slot one is reserved on Arty towers for the trebuchet
if (i == 1 &&
building.getBlueprint() != null &&
building.getBlueprint().getBuildingGroup().equals(BuildingGroup.ARTYTOWER))
continue;
if (!building.getHirelings().containsValue(i))
return i;
}

9
src/engine/objects/Contract.java

@ -246,7 +246,7 @@ public class Contract extends AbstractGameObject { @@ -246,7 +246,7 @@ public class Contract extends AbstractGameObject {
if (building == null)
return false;
// Can't slot in anything but a blueprintted building
// Can't slot in anything but a blueprinted building
if (building.getBlueprintUUID() == 0)
return false;
@ -254,13 +254,6 @@ public class Contract extends AbstractGameObject { @@ -254,13 +254,6 @@ public class Contract extends AbstractGameObject {
if (this.allowedBuildings.size() == 0)
return false;
// Restrict arty towers to a single captain
if (this.getContractID() == 842) // Tower Arty Captain
for (AbstractCharacter hireling : building.getHirelings().keySet())
if (hireling.contract.getContractID() == 842)
return false;
// Binary match
return (building.getBlueprint().getBuildingGroup().elementOf(this.allowedBuildings));
}

Loading…
Cancel
Save