refactor AI system

src/balancing/ArenaSimulation.cpp

@@ -17,6 +17,8 @@
 #include "ModuleOwnerComponent.h"
 #include "MovementIntentSystem.h"
 #include "PositionComponent.h"
+#include "RepairSystem.h"
+#include "SalvagerSystem.h"
 #include "ScrapSystem.h"
 #include "ShipIdentityComponent.h"
 #include "ShipSystem.h"
@@ -51,11 +53,16 @@ ArenaSimulation::ArenaSimulation(const GameConfig& gameConfig,
         m_rng);
 
     m_shipSystem     = std::make_unique<ShipSystem>(m_gameConfig, m_admin);
+    // Arena fights are symmetric and aggressive: player-faction ships must not
+    // retreat (REQ-BAL-SIM-AI). Only one faction would otherwise get retreat.
+    m_shipSystem->setRetreatEnabled(false);
     m_aiSystem       = std::make_unique<AiSystem>();
     m_movementIntentSystem = std::make_unique<MovementIntentSystem>();
     m_dynamicBodySystem    = std::make_unique<DynamicBodySystem>();
     m_combatSystem   = std::make_unique<CombatSystem>(m_gameConfig);
     m_scrapSystem    = std::make_unique<ScrapSystem>(m_admin);
+    m_salvagerSystem = std::make_unique<SalvagerSystem>(m_admin);
+    m_repairSystem   = std::make_unique<RepairSystem>(m_admin);
 
     placeStructures();
     spawnShips();
@@ -250,13 +257,11 @@ ArenaStatus ArenaSimulation::status() const
 
 void ArenaSimulation::tick()
 {
-    // Ship behavior systems (tick step 7).
+    // Ship behavior systems (tick step 7): evaluate, select winner, execute.
     m_shipSystem->clearMovementIntents();
-    m_aiSystem->tickHomeReturnBehavior(m_admin);
-    m_aiSystem->tickThreatResponseBehavior(m_admin, *m_buildingSystem);
-    m_aiSystem->tickRepairBehavior(m_admin, *m_buildingSystem);
-    m_aiSystem->tickRepairTools(m_admin);
-    m_aiSystem->tickSalvageBehavior(m_admin, *m_scrapSystem, *m_buildingSystem);
+    m_aiSystem->tick(m_admin, *m_buildingSystem, *m_scrapSystem);
+    m_salvagerSystem->tick(*m_scrapSystem, *m_buildingSystem);
+    m_repairSystem->tick();
 
     // Combat resolution (tick step 8).
     std::vector<WeaponFiredEvent> weaponFiredEvents;

src/balancing/ArenaSimulation.h

@@ -22,6 +22,8 @@ class BuildingSystem;
 class CombatSystem;
 class DynamicBodySystem;
 class MovementIntentSystem;
+class RepairSystem;
+class SalvagerSystem;
 class ShipSystem;
 class ScrapSystem;
 
@@ -96,6 +98,8 @@ private:
     std::unique_ptr<DynamicBodySystem>    m_dynamicBodySystem;
     std::unique_ptr<CombatSystem>   m_combatSystem;
     std::unique_ptr<ScrapSystem>    m_scrapSystem;
+    std::unique_ptr<SalvagerSystem> m_salvagerSystem;
+    std::unique_ptr<RepairSystem>   m_repairSystem;
 
     entt::entity m_team1HqEntity;
     entt::entity m_team2HqEntity;