v2.1.0: fixed rare visual bugs with alchemist's toolkit status

This commit is contained in:
Evan Debenham
2023-04-30 13:14:45 -04:00
parent b3fb41175c
commit ed4f86b800

View File

@@ -146,7 +146,7 @@ public class AlchemistsToolkit extends Artifact {
@Override @Override
public String status() { public String status() {
if (isEquipped(Dungeon.hero) && warmUpDelay > 0 && !cursed){ 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 { } else {
return super.status(); return super.status();
} }
@@ -221,12 +221,12 @@ public class AlchemistsToolkit extends Artifact {
@Override @Override
public boolean act() { public boolean act() {
if (warmUpDelay > 0 && !cursed && target.buff(MagicImmune.class) == null){ if (warmUpDelay > 0){
if (level() == 10){ if (level() == 10){
warmUpDelay = 0; warmUpDelay = 0;
} else if (warmUpDelay == 101){ } else if (warmUpDelay == 101){
warmUpDelay = 100f; warmUpDelay = 100f;
} else { } else if (!cursed && target.buff(MagicImmune.class) == null) {
float turnsToWarmUp = (int) Math.pow(10 - level(), 2); float turnsToWarmUp = (int) Math.pow(10 - level(), 2);
warmUpDelay -= 100 / turnsToWarmUp; warmUpDelay -= 100 / turnsToWarmUp;
} }