From 867393652a1199d4803c5707902f215f36c45350 Mon Sep 17 00:00:00 2001 From: Aki Date: Tue, 13 Dec 2022 18:58:56 +0100 Subject: Added naive campaign-unique ship identifiers --- campaign/include/kurator/campaign/ShipConfig.h | 3 ++ .../include/kurator/campaign/UniqueIdentifier.h | 17 +++++++++++ campaign/src/scenarios.cpp | 33 +++++++++++----------- 3 files changed, 37 insertions(+), 16 deletions(-) create mode 100644 campaign/include/kurator/campaign/UniqueIdentifier.h (limited to 'campaign') diff --git a/campaign/include/kurator/campaign/ShipConfig.h b/campaign/include/kurator/campaign/ShipConfig.h index cb5ca48..9aec2fa 100644 --- a/campaign/include/kurator/campaign/ShipConfig.h +++ b/campaign/include/kurator/campaign/ShipConfig.h @@ -3,6 +3,8 @@ #include #include +#include "UniqueIdentifier.h" + namespace kurator { @@ -12,6 +14,7 @@ namespace campaign struct ShipConfig { + UniqueIdentifier identifier; int team; std::string type; std::vector turrets; diff --git a/campaign/include/kurator/campaign/UniqueIdentifier.h b/campaign/include/kurator/campaign/UniqueIdentifier.h new file mode 100644 index 0000000..6e3c4f5 --- /dev/null +++ b/campaign/include/kurator/campaign/UniqueIdentifier.h @@ -0,0 +1,17 @@ +#pragma once + + +namespace kurator +{ +namespace campaign +{ + + +struct UniqueIdentifier +{ + int id; +}; + + +} // namespace campaign +} // namespace kurator diff --git a/campaign/src/scenarios.cpp b/campaign/src/scenarios.cpp index 6fd0403..9f4222b 100644 --- a/campaign/src/scenarios.cpp +++ b/campaign/src/scenarios.cpp @@ -14,26 +14,27 @@ namespace scenarios Scenario example() { + int id = 0; return { "Example", 12000, { - {0, "Anvil", {"ChargeLaser", "ChargeLaser"}}, - {0, "Anvil", {"ChargeLaser", "ChargeLaser"}}, - {0, "Anvil", {"ChargeLaser", "ChargeLaser"}}, - {0, "Warbringer", {"ChargeLaser"}}, - {0, "Warbringer", {"ChargeLaser"}}, - {0, "Eclipse", {"ChargeLaser"}}, - {0, "Eclipse", {"ChargeLaser"}}, - {0, "Eclipse", {"ChargeLaser"}}, - {1, "Anvil", {"ChargeLaser", "ChargeLaser"}}, - {1, "Anvil", {"ChargeLaser", "ChargeLaser"}}, - {1, "Anvil", {"ChargeLaser", "ChargeLaser"}}, - {1, "Warbringer", {"ChargeLaser"}}, - {1, "Warbringer", {"ChargeLaser"}}, - {1, "Eclipse", {"ChargeLaser"}}, - {1, "Eclipse", {"ChargeLaser"}}, - {1, "Eclipse", {"ChargeLaser"}}, + {{id++}, 0, "Anvil", {"ChargeLaser", "ChargeLaser"}}, + {{id++}, 0, "Anvil", {"ChargeLaser", "ChargeLaser"}}, + {{id++}, 0, "Anvil", {"ChargeLaser", "ChargeLaser"}}, + {{id++}, 0, "Warbringer", {"ChargeLaser"}}, + {{id++}, 0, "Warbringer", {"ChargeLaser"}}, + {{id++}, 0, "Eclipse", {"ChargeLaser"}}, + {{id++}, 0, "Eclipse", {"ChargeLaser"}}, + {{id++}, 0, "Eclipse", {"ChargeLaser"}}, + {{id++}, 1, "Anvil", {"ChargeLaser", "ChargeLaser"}}, + {{id++}, 1, "Anvil", {"ChargeLaser", "ChargeLaser"}}, + {{id++}, 1, "Anvil", {"ChargeLaser", "ChargeLaser"}}, + {{id++}, 1, "Warbringer", {"ChargeLaser"}}, + {{id++}, 1, "Warbringer", {"ChargeLaser"}}, + {{id++}, 1, "Eclipse", {"ChargeLaser"}}, + {{id++}, 1, "Eclipse", {"ChargeLaser"}}, + {{id++}, 1, "Eclipse", {"ChargeLaser"}}, }, }; } -- cgit v1.1