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

v0.6.3: fixed issues with wall blocking tilemap

Browse Source
This commit is contained in:
Evan Debenham 2018-01-18 15:40:53 -05:00
parent 0a9ea5dcb9
commit f5708a8ba7
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,9 +48,10 @@ public class WallBlockingTilemap extends Tilemap {
data = new int[size]; //clears all values, including cleared tiles data = new int[size]; //clears all values, including cleared tiles
for (int cell = 0; cell < data.length; cell++) { for (int cell = 0; cell < data.length; cell++) {
//force all none-discoverable and border cells to cleared //force all top/bottom row, and none-discoverable cells to cleared
if (!Dungeon.level.discoverable[cell] || if (!Dungeon.level.discoverable[cell]
!Dungeon.level.insideMap(cell)){ || (cell - mapWidth) <= 0
|| (cell + mapWidth) >= size){
data[cell] = CLEARED; data[cell] = CLEARED;
} else { } else {
updateMapCell(cell); updateMapCell(cell);
@ -73,9 +74,11 @@ public class WallBlockingTilemap extends Tilemap {
curr = CLEARED; curr = CLEARED;
//block wall overhang if: //block wall overhang if:
//- There are cells 2x below
//- The cell below is a wall and visible //- The cell below is a wall and visible
//- All of left, below-left, right, below-right is either a wall or hidden //- All of left, below-left, right, below-right is either a wall or hidden
} else if ( !fogHidden(cell + mapWidth) } else if ( ((cell + 2*mapWidth) < size)
&& !fogHidden(cell + mapWidth)
&& (fogHidden(cell - 1) || wall(cell - 1)) && (fogHidden(cell - 1) || wall(cell - 1))
&& (fogHidden(cell + 1) || wall(cell + 1)) && (fogHidden(cell + 1) || wall(cell + 1))
&& (fogHidden(cell - 1 + mapWidth) || wall(cell - 1 + mapWidth)) && (fogHidden(cell - 1 + mapWidth) || wall(cell - 1 + mapWidth))
@ -124,6 +127,7 @@ public class WallBlockingTilemap extends Tilemap {
//Block the side of an internal wall if: //Block the side of an internal wall if:
//- the cell above, below, or the cell itself is visible //- the cell above, below, or the cell itself is visible
//and all of the following are NOT true: //and all of the following are NOT true:
//- the cell has no neighbours on that side
//- the top-side neighbour is visible and the side neighbour isn't a wall. //- the top-side neighbour is visible and the side neighbour isn't a wall.
//- the side neighbour is both not a wall and visible //- the side neighbour is both not a wall and visible
//- the bottom-side neighbour is both not a wall and visible //- the bottom-side neighbour is both not a wall and visible
@ -135,7 +139,8 @@ public class WallBlockingTilemap extends Tilemap {
|| !fogHidden(cell + mapWidth)) { || !fogHidden(cell + mapWidth)) {
//right side //right side
if ((!wall(cell + 1) && !fogHidden(cell + 1 - mapWidth)) || if ( ((cell + 1) % mapWidth == 0) ||
(!wall(cell + 1) && !fogHidden(cell + 1 - mapWidth)) ||
(!wall(cell + 1) && !fogHidden(cell + 1)) || (!wall(cell + 1) && !fogHidden(cell + 1)) ||
(!wall(cell + 1 + mapWidth) && !fogHidden(cell + 1 + mapWidth)) (!wall(cell + 1 + mapWidth) && !fogHidden(cell + 1 + mapWidth))
){ ){
@ -145,7 +150,8 @@ public class WallBlockingTilemap extends Tilemap {
} }
//left side //left side
if ((!wall(cell - 1) && !fogHidden(cell - 1 - mapWidth)) || if ( (cell % mapWidth == 0) ||
(!wall(cell - 1) && !fogHidden(cell - 1 - mapWidth)) ||
(!wall(cell - 1) && !fogHidden(cell - 1)) || (!wall(cell - 1) && !fogHidden(cell - 1)) ||
(!wall(cell - 1 + mapWidth) && !fogHidden(cell - 1 + mapWidth)) (!wall(cell - 1 + mapWidth) && !fogHidden(cell - 1 + mapWidth))
){ ){