Fix Arrows/Bolts having hardcoded amount of modifiers, not respecting…

… material traits like writeable. #1230
SlimeKnights · Dec 18, 2014 · 5422d38 · 5422d38
1 parent bd0fb35
commit 5422d38
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/main/java/tconstruct/weaponry/WeaponryHandler.java b/src/main/java/tconstruct/weaponry/WeaponryHandler.java
@@ -86,8 +86,9 @@ public void onAmmoCrafted(ToolCraftEvent.NormalTool event)
             {
                 tags.setInteger("Fiery", 5);
             }
-            // arrows get only 2 modifiers
-            tags.setInteger("Modifiers", 2);
+            // arrows get only 2 modifiers (so one less) by default
+            int mods = Math.max(0, tags.getInteger("Modifiers")-1);
+            tags.setInteger("Modifiers", mods);
         }
         else if(event.tool instanceof BoltAmmo)
         {
@@ -113,7 +114,9 @@ else if(event.tool instanceof BoltAmmo)
             int reinforced = Math.max(headMat.reinforced(), coreMat.reinforced());
 
             setAmmoData(tags, durability, weight, breakChance, accuracy, shoddy, reinforced);
-            tags.setInteger("Modifiers", 2);
+
+            int mods = Math.max(0, tags.getInteger("Modifiers")-1);
+            tags.setInteger("Modifiers", mods);
         }
 
         // now that durability has been handled...