aboutsummaryrefslogtreecommitdiff
path: root/src/openvic-simulation/history/DiplomaticHistory.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/openvic-simulation/history/DiplomaticHistory.cpp')
-rw-r--r--src/openvic-simulation/history/DiplomaticHistory.cpp137
1 files changed, 88 insertions, 49 deletions
diff --git a/src/openvic-simulation/history/DiplomaticHistory.cpp b/src/openvic-simulation/history/DiplomaticHistory.cpp
index 088ec0a..883a212 100644
--- a/src/openvic-simulation/history/DiplomaticHistory.cpp
+++ b/src/openvic-simulation/history/DiplomaticHistory.cpp
@@ -2,6 +2,7 @@
#include "openvic-simulation/GameManager.hpp"
#include "openvic-simulation/dataloader/NodeTools.hpp"
+#include "openvic-simulation/history/Period.hpp"
using namespace OpenVic;
using namespace OpenVic::NodeTools;
@@ -17,9 +18,8 @@ WarHistory::added_wargoal_t::added_wargoal_t(
WarHistory::war_participant_t::war_participant_t(
Country const* new_country,
- Date new_joined,
- std::optional<Date> new_exited
-) : country { new_country }, joined { new_joined }, exited { new_exited } {}
+ const Period new_period
+) : country { new_country }, period { new_period } {}
WarHistory::WarHistory(
std::string_view new_war_name,
@@ -29,14 +29,23 @@ WarHistory::WarHistory(
) : war_name { new_war_name }, attackers { std::move(new_attackers) }, defenders { std::move(new_defenders) }, wargoals { std::move(new_wargoals) } {}
AllianceHistory::AllianceHistory(
- Country const* new_first, Country const* new_second,
- Date new_start, Date new_end
-) : first { new_first }, second { new_second }, start { new_start }, end { new_end } {}
+ Country const* new_first,
+ Country const* new_second,
+ const Period new_period
+) : first { new_first }, second { new_second }, period {new_period} {}
+
+ReparationsHistory::ReparationsHistory(
+ Country const* new_receiver,
+ Country const* new_sender,
+ const Period new_period
+) : receiver { new_receiver }, sender { new_sender }, period {new_period} {}
SubjectHistory::SubjectHistory(
- Country const* new_overlord, Country const* new_subject,
- const type_t new_type, const Date new_start, const Date new_end
-) : overlord { new_overlord }, subject { new_subject }, type { new_type }, start { new_start }, end { new_end } {}
+ Country const* new_overlord,
+ Country const* new_subject,
+ const type_t new_type,
+ const Period new_period
+) : overlord { new_overlord }, subject { new_subject }, type { new_type }, period {new_period} {}
void DiplomaticHistoryManager::lock_diplomatic_history() {
Logger::info("Locked diplomacy history registry after registering ", alliances.size() + subjects.size() + wars.size(), " items");
@@ -48,19 +57,29 @@ bool DiplomaticHistoryManager::is_locked() const {
}
std::vector<AllianceHistory const*> DiplomaticHistoryManager::get_alliances(Date date) const {
- std::vector<AllianceHistory const*> ret;
+ std::vector<AllianceHistory const*> ret {};
for (const auto& alliance : alliances) {
- if (alliance.start <= date && alliance.end >= date) {
+ if (alliance.period.is_date_in_period(date)) {
ret.push_back(&alliance);
}
}
return ret;
}
+std::vector<ReparationsHistory const*> DiplomaticHistoryManager::get_reparations(Date date) const {
+ std::vector<ReparationsHistory const*> ret {};
+ for (const auto& reparation : reparations) {
+ if (reparation.period.is_date_in_period(date)) {
+ ret.push_back(&reparation);
+ }
+ }
+ return ret;
+}
+
std::vector<SubjectHistory const*> DiplomaticHistoryManager::get_subjects(Date date) const {
- std::vector<SubjectHistory const*> ret;
+ std::vector<SubjectHistory const*> ret {};
for (const auto& subject : subjects) {
- if (subject.start <= date && subject.end >= date) {
+ if (subject.period.is_date_in_period(date)) {
ret.push_back(&subject);
}
}
@@ -70,7 +89,7 @@ std::vector<SubjectHistory const*> DiplomaticHistoryManager::get_subjects(Date d
std::vector<WarHistory const*> DiplomaticHistoryManager::get_wars(Date date) const {
std::vector<WarHistory const*> ret;
for (const auto& war : wars) {
- Date start;
+ Date start {};
for (const auto& wargoal : war.wargoals) {
if (wargoal.added < start) start = wargoal.added;
}
@@ -82,63 +101,83 @@ std::vector<WarHistory const*> DiplomaticHistoryManager::get_wars(Date date) con
bool DiplomaticHistoryManager::load_diplomacy_history_file(CountryManager const& country_manager, ast::NodeCPtr root) {
return expect_dictionary_keys(
"alliance", ZERO_OR_MORE, [this, &country_manager](ast::NodeCPtr node) -> bool {
- Country const* first;
- Country const* second;
- Date start, end;
+ Country const* first = nullptr;
+ Country const* second = nullptr;
+ Date start {};
+ std::optional<Date> end {};
bool ret = expect_dictionary_keys(
"first", ONE_EXACTLY, expect_identifier_or_string(country_manager.expect_country_str(assign_variable_callback_pointer(first))),
"second", ONE_EXACTLY, expect_identifier_or_string(country_manager.expect_country_str(assign_variable_callback_pointer(second))),
"start_date", ONE_EXACTLY, expect_identifier_or_string(expect_date_str(assign_variable_callback(start))),
- "end_date", ONE_EXACTLY, expect_identifier_or_string(expect_date_str(assign_variable_callback(end)))
+ "end_date", ZERO_OR_ONE, expect_identifier_or_string(expect_date_str(assign_variable_callback(end)))
)(node);
- alliances.push_back({ first, second, start, end });
+ alliances.push_back({ first, second, { start, end } });
return ret;
},
"vassal", ZERO_OR_MORE, [this, &country_manager](ast::NodeCPtr node) -> bool {
- Country const* overlord;
- Country const* subject;
- Date start, end;
+ Country const* overlord = nullptr;
+ Country const* subject = nullptr;
+ Date start {};
+ std::optional<Date> end {};
bool ret = expect_dictionary_keys(
"first", ONE_EXACTLY, expect_identifier_or_string(country_manager.expect_country_str(assign_variable_callback_pointer(overlord))),
"second", ONE_EXACTLY, expect_identifier_or_string(country_manager.expect_country_str(assign_variable_callback_pointer(subject))),
"start_date", ONE_EXACTLY, expect_identifier_or_string(expect_date_str(assign_variable_callback(start))),
- "end_date", ONE_EXACTLY, expect_identifier_or_string(expect_date_str(assign_variable_callback(end)))
+ "end_date", ZERO_OR_ONE, expect_identifier_or_string(expect_date_str(assign_variable_callback(end)))
)(node);
- subjects.push_back({ overlord, subject, SubjectHistory::type_t::VASSAL, start, end });
+ subjects.push_back({ overlord, subject, SubjectHistory::type_t::VASSAL, { start, end } });
return ret;
},
"union", ZERO_OR_MORE, [this, &country_manager](ast::NodeCPtr node) -> bool {
- Country const* overlord;
- Country const* subject;
- Date start, end;
+ Country const* overlord = nullptr;
+ Country const* subject = nullptr;
+ Date start {};
+ std::optional<Date> end {};
bool ret = expect_dictionary_keys(
"first", ONE_EXACTLY, country_manager.expect_country_identifier(assign_variable_callback_pointer(overlord)),
"second", ONE_EXACTLY, country_manager.expect_country_identifier(assign_variable_callback_pointer(subject)),
"start_date", ONE_EXACTLY, expect_date(assign_variable_callback(start)),
- "end_date", ONE_EXACTLY, expect_date(assign_variable_callback(end))
+ "end_date", ZERO_OR_ONE, expect_date(assign_variable_callback(end))
)(node);
- subjects.push_back({ overlord, subject, SubjectHistory::type_t::UNION, start, end });
+ subjects.push_back({ overlord, subject, SubjectHistory::type_t::UNION, { start, end } });
return ret;
},
"substate", ZERO_OR_MORE, [this, &country_manager](ast::NodeCPtr node) -> bool {
- Country const* overlord;
- Country const* subject;
- Date start, end;
+ Country const* overlord = nullptr;
+ Country const* subject = nullptr;
+ Date start {};
+ std::optional<Date> end {};
bool ret = expect_dictionary_keys(
"first", ONE_EXACTLY, country_manager.expect_country_identifier(assign_variable_callback_pointer(overlord)),
"second", ONE_EXACTLY, country_manager.expect_country_identifier(assign_variable_callback_pointer(subject)),
"start_date", ONE_EXACTLY, expect_date(assign_variable_callback(start)),
- "end_date", ONE_EXACTLY, expect_date(assign_variable_callback(end))
+ "end_date", ZERO_OR_ONE, expect_date(assign_variable_callback(end))
+ )(node);
+
+ subjects.push_back({ overlord, subject, SubjectHistory::type_t::SUBSTATE, { start, end } });
+ return ret;
+ },
+ "reparations", ZERO_OR_MORE, [this, &country_manager](ast::NodeCPtr node) -> bool {
+ Country const* receiver = nullptr;
+ Country const* sender = nullptr;
+ Date start {};
+ std::optional<Date> end {};
+
+ bool ret = expect_dictionary_keys(
+ "first", ONE_EXACTLY, country_manager.expect_country_identifier(assign_variable_callback_pointer(receiver)),
+ "second", ONE_EXACTLY, country_manager.expect_country_identifier(assign_variable_callback_pointer(sender)),
+ "start_date", ONE_EXACTLY, expect_date(assign_variable_callback(start)),
+ "end_date", ZERO_OR_ONE, expect_date(assign_variable_callback(end))
)(node);
- subjects.push_back({ overlord, subject, SubjectHistory::type_t::SUBSTATE, start, end });
+ reparations.push_back({ receiver, sender, { start, end } });
return ret;
}
)(root);
@@ -146,10 +185,10 @@ bool DiplomaticHistoryManager::load_diplomacy_history_file(CountryManager const&
bool DiplomaticHistoryManager::load_war_history_file(GameManager const& game_manager, ast::NodeCPtr root) {
std::string name = "";
- std::vector<WarHistory::war_participant_t> attackers;
- std::vector<WarHistory::war_participant_t> defenders;
- std::vector<WarHistory::added_wargoal_t> wargoals;
- Date current_date;
+ std::vector<WarHistory::war_participant_t> attackers {};
+ std::vector<WarHistory::war_participant_t> defenders {};
+ std::vector<WarHistory::added_wargoal_t> wargoals {};
+ Date current_date {};
bool ret = expect_dictionary_keys_and_default(
[&game_manager, &attackers, &defenders, &wargoals, &current_date, &name](std::string_view key, ast::NodeCPtr node) -> bool {
@@ -162,7 +201,8 @@ bool DiplomaticHistoryManager::load_war_history_file(GameManager const& game_man
return false;
}
}
- attackers.push_back({ &country, current_date, {} });
+
+ attackers.push_back({ &country, { current_date, {} } });
return true;
}),
"add_defender", ZERO_OR_MORE, game_manager.get_country_manager().expect_country_identifier([&defenders, &current_date, &name](Country const& country) -> bool {
@@ -172,7 +212,8 @@ bool DiplomaticHistoryManager::load_war_history_file(GameManager const& game_man
return false;
}
}
- defenders.push_back({ &country, current_date, {} });
+
+ defenders.push_back({ &country, { current_date, {} } });
return true;
}),
"rem_attacker", ZERO_OR_MORE, game_manager.get_country_manager().expect_country_identifier([&attackers, &current_date, &name](Country const& country) -> bool {
@@ -190,8 +231,7 @@ bool DiplomaticHistoryManager::load_war_history_file(GameManager const& game_man
return true;
}
- participant_to_remove->exited.emplace(current_date);
- return true;
+ return participant_to_remove->period.try_set_end(current_date);
}),
"rem_defender", ZERO_OR_MORE, game_manager.get_country_manager().expect_country_identifier([&defenders, &current_date, &name](Country const& country) -> bool {
WarHistory::war_participant_t* participant_to_remove = nullptr;
@@ -208,15 +248,14 @@ bool DiplomaticHistoryManager::load_war_history_file(GameManager const& game_man
return true;
}
- participant_to_remove->exited.emplace(current_date);
- return true;
+ return participant_to_remove->period.try_set_end(current_date);
}),
"war_goal", ZERO_OR_MORE, [&game_manager, &wargoals, &current_date](ast::NodeCPtr value) -> bool {
- Country const* actor;
- Country const* receiver;
- WargoalType const* type;
- std::optional<Country const*> third_party;
- std::optional<Province const*> target;
+ Country const* actor = nullptr;
+ Country const* receiver = nullptr;
+ WargoalType const* type = nullptr;
+ std::optional<Country const*> third_party {};
+ std::optional<Province const*> target {};
bool ret = expect_dictionary_keys(
"actor", ONE_EXACTLY, game_manager.get_country_manager().expect_country_identifier(assign_variable_callback_pointer(actor)),
generated by our cgit fork (git 2.39.0) at 2024-01-23 02:24:14 +0100