From ed4f86b80048e888a1d5fd0b8a6c0a9b7ee726fc Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sun, 30 Apr 2023 13:14:45 -0400 Subject: [PATCH] v2.1.0: fixed rare visual bugs with alchemist's toolkit status --- .../items/artifacts/AlchemistsToolkit.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/AlchemistsToolkit.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/AlchemistsToolkit.java index 5a629538b..8bc36d650 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/AlchemistsToolkit.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/AlchemistsToolkit.java @@ -146,7 +146,7 @@ public class AlchemistsToolkit extends Artifact { @Override public String status() { if (isEquipped(Dungeon.hero) && warmUpDelay > 0 && !cursed){ - return Messages.format( "%d%%", 100 - (int)warmUpDelay ); + return Messages.format( "%d%%", Math.max(0, 100 - (int)warmUpDelay) ); } else { return super.status(); } @@ -221,12 +221,12 @@ public class AlchemistsToolkit extends Artifact { @Override public boolean act() { - if (warmUpDelay > 0 && !cursed && target.buff(MagicImmune.class) == null){ + if (warmUpDelay > 0){ if (level() == 10){ warmUpDelay = 0; } else if (warmUpDelay == 101){ warmUpDelay = 100f; - } else { + } else if (!cursed && target.buff(MagicImmune.class) == null) { float turnsToWarmUp = (int) Math.pow(10 - level(), 2); warmUpDelay -= 100 / turnsToWarmUp; }