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

v1.4.0: fixed warp beacon and swarms not respecting eternal fire

Browse Source
This commit is contained in:
Evan Debenham
2022-07-29 15:33:29 -04:00
parent 90a1d3ce2b
commit 401411d16f
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/mage/WarpBeacon.java
View File

@@ -196,6 +196,7 @@ public class WarpBeacon extends ArmorAbility {
PathFinder.buildDistanceMap(target, BArray.or(Dungeon.level.passable, Dungeon.level.avoid, null));
if (Dungeon.level.pit[target] ||
(Dungeon.level.solid[target] && !Dungeon.level.passable[target]) ||
!(Dungeon.level.passable[target] || Dungeon.level.avoid[target]) ||
PathFinder.distance[hero.pos] == Integer.MAX_VALUE){
GLog.w( Messages.get(WarpBeacon.class, "invalid_beacon") );
return;

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Swarm.java
View File

@@ -88,7 +88,9 @@ public class Swarm extends Mob {
int[] neighbours = {pos + 1, pos - 1, pos + Dungeon.level.width(), pos - Dungeon.level.width()};
for (int n : neighbours) {
if (!Dungeon.level.solid[n] && Actor.findChar( n ) == null
if (!Dungeon.level.solid[n]
&& Actor.findChar( n ) == null
&& (Dungeon.level.passable[target] || Dungeon.level.avoid[target])
&& (!properties().contains(Property.LARGE) || Dungeon.level.openSpace[n])) {
candidates.add( n );
}