Merge pull request #210 from OpenVicProject/contextual_modifier_parsing

Contextual modifier parsing

2 files changed, 13 insertions, 12 deletions

diff --git a/src/openvic-simulation/scripts/Condition.cpp b/src/openvic-simulation/scripts/Condition.cpp
index 7abd717..fd1f4fa 100644
--- a/src/openvic-simulation/scripts/Condition.cpp
+++ b/src/openvic-simulation/scripts/Condition.cpp
@@ -155,7 +155,7 @@ bool ConditionManager::setup_conditions(DefinitionManager const& definition_mana
 	ret &= add_condition("great_wars_enabled", BOOLEAN, COUNTRY);
 	ret &= add_condition("have_core_in", IDENTIFIER, COUNTRY, NO_SCOPE, NO_IDENTIFIER, COUNTRY_TAG);
 	ret &= add_condition("has_country_flag", IDENTIFIER, COUNTRY, NO_SCOPE, NO_IDENTIFIER, COUNTRY_FLAG);
-	ret &= add_condition("has_country_modifier", IDENTIFIER, COUNTRY, NO_SCOPE, NO_IDENTIFIER, MODIFIER);
+	ret &= add_condition("has_country_modifier", IDENTIFIER, COUNTRY, NO_SCOPE, NO_IDENTIFIER, COUNTRY_EVENT_MODIFIER);
 	ret &= add_condition("has_cultural_sphere", BOOLEAN, COUNTRY);
 	ret &= add_condition("has_leader", STRING, COUNTRY);
 	ret &= add_condition("has_pop_culture", IDENTIFIER, COUNTRY, NO_SCOPE, NO_IDENTIFIER, CULTURE);
@@ -299,7 +299,7 @@ bool ConditionManager::setup_conditions(DefinitionManager const& definition_mana
 	ret &= add_condition("has_empty_adjacent_state", BOOLEAN, PROVINCE);
 	ret &= add_condition("has_national_minority", BOOLEAN, PROVINCE);
 	ret &= add_condition("has_province_flag", IDENTIFIER, PROVINCE, NO_SCOPE, NO_IDENTIFIER, PROVINCE_FLAG);
-	ret &= add_condition("has_province_modifier", IDENTIFIER, PROVINCE, NO_SCOPE, NO_IDENTIFIER, MODIFIER);
+	ret &= add_condition("has_province_modifier", IDENTIFIER, PROVINCE, NO_SCOPE, NO_IDENTIFIER, PROVINCE_EVENT_MODIFIER);
 	ret &= add_condition("has_recent_imigration", INTEGER, PROVINCE); //paradox typo
 	ret &= add_condition("is_blockaded", BOOLEAN, PROVINCE);
 	ret &= add_condition("is_accepted_culture", IDENTIFIER | BOOLEAN, PROVINCE, NO_SCOPE, NO_IDENTIFIER, COUNTRY_TAG);
@@ -505,9 +505,8 @@ callback_t<std::string_view> ConditionManager::expect_parse_identifier(
 		EXPECT_CALL(BUILDING, building_type, definition_manager.get_economy_manager().get_building_type_manager(), "FACTORY");
 		EXPECT_CALL(CASUS_BELLI, wargoal_type, definition_manager.get_military_manager().get_wargoal_type_manager());
 		EXPECT_CALL(GOVERNMENT_TYPE, government_type, definition_manager.get_politics_manager().get_government_type_manager());
-		EXPECT_CALL(MODIFIER, event_modifier, definition_manager.get_modifier_manager());
-		EXPECT_CALL(MODIFIER, triggered_modifier, definition_manager.get_modifier_manager());
-		EXPECT_CALL(MODIFIER, static_modifier, definition_manager.get_modifier_manager());
+		EXPECT_CALL(COUNTRY_EVENT_MODIFIER | PROVINCE_EVENT_MODIFIER, event_modifier, definition_manager.get_modifier_manager());
+		EXPECT_CALL(COUNTRY_EVENT_MODIFIER, triggered_modifier, definition_manager.get_modifier_manager());
 		EXPECT_CALL(NATIONAL_VALUE, national_value, definition_manager.get_politics_manager().get_national_value_manager());
 		EXPECT_CALL(
 			CULTURE_UNION, country_definition, definition_manager.get_country_definition_manager(), "THIS", "FROM", "THIS_UNION"
diff --git a/src/openvic-simulation/scripts/Condition.hpp b/src/openvic-simulation/scripts/Condition.hpp
index 748453f..8d4d246 100644
--- a/src/openvic-simulation/scripts/Condition.hpp
+++ b/src/openvic-simulation/scripts/Condition.hpp
@@ -63,12 +63,13 @@ namespace OpenVic {
 		BUILDING        = 1 << 20,
 		CASUS_BELLI     = 1 << 21,
 		GOVERNMENT_TYPE = 1 << 22,
-		MODIFIER        = 1 << 23,
-		NATIONAL_VALUE  = 1 << 24,
-		CULTURE_UNION   = 1 << 25, // same as COUNTRY_TAG but also accepts scope this_union
-		CONTINENT       = 1 << 26,
-		CRIME           = 1 << 27,
-		TERRAIN         = 1 << 28,
+		COUNTRY_EVENT_MODIFIER = 1 << 23,
+		PROVINCE_EVENT_MODIFIER = 1 << 24,
+		NATIONAL_VALUE  = 1 << 25,
+		CULTURE_UNION   = 1 << 26, // same as COUNTRY_TAG but also accepts scope this_union
+		CONTINENT       = 1 << 27,
+		CRIME           = 1 << 28,
+		TERRAIN         = 1 << 29
 	};
 
 	/* Allows enum types to be used with bitwise operators. */
@@ -175,7 +176,8 @@ namespace OpenVic {
 		BUILD_STRING(BUILDING);
 		BUILD_STRING(CASUS_BELLI);
 		BUILD_STRING(GOVERNMENT_TYPE);
-		BUILD_STRING(MODIFIER);
+		BUILD_STRING(COUNTRY_EVENT_MODIFIER);
+		BUILD_STRING(PROVINCE_EVENT_MODIFIER);
 		BUILD_STRING(NATIONAL_VALUE);
 		BUILD_STRING(CULTURE_UNION);
 		BUILD_STRING(CONTINENT);