contextual modifier parsingcontextual_modifier_parsing

2 files changed, 10 insertions, 19 deletions

diff --git a/src/openvic-simulation/research/Invention.cpp b/src/openvic-simulation/research/Invention.cpp
index 808dad4..1076a62 100644
--- a/src/openvic-simulation/research/Invention.cpp
+++ b/src/openvic-simulation/research/Invention.cpp
@@ -62,8 +62,6 @@ bool InventionManager::load_inventions_file(
 		inventions, [this, &modifier_manager, &unit_type_manager, &building_type_manager, &crime_manager](
 			std::string_view identifier, ast::NodeCPtr value
 		) -> bool {
-			using enum Modifier::modifier_type_t;
-
 			// TODO - use the same variable for all modifiers rather than combining them at the end?
 			ModifierValue loose_modifiers;
 			ModifierValue modifiers;
@@ -79,15 +77,13 @@ bool InventionManager::load_inventions_file(
 			ConditionScript limit { scope_t::COUNTRY, scope_t::COUNTRY, scope_t::NO_SCOPE };
 			ConditionalWeight chance { scope_t::COUNTRY, scope_t::COUNTRY, scope_t::NO_SCOPE };
 
-			bool ret = modifier_manager.expect_modifier_value_and_keys(
-				move_variable_callback(loose_modifiers),
-				INVENTION,
+			bool ret = NodeTools::expect_dictionary_keys_and_default(
+				modifier_manager.expect_base_country_modifier(loose_modifiers),
 				"news", ZERO_OR_ONE, expect_bool(assign_variable_callback(news)),
 				"limit", ONE_EXACTLY, limit.expect_script(),
 				"chance", ONE_EXACTLY, chance.expect_conditional_weight(ConditionalWeight::BASE),
-				"effect", ZERO_OR_ONE, modifier_manager.expect_modifier_value_and_keys(
-					move_variable_callback(modifiers),
-					INVENTION,
+				"effect", ZERO_OR_ONE, NodeTools::expect_dictionary_keys_and_default(
+					modifier_manager.expect_technology_modifier(modifiers),
 					"gas_attack", ZERO_OR_ONE, expect_bool(assign_variable_callback(unlock_gas_attack)),
 					"gas_defence", ZERO_OR_ONE, expect_bool(assign_variable_callback(unlock_gas_defence)),
 					"activate_unit", ZERO_OR_MORE,
diff --git a/src/openvic-simulation/research/Technology.cpp b/src/openvic-simulation/research/Technology.cpp
index a770a40..9a1cf27 100644
--- a/src/openvic-simulation/research/Technology.cpp
+++ b/src/openvic-simulation/research/Technology.cpp
@@ -142,12 +142,10 @@ bool TechnologyManager::load_technology_file_schools(
 			const bool ret = expect_dictionary_reserve_length(
 				technology_schools,
 				[this, &modifier_manager](std::string_view school_key, ast::NodeCPtr school_value) -> bool {
-					using enum Modifier::modifier_type_t;
-
 					ModifierValue modifiers;
 
-					bool ret = modifier_manager.expect_modifier_value(
-						move_variable_callback(modifiers), TECH_SCHOOL
+					bool ret = NodeTools::expect_dictionary(
+						modifier_manager.expect_base_country_modifier(modifiers)
 					)(school_value);
 
 					ret &= add_technology_school(school_key, std::move(modifiers));
@@ -170,8 +168,6 @@ bool TechnologyManager::load_technologies_file(
 	return expect_dictionary_reserve_length(technologies, [this, &modifier_manager, &unit_type_manager, &building_type_manager](
 		std::string_view tech_key, ast::NodeCPtr tech_value
 	) -> bool {
-		using enum Modifier::modifier_type_t;
-
 		ModifierValue modifiers;
 		TechnologyArea const* area = nullptr;
 		Date::year_t year = 0;
@@ -182,9 +178,8 @@ bool TechnologyManager::load_technologies_file(
 		Technology::building_set_t activated_buildings;
 		ConditionalWeight ai_chance { scope_t::COUNTRY, scope_t::COUNTRY, scope_t::NO_SCOPE };
 
-		bool ret = modifier_manager.expect_modifier_value_and_keys(
-			move_variable_callback(modifiers),
-			TECHNOLOGY,
+		bool ret = NodeTools::expect_dictionary_keys_and_default(
+			modifier_manager.expect_technology_modifier(modifiers),
 			"area", ONE_EXACTLY, expect_technology_area_identifier(assign_variable_callback_pointer(area)),
 			"year", ONE_EXACTLY, expect_uint(assign_variable_callback(year)),
 			"cost", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(cost)),
@@ -219,8 +214,8 @@ bool TechnologyManager::generate_modifiers(ModifierManager& modifier_manager) co
 	for (TechnologyFolder const& folder : get_technology_folders()) {
 		const std::string modifier_identifier = StringUtils::append_string_views(folder.get_identifier(), "_research_bonus");
 
-		ret &= modifier_manager.add_modifier_effect(
-			research_bonus_effects[folder], modifier_identifier, true, PROPORTION_DECIMAL, COUNTRY, modifier_identifier
+		ret &= modifier_manager.register_base_country_modifier_effect(
+			research_bonus_effects[folder], modifier_identifier, true, PROPORTION_DECIMAL, modifier_identifier
 		);
 	}