diff options
| author |   wvpm <24685035+wvpm@users.noreply.github.com> | 2024-10-26 18:25:15 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-10-26 18:25:15 +0200 |
| commit | 8d9ff3266439c6a94c35fdf0d8a0642a2cb34de3 (patch) | |
| tree | 46039d0eb5d630cf000e94aed584aebaaa8f3f9b /src/openvic-simulation/modifier/ModifierEffectCache.cpp | |
| parent | c88cf59997529cbca008f9a2b629822de9deaa2a (diff) | |
| parent | 3daebe5db14949f55be2c50220323138260dbaea (diff) | |
Merge pull request #210 from OpenVicProject/contextual_modifier_parsing
Contextual modifier parsing
Diffstat (limited to 'src/openvic-simulation/modifier/ModifierEffectCache.cpp')
| -rw-r--r-- | src/openvic-simulation/modifier/ModifierEffectCache.cpp | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/src/openvic-simulation/modifier/ModifierEffectCache.cpp b/src/openvic-simulation/modifier/ModifierEffectCache.cpp index 9653d23..0e7141f 100644 --- a/src/openvic-simulation/modifier/ModifierEffectCache.cpp +++ b/src/openvic-simulation/modifier/ModifierEffectCache.cpp @@ -2,6 +2,7 @@ #include "openvic-simulation/economy/BuildingType.hpp" #include "openvic-simulation/economy/GoodDefinition.hpp" +#include "openvic-simulation/map/TerrainType.hpp" #include "openvic-simulation/politics/Rebel.hpp" #include "openvic-simulation/research/Technology.hpp" @@ -48,6 +49,12 @@ ModifierEffectCache::ship_type_effects_t::ship_type_effects_t() evasion { nullptr }, torpedo_attack { nullptr } {} +ModifierEffectCache::unit_terrain_effects_t::unit_terrain_effects_t() + : attack { nullptr }, + defence { nullptr }, + attrition { nullptr }, + movement { nullptr } {} + ModifierEffectCache::strata_effects_t::strata_effects_t() : income_modifier { nullptr }, vote { nullptr }, @@ -113,7 +120,8 @@ ModifierEffectCache::ModifierEffectCache() leadership { nullptr }, leadership_modifier { nullptr }, literacy_con_impact { nullptr }, - loan_interest { nullptr }, + loan_interest_base { nullptr }, + loan_interest_foreign { nullptr }, max_loan_modifier { nullptr }, max_military_spending { nullptr }, max_national_focus { nullptr }, @@ -170,8 +178,11 @@ ModifierEffectCache::ModifierEffectCache() boost_strongest_party { nullptr }, combat_width_percentage_change { nullptr }, defence_terrain { nullptr }, - farm_rgo_eff { nullptr }, - farm_rgo_size { nullptr }, + farm_rgo_throughput_global { nullptr }, + farm_rgo_output_global { nullptr }, + farm_rgo_output_local { nullptr }, + farm_rgo_size_global { nullptr }, + farm_rgo_size_local { nullptr }, immigrant_attract { nullptr }, immigrant_push { nullptr }, life_rating { nullptr }, @@ -187,22 +198,28 @@ ModifierEffectCache::ModifierEffectCache() local_ruling_party_support { nullptr }, local_ship_build { nullptr }, max_attrition { nullptr }, - mine_rgo_eff { nullptr }, - mine_rgo_size { nullptr }, + mine_rgo_throughput_global { nullptr }, + mine_rgo_output_global { nullptr }, + mine_rgo_output_local { nullptr }, + mine_rgo_size_global { nullptr }, + mine_rgo_size_local { nullptr }, movement_cost_base { nullptr }, movement_cost_percentage_change { nullptr }, + movement_cost_percentage_change_fake { nullptr }, number_of_voters { nullptr }, pop_consciousness_modifier { nullptr }, pop_militancy_modifier { nullptr }, population_growth { nullptr }, - supply_limit { nullptr }, + supply_limit_global_percentage_change { nullptr }, + supply_limit_local_base { nullptr }, /* Military Modifier Effects */ - attack { nullptr }, + attack_leader { nullptr }, attrition { nullptr }, defence_leader { nullptr }, experience { nullptr }, - morale { nullptr }, + morale_global { nullptr }, + morale_leader { nullptr }, organisation { nullptr }, reconnaissance { nullptr }, reliability { nullptr }, @@ -219,6 +236,7 @@ ModifierEffectCache::ModifierEffectCache() regiment_type_effects { nullptr }, navy_base_effects {}, ship_type_effects { nullptr }, + unit_terrain_effects { nullptr }, /* Rebel Effects */ rebel_org_gain_all { nullptr }, |