konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v3.3.0: fixed door locking's interactions with large and immobile chars

Browse Source
This commit is contained in:
Evan Debenham
2025-11-30 11:17:02 -05:00
parent 80aa9816bd
commit 90f4ec3ef5
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SkeletonKey.java
View File

@@ -213,21 +213,23 @@ public class SkeletonKey extends Artifact {
//attempt to knock back char //attempt to knock back char
if (Actor.findChar(target) != null){ if (Actor.findChar(target) != null){
Char toMove = Actor.findChar(target);
int pushCell = -1; int pushCell = -1;
//push to the closest open cell that's further than the door //push to the closest open cell that's further than the door
for (int i : PathFinder.NEIGHBOURS8){ for (int i : PathFinder.NEIGHBOURS8){
if (!Dungeon.level.solid[target+i] && Actor.findChar(target+i) == null){ if (!Dungeon.level.solid[target+i]
if (Dungeon.level.trueDistance(curUser.pos, target+i) > Dungeon.level.trueDistance(curUser.pos, target)) { && Actor.findChar(target+i) == null
if (pushCell == -1 || Dungeon.level.trueDistance(curUser.pos, pushCell) > Dungeon.level.trueDistance(curUser.pos, target + i)){ && (Dungeon.level.openSpace[target+i] || !Char.hasProp(toMove, Char.Property.LARGE))
pushCell = target + i; && Dungeon.level.trueDistance(curUser.pos, target+i) > Dungeon.level.trueDistance(curUser.pos, target)
} && (pushCell == -1 || Dungeon.level.trueDistance(curUser.pos, pushCell) > Dungeon.level.trueDistance(curUser.pos, target + i))){
} pushCell = target + i;
} }
} }
if (pushCell != -1){ if (pushCell != -1 && !Char.hasProp(toMove, Char.Property.IMMOVABLE)){
Ballistica push = new Ballistica(target, pushCell, Ballistica.PROJECTILE); Ballistica push = new Ballistica(target, pushCell, Ballistica.PROJECTILE);
WandOfBlastWave.throwChar(Actor.findChar(target), push, 1, false, false, this); WandOfBlastWave.throwChar(toMove, push, 1, false, false, this);
} else { } else {
GLog.w(Messages.get(SkeletonKey.class, "lock_no_space")); GLog.w(Messages.get(SkeletonKey.class, "lock_no_space"));
return; return;