Fixed spider mines not simulating splash.

Author: Bytekeeper

src/main/java/org/bk/ass/bt/Succeeder.java

@@ -1,5 +1,8 @@
 package org.bk.ass.bt;
 
+/**
+ * Never fails, but
+ */
 public class Succeeder extends Decorator {
 
   public Succeeder(TreeNode delegate) {
@@ -8,6 +11,10 @@ public Succeeder(TreeNode delegate) {
 
   @Override
   protected void updateStatusFromDelegate(NodeStatus status) {
-    success();
+    if (status != NodeStatus.RUNNING) {
+      success();
+    } else {
+      running();
+    }
   }
 }

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

@@ -1,6 +1,5 @@
 package org.bk.ass.sim;
 
-import static org.bk.ass.sim.AgentUtil.dealDamage;
 import static org.bk.ass.sim.AgentUtil.distanceSquared;
 import static org.bk.ass.sim.AgentUtil.moveToward;
 
@@ -43,7 +42,7 @@ public boolean simUnit(
     moveToward(frameSkip, agent, selectedEnemy, (float) Math.sqrt(selectedDistanceSquared));
 
     if (selectedDistanceSquared <= agent.speedSquared) {
-      dealDamage(agent, agent.weaponVs(selectedEnemy), selectedEnemy);
+      AttackerBehavior.attack(agent, agent.weaponVs(selectedEnemy), selectedEnemy, allies, enemies);
       agent.healthShifted = 0;
     }
     return true;

src/test/java/org/bk/ass/bt/SucceederTest.java

@@ -38,7 +38,7 @@ void shouldBeSuccessOnRunning() {
     sut.exec();
 
     /// THEN
-    assertThat(sut.getStatus()).isEqualTo(NodeStatus.SUCCESS);
+    assertThat(sut.getStatus()).isEqualTo(NodeStatus.RUNNING);
   }
 
 }

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

@@ -1082,7 +1082,7 @@ void shouldDieWhenRunningAwayWithSpeedPenalty() {
   @Test
   void spiderMineShouldNotAttackBuilding() {
     // GIVEN
-    simulator.addAgentA(factory.of(UnitType.Terran_Vulture_Spider_Mine).setDetected(false));
+    simulator.addAgentA(factory.of(UnitType.Terran_Vulture_Spider_Mine).setDetected(false).setBurrowed(true));
     simulator.addAgentB(factory.of(UnitType.Zerg_Sunken_Colony));
 
     // WHEN
@@ -1096,7 +1096,7 @@ void spiderMineShouldNotAttackBuilding() {
   @Test
   void spiderMineShouldAttackWithinSeekRange() {
     // GIVEN
-    simulator.addAgentA(factory.of(UnitType.Terran_Vulture_Spider_Mine).setDetected(false));
+    simulator.addAgentA(factory.of(UnitType.Terran_Vulture_Spider_Mine).setDetected(false).setBurrowed(true));
     simulator.addAgentB(factory.of(UnitType.Zerg_Zergling));
 
     // WHEN
@@ -1110,7 +1110,7 @@ void spiderMineShouldAttackWithinSeekRange() {
   @Test
   void spiderMineShouldNotAttackOutsideOfSeekRange() {
     // GIVEN
-    simulator.addAgentA(factory.of(UnitType.Terran_Vulture_Spider_Mine).setDetected(false));
+    simulator.addAgentA(factory.of(UnitType.Terran_Vulture_Spider_Mine).setDetected(false).setBurrowed(true));
     simulator.addAgentB(factory.of(UnitType.Zerg_Zergling).setX(128));
 
     // WHEN
@@ -1124,10 +1124,24 @@ void spiderMineShouldNotAttackOutsideOfSeekRange() {
     assertThat(simulator.getAgentsB()).isNotEmpty();
   }
 
+  @Test
+  void spiderMineShouldDoSplashDamage() {
+    // GIVEN
+    simulator.addAgentA(factory.of(UnitType.Terran_Vulture_Spider_Mine).setDetected(false).setBurrowed(true));
+    simulator.addAgentB(factory.of(UnitType.Zerg_Zergling).setX(16));
+    simulator.addAgentB(factory.of(UnitType.Zerg_Zergling).setX(16));
+
+    // WHEN
+    simulator.simulate(20);
+
+    // THEN
+    assertThat(simulator.getAgentsB()).isEmpty();
+  }
+
   @Test
   void spiderMineShouldNotAttackWorker() {
     // GIVEN
-    simulator.addAgentA(factory.of(UnitType.Terran_Vulture_Spider_Mine).setDetected(false));
+    simulator.addAgentA(factory.of(UnitType.Terran_Vulture_Spider_Mine).setDetected(false).setBurrowed(true));
     simulator.addAgentB(factory.of(UnitType.Zerg_Drone));
     simulator.addAgentB(factory.of(UnitType.Terran_SCV));
     simulator.addAgentB(factory.of(UnitType.Protoss_Probe));