better triggered modifier scopes

cwtools · Dec 27, 2018 · 9ff4eea · 9ff4eea
1 parent c403e67
commit 9ff4eea
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 23 deletions.
diff --git a/config/common/new/common_economic_templates.cwt b/config/common/new/common_economic_templates.cwt
@@ -91,14 +91,26 @@ alias[economic_template:upkeep] = {
 }
 
 
+## replace_scope = { this = planet root = planet }
 alias[triggered_planet_modifier:triggered_planet_modifier] = {
 	potential = {
 		alias_name[trigger] = alias_match_left[trigger]
 	}
-	## replace_scope = { this = planet root = planet }
 	alias_name[modifier] = alias_match_left[modifier]
 	## cardinality = 0..1
-	## replace_scope = { this = planet root = planet }
+	modifier = {
+		alias_name[modifier] = alias_match_left[modifier]
+	}
+}
+
+## replace_scope = { this = planet root = planet }
+alias[triggered_planet_modifier_pop:triggered_planet_modifier] = {
+	## replace_scope = { this = pop root = pop }
+	potential = {
+		alias_name[trigger] = alias_match_left[trigger]
+	}
+	alias_name[modifier] = alias_match_left[modifier]
+	## cardinality = 0..1
 	modifier = {
 		alias_name[modifier] = alias_match_left[modifier]
 	}
@@ -116,53 +128,75 @@ alias[triggered_planet_modifier_direct:triggered_planet_modifier] = {
 	}
 }
 
-alias[triggered_system_modifier:triggered_system_modifier] = {
+## replace_scope = { this = system root = system }
+alias[triggered_system_modifier_starbase:triggered_system_modifier] = {
+	## replace_scope = { this = starbase root = starbase }
 	potential = {
 		alias_name[trigger] = alias_match_left[trigger]
 	}
-	## replace_scope = { this = system root = system }
 	alias_name[modifier] = alias_match_left[modifier]
 	## cardinality = 0..1
-	## replace_scope = { this = system root = system }
 	modifier = {
 		alias_name[modifier] = alias_match_left[modifier]
 	}
 }
 
-alias[triggered_country_modifier:triggered_country_modifier] = {
+## replace_scope = { this = country root = country }
+alias[triggered_country_modifier_starbase:triggered_country_modifier] = {
+	## replace_scope = { this = starbase root = starbase }
+	potential = {
+		alias_name[trigger] = alias_match_left[trigger]
+	}
+	alias_name[modifier] = alias_match_left[modifier]
+	## cardinality = 0..1
+	modifier = {
+		alias_name[modifier] = alias_match_left[modifier]
+	}
+}
+## replace_scope = { this = country root = country }
+alias[triggered_country_modifier_pop:triggered_country_modifier] = {
+	## replace_scope = { this = pop root = pop }
 	potential = {
 		alias_name[trigger] = alias_match_left[trigger]
 	}
-	## replace_scope = { this = country root = country }
 	alias_name[modifier] = alias_match_left[modifier]
 	## cardinality = 0..1
-	## replace_scope = { this = country root = country }
 	modifier = {
 		alias_name[modifier] = alias_match_left[modifier]
 	}
 }
 
+## replace_scope = { this = pop root = pop }
 alias[triggered_pop_modifier:triggered_pop_modifier] = {
 	potential = {
 		alias_name[trigger] = alias_match_left[trigger]
 	}
-	## replace_scope = { this = pop root = pop }
 	alias_name[modifier] = alias_match_left[modifier]
 	## cardinality = 0..1
-	## replace_scope = { this = pop root = pop }
 	modifier = {
 		alias_name[modifier] = alias_match_left[modifier]
 	}
 }
 
+## replace_scope = { this = starbase root = starbase }
 alias[triggered_station_modifier:triggered_station_modifier] = {
 	potential = {
 		alias_name[trigger] = alias_match_left[trigger]
 	}
-	## replace_scope = { this = starbase root = starbase }
 	alias_name[modifier] = alias_match_left[modifier]
 	## cardinality = 0..1
-	## replace_scope = { this = starbase root = starbase }
+	modifier = {
+		alias_name[modifier] = alias_match_left[modifier]
+	}
+}
+
+## replace_scope = { this = starbase root = starbase }
+alias[triggered_station_modifier_starbase:triggered_station_modifier] = {
+	potential = {
+		alias_name[trigger] = alias_match_left[trigger]
+	}
+	alias_name[modifier] = alias_match_left[modifier]
+	## cardinality = 0..1
 	modifier = {
 		alias_name[modifier] = alias_match_left[modifier]
 	}

diff --git a/config/common/new/jobs_and_social_strata.cwt b/config/common/new/jobs_and_social_strata.cwt
@@ -73,9 +73,9 @@ job = {
 	}
 
 	## cardinality = 0..1
-	alias_name[triggered_planet_modifier] = alias_match_left[triggered_planet_modifier]
+	alias_name[triggered_planet_modifier_pop] = alias_match_left[triggered_planet_modifier_pop]
 	## cardinality = 0..1
-	alias_name[triggered_country_modifier] = alias_match_left[triggered_country_modifier]
+	alias_name[triggered_country_modifier_pop] = alias_match_left[triggered_country_modifier_pop]
 	## cardinality = 0..1
 	alias_name[triggered_pop_modifier] = alias_match_left[triggered_pop_modifier]
 

diff --git a/config/common/new/starbases_consolidated.cwt b/config/common/new/starbases_consolidated.cwt
@@ -93,9 +93,9 @@ starbase_building = {
 		alias_name[modifier] = alias_match_left[modifier]
 	}
 
-	alias_name[triggered_system_modifier] = alias_match_left[triggered_system_modifier]
-	alias_name[triggered_country_modifier] = alias_match_left[triggered_country_modifier]
-	alias_name[triggered_station_modifier] = alias_match_left[triggered_station_modifier]
+	alias_name[triggered_system_modifier_starbase] = alias_match_left[triggered_system_modifier_starbase]
+	alias_name[triggered_country_modifier_starbase] = alias_match_left[triggered_country_modifier_starbase]
+	alias_name[triggered_station_modifier_starbase] = alias_match_left[triggered_station_modifier_starbase]
 }
 
 #Done based on educated guesswork
@@ -172,8 +172,8 @@ starbase_module = {
 		alias_name[modifier] = alias_match_left[modifier]
 	}
 
-	alias_name[triggered_system_modifier] = alias_match_left[triggered_system_modifier]
-	alias_name[triggered_country_modifier] = alias_match_left[triggered_country_modifier]
+	alias_name[triggered_system_modifier_starbase] = alias_match_left[triggered_system_modifier_starbase]
+	alias_name[triggered_country_modifier_starbase] = alias_match_left[triggered_country_modifier_starbase]
 
 	## cardinality = 0..1
 	ai_weight = {

diff --git a/config/events.cwt b/config/events.cwt
@@ -35,7 +35,7 @@ types = {
 		## type_key_filter = event
 		subtype[scopeless] = {
 		}
-		
+
 		subtype[hidden] = {
 			hide_window = yes
 		}
@@ -139,7 +139,7 @@ event = {
 			## cardinality = 0..1
 			show_sound = <sound_effect>
 		}
-		
+
 		## cardinality = 0..1
 		show_sound = <sound_effect>
 		## cardinality = 0..1
@@ -199,7 +199,7 @@ event = {
 			## cardinality = 0..1
 			ai_chance = {
 				factor = float[0..10000]
-				
+
 				#Note: Weight does not work (guaranteed error message), add seems to usually cause error messages
 				alias_name[modifier_rule_factor] = alias_match_left[modifier_rule_factor]
 			}
@@ -239,7 +239,7 @@ event = {
 		## severity = info
 		## cardinality = 0..1
 		desc = OK
-		
+
 		## severity = info
 		## cardinality = 0..0
 		picture = scalar