summaryrefslogtreecommitdiff
path: root/battles
diff options
context:
space:
mode:
Diffstat (limited to 'battles')
-rw-r--r--battles/include/kurator/battles/ShipConfig.h8
-rw-r--r--battles/src/BaseBattle.cpp15
-rw-r--r--battles/src/scenarios.cpp37
3 files changed, 28 insertions, 32 deletions
diff --git a/battles/include/kurator/battles/ShipConfig.h b/battles/include/kurator/battles/ShipConfig.h
index bc01ad2..2066430 100644
--- a/battles/include/kurator/battles/ShipConfig.h
+++ b/battles/include/kurator/battles/ShipConfig.h
@@ -1,10 +1,8 @@
#pragma once
+#include <string>
#include <vector>
-#include <kurator/universe/ShipType.h>
-#include <kurator/universe/TurretType.h>
-
namespace kurator
{
@@ -15,8 +13,8 @@ namespace battles
struct ShipConfig
{
int team;
- universe::ShipType type;
- std::vector<universe::TurretType> turrets;
+ std::string type;
+ std::vector<std::string> turrets;
};
diff --git a/battles/src/BaseBattle.cpp b/battles/src/BaseBattle.cpp
index 815c683..8a3dc37 100644
--- a/battles/src/BaseBattle.cpp
+++ b/battles/src/BaseBattle.cpp
@@ -1,13 +1,13 @@
#include "BaseBattle.h"
-#include <cmath>
#include <memory>
+#include <type_traits>
#include <entt/entity/registry.hpp>
#include <kurator/battles/components.h>
#include <kurator/battles/Scenario.h>
-#include <kurator/universe/ShipType.h>
+#include <kurator/universe.h>
namespace kurator
@@ -23,17 +23,20 @@ BaseBattle::BaseBattle(const Scenario& scenario) :
_registry {},
spawner {total_teams_in(scenario), 2.5, 0.1}
{
+ const auto repo = universe::load_sample();
for (const auto& ship : scenario.ships) {
const auto entity = _registry.create();
- _registry.emplace<universe::ShipType>(entity, ship.type);
+ const auto type = repo->ship_type(ship.type);
+ _registry.emplace<std::decay<decltype(type)>::type>(entity, type);
_registry.emplace<Team>(entity, ship.team);
_registry.emplace<Transform>(entity, spawner.get(ship.team));
_registry.emplace<FloatingMovement>(entity, 0.4);
_registry.emplace<AIState>(entity, Point{0.0, 0.0});
- _registry.emplace<HitPoints>(entity, ship.type.base_health_points);
- for (const auto& turret_def : ship.turrets) {
+ _registry.emplace<HitPoints>(entity, type.base_health_points);
+ for (const auto& turret_name : ship.turrets) {
const auto turret = _registry.create();
- _registry.emplace<universe::TurretType>(turret, turret_def);
+ const auto def = repo->turret_type(turret_name);
+ _registry.emplace<std::decay<decltype(def)>::type>(turret, def);
_registry.emplace<TurretControl>(turret, 0.0, entity);
_registry.emplace<Transform>(turret, Point{0.0, 0.0}, 0.0, entity);
}
diff --git a/battles/src/scenarios.cpp b/battles/src/scenarios.cpp
index 3b35f44..7a79942 100644
--- a/battles/src/scenarios.cpp
+++ b/battles/src/scenarios.cpp
@@ -1,7 +1,6 @@
#include <kurator/battles/scenarios.h>
#include <kurator/battles/Scenario.h>
-#include <kurator/universe/ShipType.h>
namespace kurator
@@ -15,29 +14,25 @@ namespace scenarios
Scenario
example()
{
- const universe::ShipType halo {"halo", 6.0};
- const universe::ShipType cube {"cube", 12.0};
- const universe::ShipType bell {"bell", 30.0};
- const universe::TurretType cannon {"cannon", 1.0, 1.0, 0.5};
return {
"example",
{
- {0, halo, {cannon}},
- {0, halo, {cannon}},
- {0, cube, {cannon, cannon}},
- {0, cube, {cannon, cannon}},
- {0, cube, {cannon, cannon}},
- {0, bell, {cannon}},
- {0, bell, {cannon}},
- {0, bell, {cannon}},
- {1, halo, {cannon}},
- {1, halo, {cannon}},
- {1, bell, {cannon}},
- {1, cube, {cannon, cannon}},
- {1, cube, {cannon, cannon}},
- {1, cube, {cannon, cannon}},
- {1, bell, {cannon}},
- {1, bell, {cannon}},
+ {0, "halo", {"cannon"}},
+ {0, "halo", {"cannon"}},
+ {0, "cube", {"cannon", "cannon"}},
+ {0, "cube", {"cannon", "cannon"}},
+ {0, "cube", {"cannon", "cannon"}},
+ {0, "bell", {"cannon"}},
+ {0, "bell", {"cannon"}},
+ {0, "bell", {"cannon"}},
+ {1, "halo", {"cannon"}},
+ {1, "halo", {"cannon"}},
+ {1, "bell", {"cannon"}},
+ {1, "cube", {"cannon", "cannon"}},
+ {1, "cube", {"cannon", "cannon"}},
+ {1, "cube", {"cannon", "cannon"}},
+ {1, "bell", {"cannon"}},
+ {1, "bell", {"cannon"}},
},
};
}