From be396f4e2d7d988b8d3fb85a51ed2976a29bfa87 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 12 Jul 2017 00:11:42 -0400 Subject: [PATCH] v0.6.1: fixed rare problematic enemy and npc placement --- .../shatteredpixeldungeon/levels/RegularLevel.java | 7 ++++++- .../levels/rooms/standard/PlatformRoom.java | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java index b4ab234ba..207ae52fe 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java @@ -276,7 +276,12 @@ public abstract class RegularLevel extends Level { continue; } - cell = pointToCell(room.random()); + //if we can avoid it, don't place along the perimiter + if (room.width() >= 6 && room.height() >= 6) { + cell = pointToCell(room.random(2)); + } else { + cell = pointToCell(room.random(1)); + } if (!Dungeon.visible[cell] && Actor.findChar( cell ) == null && Level.passable[cell] diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/PlatformRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/PlatformRoom.java index 19c9b0a35..30a8410a0 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/PlatformRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/PlatformRoom.java @@ -33,12 +33,12 @@ public class PlatformRoom extends StandardRoom { @Override public int minWidth() { - return Math.max(super.minWidth(), 5); + return Math.max(super.minWidth(), 6); } @Override public int minHeight() { - return Math.max(super.minHeight(), 5); + return Math.max(super.minHeight(), 6); } @Override