diff --git a/src/main/java/tconstruct/modifiers/tools/ModAttack.java b/src/main/java/tconstruct/modifiers/tools/ModAttack.java index 71b6cdf961..657eec9f2e 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModAttack.java +++ b/src/main/java/tconstruct/modifiers/tools/ModAttack.java @@ -86,11 +86,12 @@ public void modify(ItemStack[] input, ItemStack tool) { if (tags.hasKey(key)) { int[] keyPair = tags.getIntArray(key); int increase = matchingAmount(input); + int overThreshold = increase / threshold; int leftToBoost = threshold - (keyPair[0] % threshold); if (increase >= leftToBoost) { int attack = tags.getInteger("Attack"); - attack += 1; + attack += (overThreshold > 1) ? overThreshold : 1; tags.setInteger("Attack", attack); } @@ -113,13 +114,14 @@ public void modify(ItemStack[] input, ItemStack tool) { modifiers -= 1; tags.setInteger("Modifiers", modifiers); int increase = matchingAmount(input); + int overThreshold = increase / threshold; String modName = "\u00a7f" + guiType + " (" + increase + "/" + max + ")"; int tooltipIndex = addToolTip(tool, tooltipName, modName); int[] keyPair = new int[] { increase, max, tooltipIndex }; tags.setIntArray(key, keyPair); int attack = tags.getInteger("Attack"); - attack += 1; + attack += (overThreshold >= 1) ? overThreshold : 0; tags.setInteger("Attack", attack); } }