From 9520c9a402d60d0b182d688c609a332466d33061 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Mon, 23 Oct 2017 02:08:02 -0400
Subject: [PATCH] v0.6.2: adjusted secret chest and trap rooms

---
 .../rooms/secret/SecretChestChasmRoom.java    | 24 ++++++++++++-------
 .../levels/rooms/special/TrapsRoom.java       |  5 ++--
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretChestChasmRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretChestChasmRoom.java
index bb6e0102f..d466f5477 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretChestChasmRoom.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretChestChasmRoom.java
@@ -33,16 +33,28 @@ import com.watabou.utils.Point;
 
 public class SecretChestChasmRoom extends SecretRoom {
 	
+	//width and height are controlled here so that this room always requires 2 levitation potions
+	
 	@Override
 	public int minWidth() {
 		return 8;
 	}
 	
+	@Override
+	public int maxWidth() {
+		return 9;
+	}
+	
 	@Override
 	public int minHeight() {
 		return 8;
 	}
 	
+	@Override
+	public int maxHeight() {
+		return 9;
+	}
+	
 	@Override
 	public void paint(Level level) {
 		super.paint(level);
@@ -69,23 +81,19 @@ public class SecretChestChasmRoom extends SecretRoom {
 		
 		p = new Point(left+3, top+3);
 		Painter.set(level, p, Terrain.EMPTY_SP);
-		level.drop(Generator.random(Generator.Category.SCROLL),
-				level.pointToCell(p)).type = Heap.Type.LOCKED_CHEST;
+		level.drop(Generator.random(), level.pointToCell(p)).type = Heap.Type.LOCKED_CHEST;
 		
 		p.x = right-3;
 		Painter.set(level, p, Terrain.EMPTY_SP);
-		level.drop(Generator.random(Generator.Category.POTION),
-				level.pointToCell(p)).type = Heap.Type.LOCKED_CHEST;
+		level.drop(Generator.random(), level.pointToCell(p)).type = Heap.Type.LOCKED_CHEST;
 		
 		p.y = bottom-3;
 		Painter.set(level, p, Terrain.EMPTY_SP);
-		level.drop(Generator.random(Generator.Category.SCROLL),
-				level.pointToCell(p)).type = Heap.Type.LOCKED_CHEST;
+		level.drop(Generator.random(), level.pointToCell(p)).type = Heap.Type.LOCKED_CHEST;
 		
 		p.x = left+3;
 		Painter.set(level, p, Terrain.EMPTY_SP);
-		level.drop(Generator.random(Generator.Category.POTION),
-				level.pointToCell(p)).type = Heap.Type.LOCKED_CHEST;
+		level.drop(Generator.random(), level.pointToCell(p)).type = Heap.Type.LOCKED_CHEST;
 		
 		level.addItemToSpawn(new PotionOfLevitation());
 		
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/TrapsRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/TrapsRoom.java
index 62c6ab1e6..af4ad9026 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/TrapsRoom.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/TrapsRoom.java
@@ -38,7 +38,6 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.traps.FlockTrap;
 import com.shatteredpixel.shatteredpixeldungeon.levels.traps.GrimTrap;
 import com.shatteredpixel.shatteredpixeldungeon.levels.traps.GrippingTrap;
 import com.shatteredpixel.shatteredpixeldungeon.levels.traps.PoisonDartTrap;
-import com.shatteredpixel.shatteredpixeldungeon.levels.traps.SummoningTrap;
 import com.shatteredpixel.shatteredpixeldungeon.levels.traps.TeleportationTrap;
 import com.shatteredpixel.shatteredpixeldungeon.levels.traps.Trap;
 import com.shatteredpixel.shatteredpixeldungeon.levels.traps.WarpingTrap;
@@ -52,9 +51,9 @@ public class TrapsRoom extends SpecialRoom {
 		Painter.fill( level, this, Terrain.WALL );
 
 		Class<? extends Trap> trapClass;
-		switch (Random.Int(5)){
+		switch (Random.Int(4)){
 			case 0:
-				trapClass = !Dungeon.bossLevel(Dungeon.depth + 1)? null : SummoningTrap.class;
+				trapClass = null;
 				break;
 			default:
 				trapClass = Random.oneOf(levelTraps[Dungeon.depth/5]);