v2.1.0: fixed projectile traps picking targets before actually firing

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrimTrap.java

@@ -48,6 +48,17 @@ public class GrimTrap extends Trap {
 
 	@Override
 	public void activate() {
+
+		//we handle this inside of a separate actor as the trap may produce a visual effect we need to pause for
+		Actor.add(new Actor() {
+
+			{
+				actPriority = VFX_PRIO;
+			}
+
+			@Override
+			protected boolean act() {
+				Actor.remove(this);
 				Char target = Actor.findChar(pos);
 
 				//find the closest char that can be aimed at
@@ -66,11 +77,8 @@ public class GrimTrap extends Trap {
 
 				if (target != null) {
 					final Char finalTarget = target;
-			final GrimTrap trap = this;
-			int damage;
-			
 					//instant kill, use a mix of current HP and max HP, just like psi blast (for resistances)
-			damage = Math.round(finalTarget.HT/2f + finalTarget.HP/2f);
+					int damage = Math.round(finalTarget.HT/2f + finalTarget.HP/2f);
 
 					//can't do more than 90% HT for the hero specifically
 					if (finalTarget == Dungeon.hero){
@@ -78,17 +86,7 @@ public class GrimTrap extends Trap {
 					}
 
 					final int finalDmg = damage;
-			
+					if (Dungeon.level.heroFOV[pos] || Dungeon.level.heroFOV[target.pos]) {
-			Actor.add(new Actor() {
-				
-				{
-					//it's a visual effect, gets priority no matter what
-					actPriority = VFX_PRIO;
-				}
-				
-				@Override
-				protected boolean act() {
-					final Actor toRemove = this;
 						((MagicMissile)finalTarget.sprite.parent.recycle(MagicMissile.class)).reset(
 								MagicMissile.SHADOW,
 								DungeonTilemap.tileCenterToWorld(pos),
@@ -96,28 +94,33 @@ public class GrimTrap extends Trap {
 								new Callback() {
 									@Override
 									public void call() {
-									finalTarget.damage(finalDmg, trap);
+										finalTarget.damage(finalDmg, GrimTrap.this);
 										if (finalTarget == Dungeon.hero) {
 											Sample.INSTANCE.play(Assets.Sounds.CURSED);
 											if (!finalTarget.isAlive()) {
 												Badges.validateDeathFromGrimOrDisintTrap();
-											Dungeon.fail( GrimTrap.class );
+												Dungeon.fail( GrimTrap.this.getClass() );
 												GLog.n( Messages.get(GrimTrap.class, "ondeath") );
 											}
 										} else {
 											Sample.INSTANCE.play(Assets.Sounds.BURNING);
 										}
 										finalTarget.sprite.emitter().burst(ShadowParticle.UP, 10);
-									Actor.remove(toRemove);
 										next();
 									}
 								});
 						return false;
+					} else {
+						finalTarget.damage(finalDmg, GrimTrap.this);
+						return true;
 					}
-			});
 				} else {
 					CellEmitter.get(pos).burst(ShadowParticle.UP, 10);
 					Sample.INSTANCE.play(Assets.Sounds.BURNING);
+					return true;
 				}
 			}
+
+		});
+	}
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PoisonDartTrap.java

@@ -56,6 +56,17 @@ public class PoisonDartTrap extends Trap {
 	
 	@Override
 	public void activate() {
+
+		//we handle this inside of a separate actor as the trap may produce a visual effect we need to pause for
+		Actor.add(new Actor() {
+
+			{
+				actPriority = VFX_PRIO;
+			}
+
+			@Override
+			protected boolean act() {
+				Actor.remove(this);
 				Char target = Actor.findChar(pos);
 
 				if (target != null && !canTarget(target)){
@@ -75,26 +86,16 @@ public class PoisonDartTrap extends Trap {
 						}
 					}
 				}
+
 				if (target != null) {
 					final Char finalTarget = target;
-			final PoisonDartTrap trap = this;
 					if (Dungeon.level.heroFOV[pos] || Dungeon.level.heroFOV[target.pos]) {
-				Actor.add(new Actor() {
-					
-					{
-						//it's a visual effect, gets priority no matter what
-						actPriority = VFX_PRIO;
-					}
-					
-					@Override
-					protected boolean act() {
-						final Actor toRemove = this;
 						((MissileSprite) ShatteredPixelDungeon.scene().recycle(MissileSprite.class)).
 								reset(pos, finalTarget.sprite, new PoisonDart(), new Callback() {
 									@Override
 									public void call() {
 										int dmg = Random.NormalIntRange(4, 8) - finalTarget.drRoll();
-									finalTarget.damage(dmg, trap);
+										finalTarget.damage(dmg, PoisonDartTrap.this);
 										if (finalTarget == Dungeon.hero){
 											//for the poison dart traps in the Tengu fight
 											if (Dungeon.depth == 10) {
@@ -102,24 +103,27 @@ public class PoisonDartTrap extends Trap {
 												Statistics.bossScores[1] -= 100;
 											}
 											if (!finalTarget.isAlive()) {
-											Dungeon.fail(trap.getClass());
+												Dungeon.fail(PoisonDartTrap.this.getClass());
 											}
 										}
 										Buff.affect( finalTarget, Poison.class ).set( poisonAmount() );
 										Sample.INSTANCE.play(Assets.Sounds.HIT, 1, 1, Random.Float(0.8f, 1.25f));
 										finalTarget.sprite.bloodBurstA(finalTarget.sprite.center(), dmg);
 										finalTarget.sprite.flash();
-									Actor.remove(toRemove);
 										next();
 									}
 								});
 						return false;
-					}
-				});
 					} else {
-				finalTarget.damage(Random.NormalIntRange(4, 8) - finalTarget.drRoll(), trap);
+						finalTarget.damage(Random.NormalIntRange(4, 8) - finalTarget.drRoll(), PoisonDartTrap.this);
 						Buff.affect( finalTarget, Poison.class ).set( poisonAmount() );
+						return true;
+					}
+				} else {
+					return true;
 				}
 			}
+
+		});
 	}
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WornDartTrap.java

@@ -45,8 +45,20 @@ public class WornDartTrap extends Trap {
 
 	@Override
 	public void activate() {
+
+		//we handle this inside of a separate actor as the trap may produce a visual effect we need to pause for
+		Actor.add(new Actor() {
+
+			{
+				actPriority = VFX_PRIO;
+			}
+
+			@Override
+			protected boolean act() {
+				Actor.remove(this);
 				Char target = Actor.findChar(pos);
 
+				//find the closest char that can be aimed at
 				if (target == null){
 					float closestDist = Float.MAX_VALUE;
 					for (Char ch : Actor.chars()){
@@ -59,42 +71,35 @@ public class WornDartTrap extends Trap {
 						}
 					}
 				}
+
 				if (target != null) {
 					final Char finalTarget = target;
-			final WornDartTrap trap = this;
 					if (Dungeon.level.heroFOV[pos] || Dungeon.level.heroFOV[target.pos]) {
-				Actor.add(new Actor() {
-					
-					{
-						//it's a visual effect, gets priority no matter what
-						actPriority = VFX_PRIO;
-					}
-					
-					@Override
-					protected boolean act() {
-						final Actor toRemove = this;
 						((MissileSprite) ShatteredPixelDungeon.scene().recycle(MissileSprite.class)).
 								reset(pos, finalTarget.sprite, new Dart(), new Callback() {
 									@Override
 									public void call() {
 										int dmg = Random.NormalIntRange(4, 8) - finalTarget.drRoll();
-								finalTarget.damage(dmg, trap);
+										finalTarget.damage(dmg, WornDartTrap.this);
 										if (finalTarget == Dungeon.hero && !finalTarget.isAlive()){
-									Dungeon.fail( trap.getClass()  );
+											Dungeon.fail( WornDartTrap.this.getClass()  );
 										}
 										Sample.INSTANCE.play(Assets.Sounds.HIT, 1, 1, Random.Float(0.8f, 1.25f));
 										finalTarget.sprite.bloodBurstA(finalTarget.sprite.center(), dmg);
 										finalTarget.sprite.flash();
-								Actor.remove(toRemove);
 										next();
 									}
 								});
 						return false;
-					}
-				});
 					} else {
-				finalTarget.damage(Random.NormalIntRange(4, 8) - finalTarget.drRoll(), trap);
+						finalTarget.damage(Random.NormalIntRange(4, 8) - finalTarget.drRoll(), WornDartTrap.this);
+						return true;
+					}
+				} else {
+					return true;
 				}
 			}
+
+		});
 	}
 }