Bounces should target live units only

JavaBWAPI · Oct 20, 2019 · faf1e2b · faf1e2b
1 parent 55d9c8b
commit faf1e2b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/main/java/org/bk/ass/sim/AgentUtil.java b/src/main/java/org/bk/ass/sim/AgentUtil.java
@@ -127,6 +127,7 @@ public static void dealBounceDamage(
     for (int i = enemies.size() - 1; i >= 0 && remainingBounces > 0; i--) {
       Agent enemy = enemies.get(i);
       if (enemy != lastTarget
+              && enemy.healthShifted > 0
               && abs(enemy.x - lastTarget.x) <= 96
               && abs(enemy.y - lastTarget.y) <= 96) {
         lastTarget = enemy;

diff --git a/src/main/java/org/bk/ass/sim/RetreatBehavior.java b/src/main/java/org/bk/ass/sim/RetreatBehavior.java
@@ -22,6 +22,7 @@ static boolean simFlee(int frames, Agent agent, UnorderedCollection<Agent> enemi
     for (int i = enemies.size() - 1; i >= 0; i--) {
       Agent enemy = enemies.get(i);
       Weapon wpn = enemy.weaponVs(agent);
+      // Enemy could be dead already, but skipping it generally doesn't make a difference and it will be gone next frame.
       if (wpn.damageShifted != 0) {
         int distanceSq = distanceSquared(agent, enemy);
         if (distanceSq >= wpn.minRangeSquared && distanceSq < selectedDistanceSquared) {