Merge remote-tracking branch 'imTheSupremeOne/master' into dev

This commit is contained in:
Martin Robertz committed 2026-02-06 20:58:09 +01:00
commit 2dfeb58443
1 file changed
+4 -2
@@ -86,11 +86,12 @@ public class ModAttack extends ItemModTypeFilter {
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 class ModAttack extends ItemModTypeFilter {
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);
}
}