Add game rule for economic country

Author: wvpm

src/openvic-simulation/InstanceManager.cpp

@@ -145,6 +145,7 @@ bool InstanceManager::setup() {
 	ret &= map_instance.setup(
 		definition_manager.get_economy_manager().get_building_type_manager(),
 		market_instance,
+		game_rules_manager,
 		definition_manager.get_modifier_manager().get_modifier_effect_cache(),
 		definition_manager.get_pop_manager().get_stratas(),
 		definition_manager.get_pop_manager().get_pop_types(),

src/openvic-simulation/map/MapInstance.cpp

@@ -19,6 +19,7 @@ ProvinceInstance const& MapInstance::get_province_instance_from_definition(Provi
 bool MapInstance::setup(
 	BuildingTypeManager const& building_type_manager,
 	MarketInstance& market_instance,
+	GameRulesManager const& game_rules_manager,
 	ModifierEffectCache const& modifier_effect_cache,
 	decltype(ProvinceInstance::population_by_strata)::keys_type const& strata_keys,
 	decltype(ProvinceInstance::pop_type_distribution)::keys_type const& pop_type_keys,
@@ -40,6 +41,7 @@ bool MapInstance::setup(
 		for (ProvinceDefinition const& province : map_definition.get_province_definitions()) {
 			if (province_instances.add_item({
 				market_instance,
+				game_rules_manager,
 				modifier_effect_cache,
 				province,
 				strata_keys,

src/openvic-simulation/map/MapInstance.hpp

@@ -49,6 +49,7 @@ namespace OpenVic {
 		bool setup(
 			BuildingTypeManager const& building_type_manager,
 			MarketInstance& market_instance,
+			GameRulesManager const& game_rules_manager,
 			ModifierEffectCache const& modifier_effect_cache,
 			decltype(ProvinceInstance::population_by_strata)::keys_type const& strata_keys,
 			decltype(ProvinceInstance::pop_type_distribution)::keys_type const& pop_type_keys,

src/openvic-simulation/map/ProvinceInstance.cpp

@@ -10,6 +10,7 @@
 #include "openvic-simulation/map/Region.hpp"
 #include "openvic-simulation/map/TerrainType.hpp"
 #include "openvic-simulation/military/UnitInstanceGroup.hpp"
+#include "openvic-simulation/misc/GameRulesManager.hpp"
 #include "openvic-simulation/modifier/StaticModifierCache.hpp"
 #include "openvic-simulation/politics/Ideology.hpp"
 #include "openvic-simulation/pop/PopValuesFromProvince.hpp"
@@ -19,6 +20,7 @@ using namespace OpenVic;
 
 ProvinceInstance::ProvinceInstance(
 	MarketInstance& new_market_instance,
+	GameRulesManager const& new_game_rules_manager,
 	ModifierEffectCache const& new_modifier_effect_cache,
 	ProvinceDefinition const& new_province_definition,
 	decltype(population_by_strata)::keys_type const& strata_keys,
@@ -28,6 +30,7 @@ ProvinceInstance::ProvinceInstance(
 	HasIndex { new_province_definition.get_index() },
 	FlagStrings { "province" },
 	province_definition { new_province_definition },
+	game_rules_manager { new_game_rules_manager },
 	modifier_effect_cache { new_modifier_effect_cache },
 	terrain_type { new_province_definition.get_default_terrain_type() },
 	rgo { new_market_instance, pop_type_keys },
@@ -84,6 +87,14 @@ bool ProvinceInstance::set_owner(CountryInstance* new_owner) {
 		for (Pop& pop : pops) {
 			pop.update_location_based_attributes();
 		}
+
+		if (game_rules_manager.get_country_to_report_economy() == country_to_report_economy_t::Owner) {
+			country_to_report_economy = new_owner;
+		} else if (game_rules_manager.get_country_to_report_economy() == country_to_report_economy_t::NeitherWhenOccupied) {
+			country_to_report_economy = is_occupied()
+				? nullptr
+				: owner;
+		}
 	}
 
 	return ret;
@@ -92,6 +103,10 @@ bool ProvinceInstance::set_owner(CountryInstance* new_owner) {
 bool ProvinceInstance::set_controller(CountryInstance* new_controller) {
 	bool ret = true;
 
+	if (new_controller == nullptr) {
+		new_controller = owner;
+	}
+
 	if (controller != new_controller) {
 		if (controller != nullptr) {
 			ret &= controller->remove_controlled_province(*this);
@@ -102,6 +117,14 @@ bool ProvinceInstance::set_controller(CountryInstance* new_controller) {
 		if (controller != nullptr) {
 			ret &= controller->add_controlled_province(*this);
 		}
+
+		if (game_rules_manager.get_country_to_report_economy() == country_to_report_economy_t::Controller) {
+			country_to_report_economy = new_controller;
+		} else if (game_rules_manager.get_country_to_report_economy() == country_to_report_economy_t::NeitherWhenOccupied) {
+			country_to_report_economy = is_occupied()
+				? nullptr
+				: owner;
+		}
 	}
 
 	return ret;

src/openvic-simulation/map/ProvinceInstance.hpp

@@ -32,6 +32,7 @@ namespace OpenVic {
 	struct CountryInstanceManager;
 	struct ModifierEffectCache;
 	struct MarketInstance;
+	struct GameRulesManager;
 
 	struct UnitInstanceGroup;
 
@@ -64,6 +65,7 @@ namespace OpenVic {
 
 	private:
 		ProvinceDefinition const& PROPERTY(province_definition);
+		GameRulesManager const& PROPERTY(game_rules_manager);
 		ModifierEffectCache const& PROPERTY(modifier_effect_cache);
 
 		TerrainType const* PROPERTY(terrain_type);
@@ -73,6 +75,7 @@ namespace OpenVic {
 
 		CountryInstance* PROPERTY_PTR(owner, nullptr);
 		CountryInstance* PROPERTY_PTR(controller, nullptr);
+		CountryInstance* PROPERTY_PTR(country_to_report_economy, nullptr);
 		ordered_set<CountryInstance*> PROPERTY(cores);
 
 		// The total/resultant modifier of local effects on this province (global effects come from the province's owner)
@@ -117,6 +120,7 @@ namespace OpenVic {
 
 		ProvinceInstance(
 			MarketInstance& new_market_instance,
+			GameRulesManager const& new_game_rules_manager,
 			ModifierEffectCache const& new_modifier_effect_cache,
 			ProvinceDefinition const& new_province_definition,
 			decltype(population_by_strata)::keys_type const& strata_keys,
@@ -136,14 +140,6 @@ namespace OpenVic {
 			return province_definition;
 		}
 
-		constexpr CountryInstance const* get_country_to_report_economy() const {
-			return controller;
-		}
-
-		constexpr CountryInstance* get_country_to_report_economy() {
-			return controller;
-		}
-
 		void set_state(State* new_state);
 
 		constexpr GoodDefinition const* get_rgo_good() const {
@@ -157,6 +153,7 @@ namespace OpenVic {
 
 		bool set_owner(CountryInstance* new_owner);
 		bool set_controller(CountryInstance* new_controller);
+
 		// The warn argument controls whether a log message is emitted when a core already does/doesn't exist, e.g. we may
 		// want to know if there are redundant province history instructions setting a core multiple times, but we may not
 		// want to be swamped with log messages by effect scripts which use add_core/remove_core very liberally. Regardless
@@ -170,6 +167,9 @@ namespace OpenVic {
 		constexpr bool is_colonial_province() const {
 			return colony_status != colony_status_t::STATE;
 		}
+		constexpr bool is_occupied() const {
+			return owner != controller;
+		}
 
 		// The values returned by these functions are scaled by population size, so they must be divided by population size
 		// to get the support as a proportion of 1.0

src/openvic-simulation/misc/GameRulesManager.hpp

@@ -2,6 +2,12 @@
 
 #include "openvic-simulation/utility/Getters.hpp"
 namespace OpenVic {
+	enum struct country_to_report_economy_t : uint8_t {
+		Owner,
+		Controller,
+		NeitherWhenOccupied
+	};
+
 	enum struct demand_category : uint8_t {
 		None,
 		PopNeeds,
@@ -14,6 +20,7 @@ namespace OpenVic {
 		// if changed during a session, call on_use_exponential_price_changes_changed for each GoodInstance.
 		bool PROPERTY_RW(use_exponential_price_changes, false);
 		demand_category PROPERTY_RW(artisanal_input_demand_category, demand_category::None);
+		country_to_report_economy_t PROPERTY_RW(country_to_report_economy, country_to_report_economy_t::Owner);
 
 	public:
 		constexpr bool get_use_optimal_pricing() const {