Fixed movement within tiles. Also fixed bug trashing the collision map if an agent's position was modified after being added to the simulation.

Author: Bytekeeper

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

@@ -27,6 +27,8 @@ public class Agent {
   int elevationLevel = -2;
   int x;
   int y;
+  int nx;
+  int ny;
   boolean speedUpgrade;
   float baseSpeed;
   int speedSquared;
@@ -122,6 +124,8 @@ public Agent(Agent other) {
     this.elevationLevel = other.elevationLevel;
     this.x = other.x;
     this.y = other.y;
+    this.nx = other.nx;
+    this.ny = other.ny;
     this.speedUpgrade = other.speedUpgrade;
     this.baseSpeed = other.baseSpeed;
     this.speedSquared = other.speedSquared;
@@ -282,12 +286,12 @@ public Agent setElevationLevel(int elevationLevel) {
   }
 
   public Agent setX(int x) {
-    this.x = x;
+    this.nx = x;
     return this;
   }
 
   public Agent setY(int y) {
-    this.y = y;
+    this.ny = y;
     return this;
   }
 

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

@@ -116,8 +116,8 @@ public static int reduceDamageByTargetSizeAndDamageType(
   public static void randomizePositions(Collection<Agent> agents, int ax, int ay, int bx, int by) {
     SplittableRandom posRnd = new SplittableRandom(1337L);
     for (Agent agent : agents) {
-      agent.x = posRnd.nextInt(ax, bx + 1);
-      agent.y = posRnd.nextInt(ay, by + 1);
+      agent.nx = posRnd.nextInt(ax, bx + 1);
+      agent.ny = posRnd.nextInt(ay, by + 1);
     }
   }
 }

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

@@ -78,8 +78,7 @@ public boolean simUnit(
     }
 
     if (agent.cooldown <= 0
-        && selectedDistanceSquared
-            <= Math.max(Simulator.MIN_SIMULATION_RANGE, selectedWeapon.maxRangeSquared)) {
+        && selectedDistanceSquared <= selectedWeapon.maxRangeSquared) {
       simAttack(agent, allies, enemies, selectedEnemy, selectedWeapon);
     }
 

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

@@ -36,6 +36,7 @@ public class BWAPI4JAgentFactory {
 
   private BiConsumer<Agent, Collection<Agent>> bunkerDeathHandler =
       (bunker, agents) -> {
+    // TODO: Fix collision map not being updated here
         agents.add(of(UnitType.Terran_Marine));
         agents.add(of(UnitType.Terran_Marine));
         agents.add(of(UnitType.Terran_Marine));

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

@@ -40,6 +40,7 @@ public class JBWAPIAgentFactory {
 
   private BiConsumer<Agent, Collection<Agent>> bunkerReplacer =
       (bunker, agents) -> {
+        // TODO: Fix collision map not being updated here
         agents.add(of(UnitType.Terran_Marine));
         agents.add(of(UnitType.Terran_Marine));
         agents.add(of(UnitType.Terran_Marine));

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

@@ -32,9 +32,6 @@ public class Simulator {
 
   private static final int MAX_MAP_DIMENSION = 8192;
   private static final int TILE_SIZE = 16;
-  // Hack to fix DTs not being able to hit a target in another TILE due to collision
-  public static final int MIN_SIMULATION_RANGE =
-      (TILE_SIZE + TILE_SIZE / 2) * (TILE_SIZE + TILE_SIZE / 2);
   private static final int COLLISION_MAP_DIMENSION = MAX_MAP_DIMENSION / TILE_SIZE;
   private final UnorderedCollection<Agent> playerA = new UnorderedCollection<>();
   private final UnorderedCollection<Agent> playerB = new UnorderedCollection<>();
@@ -55,7 +52,6 @@ private Simulator(int frameSkip, Behavior playerABehavior, Behavior playerBBehav
   }
 
   public Simulator addAgentA(Agent agent) {
-    checkBounds(agent);
     playerA.add(agent);
     if (!agent.isFlyer) {
       collision[colindex(agent.x, agent.y)]++;
@@ -72,7 +68,6 @@ public void removeAgentB(Agent agent) {
   }
 
   public Simulator addAgentB(Agent agent) {
-    checkBounds(agent);
     playerB.add(agent);
     if (!agent.isFlyer) {
       collision[colindex(agent.x, agent.y)]++;
@@ -126,6 +121,30 @@ public int simulate() {
    */
   public int simulate(int frames) {
     if (frames > 0) frames += Math.floorMod(frameSkip - frames, frameSkip);
+    for (int i = playerA.size() - 1; i >= 0; i--) {
+      Agent agent = playerA.get(i);
+      if (!agent.isFlyer) {
+        int oldCI = colindex(agent.x, agent.y);
+        int newCI = colindex(agent.nx, agent.ny);
+        collision[oldCI]--;
+        collision[newCI]++;
+      }
+      agent.x = agent.nx;
+      agent.y = agent.ny;
+      checkBounds(agent);
+    }
+    for (int i = playerB.size() - 1; i >= 0; i--) {
+      Agent agent = playerB.get(i);
+      if (!agent.isFlyer) {
+        int oldCI = colindex(agent.x, agent.y);
+        int newCI = colindex(agent.nx, agent.ny);
+        collision[oldCI]--;
+        collision[newCI]++;
+      }
+      agent.x = agent.nx;
+      agent.y = agent.ny;
+      checkBounds(agent);
+    }
     while (frames != 0 && !playerA.isEmpty() && !playerB.isEmpty()) {
       frames -= frameSkip;
       if (!step()) {
@@ -134,6 +153,16 @@ public int simulate(int frames) {
     }
     playerA.clearReferences();
     playerB.clearReferences();
+    for (int i = playerA.size() - 1; i >= 0; i--) {
+      Agent agent = playerA.get(i);
+      agent.nx = agent.x;
+      agent.ny = agent.y;
+    }
+    for (int i = playerB.size() - 1; i >= 0; i--) {
+      Agent agent = playerB.get(i);
+      agent.nx = agent.x;
+      agent.ny = agent.y;
+    }
     return frames;
   }
 
@@ -234,10 +263,14 @@ private void updatePosition(Agent agent) {
       int newCI = colindex(tx, ty);
       if (oldCI != newCI) {
         if (collision[newCI] > TILE_SIZE / 8 - 1) {
-          return;
+          int cx = agent.x / TILE_SIZE * TILE_SIZE;
+          int cy = agent.y / TILE_SIZE * TILE_SIZE;
+          tx = Math.max(cx, Math.min(cx + TILE_SIZE - 1, tx));
+          ty = Math.max(cy, Math.min(cy + TILE_SIZE - 1, ty));
+        } else {
+          collision[oldCI]--;
+          collision[newCI]++;
         }
-        collision[oldCI]--;
-        collision[newCI]++;
       }
     }
 

src/test/java/org/bk/ass/sim/SimulatorTest.java

@@ -696,16 +696,20 @@ void goonShouldDieWhenRunningAwayFromScout() {
 
   @Test
   void addAgentAAtInvalidPositionShouldThrowException() {
+    simulator.addAgentA(factory.of(UnitType.Protoss_Scout).setX(9000));
+
     assertThrows(
         PositionOutOfBoundsException.class,
-        () -> simulator.addAgentA(factory.of(UnitType.Protoss_Scout).setX(9000)));
+        () -> simulator.simulate(1));
   }
 
   @Test
   void addAgentBAtInvalidPositionShouldThrowException() {
+    simulator.addAgentB(factory.of(UnitType.Protoss_Scout).setY(9000));
+
     assertThrows(
         PositionOutOfBoundsException.class,
-        () -> simulator.addAgentB(factory.of(UnitType.Protoss_Scout).setY(9000)));
+        () -> simulator.simulate(1));
   }
 
   @Test
@@ -935,7 +939,7 @@ void reaverVs12Lings() {
     // GIVEN
     simulator.addAgentA(factory.of(UnitType.Protoss_Reaver));
 
-    for (int i = 0; i < 12; i++) {
+    for (int i = 0; i < 13; i++) {
       simulator.addAgentB(factory.of(UnitType.Zerg_Zergling).setX(i * 30));
     }