v0.2.2a: refactored and tweaked placement of key items in rooms.

src/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java

@@ -447,17 +447,28 @@ public abstract class Level implements Bundlable {
 		}
 	}
 
-    //TODO: this results in lots of empty rooms that could otherwise have a prize, should rework, also fix typo.
+    public Item findPrizeItem(){ return findPrizeItem(null); }
-	public Item itemToSpanAsPrize() {
+
-		if (Random.Int( itemsToSpawn.size() + 1 ) > 0) {
+    public Item findPrizeItem(Class<?extends Item> match){
-			Item item = Random.element( itemsToSpawn );
+        if (itemsToSpawn.size() == 0)
+            return null;
+
+        if (match == null){
+            Item item = Random.element(itemsToSpawn);
+            itemsToSpawn.remove(item);
+            return item;
+        }
+
+        for (Item item : itemsToSpawn){
+            if (match.isInstance(item)){
                 itemsToSpawn.remove( item );
                 return item;
-		} else {
-			return null;
             }
         }
 
+        return null;
+    }
+	
 	private void buildFlagMaps() {
 		
 		for (int i=0; i < LENGTH; i++) {

src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/LaboratoryPainter.java

@@ -71,13 +71,10 @@ public class LaboratoryPainter extends Painter {
 	
 	private static Item prize( Level level ) {
 
-		Item prize = level.itemToSpanAsPrize();
+        Item prize = level.findPrizeItem( Potion.class );
-		if (prize instanceof Potion) {
+        if (prize == null)
-			return prize;
+            prize = Generator.random( Generator.Category.POTION );
-		} else if (prize != null) {
-			level.addItemToSpawn( prize );
-		}
 
-		return Generator.random( Generator.Category.POTION );
+        return prize;
 	}
 }

src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/LibraryPainter.java

@@ -78,13 +78,10 @@ public class LibraryPainter extends Painter {
 	
 	private static Item prize( Level level ) {
 		
-		Item prize = level.itemToSpanAsPrize();
+		Item prize = level.findPrizeItem( Scroll.class );
-		if (prize instanceof Scroll) {
+		if (prize == null)
-			return prize;
+            prize = Generator.random( Generator.Category.SCROLL );
-		} else if (prize != null) {
-			level.addItemToSpawn( prize );
-		}
 		
-		return Generator.random( Generator.Category.SCROLL );
+		return prize;
 	}
 }

src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/PitPainter.java

@@ -76,8 +76,9 @@ public class PitPainter extends Painter {
 	
 	private static Item prize( Level level ) {
 		
-		Item prize = level.itemToSpanAsPrize();
+		if (Random.Int(2) != 0){
-		if (prize != null) {
+            Item prize = level.findPrizeItem();
+            if (prize != null)
                 return prize;
         }
 		

src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/PoolPainter.java

@@ -83,8 +83,11 @@ public class PoolPainter extends Painter {
 	
 	private static Item prize( Level level ) {
 
-		Item prize = level.itemToSpanAsPrize();
+        Item prize;
-		if (prize != null) {
+
+        if (Random.Int(3) != 0){
+            prize = level.findPrizeItem();
+            if (prize != null)
                 return prize;
         }
 

src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/StoragePainter.java

@@ -49,8 +49,9 @@ public class StoragePainter extends Painter {
 	
 	private static Item prize( Level level ) {
 
-		Item prize = level.itemToSpanAsPrize();
+        if (Random.Int(2) != 0){
-		if (prize != null) {
+            Item prize = level.findPrizeItem();
+            if (prize != null)
                 return prize;
         }
 		

src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/TrapsPainter.java

@@ -79,8 +79,11 @@ public class TrapsPainter extends Painter {
 	
 	private static Item prize( Level level ) {
 
-		Item prize = level.itemToSpanAsPrize();
+        Item prize;
-		if (prize != null) {
+
+        if (Random.Int(4) != 0){
+            prize = level.findPrizeItem();
+            if (prize != null)
                 return prize;
         }