LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.9.4: fixed pitfall traps not cancelling hero actions if they fell

Browse Source
This commit is contained in:
Evan Debenham 2021-07-28 17:26:38 -04:00
parent 1ae3e4fcbd
commit 72a821e087
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PitfallTrap.java
View File

@ -78,6 +78,8 @@ public class PitfallTrap extends Trap {
@Override
public boolean act() {
boolean herofell = false;
if (depth == Dungeon.depth) {
for (int i : PathFinder.NEIGHBOURS9) {
@ -109,6 +111,7 @@ public class PitfallTrap extends Trap {
&& !(ch.alignment == Char.Alignment.NEUTRAL && Char.hasProp(ch, Char.Property.IMMOVABLE))) {
if (ch == Dungeon.hero) {
Chasm.heroFall(cell);
herofell = true;
} else {
Chasm.mobFall((Mob) ch);
}
@ -118,7 +121,7 @@ public class PitfallTrap extends Trap {
}
detach();
return true;
return !herofell;
}
private static final String POS = "pos";