LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Evan Debenham 2014-11-05 16:50:08 -05:00
parent fd81d67616
commit dc4232de2a
7 changed files with 74 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java
View File

@ -447,16 +447,27 @@ 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)
itemsToSpawn.remove( item ); return null;
return item;
} else { if (match == null){
return null; Item item = Random.element(itemsToSpawn);
} itemsToSpawn.remove(item);
} return item;
}
for (Item item : itemsToSpawn){
if (match.isInstance(item)){
itemsToSpawn.remove( item );
return item;
}
}
return null;
}
private void buildFlagMaps() { private void buildFlagMaps() {

15
src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/LaboratoryPainter.java
View File

@ -70,14 +70,11 @@ public class LaboratoryPainter extends Painter {
} }
private static Item prize( Level level ) { 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 prize;
}
return Generator.random( Generator.Category.POTION );
} }
} }

11
src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/LibraryPainter.java
View File

@ -78,13 +78,10 @@ public class LibraryPainter extends Painter {
private static Item prize( Level level ) { 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;
} }
} }

9
src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/PitPainter.java
View File

@ -76,10 +76,11 @@ public class PitPainter extends Painter {
private static Item prize( Level level ) { private static Item prize( Level level ) {
Item prize = level.itemToSpanAsPrize(); if (Random.Int(2) != 0){
if (prize != null) { Item prize = level.findPrizeItem();
return prize; if (prize != null)
} return prize;
}
return Generator.random( Random.oneOf( return Generator.random( Random.oneOf(
Generator.Category.POTION, Generator.Category.POTION,

45
src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/PoolPainter.java
View File

@ -82,27 +82,30 @@ public class PoolPainter extends Painter {
} }
private static Item prize( Level level ) { private static Item prize( Level level ) {
Item prize = level.itemToSpanAsPrize();
if (prize != null) {
return prize;
}
prize = Generator.random( Random.oneOf(
Generator.Category.WEAPON,
Generator.Category.ARMOR
) );
for (int i=0; i < 4; i++) { Item prize;
Item another = Generator.random( Random.oneOf(
Generator.Category.WEAPON, if (Random.Int(3) != 0){
Generator.Category.ARMOR prize = level.findPrizeItem();
) ); if (prize != null)
if (another.level > prize.level) { return prize;
prize = another; }
}
} prize = Generator.random( Random.oneOf(
Generator.Category.WEAPON,
return prize; Generator.Category.ARMOR
) );
for (int i=0; i < 4; i++) {
Item another = Generator.random( Random.oneOf(
Generator.Category.WEAPON,
Generator.Category.ARMOR
) );
if (another.level > prize.level) {
prize = another;
}
}
return prize;
} }
} }

11
src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/StoragePainter.java
View File

@ -48,11 +48,12 @@ public class StoragePainter extends Painter {
} }
private static Item prize( Level level ) { private static Item prize( Level level ) {
Item prize = level.itemToSpanAsPrize(); if (Random.Int(2) != 0){
if (prize != null) { Item prize = level.findPrizeItem();
return prize; if (prize != null)
} return prize;
}
return Generator.random( Random.oneOf( return Generator.random( Random.oneOf(
Generator.Category.POTION, Generator.Category.POTION,

13
src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/TrapsPainter.java
View File

@ -78,11 +78,14 @@ public class TrapsPainter extends Painter {
} }
private static Item prize( Level level ) { private static Item prize( Level level ) {
Item prize = level.itemToSpanAsPrize(); Item prize;
if (prize != null) {
return prize; if (Random.Int(4) != 0){
} prize = level.findPrizeItem();
if (prize != null)
return prize;
}
prize = Generator.random( Random.oneOf( prize = Generator.random( Random.oneOf(
Generator.Category.WEAPON, Generator.Category.WEAPON,