From 5d9f9534b0be98c73b2d602f3195eff6c8b56985 Mon Sep 17 00:00:00 2001 From: Aki Date: Fri, 23 Dec 2022 01:44:01 +0100 Subject: Moved sample scenario creation to a loop --- campaign/src/scenarios.cpp | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) (limited to 'campaign') diff --git a/campaign/src/scenarios.cpp b/campaign/src/scenarios.cpp index 9f4222b..de57971 100644 --- a/campaign/src/scenarios.cpp +++ b/campaign/src/scenarios.cpp @@ -1,6 +1,7 @@ #include #include +#include namespace kurator @@ -15,28 +16,16 @@ Scenario example() { int id = 0; - return { - "Example", - 12000, - { - {{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"}}, - }, - }; + Scenario scenario {"Example", 12000, {}}; + for (int team = 0; team < 2; ++team) { + for (int i = 0; i < 2; ++i) + scenario.ships.push_back(ShipConfig{{id++}, team, "Anvil", {"ChargeLaser", "ChargeLaser"}}); + for (int i = 0; i < 3; ++i) + scenario.ships.push_back(ShipConfig{{id++}, team, "Warbringer", {"ChargeLaser"}}); + for (int i = 0; i < 5; ++i) + scenario.ships.push_back(ShipConfig{{id++}, team, "Eclipse", {"ChargeLaser"}}); + } + return scenario; } -- cgit v1.1