1 files changed, 4 insertions, 3 deletions
diff --git a/kurator/src/Battle.h b/kurator/src/Battle.h
index c02717d..f6ec8d6 100644
--- a/kurator/src/Battle.h
+++ b/kurator/src/Battle.h
@@ -4,9 +4,9 @@
 #include <memory>
 
 #include <kurator/campaign/Scenario.h>
-#include <kurator/engine/Context.h>
-#include <kurator/sim/Battle.h>
 #include <kurator/sim/events.h>
+#include <kurator/sim/State.h>
+#include <kurator/sim/System.h>
 #include <kurator/stats/EventLog.h>
 #include <kurator/stats/events.h>
 
@@ -34,7 +34,8 @@ public:
 	void on_ship_left(const stats::ShipLeft& event);  // duplicated?
 private:
 	std::shared_ptr<Session> session;
-	std::unique_ptr<sim::Battle> battle;
+	sim::State ctx;
+	sim::System simulation_base;
 	ForceBalance balance;
 	stats::EventLog log;
 	Callback report;