Country reforms and rulescountry-unlock

4 files changed, 83 insertions, 30 deletions

diff --git a/src/openvic-simulation/country/CountryDefinition.cpp b/src/openvic-simulation/country/CountryDefinition.cpp
index a9e7487..12a7a22 100644
--- a/src/openvic-simulation/country/CountryDefinition.cpp
+++ b/src/openvic-simulation/country/CountryDefinition.cpp
@@ -138,24 +138,31 @@ node_callback_t CountryDefinitionManager::load_country_party(
 		std::string_view party_name;
 		Date start_date, end_date;
 		Ideology const* ideology;
-		CountryParty::policy_map_t policies;
+		CountryParty::policy_map_t policies { &politics_manager.get_issue_manager().get_issue_groups() };
 
 		bool ret = expect_dictionary_keys_and_default(
 			[&politics_manager, &policies, &party_name](std::string_view key, ast::NodeCPtr value) -> bool {
 				return politics_manager.get_issue_manager().expect_issue_group_str(
 					[&politics_manager, &policies, value, &party_name](IssueGroup const& group) -> bool {
-						if (policies.contains(&group)) {
+						CountryParty::policy_map_t::value_ref_t policy = policies[group];
+
+						if (policy != nullptr) {
 							Logger::error("Country party ", party_name, " has duplicate entry for ", group.get_identifier());
 							return false;
 						}
+
 						return politics_manager.get_issue_manager().expect_issue_identifier(
-							[&policies, &group](Issue const& issue) -> bool {
+							[&group, &policy](Issue const& issue) -> bool {
 								if (&issue.get_group() == &group) {
-									return map_callback(policies, &group)(&issue);
+									policy = &issue;
+									return true;
 								}
+
 								// TODO - change this back to error/false once TGC no longer has this issue
-								Logger::warning("Invalid policy ", issue.get_identifier(), ", group is ",
-									issue.get_group().get_identifier(), " when ", group.get_identifier(), " was expected");
+								Logger::warning(
+									"Invalid policy ", issue.get_identifier(), ", group is ",
+									issue.get_group().get_identifier(), " when ", group.get_identifier(), " was expected."
+								);
 								return true;
 							}
 						)(value);
diff --git a/src/openvic-simulation/country/CountryDefinition.hpp b/src/openvic-simulation/country/CountryDefinition.hpp
index f04796a..6462be1 100644
--- a/src/openvic-simulation/country/CountryDefinition.hpp
+++ b/src/openvic-simulation/country/CountryDefinition.hpp
@@ -14,6 +14,7 @@
 #include "openvic-simulation/types/Colour.hpp"
 #include "openvic-simulation/types/Date.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
+#include "openvic-simulation/types/IndexedMap.hpp"
 #include "openvic-simulation/types/OrderedContainers.hpp"
 
 namespace OpenVic {
@@ -23,7 +24,7 @@ namespace OpenVic {
 	struct CountryParty : HasIdentifierAndColour {
 		friend struct CountryDefinitionManager;
 
-		using policy_map_t = ordered_map<IssueGroup const*, Issue const*>;
+		using policy_map_t = IndexedMap<IssueGroup, Issue const*>;
 
 	private:
 		const Date PROPERTY(start_date);
diff --git a/src/openvic-simulation/country/CountryInstance.cpp b/src/openvic-simulation/country/CountryInstance.cpp
index e0932eb..183b0c8 100644
--- a/src/openvic-simulation/country/CountryInstance.cpp
+++ b/src/openvic-simulation/country/CountryInstance.cpp
@@ -21,6 +21,7 @@ CountryInstance::CountryInstance(
 	decltype(unlocked_technologies)::keys_t const& technology_keys,
 	decltype(unlocked_inventions)::keys_t const& invention_keys,
 	decltype(upper_house)::keys_t const& ideology_keys,
+	decltype(reforms)::keys_t const& reform_keys,
 	decltype(government_flag_overrides)::keys_t const& government_type_keys,
 	decltype(unlocked_crimes)::keys_t const& crime_keys,
 	decltype(pop_type_distribution)::keys_t const& pop_type_keys,
@@ -69,7 +70,9 @@ CountryInstance::CountryInstance(
 	last_election {},
 	ruling_party { nullptr },
 	upper_house { &ideology_keys },
-	reforms {},
+	reforms { &reform_keys },
+	total_administrative_multiplier { 0 },
+	rule_set {},
 	government_flag_overrides { &government_type_keys },
 	flag_government_type { nullptr },
 	suppression_points { 0 },
@@ -240,27 +243,37 @@ bool CountryInstance::set_upper_house(Ideology const* ideology, fixed_point_t po
 	}
 }
 
-bool CountryInstance::add_reform(Reform const* new_reform) {
-	if (std::find(reforms.begin(), reforms.end(), new_reform) != reforms.end()) {
-		Logger::warning(
-			"Attempted to add reform \"", new_reform, "\" to country ", get_identifier(), ": already present!"
-		);
-		return false;
+bool CountryInstance::set_ruling_party(CountryParty const& new_ruling_party) {
+	if (ruling_party != &new_ruling_party) {
+		ruling_party = &new_ruling_party;
+
+		return update_rule_set();
+	} else {
+		return true;
 	}
-	reforms.push_back(new_reform);
-	return true;
 }
 
-bool CountryInstance::remove_reform(Reform const* reform_to_remove) {
-	auto existing_entry = std::find(reforms.begin(), reforms.end(), reform_to_remove);
-	if (existing_entry == reforms.end()) {
-		Logger::warning(
-			"Attempted to remove reform \"", reform_to_remove, "\" from country ", get_identifier(), ": not present!"
-		);
-		return false;
+bool CountryInstance::add_reform(Reform const& new_reform) {
+	ReformGroup const& reform_group = new_reform.get_reform_group();
+	decltype(reforms)::value_ref_t reform = reforms[reform_group];
+
+	if (reform != &new_reform) {
+		if (reform_group.is_administrative()) {
+			if (reform != nullptr) {
+				total_administrative_multiplier -= reform->get_administrative_multiplier();
+			}
+			total_administrative_multiplier += new_reform.get_administrative_multiplier();
+		}
+
+		reform = &new_reform;
+
+		// TODO - if new_reform.get_reform_group().get_type().is_uncivilised() ?
+		// TODO - new_reform.get_on_execute_trigger() / new_reform.get_on_execute_effect() ?
+
+		return update_rule_set();
+	} else {
+		return true;
 	}
-	reforms.erase(existing_entry);
-	return true;
 }
 
 template<UnitType::branch_t Branch>
@@ -663,7 +676,9 @@ bool CountryInstance::apply_history_to_country(
 		ret &= add_accepted_culture(*culture);
 	}
 	set_optional(religion, entry.get_religion());
-	set_optional(ruling_party, entry.get_ruling_party());
+	if (entry.get_ruling_party()) {
+		ret &= set_ruling_party(**entry.get_ruling_party());
+	}
 	set_optional(last_election, entry.get_last_election());
 	ret &= upper_house.copy(entry.get_upper_house());
 	if (entry.get_capital()) {
@@ -677,7 +692,7 @@ bool CountryInstance::apply_history_to_country(
 	}
 	set_optional(prestige, entry.get_prestige());
 	for (Reform const* reform : entry.get_reforms()) {
-		ret &= add_reform(reform);
+		ret &= add_reform(*reform);
 	}
 	set_optional(tech_school, entry.get_tech_school());
 	constexpr auto set_bool_map_to_indexed_map =
@@ -888,6 +903,26 @@ void CountryInstance::_update_military(DefineManager const& define_manager, Unit
 	// TODO - update max_ship_supply, leadership_points, war_exhaustion
 }
 
+bool CountryInstance::update_rule_set() {
+	rule_set.clear();
+
+	if (ruling_party != nullptr) {
+		for (Issue const* issue : ruling_party->get_policies()) {
+			if (issue != nullptr) {
+				rule_set |= issue->get_rules();
+			}
+		}
+	}
+
+	for (Reform const* reform : reforms) {
+		if (reform != nullptr) {
+			rule_set |= reform->get_rules();
+		}
+	}
+
+	return rule_set.trim_and_resolve_conflicts(true);
+}
+
 void CountryInstance::update_gamestate(DefineManager const& define_manager, UnitTypeManager const& unit_type_manager) {
 	// Order of updates might need to be changed/functions split up to account for dependencies
 	_update_production(define_manager);
@@ -1060,6 +1095,7 @@ bool CountryInstanceManager::generate_country_instances(
 	decltype(CountryInstance::unlocked_technologies)::keys_t const& technology_keys,
 	decltype(CountryInstance::unlocked_inventions)::keys_t const& invention_keys,
 	decltype(CountryInstance::upper_house)::keys_t const& ideology_keys,
+	decltype(CountryInstance::reforms)::keys_t const& reform_keys,
 	decltype(CountryInstance::government_flag_overrides)::keys_t const& government_type_keys,
 	decltype(CountryInstance::unlocked_crimes)::keys_t const& crime_keys,
 	decltype(CountryInstance::pop_type_distribution)::keys_t const& pop_type_keys,
@@ -1077,6 +1113,7 @@ bool CountryInstanceManager::generate_country_instances(
 			technology_keys,
 			invention_keys,
 			ideology_keys,
+			reform_keys,
 			government_type_keys,
 			crime_keys,
 			pop_type_keys,
diff --git a/src/openvic-simulation/country/CountryInstance.hpp b/src/openvic-simulation/country/CountryInstance.hpp
index c768a86..a7128aa 100644
--- a/src/openvic-simulation/country/CountryInstance.hpp
+++ b/src/openvic-simulation/country/CountryInstance.hpp
@@ -6,6 +6,7 @@
 
 #include "openvic-simulation/military/Leader.hpp"
 #include "openvic-simulation/military/UnitInstanceGroup.hpp"
+#include "openvic-simulation/politics/Rule.hpp"
 #include "openvic-simulation/pop/Pop.hpp"
 #include "openvic-simulation/types/Date.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
@@ -24,6 +25,7 @@ namespace OpenVic {
 	struct GovernmentType;
 	struct CountryParty;
 	struct Ideology;
+	struct ReformGroup;
 	struct Reform;
 	struct Crime;
 	struct Culture;
@@ -109,7 +111,9 @@ namespace OpenVic {
 		Date PROPERTY(last_election);
 		CountryParty const* PROPERTY(ruling_party);
 		IndexedMap<Ideology, fixed_point_t> PROPERTY(upper_house);
-		std::vector<Reform const*> PROPERTY(reforms); // TODO: should be map of reform groups to active reforms: must set defaults & validate applied history
+		IndexedMap<ReformGroup, Reform const*> PROPERTY(reforms);
+		fixed_point_t PROPERTY(total_administrative_multiplier);
+		RuleSet PROPERTY(rule_set);
 		// TODO - national issue support distribution (for just voters and for everyone)
 		IndexedMap<GovernmentType, GovernmentType const*> PROPERTY(government_flag_overrides);
 		GovernmentType const* PROPERTY(flag_government_type);
@@ -181,6 +185,7 @@ namespace OpenVic {
 			decltype(unlocked_technologies)::keys_t const& technology_keys,
 			decltype(unlocked_inventions)::keys_t const& invention_keys,
 			decltype(upper_house)::keys_t const& ideology_keys,
+			decltype(reforms)::keys_t const& reform_keys,
 			decltype(government_flag_overrides)::keys_t const& government_type_keys,
 			decltype(unlocked_crimes)::keys_t const& crime_keys,
 			decltype(pop_type_distribution)::keys_t const& pop_type_keys,
@@ -212,8 +217,8 @@ namespace OpenVic {
 		bool remove_accepted_culture(Culture const& culture_to_remove);
 		/* Set a party's popularity in the upper house. */
 		bool set_upper_house(Ideology const* ideology, fixed_point_t popularity);
-		bool add_reform(Reform const* new_reform);
-		bool remove_reform(Reform const* reform_to_remove);
+		bool set_ruling_party(CountryParty const& new_ruling_party);
+		bool add_reform(Reform const& new_reform);
 
 		template<UnitType::branch_t Branch>
 		bool add_unit_instance_group(UnitInstanceGroup<Branch>& group);
@@ -287,6 +292,8 @@ namespace OpenVic {
 		void _update_diplomacy();
 		void _update_military(DefineManager const& define_manager, UnitTypeManager const& unit_type_manager);
 
+		bool update_rule_set();
+
 	public:
 
 		void update_gamestate(DefineManager const& define_manager, UnitTypeManager const& unit_type_manager);
@@ -321,6 +328,7 @@ namespace OpenVic {
 			decltype(CountryInstance::unlocked_technologies)::keys_t const& technology_keys,
 			decltype(CountryInstance::unlocked_inventions)::keys_t const& invention_keys,
 			decltype(CountryInstance::upper_house)::keys_t const& ideology_keys,
+			decltype(CountryInstance::reforms)::keys_t const& reform_keys,
 			decltype(CountryInstance::government_flag_overrides)::keys_t const& government_type_keys,
 			decltype(CountryInstance::unlocked_crimes)::keys_t const& crime_keys,
 			decltype(CountryInstance::pop_type_distribution)::keys_t const& pop_type_keys,