From c99b1ab491f4b3a3682b7dd7ab69a1f6f96dd559 Mon Sep 17 00:00:00 2001
From: FatBoy-DOTC <justin.chucksinsulating@gmail.com>
Date: Sat, 24 Feb 2024 21:56:26 -0600
Subject: [PATCH] zone override

---
 src/engine/objects/Blueprint.java | 47 +------------------------------
 src/engine/objects/NPC.java       |  2 +-
 2 files changed, 2 insertions(+), 47 deletions(-)

diff --git a/src/engine/objects/Blueprint.java b/src/engine/objects/Blueprint.java
index 15777c27..c7baa3f3 100644
--- a/src/engine/objects/Blueprint.java
+++ b/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() {
diff --git a/src/engine/objects/NPC.java b/src/engine/objects/NPC.java
index 1e6d2f83..6d330d8d 100644
--- a/src/engine/objects/NPC.java
+++ b/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;
     }