diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/PitRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/PitRoom.java
index 6e321e341..58d6bd5f9 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/PitRoom.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/PitRoom.java
@@ -77,6 +77,9 @@ public class PitRoom extends SpecialRoom {
 				case 2:
 					mainLoot = Generator.random(Random.oneOf(
 							Generator.Category.WEAPON,
+							Generator.Category.WEAPON,
+							Generator.Category.MISSILE,
+							Generator.Category.ARMOR,
 							Generator.Category.ARMOR));
 					break;
 			}
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/PoolRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/PoolRoom.java
index 12937df4f..469f72154 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/PoolRoom.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/PoolRoom.java
@@ -111,16 +111,25 @@ public class PoolRoom extends SpecialRoom {
 		}
 
 		//1 floor set higher in probability, never cursed
-		if (Random.Int(2) == 0) {
-			prize = Generator.randomWeapon((Dungeon.depth / 5) + 1);
-			if (((Weapon)prize).hasCurseEnchant()){
-				((Weapon) prize).enchant(null);
-			}
-		} else {
-			prize = Generator.randomArmor((Dungeon.depth / 5) + 1);
-			if (((Armor)prize).hasCurseGlyph()){
-				((Armor) prize).inscribe(null);
-			}
+		switch (Random.Int(5)){
+			case 0: case 1: default:
+				prize = Generator.randomWeapon((Dungeon.depth / 5) + 1);
+				if (((Weapon)prize).hasCurseEnchant()){
+					((Weapon) prize).enchant(null);
+				}
+				break;
+			case 2:
+				prize = Generator.randomMissile((Dungeon.depth / 5) + 1);
+				if (((Weapon)prize).hasCurseEnchant()){
+					((Weapon) prize).enchant(null);
+				}
+				break;
+			case 3: case 4:
+				prize = Generator.randomArmor((Dungeon.depth / 5) + 1);
+				if (((Armor)prize).hasCurseGlyph()){
+					((Armor) prize).inscribe(null);
+				}
+				break;
 		}
 		prize.cursed = false;
 		prize.cursedKnown = true;
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/SentryRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/SentryRoom.java
index 8e14f408c..417c1a648 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/SentryRoom.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/SentryRoom.java
@@ -23,7 +23,6 @@ package com.shatteredpixel.shatteredpixeldungeon.levels.rooms.special;
 
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
 import com.shatteredpixel.shatteredpixeldungeon.Badges;
-import com.shatteredpixel.shatteredpixeldungeon.Challenges;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
@@ -184,17 +183,25 @@ public class SentryRoom extends SpecialRoom {
 		}
 
 		//1 floor set higher in probability, never cursed
-		//1 floor set higher in probability, never cursed
-		if (Random.Int(2) == 0) {
-			prize = Generator.randomWeapon((Dungeon.depth / 5) + 1);
-			if (((Weapon)prize).hasCurseEnchant()){
-				((Weapon) prize).enchant(null);
-			}
-		} else {
-			prize = Generator.randomArmor((Dungeon.depth / 5) + 1);
-			if (((Armor)prize).hasCurseGlyph()){
-				((Armor) prize).inscribe(null);
-			}
+		switch (Random.Int(5)){
+			case 0: case 1: default:
+				prize = Generator.randomWeapon((Dungeon.depth / 5) + 1);
+				if (((Weapon)prize).hasCurseEnchant()){
+					((Weapon) prize).enchant(null);
+				}
+				break;
+			case 2:
+				prize = Generator.randomMissile((Dungeon.depth / 5) + 1);
+				if (((Weapon)prize).hasCurseEnchant()){
+					((Weapon) prize).enchant(null);
+				}
+				break;
+			case 3: case 4:
+				prize = Generator.randomArmor((Dungeon.depth / 5) + 1);
+				if (((Armor)prize).hasCurseGlyph()){
+					((Armor) prize).inscribe(null);
+				}
+				break;
 		}
 		prize.cursed = false;
 		prize.cursedKnown = true;
@@ -354,7 +361,7 @@ public class SentryRoom extends SpecialRoom {
 
 	public static class SentrySprite extends MobSprite {
 
-		private Animation charging;
+		private final Animation charging;
 		private Emitter chargeParticles;
 
 		public SentrySprite(){