From 3836b54a64fa1d40116e4c6b4a45818f8697bb90 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Thu, 13 Feb 2020 22:56:08 -0500
Subject: [PATCH] v0.8.0: various adjustments for floor 21 now being a demon
 halls floor

---
 .../shatteredpixel/shatteredpixeldungeon/items/Torch.java   | 2 +-
 .../levels/rooms/special/ShopRoom.java                      | 5 ++---
 .../levels/rooms/standard/StandardRoom.java                 | 6 ++----
 .../shatteredpixeldungeon/scenes/GameScene.java             | 4 ++--
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Torch.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Torch.java
index 0b457e671..4da174cef 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Torch.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Torch.java
@@ -85,7 +85,7 @@ public class Torch extends Item {
 	
 	@Override
 	public int price() {
-		return 10 * quantity;
+		return 8 * quantity;
 	}
 
 }
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/ShopRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/ShopRoom.java
index 86bf81193..00ad643bc 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/ShopRoom.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/ShopRoom.java
@@ -176,9 +176,8 @@ public class ShopRoom extends SpecialRoom {
 			w = (MeleeWeapon) Generator.random(Generator.wepTiers[4]);
 			itemsToSpawn.add( Generator.random(Generator.misTiers[4]).quantity(2).identify() );
 			itemsToSpawn.add( new PlateArmor().identify() );
-			itemsToSpawn.add( new Torch() );
-			itemsToSpawn.add( new Torch() );
-			itemsToSpawn.add( new Torch() );
+			itemsToSpawn.add( new Torch().quantity(2) );
+			itemsToSpawn.add( new Torch().quantity(2) );
 			break;
 		}
 		w.enchant(null);
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/StandardRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/StandardRoom.java
index 8c56029be..368bc34a9 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/StandardRoom.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/StandardRoom.java
@@ -148,10 +148,8 @@ public abstract class StandardRoom extends Room {
 		chances[16] = new float[]{20,  0,0, 0,0, 0,0, 15,5, 0,0,    1,1,1,1,1,1,1,1,1,1};
 		chances[20] = chances[19] = chances[18] = chances[17] = chances[16];
 		
-		chances[21] = chances[5];
-		
-		chances[22] = new float[]{20,  0,0, 0,0, 0,0, 0,0, 15,5,    1,1,1,1,1,1,1,1,1,1};
-		chances[26] = chances[25] = chances[24] = chances[23] = chances[22];
+		chances[21] = new float[]{20,  0,0, 0,0, 0,0, 0,0, 15,5,    1,1,1,1,1,1,1,1,1,1};
+		chances[26] = chances[25] = chances[24] = chances[23] = chances[22] = chances[21];
 	}
 	
 	
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
index 331b25841..3543900e0 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
@@ -369,11 +369,11 @@ public class GameScene extends PixelScene {
 			case 16:
 				WndStory.showChapter( WndStory.ID_CITY );
 				break;
-			case 22:
+			case 21:
 				WndStory.showChapter( WndStory.ID_HALLS );
 				break;
 			}
-			if (Dungeon.hero.isAlive() && Dungeon.depth != 22) {
+			if (Dungeon.hero.isAlive()) {
 				Badges.validateNoKilling();
 			}
 			break;