From d633a10b3d69d9fb1fda8cf8e6aa37a12b244397 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sun, 12 May 2024 12:27:32 -0400 Subject: [PATCH] v2.4.0: adjusted extra charge gain logic for armband, fixing log spam --- .../items/artifacts/MasterThievesArmband.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/MasterThievesArmband.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/MasterThievesArmband.java index 4148c33a7..76a1fdb1c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/MasterThievesArmband.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/MasterThievesArmband.java @@ -217,18 +217,19 @@ public class MasterThievesArmband extends Artifact { @Override public void charge(Hero target, float amount) { if (cursed || target.buff(MagicImmune.class) != null) return; - partialCharge += 0.1f * amount; - partialCharge = Math.min(partialCharge, chargeCap - charge); - while (partialCharge >= 1f){ - charge++; - partialCharge--; + if (charge < chargeCap) { + partialCharge += 0.1f * amount; + while (partialCharge >= 1f) { + charge++; + partialCharge--; + } + if (charge >= chargeCap) { + GLog.p(Messages.get(MasterThievesArmband.class, "full")); + partialCharge = 0; + charge = chargeCap; + } + updateQuickslot(); } - if (charge >= chargeCap){ - GLog.p( Messages.get(MasterThievesArmband.class, "full") ); - partialCharge = 0; - charge = chargeCap; - } - updateQuickslot(); } @Override