From 5422d3881a60733bd6317608b4211250fe9eb618 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Thu, 18 Dec 2014 22:19:10 +0100 Subject: [PATCH] Fix Arrows/Bolts having hardcoded amount of modifiers, not respecting material traits like writeable. #1230 --- src/main/java/tconstruct/weaponry/WeaponryHandler.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/tconstruct/weaponry/WeaponryHandler.java b/src/main/java/tconstruct/weaponry/WeaponryHandler.java index a86171e0..d82da290 100644 --- a/src/main/java/tconstruct/weaponry/WeaponryHandler.java +++ b/src/main/java/tconstruct/weaponry/WeaponryHandler.java @@ -86,8 +86,9 @@ public class WeaponryHandler { { 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 @@ public class WeaponryHandler { 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...