v2.5.0: fixed challenge arena briefly persisting between floors

This commit is contained in:
Evan Debenham
2024-08-27 15:46:11 -04:00
parent d17a333740
commit 39808793f0
@@ -68,6 +68,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.TimekeepersHourg
import com.shatteredpixel.shatteredpixeldungeon.items.bombs.Bomb; import com.shatteredpixel.shatteredpixeldungeon.items.bombs.Bomb;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfStrength; import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfStrength;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.exotic.ScrollOfChallenge;
import com.shatteredpixel.shatteredpixeldungeon.items.stones.StoneOfEnchantment; import com.shatteredpixel.shatteredpixeldungeon.items.stones.StoneOfEnchantment;
import com.shatteredpixel.shatteredpixeldungeon.items.stones.StoneOfIntuition; import com.shatteredpixel.shatteredpixeldungeon.items.stones.StoneOfIntuition;
import com.shatteredpixel.shatteredpixeldungeon.items.trinkets.DimensionalSundial; import com.shatteredpixel.shatteredpixeldungeon.items.trinkets.DimensionalSundial;
@@ -580,9 +581,11 @@ public abstract class Level implements Bundlable {
Swiftthistle.TimeBubble timeBubble = Dungeon.hero.buff(Swiftthistle.TimeBubble.class); Swiftthistle.TimeBubble timeBubble = Dungeon.hero.buff(Swiftthistle.TimeBubble.class);
if (timeBubble != null) timeBubble.disarmPresses(); if (timeBubble != null) timeBubble.disarmPresses();
//iron stomach does not persist through chasm falling //iron stomach and challenge arena do not persist between floors
Talent.WarriorFoodImmunity foodImmune = Dungeon.hero.buff(Talent.WarriorFoodImmunity.class); Talent.WarriorFoodImmunity foodImmune = Dungeon.hero.buff(Talent.WarriorFoodImmunity.class);
if (foodImmune != null) foodImmune.detach(); if (foodImmune != null) foodImmune.detach();
ScrollOfChallenge.ChallengeArena arena = Dungeon.hero.buff(ScrollOfChallenge.ChallengeArena.class);
if (arena != null) arena.detach();
//spend the hero's partial turns, so the hero cannot take partial turns between floors //spend the hero's partial turns, so the hero cannot take partial turns between floors
Dungeon.hero.spendToWhole(); Dungeon.hero.spendToWhole();