Contract moved to AbstractCharacter.

Arty tower restricted to a single tower captain.

src/engine/gameManager/BuildingManager.java

@@ -51,7 +51,7 @@ public enum BuildingManager {
 
         for (int i = 1; i <= numOfSlots; i++) {
 
-            // Slot two is reserved on Arty towers for the trebuchet
+            // Slot one is reserved on Arty towers for the trebuchet
 
             if (i == 1 &&
                     building.getBlueprint() != null &&

src/engine/net/client/handlers/ActivateNPCMsgHandler.java

@@ -49,9 +49,12 @@ public class ActivateNPCMsgHandler extends AbstractClientMsgHandler {
 
 		for (Item hirelings : player.getInventory()) {
 			if (hirelings.getItemBase().getType().equals(ItemType.CONTRACT)) {
+
 				contract = DbManager.ContractQueries.GET_CONTRACT(hirelings.getItemBase().getUUID());
+
 				if (contract == null)
 					continue;
+
 				if (contract.canSlotinBuilding(building))
 					ItemLists.add(hirelings);
 			}

src/engine/objects/AbstractCharacter.java

@@ -119,6 +119,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
 	protected Regions lastRegion = null;
 
 	protected boolean movingUp = false;
+	public Contract contract;
 
 
 	/**

src/engine/objects/Contract.java

@@ -254,9 +254,15 @@ 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));
-
 	 }
 
 	public int getEquipmentSet() {

src/engine/objects/Mob.java

@@ -65,7 +65,6 @@ public class Mob extends AbstractIntelligenceAgent {
     public int spawnTime;
     public Zone parentZone;
     public Building building;
-    public Contract contract;
     public boolean hasLoot = false;
     public boolean isPlayerGuard = false;
     public AbstractCharacter npcOwner;

src/engine/objects/NPC.java

@@ -52,7 +52,7 @@ public class NPC extends AbstractCharacter {
 	protected MobBase mobBase;
 	protected String name;
 	public Building building;
-	protected Contract contract;
+
 	protected int dbID;
 	protected int currentID;
 	private DateTime upgradeDateTime = null;