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

v1.4.2: fixed rare edge cases in wall blocking tilemap

Browse Source
This commit is contained in:
Evan Debenham
2022-10-27 13:04:35 -04:00
parent 385fa9791c
commit e4bb557911
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/WallBlockingTilemap.java
View File

@@ -24,6 +24,7 @@ package com.shatteredpixel.shatteredpixeldungeon.tiles;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.levels.HallsBossLevel;
import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
import com.watabou.noosa.TextureFilm;
import com.watabou.noosa.Tilemap;
@@ -106,8 +107,13 @@ public class WallBlockingTilemap extends Tilemap {
//- none of the remaining 5 neighbour cells are both not a wall and visible
//if all 3 above are wall we can shortcut and just clear the cell
//unless one or more is a shelf, then we have to just block none
if (wall(cell - 1 - mapWidth) && wall(cell - mapWidth) && wall(cell + 1 - mapWidth)){
curr = CLEARED;
if (shelf(cell - 1 - mapWidth) || shelf(cell - mapWidth) || shelf(cell + 1 - mapWidth)){
curr = BLOCK_NONE;
} else {
curr = CLEARED;
}
} else if ((!wall(cell - 1 - mapWidth) && !fogHidden(cell - 1 - mapWidth) && wall(cell - 1)) ||
(!wall(cell - mapWidth) && !fogHidden(cell - mapWidth)) ||
@@ -195,6 +201,10 @@ public class WallBlockingTilemap extends Tilemap {
return DungeonTileSheet.wallStitcheable(Dungeon.level.map[cell]);
}
private boolean shelf(int cell) {
return Dungeon.level.map[cell] == Terrain.BOOKSHELF;
}
private boolean door(int cell) {
return DungeonTileSheet.doorTile(Dungeon.level.map[cell]);
}
@@ -202,8 +212,8 @@ public class WallBlockingTilemap extends Tilemap {
public synchronized void updateArea(int cell, int radius){
int l = cell%mapWidth - radius;
int t = cell/mapWidth - radius;
int r = cell%mapWidth + radius;
int b = cell/mapWidth + radius;
int r = cell%mapWidth - radius + 1 + 2*radius;
int b = cell/mapWidth - radius + 1 + 2*radius;
updateArea(
Math.max(0, l),
Math.max(0, t),