Fixed TGC compatibility + misc cleanup

1 files changed, 52 insertions, 34 deletions

diff --git a/src/openvic-simulation/misc/Modifier.cpp b/src/openvic-simulation/misc/Modifier.cpp
index 40698e5..f22a2cc 100644
--- a/src/openvic-simulation/misc/Modifier.cpp
+++ b/src/openvic-simulation/misc/Modifier.cpp
@@ -100,12 +100,21 @@ bool ModifierManager::setup_modifier_effects() {
 	using enum ModifierEffect::format_t;
 
 	/* Country Modifier Effects */
+	ret &= add_modifier_effect("administrative_efficiency", true);
 	ret &= add_modifier_effect("administrative_efficiency_modifier", true);
 	ret &= add_modifier_effect("badboy", false, RAW_DECIMAL);
+	ret &= add_modifier_effect("cb_creation_speed", true); //seemingly works the same way as cb_generation_speed_modifier
 	ret &= add_modifier_effect("cb_generation_speed_modifier", true);
+	ret &= add_modifier_effect("colonial_life_rating", false, INT);
+	ret &= add_modifier_effect("colonial_migration", true);
+	ret &= add_modifier_effect("colonial_points", true, INT);
+	ret &= add_modifier_effect("colonial_prestige", true);
 	ret &= add_modifier_effect("core_pop_consciousness_modifier", false, RAW_DECIMAL);
 	ret &= add_modifier_effect("core_pop_militancy_modifier", false, RAW_DECIMAL);
+	ret &= add_modifier_effect("dig_in_cap", true, INT);
+	ret &= add_modifier_effect("diplomatic_points", true);
 	ret &= add_modifier_effect("diplomatic_points_modifier", true);
+	ret &= add_modifier_effect("education_efficiency", true);
 	ret &= add_modifier_effect("education_efficiency_modifier", true);
 	ret &= add_modifier_effect("factory_cost", false);
 	ret &= add_modifier_effect("factory_input", false);
@@ -115,23 +124,32 @@ bool ModifierManager::setup_modifier_effects() {
 	ret &= add_modifier_effect("global_assimilation_rate", true);
 	ret &= add_modifier_effect("global_immigrant_attract", true);
 	ret &= add_modifier_effect("global_pop_consciousness_modifier", false, RAW_DECIMAL);
+	ret &= add_modifier_effect("global_pop_growth", true);
 	ret &= add_modifier_effect("global_pop_militancy_modifier", false, RAW_DECIMAL);
 	ret &= add_modifier_effect("global_population_growth", true);
 	ret &= add_modifier_effect("goods_demand", false);
 	ret &= add_modifier_effect("import_cost", false);
+	ret &= add_modifier_effect("increase_research", true);
+	ret &= add_modifier_effect("influence", true);
 	ret &= add_modifier_effect("influence_modifier", true);
 	ret &= add_modifier_effect("issue_change_speed", true);
+	ret &= add_modifier_effect("land_attack_modifier", true);
+	ret &= add_modifier_effect("land_attrition", false);
+	ret &= add_modifier_effect("land_defense_modifier", true);
 	ret &= add_modifier_effect("land_organisation", true);
 	ret &= add_modifier_effect("land_unit_start_experience", true, RAW_DECIMAL);
 	ret &= add_modifier_effect("leadership", true, RAW_DECIMAL);
 	ret &= add_modifier_effect("leadership_modifier", true);
+	ret &= add_modifier_effect("literacy_con_impact", false);
 	ret &= add_modifier_effect("loan_interest", false);
 	ret &= add_modifier_effect("max_loan_modifier", true);
 	ret &= add_modifier_effect("max_military_spending", true);
+	ret &= add_modifier_effect("max_national_focus", true, INT);
 	ret &= add_modifier_effect("max_social_spending", true);
 	ret &= add_modifier_effect("max_tariff", true);
 	ret &= add_modifier_effect("max_tax", true);
 	ret &= add_modifier_effect("max_war_exhaustion", true, PERCENTAGE_DECIMAL);
+	ret &= add_modifier_effect("military_tactics", true);
 	ret &= add_modifier_effect("min_military_spending", true);
 	ret &= add_modifier_effect("min_social_spending", true);
 	ret &= add_modifier_effect("min_tariff", true);
@@ -139,76 +157,73 @@ bool ModifierManager::setup_modifier_effects() {
 	ret &= add_modifier_effect("mobilisation_economy_impact", false);
 	ret &= add_modifier_effect("mobilisation_impact", false);
 	ret &= add_modifier_effect("mobilisation_size", true);
+	ret &= add_modifier_effect("mobilization_economy_impact", false);
+	ret &= add_modifier_effect("mobilization_impact", false);
+	ret &= add_modifier_effect("mobilization_size", true);
+	ret &= add_modifier_effect("naval_attack_modifier", true);
+	ret &= add_modifier_effect("naval_attrition", false);
+	ret &= add_modifier_effect("naval_defense_modifier", true);
 	ret &= add_modifier_effect("naval_organisation", true);
 	ret &= add_modifier_effect("naval_unit_start_experience", true, RAW_DECIMAL);
 	ret &= add_modifier_effect("non_accepted_pop_consciousness_modifier", false, RAW_DECIMAL);
 	ret &= add_modifier_effect("non_accepted_pop_militancy_modifier", false, RAW_DECIMAL);
 	ret &= add_modifier_effect("org_regain", true);
+	ret &= add_modifier_effect("pension_level", true);
+	ret &= add_modifier_effect("permanent_prestige", true, RAW_DECIMAL);
+	ret &= add_modifier_effect("plurality", true, PERCENTAGE_DECIMAL);
 	ret &= add_modifier_effect("political_reform_desire", false);
+	ret &= add_modifier_effect("pop_growth", true);
 	ret &= add_modifier_effect("prestige", true, RAW_DECIMAL);
+	ret &= add_modifier_effect("regular_experience_level", true, RAW_DECIMAL);
+	ret &= add_modifier_effect("reinforce_rate", true);
 	ret &= add_modifier_effect("research_points", true, RAW_DECIMAL);
 	ret &= add_modifier_effect("research_points_modifier", true);
 	ret &= add_modifier_effect("research_points_on_conquer", true);
 	ret &= add_modifier_effect("rgo_output", true);
 	ret &= add_modifier_effect("RGO_output", true);
+	ret &= add_modifier_effect("rgo_size", true);
+	ret &= add_modifier_effect("RGO_size", true);
 	ret &= add_modifier_effect("rgo_throughput", true);
 	ret &= add_modifier_effect("RGO_throughput", true);
 	ret &= add_modifier_effect("ruling_party_support", true);
+	ret &= add_modifier_effect("shared_prestige", true, RAW_DECIMAL);
 	ret &= add_modifier_effect("social_reform_desire", false);
+	ret &= add_modifier_effect("soldier_to_pop_loss", true);
+	ret &= add_modifier_effect("seperatism", false); // paradox typo
 	ret &= add_modifier_effect("supply_consumption", false);
+	ret &= add_modifier_effect("supply_range", true);
+	ret &= add_modifier_effect("suppression_points_modifier", true);
+	ret &= add_modifier_effect("tariff_efficiency_modifier", true);
+	ret &= add_modifier_effect("tax_eff", true);
 	ret &= add_modifier_effect("tax_efficiency", true);
+	ret &= add_modifier_effect("unit_recruitment_time", false);
 	ret &= add_modifier_effect("unit_start_experience", true, RAW_DECIMAL);
 	ret &= add_modifier_effect("war_exhaustion", false);
-	ret &= add_modifier_effect("reinforce_rate", true);
-	ret &= add_modifier_effect("colonial_migration", true);
-	ret &= add_modifier_effect("supply_range", true);
-	ret &= add_modifier_effect("colonial_points", true, INT);
-	ret &= add_modifier_effect("diplomatic_points", true);
-	ret &= add_modifier_effect("cb_creation_speed", true); //seemingly works the same way as cb_generation_speed_modifier
-	ret &= add_modifier_effect("education_efficiency", true);
-	ret &= add_modifier_effect("increase_research", true);
-	ret &= add_modifier_effect("influence", true);
-	ret &= add_modifier_effect("administrative_efficiency", true);
-	ret &= add_modifier_effect("tax_eff", true);
-	ret &= add_modifier_effect("military_tactics", true);
-	ret &= add_modifier_effect("dig_in_cap", true, INT);
-	ret &= add_modifier_effect("max_national_focus", true, INT);
-	ret &= add_modifier_effect("regular_experience_level", true, RAW_DECIMAL);
-	ret &= add_modifier_effect("land_attrition", false);
-	ret &= add_modifier_effect("naval_attrition", false);
-	ret &= add_modifier_effect("permanent_prestige", true, RAW_DECIMAL);
-	ret &= add_modifier_effect("shared_prestige", true, RAW_DECIMAL);
-	ret &= add_modifier_effect("colonial_prestige", true);
-	ret &= add_modifier_effect("soldier_to_pop_loss", true);
-	ret &= add_modifier_effect("pop_growth", true);
-	ret &= add_modifier_effect("plurality", true, PERCENTAGE_DECIMAL);
-	ret &= add_modifier_effect("suppression_points_modifier", true);
-	ret &= add_modifier_effect("colonial_life_rating", false, INT);
-	ret &= add_modifier_effect("seperatism", false); //paradox typo
 
 	/* Province Modifier Effects */
 	ret &= add_modifier_effect("assimilation_rate", true);
 	ret &= add_modifier_effect("boost_strongest_party", false);
+	ret &= add_modifier_effect("farm_rgo_eff", true);
+	ret &= add_modifier_effect("farm_RGO_eff", true);
+	ret &= add_modifier_effect("farm_rgo_size", true);
+	ret &= add_modifier_effect("farm_RGO_size", true);
+	ret &= add_modifier_effect("flashpoint_tension", false);
 	ret &= add_modifier_effect("immigrant_attract", true);
 	ret &= add_modifier_effect("immigrant_push", false);
 	ret &= add_modifier_effect("life_rating", true);
+	ret &= add_modifier_effect("local_artisan_input", true);
+	ret &= add_modifier_effect("local_artisan_output", true);
+	ret &= add_modifier_effect("local_artisan_throughput", true);
 	ret &= add_modifier_effect("local_factory_input", true);
 	ret &= add_modifier_effect("local_factory_output", true);
 	ret &= add_modifier_effect("local_factory_throughput", true);
 	ret &= add_modifier_effect("local_repair", true);
 	ret &= add_modifier_effect("local_rgo_output", true);
 	ret &= add_modifier_effect("local_RGO_output", true);
+	ret &= add_modifier_effect("local_rgo_throughput", true);
 	ret &= add_modifier_effect("local_RGO_throughput", true);
 	ret &= add_modifier_effect("local_ruling_party_support", true);
 	ret &= add_modifier_effect("local_ship_build", false);
-	ret &= add_modifier_effect("pop_consciousness_modifier", false, RAW_DECIMAL);
-	ret &= add_modifier_effect("pop_militancy_modifier", false, RAW_DECIMAL);
-	ret &= add_modifier_effect("population_growth", true);
-	ret &= add_modifier_effect("flashpoint_tension", false);
-	ret &= add_modifier_effect("farm_rgo_eff", true);
-	ret &= add_modifier_effect("farm_RGO_eff", true);
-	ret &= add_modifier_effect("farm_rgo_size", true);
-	ret &= add_modifier_effect("farm_RGO_size", true);
 	ret &= add_modifier_effect("max_attrition", false, RAW_DECIMAL);
 	ret &= add_modifier_effect("mine_rgo_eff", true);
 	ret &= add_modifier_effect("mine_RGO_eff", true);
@@ -216,6 +231,9 @@ bool ModifierManager::setup_modifier_effects() {
 	ret &= add_modifier_effect("mine_RGO_size", true);
 	ret &= add_modifier_effect("movement_cost", false);
 	ret &= add_modifier_effect("number_of_voters", false);
+	ret &= add_modifier_effect("pop_consciousness_modifier", false, RAW_DECIMAL);
+	ret &= add_modifier_effect("pop_militancy_modifier", false, RAW_DECIMAL);
+	ret &= add_modifier_effect("population_growth", true);
 	ret &= add_modifier_effect("railroads", true); // capitalist likelihood for railroads vs factories
 	ret &= add_modifier_effect("supply_limit", true, RAW_DECIMAL);