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

v1.2.0: fixed red sentries being considered enemies when they shouldn't

Browse Source
This commit is contained in:
Evan Debenham 2022-03-21 17:07:25 -04:00
parent c097ea8226
commit 01757b71e5
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
View File

@ -1279,7 +1279,7 @@ public class Hero extends Char {
Mob target = null; Mob target = null;
for (Mob m : Dungeon.level.mobs.toArray(new Mob[0])) { for (Mob m : Dungeon.level.mobs.toArray(new Mob[0])) {
if (fieldOfView[ m.pos ] && m.alignment == Alignment.ENEMY && !(m instanceof NPC)) { if (fieldOfView[ m.pos ] && m.alignment == Alignment.ENEMY) {
visible.add(m); visible.add(m);
if (!visibleEnemies.contains( m )) { if (!visibleEnemies.contains( m )) {
newMob = true; newMob = true;

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java
View File

@ -1093,7 +1093,7 @@ public abstract class Level implements Bundlable {
blocking[i] = false; blocking[i] = false;
} }
} }
} else if (c.alignment == Char.Alignment.ENEMY } else if (c.alignment != Char.Alignment.ALLY
&& Dungeon.level.blobs.containsKey(SmokeScreen.class) && Dungeon.level.blobs.containsKey(SmokeScreen.class)
&& Dungeon.level.blobs.get(SmokeScreen.class).volume > 0) { && Dungeon.level.blobs.get(SmokeScreen.class).volume > 0) {
System.arraycopy(Dungeon.level.losBlocking, 0, modifiableBlocking, 0, modifiableBlocking.length); System.arraycopy(Dungeon.level.losBlocking, 0, modifiableBlocking, 0, modifiableBlocking.length);

1
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/SentryRoom.java
View File

@ -217,7 +217,6 @@ public class SentryRoom extends SpecialRoom {
spriteClass = SentrySprite.class; spriteClass = SentrySprite.class;
properties.add(Property.IMMOVABLE); properties.add(Property.IMMOVABLE);
alignment = Alignment.ENEMY;
} }
private float initialChargeDelay; private float initialChargeDelay;