Moved damage dealing/distribution code to AgentUtil

Author: Bytekeeper

src/main/java/org/bk/ass/sim/AgentUtil.java

@@ -194,4 +194,28 @@ public static int reduceDamageByTargetSizeAndDamageType(
     }
     return damageShifted;
   }
+
+  public static void attack(Agent agent, Weapon selectedWeapon, Agent selectedEnemy, UnorderedCollection<Agent> allies, UnorderedCollection<Agent> enemies) {
+    dealDamage(agent, selectedWeapon, selectedEnemy);
+    switch (selectedWeapon.splashType) {
+      case BOUNCE:
+        dealBounceDamage(selectedWeapon, selectedEnemy, enemies);
+        break;
+      case RADIAL_SPLASH:
+        dealRadialSplashDamage(selectedWeapon, selectedEnemy, allies, enemies);
+        break;
+      case RADIAL_ENEMY_SPLASH:
+        dealRadialSplashDamage(selectedWeapon, selectedEnemy, enemies);
+        break;
+      case LINE_SPLASH:
+        dealLineSplashDamage(agent, selectedWeapon, selectedEnemy, enemies);
+        break;
+      default:
+        // No splash
+    }
+    agent.cooldown = agent.maxCooldown;
+    if (agent.remainingStimFrames > 0) {
+      agent.cooldown /= 2;
+    }
+  }
 }

src/main/java/org/bk/ass/sim/AttackerBehavior.java

@@ -95,27 +95,8 @@ private void simAttack(
         && agent.healthShifted >= agent.maxHealthShifted / 2) {
       agent.stim();
     }
-    dealDamage(agent, selectedWeapon, selectedEnemy);
-    switch (selectedWeapon.splashType) {
-      case BOUNCE:
-        dealBounceDamage(selectedWeapon, selectedEnemy, enemies);
-        break;
-      case RADIAL_SPLASH:
-        dealRadialSplashDamage(selectedWeapon, selectedEnemy, allies, enemies);
-        break;
-      case RADIAL_ENEMY_SPLASH:
-        dealRadialSplashDamage(selectedWeapon, selectedEnemy, enemies);
-        break;
-      case LINE_SPLASH:
-        dealLineSplashDamage(agent, selectedWeapon, selectedEnemy, enemies);
-        break;
-      default:
-        // No splash
-    }
-    agent.cooldown = agent.maxCooldown;
-    if (agent.remainingStimFrames > 0) {
-      agent.cooldown /= 2;
-    }
+
+    AgentUtil.attack(agent, selectedWeapon, selectedEnemy, allies, enemies);
   }
 
   private void simCombatMove(
@@ -131,7 +112,7 @@ private void simCombatMove(
             && selectedEnemy.speed < agent.speed;
     float distance = (float) sqrt(selectedDistanceSquared);
     if (shouldKite) {
-      if (distance + agent.speed < selectedWeapon.maxRange) {
+      if (distance + agent.speed <= selectedWeapon.maxRange) {
         moveAwayFrom(frameSkip, agent, selectedEnemy, distance);
       }
     } else {