Flattened Scenario and move sample to battles module

3 files changed, 23 insertions, 2 deletions

diff --git a/battles/include/kurator/battles/Scenario.h b/battles/include/kurator/battles/Scenario.h
index 94adf73..b9bcc09 100644
--- a/battles/include/kurator/battles/Scenario.h
+++ b/battles/include/kurator/battles/Scenario.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <string>
 #include <vector>
 
 #include "ShipConfig.h"
@@ -13,8 +14,8 @@ namespace battles
 
 struct Scenario
 {
-	using TeamComposition = std::vector<ShipConfig>;
-	std::vector<TeamComposition> teams;
+	std::string name;
+	std::vector<ShipConfig> ships;
 };
 
 
diff --git a/battles/include/kurator/battles/ShipConfig.h b/battles/include/kurator/battles/ShipConfig.h
index f2315fe..bc01ad2 100644
--- a/battles/include/kurator/battles/ShipConfig.h
+++ b/battles/include/kurator/battles/ShipConfig.h
@@ -14,6 +14,7 @@ namespace battles
 
 struct ShipConfig
 {
+	int team;
 	universe::ShipType type;
 	std::vector<universe::TurretType> turrets;
 };
diff --git a/battles/include/kurator/battles/scenarios.h b/battles/include/kurator/battles/scenarios.h
new file mode 100644
index 0000000..3d7e697
--- /dev/null
+++ b/battles/include/kurator/battles/scenarios.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "Scenario.h"
+
+
+namespace kurator
+{
+namespace battles
+{
+namespace scenarios
+{
+
+
+Scenario example();
+
+
+}  // namespace scenarios
+}  // namespace battles
+}  // namespace kurator