Extracted basic simulation behaviour and that part of state to own class

1 files changed, 4 insertions, 30 deletions

diff --git a/sim/src/BaseBattle.cpp b/sim/src/BaseBattle.cpp
index 916a9f8..ee09740 100644
--- a/sim/src/BaseBattle.cpp
+++ b/sim/src/BaseBattle.cpp
@@ -1,21 +1,11 @@
 #include "BaseBattle.h"
 
-#include <algorithm>
-
 #include <entt/entity/registry.hpp>
 #include <entt/signal/dispatcher.hpp>
 
 #include <kurator/engine/Context.h>
 #include <kurator/campaign/Scenario.h>
 #include <kurator/sim.h>
-#include <kurator/sim/components.h>
-#include <kurator/sim/FloatingMovement.h>
-#include <kurator/sim/systems.h>
-#include <kurator/sim/TurretControl.h>
-#include <kurator/universe/UniqueIdentifier.h>
-
-#include "Builder.h"
-#include "RandomSpawner.h"
 
 
 namespace kurator
@@ -24,10 +14,10 @@ namespace sim
 {
 
 
-BaseBattle::BaseBattle(const campaign::Scenario& scenario)
+BaseBattle::BaseBattle(const campaign::Scenario& scenario) :
+	state {load_scenario(scenario)},
+	base {base_simulation_systems(state)}
 {
-	load_scenario(state, scenario);
-	manager.extend(state.registry);
 }
 
 
@@ -48,23 +38,7 @@ BaseBattle::const_context() const
 void
 BaseBattle::update(engine::Context& ctx)
 {
-	pick_random_targets();
-	keep_at_range(ctx);
-	FloatingMovement::update(ctx);
-	TurretControl::update(ctx);
-	kill_off_dead(ctx);
-	manager.update(ctx);
-}
-
-
-void
-BaseBattle::pick_random_targets()
-{
-	auto view = state.registry.view<Team, AIState>();
-	for (auto&& [entity, team, ai] : view.each()) {
-		if (!state.registry.valid(ai.target))
-			ai.target = manager.random(team.id);
-	}
+	base(ctx);
 }