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

v2.0.0: fixed soiled fist being able to see through shrouding fog

Browse Source
This commit is contained in:
Evan Debenham
2022-11-17 11:55:17 -05:00
parent 1948c11480
commit 08079ab6d1
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java
+15 -7
View File
@@ -1168,7 +1168,7 @@ public abstract class Level implements Bundlable {
boolean sighted = c.buff( Blindness.class ) == null && c.buff( Shadows.class ) == null boolean sighted = c.buff( Blindness.class ) == null && c.buff( Shadows.class ) == null
&& c.buff( TimekeepersHourglass.timeStasis.class ) == null && c.isAlive(); && c.buff( TimekeepersHourglass.timeStasis.class ) == null && c.isAlive();
if (sighted) { if (sighted) {
boolean[] blocking; boolean[] blocking = null;
if (modifiableBlocking == null || modifiableBlocking.length != Dungeon.level.losBlocking.length){ if (modifiableBlocking == null || modifiableBlocking.length != Dungeon.level.losBlocking.length){
modifiableBlocking = new boolean[Dungeon.level.losBlocking.length]; modifiableBlocking = new boolean[Dungeon.level.losBlocking.length];
@@ -1176,25 +1176,33 @@ public abstract class Level implements Bundlable {
if ((c instanceof Hero && ((Hero) c).subClass == HeroSubClass.WARDEN) if ((c instanceof Hero && ((Hero) c).subClass == HeroSubClass.WARDEN)
|| c instanceof YogFist.SoiledFist) { || c instanceof YogFist.SoiledFist) {
System.arraycopy(Dungeon.level.losBlocking, 0, modifiableBlocking, 0, modifiableBlocking.length); if (blocking == null) {
blocking = modifiableBlocking; System.arraycopy(Dungeon.level.losBlocking, 0, modifiableBlocking, 0, modifiableBlocking.length);
blocking = modifiableBlocking;
}
for (int i = 0; i < blocking.length; i++){ for (int i = 0; i < blocking.length; i++){
if (blocking[i] && (Dungeon.level.map[i] == Terrain.HIGH_GRASS || Dungeon.level.map[i] == Terrain.FURROWED_GRASS)){ if (blocking[i] && (Dungeon.level.map[i] == Terrain.HIGH_GRASS || Dungeon.level.map[i] == Terrain.FURROWED_GRASS)){
blocking[i] = false; blocking[i] = false;
} }
} }
} else if (c.alignment != Char.Alignment.ALLY }
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); if (blocking == null) {
blocking = modifiableBlocking; System.arraycopy(Dungeon.level.losBlocking, 0, modifiableBlocking, 0, modifiableBlocking.length);
blocking = modifiableBlocking;
}
Blob s = Dungeon.level.blobs.get(SmokeScreen.class); Blob s = Dungeon.level.blobs.get(SmokeScreen.class);
for (int i = 0; i < blocking.length; i++){ for (int i = 0; i < blocking.length; i++){
if (!blocking[i] && s.cur[i] > 0){ if (!blocking[i] && s.cur[i] > 0){
blocking[i] = true; blocking[i] = true;
} }
} }
} else { }
if (blocking == null){
blocking = Dungeon.level.losBlocking; blocking = Dungeon.level.losBlocking;
} }