From 294f8fe02b1487bd80d834fbe286edbb4c497629 Mon Sep 17 00:00:00 2001 From: MagicBot Date: Wed, 3 May 2023 16:17:53 -0400 Subject: [PATCH] Override removed edge case handed in db. --- src/engine/gameManager/BuildingManager.java | 7 ------- src/engine/objects/Contract.java | 9 +-------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/engine/gameManager/BuildingManager.java b/src/engine/gameManager/BuildingManager.java index 92deb31e..33b6b660 100644 --- a/src/engine/gameManager/BuildingManager.java +++ b/src/engine/gameManager/BuildingManager.java @@ -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; } diff --git a/src/engine/objects/Contract.java b/src/engine/objects/Contract.java index b85a756d..c31f59af 100644 --- a/src/engine/objects/Contract.java +++ b/src/engine/objects/Contract.java @@ -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 { 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)); }