zone override

src/engine/objects/Blueprint.java

@@ -493,53 +493,8 @@ public class Blueprint {
         // buildings current Maintenance BuildingGroup.  These values
         // are expressed in hours
 
-        switch (this.buildingGroup) {
 
-            case GENERICNOUPGRADE:
-                break; // Cannot be upgraded
-            case VILLA:
-            case ESTATE:
-            case FORTRESS:
-            case CITADEL:
-                rankTime = (7 * targetRank) - 7;
-                break;
-            case TOL:
-                rankTime = (7 * targetRank) - 7;
-                break;
-            case BARRACK:
-                rankTime = (7 * targetRank) - 7;
-                break;
-            case CHURCH:
-                rankTime = (7 * targetRank) - 7;
-                break;
-            case FORGE:
-            case INN:
-            case TAILOR:
-            case MAGICSHOP:
-                rankTime = (7 * targetRank) - 7;
-                break;
-            case SPIRE:
-                rankTime = (4 * targetRank) + 4;
-                break;
-            case AMAZONHALL:
-            case CATHEDRAL:
-            case GREATHALL:
-            case KEEP:
-            case THIEFHALL:
-            case TEMPLEHALL:
-            case WIZARDHALL:
-            case ELVENHALL:
-            case ELVENSANCTUM:
-            case IREKEIHALL:
-            case FORESTHALL:
-                rankTime = (7 * targetRank) - 7;
-                break;
-            default:
-                Logger.error("Attempt to retrieve ranktime without MaintGroup");
-                break;
-        }
-
-        return rankTime;
+        return 5;
     }
 
     public Vector2f getExtents() {

src/engine/objects/NPC.java

@@ -1153,7 +1153,7 @@ public class NPC extends AbstractCharacter {
         upgradeTime = Integer.MAX_VALUE;
 
         if (this.getRank() < 7)
-            return (this.getRank() * 8);
+            return 5;
 
         return 0;
     }