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

v0.3.0e: fixed a bug where summoning trap chains were spawning mobs inside of eachother

Browse Source
This commit is contained in:
Evan Debenham 2015-06-17 10:54:43 -04:00 committed by Evan Debenham
parent a12911424e
commit c55e38a86a
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/SummoningTrap.java
View File

@ -36,8 +36,6 @@ public class SummoningTrap extends Trap {
private static final float DELAY = 2f; private static final float DELAY = 2f;
private static final Mob DUMMY = new Mob() {};
// 0x770088 // 0x770088
{ {
name = "Summoning trap"; name = "Summoning trap";
@ -59,8 +57,6 @@ public class SummoningTrap extends Trap {
} }
} }
// It's complicated here, because these traps can be activated in chain
ArrayList<Integer> candidates = new ArrayList<>(); ArrayList<Integer> candidates = new ArrayList<>();
for (int i=0; i < Level.NEIGHBOURS8.length; i++) { for (int i=0; i < Level.NEIGHBOURS8.length; i++) {
@ -75,17 +71,23 @@ public class SummoningTrap extends Trap {
while (nMobs > 0 && candidates.size() > 0) { while (nMobs > 0 && candidates.size() > 0) {
int index = Random.index( candidates ); int index = Random.index( candidates );
DUMMY.pos = candidates.get( index );
respawnPoints.add( candidates.remove( index ) ); respawnPoints.add( candidates.remove( index ) );
nMobs--; nMobs--;
} }
ArrayList<Mob> mobs = new ArrayList<>();
for (Integer point : respawnPoints) { for (Integer point : respawnPoints) {
Mob mob = Bestiary.mob( Dungeon.depth ); Mob mob = Bestiary.mob( Dungeon.depth );
mob.state = mob.WANDERING; mob.state = mob.WANDERING;
mob.pos = point;
GameScene.add( mob, DELAY ); GameScene.add( mob, DELAY );
ScrollOfTeleportation.appear( mob, point ); mobs.add( mob );
}
//important to process the visuals and pressing of cells last, so spawned mobs have a chance to occupy cells first
for (Mob mob : mobs){
ScrollOfTeleportation.appear(mob, mob.pos);
} }
} }