From 6238774c86caa63954d40b358545a0e6e22750c0 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 24 Apr 2024 14:03:00 -0400 Subject: [PATCH] v2.4.0: tweaked extra ground placement in bridge entrance/exit rooms --- .../rooms/standard/entrance/ChasmBridgeEntranceRoom.java | 4 +--- .../rooms/standard/entrance/WaterBridgeEntranceRoom.java | 4 +--- .../levels/rooms/standard/exit/ChasmBridgeExitRoom.java | 4 +--- .../levels/rooms/standard/exit/WaterBridgeExitRoom.java | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/entrance/ChasmBridgeEntranceRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/entrance/ChasmBridgeEntranceRoom.java index 3617eaf54..5fbb682a9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/entrance/ChasmBridgeEntranceRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/entrance/ChasmBridgeEntranceRoom.java @@ -56,9 +56,7 @@ public class ChasmBridgeEntranceRoom extends ChasmBridgeRoom { } while (spaceRect.inside(level.cellToPoint(entrance)) || level.findMob(entrance) != null); for (int i : PathFinder.NEIGHBOURS8){ - if (level.map[entrance+i] == Terrain.CHASM) { - Painter.set(level, entrance + i, Terrain.EMPTY); - } + Painter.set(level, entrance + i, Terrain.EMPTY); } Painter.set( level, entrance, Terrain.ENTRANCE ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/entrance/WaterBridgeEntranceRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/entrance/WaterBridgeEntranceRoom.java index 35e48d5a4..e135a607c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/entrance/WaterBridgeEntranceRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/entrance/WaterBridgeEntranceRoom.java @@ -56,9 +56,7 @@ public class WaterBridgeEntranceRoom extends WaterBridgeRoom { } while (spaceRect.inside(level.cellToPoint(entrance)) || level.findMob(entrance) != null); for (int i : PathFinder.NEIGHBOURS8){ - if (level.map[entrance+i] == Terrain.WATER) { - Painter.set(level, entrance + i, Terrain.EMPTY); - } + Painter.set(level, entrance + i, Terrain.EMPTY); } Painter.set( level, entrance, Terrain.ENTRANCE ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/exit/ChasmBridgeExitRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/exit/ChasmBridgeExitRoom.java index b4b369a6e..2af26b271 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/exit/ChasmBridgeExitRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/exit/ChasmBridgeExitRoom.java @@ -56,9 +56,7 @@ public class ChasmBridgeExitRoom extends ChasmBridgeRoom { } while (spaceRect.inside(level.cellToPoint(exit)) || level.findMob(exit) != null); for (int i : PathFinder.NEIGHBOURS8){ - if (level.map[exit+i] == Terrain.CHASM) { - Painter.set(level, exit + i, Terrain.EMPTY); - } + Painter.set(level, exit + i, Terrain.EMPTY); } Painter.set( level, exit, Terrain.EXIT ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/exit/WaterBridgeExitRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/exit/WaterBridgeExitRoom.java index 12aefd435..150b02d1d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/exit/WaterBridgeExitRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/exit/WaterBridgeExitRoom.java @@ -56,9 +56,7 @@ public class WaterBridgeExitRoom extends WaterBridgeRoom { } while (spaceRect.inside(level.cellToPoint(exit)) || level.findMob(exit) != null); for (int i : PathFinder.NEIGHBOURS8){ - if (level.map[exit+i] == Terrain.WATER) { - Painter.set(level, exit + i, Terrain.EMPTY); - } + Painter.set(level, exit + i, Terrain.EMPTY); } Painter.set( level, exit, Terrain.EXIT );