v1.4.0: improved locked exit visuals by properly overlapping the hero

2022-08-09 12:57:32 -04:00
parent 35b1fed388
commit 800a5076d7
7 changed files with 7 additions and 1 deletions
--- a/core/src/main/assets/environment/tiles_caves.png
+++ b/core/src/main/assets/environment/tiles_caves.png
--- a/core/src/main/assets/environment/tiles_city.png
+++ b/core/src/main/assets/environment/tiles_city.png
--- a/core/src/main/assets/environment/tiles_halls.png
+++ b/core/src/main/assets/environment/tiles_halls.png
--- a/core/src/main/assets/environment/tiles_prison.png
+++ b/core/src/main/assets/environment/tiles_prison.png
--- a/core/src/main/assets/environment/tiles_sewers.png
+++ b/core/src/main/assets/environment/tiles_sewers.png
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/DungeonTileSheet.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/DungeonTileSheet.java
@@ -344,6 +344,9 @@ public class DungeonTileSheet {
 	public static final int HIGH_GRASS_OVERHANG_ALT     = WALL_OVERHANG+38;
 	public static final int FURROWED_OVERHANG_ALT       = WALL_OVERHANG+39;

+	//exit visuals are rendered flat atm, so they actually underhand
+	public static final int EXIT_UNDERHANG              = WALL_OVERHANG+41;
+
 	/**********************************************************************
 	 * Logic for the selection of tile visuals
 	 **********************************************************************/
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/DungeonWallsTilemap.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/DungeonWallsTilemap.java
@@ -62,7 +62,10 @@ public class DungeonWallsTilemap extends DungeonTilemap {

 		}

-		if (pos + mapWidth < size && DungeonTileSheet.wallStitcheable(map[pos+mapWidth])) {
+
+		if (map[pos] == Terrain.LOCKED_EXIT || map[pos] == Terrain.UNLOCKED_EXIT){
+			return DungeonTileSheet.EXIT_UNDERHANG;
+		} else if (pos + mapWidth < size && DungeonTileSheet.wallStitcheable(map[pos+mapWidth])) {

 			return DungeonTileSheet.stitchWallOverhangTile(
 					tile,