diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java index da69c572d..4e4e6e560 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java @@ -191,13 +191,6 @@ public class CavesBossLevel extends Level { } } - int sign; - do { - sign = Random.Int( ROOM_LEFT, ROOM_RIGHT ) + Random.Int( ROOM_TOP, ROOM_BOTTOM ) * width(); - } while (sign == entrance || map[sign] == Terrain.INACTIVE_TRAP); - map[sign] = Terrain.SIGN; - - return true; } @@ -221,7 +214,7 @@ public class CavesBossLevel extends Level { int pos; do { pos = Random.IntRange( ROOM_LEFT, ROOM_RIGHT ) + Random.IntRange( ROOM_TOP + 1, ROOM_BOTTOM ) * width(); - } while (pos == entrance || map[pos] == Terrain.SIGN); + } while (pos == entrance); drop( item, pos ).type = Heap.Type.REMAINS; } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityBossLevel.java index f69899cbc..592a2b33f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityBossLevel.java @@ -139,9 +139,6 @@ public class CityBossLevel extends Level { } } - int sign = arenaDoor + 2*width() + 1; - map[sign] = Terrain.SIGN; - return true; } @@ -175,7 +172,7 @@ public class CityBossLevel extends Level { pos = Random.IntRange( LEFT + 1, LEFT + HALL_WIDTH - 2 ) + Random.IntRange( TOP + HALL_HEIGHT + 1, TOP + HALL_HEIGHT + CHAMBER_HEIGHT ) * width(); - } while (pos == entrance || map[pos] == Terrain.SIGN); + } while (pos == entrance); drop( item, pos ).type = Heap.Type.REMAINS; } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/DeadEndLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/DeadEndLevel.java index 3761b20b0..e0f849782 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/DeadEndLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/DeadEndLevel.java @@ -66,8 +66,6 @@ public class DeadEndLevel extends Level { entrance = SIZE * width() + SIZE / 2 + 1; map[entrance] = Terrain.ENTRANCE; - map[(SIZE / 2 + 1) * (width() + 1)] = Terrain.SIGN; - exit = 0; return true; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/HallsBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/HallsBossLevel.java index 8b2f50a01..4304fe608 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/HallsBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/HallsBossLevel.java @@ -162,7 +162,7 @@ public class HallsBossLevel extends Level { int pos; do { pos = Random.IntRange( ROOM_LEFT, ROOM_RIGHT ) + Random.IntRange( ROOM_TOP + 1, ROOM_BOTTOM ) * width(); - } while (pos == entrance || map[pos] == Terrain.SIGN); + } while (pos == entrance); drop( item, pos ).type = Heap.Type.REMAINS; } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/LastShopLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/LastShopLevel.java index b433d6367..9cba96a4f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/LastShopLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/LastShopLevel.java @@ -120,7 +120,7 @@ public class LastShopLevel extends RegularLevel { int pos; do { pos = pointToCell(roomEntrance.random()); - } while (pos == entrance || map[pos] == Terrain.SIGN); + } while (pos == entrance); drop( item, pos ).type = Heap.Type.REMAINS; } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java index beaa5ea5c..d84fb9f79 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java @@ -385,7 +385,6 @@ public class PrisonBossLevel extends Level { private static final int D = Terrain.DOOR; private static final int L = Terrain.LOCKED_DOOR; private static final int e = Terrain.EMPTY; - private static final int S = Terrain.SIGN; private static final int T = Terrain.INACTIVE_TRAP; @@ -402,7 +401,7 @@ public class PrisonBossLevel extends Level { W, W, W, W, e, e, e, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, e, E, e, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, e, e, e, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, - W, W, W, W, S, e, e, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, + W, W, W, W, e, e, e, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, D, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, e, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, M, W, W, e, W, W, M, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, @@ -504,7 +503,7 @@ public class PrisonBossLevel extends Level { W, W, W, W, e, e, e, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, e, E, e, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, e, e, e, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, - W, W, W, W, S, e, e, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, + W, W, W, W, e, e, e, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, D, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, e, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, M, W, W, e, W, W, M, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, W, diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/SewerBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/SewerBossLevel.java index 5e55170f8..c0826da40 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/SewerBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/SewerBossLevel.java @@ -120,7 +120,7 @@ public class SewerBossLevel extends SewerLevel { int pos; do { pos = pointToCell(roomEntrance.random()); - } while (pos == entrance || map[pos] == Terrain.SIGN || solid[pos]); + } while (pos == entrance || solid[pos]); drop( item, pos ).type = Heap.Type.REMAINS; } } @@ -130,7 +130,7 @@ public class SewerBossLevel extends SewerLevel { int pos; do { pos = pointToCell(roomEntrance.random()); - } while (pos == entrance || map[pos] == Terrain.SIGN || solid[pos]); + } while (pos == entrance || solid[pos]); return pos; }