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

Merging 1.7.5 Source: levels/painters changes

Browse Source
This commit is contained in:
Evan Debenham 2015-02-02 14:16:38 -05:00
parent 1a4d177a9e
commit a6c89490b0
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/RatKingPainter.java
View File

@ -49,6 +49,14 @@ public class RatKingPainter extends Painter {
addChest( level, i * Level.WIDTH + room.right - 1, door ); addChest( level, i * Level.WIDTH + room.right - 1, door );
} }
while (true) {
Heap chest = level.heaps.get( room.random() );
if (chest != null) {
chest.type = Heap.Type.MIMIC;
break;
}
}
RatKing king = new RatKing(); RatKing king = new RatKing();
king.pos = room.random( 1 ); king.pos = room.random( 1 );
level.mobs.add( king ); level.mobs.add( king );

2
src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/TreasuryPainter.java
View File

@ -43,7 +43,7 @@ public class TreasuryPainter extends Painter {
do { do {
pos = room.random(); pos = room.random();
} while (level.map[pos] != Terrain.EMPTY || level.heaps.get( pos ) != null); } while (level.map[pos] != Terrain.EMPTY || level.heaps.get( pos ) != null);
level.drop( new Gold().random(), pos ).type = heapType; level.drop( new Gold().random(), pos ).type = (i == 0 && heapType == Heap.Type.CHEST ? Heap.Type.MIMIC : heapType);
} }
if (heapType == Heap.Type.HEAP) { if (heapType == Heap.Type.HEAP) {