Merge pull request #203 from Kaiserreich/master

Update Hoi4 CWTools config - maintenance

Config/common/achievements.cwt

@@ -1,8 +1,8 @@
 types = {
 	type[achievement] = {
 		path = "game/common/achievements"
-        unique = yes
-    }
+		unique = yes
+	}
 }
 
 ## replace_scope = { ROOT = country THIS = country }
@@ -16,13 +16,21 @@ achievement = {
 		## cardinality = ~1..inf
 		alias_name[trigger] = alias_match_left[trigger]
 	}
+
+	## cardinality = 0..1
+	ribbon = {
+		frames = { int }
+		colors = {
+			scalar
+		}
+	}
 }
 
 enums = {
 	complex_enum[mod_achievement_id] = {
 		path = "game/common/achievements"
-        unique = yes
-		start_from_root = yes		
+		unique = yes
+		start_from_root = yes
 		name = {
 			unique_id = enum_name
 		}

Config/common/decisions.cwt

@@ -159,6 +159,9 @@ decision_category = {
 			enum[provinces]
 		}
 
+		## cardinality = 0..1
+		highlight_only_provinces = bool
+
 		## cardinality = 0..1
 		highlight_color_before_active = int
 		## cardinality = 0..1
@@ -339,6 +342,9 @@ decision = {
 			enum[provinces]
 		}
 
+		## cardinality = 0..1
+		highlight_only_provinces = bool
+
 		## cardinality = 0..1
 		highlight_color_before_active = int
 		## cardinality = 0..1
@@ -486,6 +492,9 @@ decision = {
 				state = variable_field
 			}
 
+			## cardinality = 0..1
+			highlight_only_provinces = bool
+
 			## cardinality = 0..1
 			highlight_provinces = {
 				## cardinality = ~1..inf

Config/common/peace_conference.cwt

@@ -161,11 +161,11 @@ alias[trigger:pc_is_forced_government_to] = <ideology>
 
 ### Checks if the current scope has the specified amount in total score within the peace conference. 	Can only be used for the winning countries. 	1.12
 ## scope = country
-alias[trigger:pc_total_score] = int
+alias[trigger:pc_total_score] = int_variable_field
 
 ### Checks if the current scope has the specified amount in current score within the peace conference. 
 ## scope = country
-alias[trigger:pc_current_score] = int
+alias[trigger:pc_current_score] = int_variable_field
 
 ### Check if state is claimed with a take_states action in conference for TAG. Example: pc_is_state_claimed_and_taken_by = SOV/ROOT/ROOT.FROM"
 ## scope = state

Config/common/scripted_guis.cwt

@@ -52,6 +52,9 @@ scripted_gui = {
 	## cardinality = 0..1
 	context_type = enum[context_type]
 
+	## cardinality = 0..1
+	mapmode = <scripted_map_modes>
+
 	## cardinality = 0..1
 	parent_window_token = enum[parent_window_token]
 
@@ -350,6 +353,11 @@ scripted_gui = {
 			target_array = value[array]
 			## cardinality = 0..1
 			target_array = variable_field
+			## cardinality = 0..1
+			target_trigger = {
+				## cardinality = ~1..inf
+				alias_name[trigger] = alias_match_left[trigger]
+			}
 		}
 		## cardinality = 0..inf
 		### Limits AI to selected scopes. When used multiple times, will use all matching scopes.
@@ -397,6 +405,11 @@ scripted_gui = {
 			target_array = value[array]
 			## cardinality = 0..1
 			target_array = variable_field
+			## cardinality = 0..1
+			target_trigger = {
+				## cardinality = ~1..inf
+				alias_name[trigger] = alias_match_left[trigger]
+			}
 		}
 		## cardinality = 0..inf
 		### Limits AI to selected scopes. When used multiple times, will use all matching scopes.

Config/effects.cwt

@@ -913,6 +913,21 @@ alias[effect:build_railway] = {
 	}
 	## cardinality = 0..1
 	build_only_on_allied = bool
+	### You can specify a weight function that will be used in pathing. The scope will be the controller of the province it is trying to path to.
+  	### A negative value will make it not to path to that controller.
+  	### Non-negative values will be used as a path cost for that province.
+	## cardinality = 0..1
+	controller_priority ={
+		## cardinality = 0..1
+		base = variable_field
+		## cardinality = 0..inf
+		modifier = {
+			## cardinality = ~1..inf
+			tag = enum[country_tags]
+			## cardinality = ~1..1
+			add = float
+		}
+	}
 	## cardinality = 0..1
 	level = int[1..5]
 	### Option 3: Specify start & end state IDs. It will pick provinces with the best node (capital > nodes > naval ) start_state = 50 target_state = 100
@@ -928,6 +943,21 @@ alias[effect:build_railway] = {
 alias[effect:build_railway] = {
 	## cardinality = 0..1
 	build_only_on_allied = bool
+	### You can specify a weight function that will be used in pathing. The scope will be the controller of the province it is trying to path to.
+  	### A negative value will make it not to path to that controller.
+  	### Non-negative values will be used as a path cost for that province.
+	## cardinality = 0..1
+	controller_priority ={
+		## cardinality = 0..1
+		base = variable_field
+		## cardinality = 0..inf
+		modifier = {
+			## cardinality = ~1..inf
+			tag = enum[country_tags]
+			## cardinality = ~1..1
+			add = float
+		}
+	}
 	## cardinality = 0..1
 	level = int[1..5]
 	start_province = enum[provinces]
@@ -950,6 +980,21 @@ alias[effect:build_railway] = {
 alias[effect:build_railway] = {
 	## cardinality = 0..1
 	build_only_on_allied = bool
+	### You can specify a weight function that will be used in pathing. The scope will be the controller of the province it is trying to path to.
+  	### A negative value will make it not to path to that controller.
+  	### Non-negative values will be used as a path cost for that province.
+	## cardinality = 0..1
+	controller_priority ={
+		## cardinality = 0..1
+		base = variable_field
+		## cardinality = 0..inf
+		modifier = {
+			## cardinality = ~1..inf
+			tag = enum[country_tags]
+			## cardinality = ~1..1
+			add = float
+		}
+	}
 	## cardinality = 0..1
 	level = int[1..5]
 	start_state = <state>

Config/triggers.cwt

@@ -2362,9 +2362,15 @@ alias[trigger:has_bombing_war_support] = float
 ## scope = country
 alias[trigger:has_bombing_war_support] = variable_field_32
 
-### Has a certain amount of resources
+### Checks for amount of resources in country
 ## scope = country
 alias[trigger:has_resources_in_country] = {
 	resource = <resource>
 	amount = int_variable_field
+	### Checks extracted amount instead of country balance. Default - no
+	## cardinality = 0..1
+	extracted = bool
+	### Checks only amount from local buildings instead of country balance. Default - no
+	## cardinality = 0..1
+	buildings = bool
 }

Config/variables.cwt

@@ -648,6 +648,12 @@ values = {
 		### (Trigger) Total produced equipment of typetrain
 		total_equipment_produced_train
 
+		### (Trigger) Checks country's total peace conference score. Only usable if the country is on the winning side. Example: CZE = { pc_current_score > 400 }
+		pc_current_score
+
+		### (Trigger) Checks country's total peace conference score. Only usable if the country is on the winning side. Example: CZE = { pc_total_score > 400 }
+		pc_total_score
+
 		# =======================
 		# STATE DYNAMIC VARIABLES
 		# =======================