konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions 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
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/LaboratoryPainter.java
+6 -9
View File
@@ -70,14 +70,11 @@ public class LaboratoryPainter extends Painter {
}
private static Item prize( Level level ) {
Item prize = level.itemToSpanAsPrize();
if (prize instanceof Potion) {
return prize;
} else if (prize != null) {
level.addItemToSpawn( prize );
}
return Generator.random( Generator.Category.POTION );
Item prize = level.findPrizeItem( Potion.class );
if (prize == null)
prize = Generator.random( Generator.Category.POTION );
return prize;
}
}
src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/LibraryPainter.java
+4 -7
View File
@@ -78,13 +78,10 @@ public class LibraryPainter extends Painter {
private static Item prize( Level level ) {
Item prize = level.itemToSpanAsPrize();
if (prize instanceof Scroll) {
return prize;
} else if (prize != null) {
level.addItemToSpawn( prize );
}
Item prize = level.findPrizeItem( Scroll.class );
if (prize == null)
prize = Generator.random( Generator.Category.SCROLL );
return Generator.random( Generator.Category.SCROLL );
return prize;
}
}
src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/PitPainter.java
+5 -4
View File
@@ -76,10 +76,11 @@ public class PitPainter extends Painter {
private static Item prize( Level level ) {
Item prize = level.itemToSpanAsPrize();
if (prize != null) {
return prize;
}
if (Random.Int(2) != 0){
Item prize = level.findPrizeItem();
if (prize != null)
return prize;
}
return Generator.random( Random.oneOf(
Generator.Category.POTION,
src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/PoolPainter.java
+24 -21
View File
@@ -82,27 +82,30 @@ public class PoolPainter extends Painter {
}
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 another = Generator.random( Random.oneOf(
Generator.Category.WEAPON,
Generator.Category.ARMOR
) );
if (another.level > prize.level) {
prize = another;
}
}
return prize;
Item prize;
if (Random.Int(3) != 0){
prize = level.findPrizeItem();
if (prize != null)
return prize;
}
prize = Generator.random( Random.oneOf(
Generator.Category.WEAPON,
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;
}
}
src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/StoragePainter.java
+6 -5
View File
@@ -48,11 +48,12 @@ public class StoragePainter extends Painter {
}
private static Item prize( Level level ) {
Item prize = level.itemToSpanAsPrize();
if (prize != null) {
return prize;
}
if (Random.Int(2) != 0){
Item prize = level.findPrizeItem();
if (prize != null)
return prize;
}
return Generator.random( Random.oneOf(
Generator.Category.POTION,
src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/TrapsPainter.java
+8 -5
View File
@@ -78,11 +78,14 @@ public class TrapsPainter extends Painter {
}
private static Item prize( Level level ) {
Item prize = level.itemToSpanAsPrize();
if (prize != null) {
return prize;
}
Item prize;
if (Random.Int(4) != 0){
prize = level.findPrizeItem();
if (prize != null)
return prize;
}
prize = Generator.random( Random.oneOf(
Generator.Category.WEAPON,