From 6d721d3b54ad0ec19b4d74322df356261b142787 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 27 Sep 2022 17:46:39 -0400 Subject: [PATCH] v1.4.0: improved logic for when items block level transitions --- .../shatteredpixeldungeon/actors/hero/Hero.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java index 52a813f78..062b9c00f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java @@ -897,10 +897,13 @@ public class Hero extends Char { if (waitOrPickup) { spendAndNextConstant(TIME_TO_REST); + } //allow the hero to move between levels even if they can't collect the item - } else if (Dungeon.level.getTransition(pos) != null){ - return actTransition(new HeroAction.LvlTransition(pos)); + if (Dungeon.level.getTransition(pos) != null){ + throwItems(); + } else { + heap.sprite.drop(); } if (item instanceof Dewdrop @@ -913,8 +916,7 @@ public class Hero extends Char { GLog.n(Messages.capitalize(Messages.get(this, "you_cant_have", item.name()))); } - heap.sprite.drop(); - ready(); + next(); } } else { ready();