Merge branch 'lakebane-old' into lakebane-master

# Conflicts: # src/engine/gameManager/LootManager.java
2024-06-08 19:06:15 -05:00
parent 2f87fd9812 3c23a070df
commit a7d1dc5fd0
2 changed files with 11 additions and 6 deletions
@@ -1631,8 +1631,8 @@ public class ClientMessagePump implements NetMsgHandler {
            if (toRepair == null)
                return;

-            if (toRepair.getItemBase().isGlass())
-                return;
+            //if (toRepair.getItemBase().isGlass())
+            //    return;

            //make sure item is in player's inventory or equipment
            if (!itemMan.inventoryContains(toRepair) && !itemMan.equippedContains(toRepair))
@@ -1654,6 +1654,12 @@ public class ClientMessagePump implements NetMsgHandler {
            }
            //TODO get cost to repair
            int cost = (int) ((max - dur) * 80.1);
+
+            //glass costs 3x as much to repair
+            if (toRepair.getItemBase().isGlass()){
+                cost *= 3;
+            }
+
            Building b = (!npc.isStatic()) ? npc.getBuilding() : null;

            if (b != null)