diff options
| author |   wvpm <24685035+wvpm@users.noreply.github.com> | 2024-10-31 20:44:49 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-10-31 20:44:49 +0100 |
| commit | c6f7c8047abbe0a91b2a88365eee2259d8a91a65 (patch) | |
| tree | c8c1c67b0006c65541b4f9d8897e8b9137f5346c /src/openvic-simulation/modifier/ModifierManager.cpp | |
| parent | c763a0aedd834432b54b6e49c6bc7e1936be1131 (diff) | |
| parent | 2cebd422b1f34d5f82e0576afcf786c9b5c57271 (diff) | |
Merge pull request #221 from OpenVicProject/correct_rgo_size
Correct rgo size calcuation
Diffstat (limited to 'src/openvic-simulation/modifier/ModifierManager.cpp')
| -rw-r--r-- | src/openvic-simulation/modifier/ModifierManager.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/openvic-simulation/modifier/ModifierManager.cpp b/src/openvic-simulation/modifier/ModifierManager.cpp index a5ef8a8..ea2e0fd 100644 --- a/src/openvic-simulation/modifier/ModifierManager.cpp +++ b/src/openvic-simulation/modifier/ModifierManager.cpp @@ -428,7 +428,11 @@ bool ModifierManager::setup_modifier_effects() { ret &= register_base_province_modifier_effect( modifier_effect_cache.farm_rgo_output_local, "farm_rgo_eff", true, PROPORTION_DECIMAL, "TECH_FARM_OUTPUT" ); - ret &= register_shared_tech_country_modifier_effect( + ret &= register_base_country_modifier_effect( + modifier_effect_cache.farm_rgo_size_fake, "farm_rgo_size", true, PROPORTION_DECIMAL, + ModifierEffect::make_default_modifier_effect_localisation_key("farm_size"), has_no_effect + ); + ret &= register_technology_modifier_effect( modifier_effect_cache.farm_rgo_size_global, "farm_rgo_size", true, PROPORTION_DECIMAL, ModifierEffect::make_default_modifier_effect_localisation_key("farm_size") ); @@ -499,7 +503,11 @@ bool ModifierManager::setup_modifier_effects() { ret &= register_base_province_modifier_effect( modifier_effect_cache.mine_rgo_output_local, "mine_rgo_eff", true, PROPORTION_DECIMAL, "TECH_MINE_OUTPUT" ); - ret &= register_shared_tech_country_modifier_effect( + ret &= register_base_country_modifier_effect( + modifier_effect_cache.mine_rgo_size_fake, "mine_rgo_size", true, PROPORTION_DECIMAL, + ModifierEffect::make_default_modifier_effect_localisation_key("mine_size"), has_no_effect + ); + ret &= register_technology_modifier_effect( modifier_effect_cache.mine_rgo_size_global, "mine_rgo_size", true, PROPORTION_DECIMAL, ModifierEffect::make_default_modifier_effect_localisation_key("mine_size") ); |