konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.4.3: added more rules for items spawning ontop of traps

Browse Source
This commit is contained in:
Evan Debenham
2016-10-06 22:11:19 -04:00
parent 2b6de44780
commit 4ffd6f9c83
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java
+16 -6
View File
@@ -30,11 +30,14 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
import com.shatteredpixel.shatteredpixeldungeon.items.Generator; import com.shatteredpixel.shatteredpixeldungeon.items.Generator;
import com.shatteredpixel.shatteredpixeldungeon.items.Heap; import com.shatteredpixel.shatteredpixeldungeon.items.Heap;
import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion;
import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfWealth; import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfWealth;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll;
import com.shatteredpixel.shatteredpixeldungeon.levels.Room.Type; import com.shatteredpixel.shatteredpixeldungeon.levels.Room.Type;
import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter; import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter;
import com.shatteredpixel.shatteredpixeldungeon.levels.painters.ShopPainter; import com.shatteredpixel.shatteredpixeldungeon.levels.painters.ShopPainter;
import com.shatteredpixel.shatteredpixeldungeon.levels.traps.ChillingTrap;
import com.shatteredpixel.shatteredpixeldungeon.levels.traps.ExplosiveTrap;
import com.shatteredpixel.shatteredpixeldungeon.levels.traps.FireTrap; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.FireTrap;
import com.shatteredpixel.shatteredpixeldungeon.levels.traps.Trap; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.Trap;
import com.shatteredpixel.shatteredpixeldungeon.levels.traps.WornTrap; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.WornTrap;
@@ -690,13 +693,20 @@ public abstract class RegularLevel extends Level {
} }
for (Item item : itemsToSpawn) { for (Item item : itemsToSpawn) {
int cell = randomDropCell(); int cell;
if (item instanceof Scroll) { do {
while ((map[cell] == Terrain.TRAP || map[cell] == Terrain.SECRET_TRAP) cell = randomDropCell();
&& traps.get( cell ) instanceof FireTrap) { if (item instanceof Scroll) {
cell = randomDropCell(); while (traps.get(cell) instanceof FireTrap) {
cell = randomDropCell();
}
} else if (item instanceof Potion) {
while (traps.get(cell) instanceof ChillingTrap) {
cell = randomDropCell();
}
} }
} } while (traps.get(cell) instanceof ExplosiveTrap);
drop( item, cell ).type = Heap.Type.HEAP; drop( item, cell ).type = Heap.Type.HEAP;
} }