Merge pull request #207 from Kaiserreich/master

Update Hoi4 CWTools config (DLC_043) - more fixes

Config/common/ai_strategy.cwt

@@ -386,8 +386,10 @@ alias[ai_strategy_rule:ai_strategy] = {
 	## cardinality = 0..inf
 	strategic_region = <strategic_region>
 	### Target a specific ai area. Can specify multiple.
+	## cardinality = 0..inf
 	area = <ai_area>
 	### Trigger to check against a specific country. Scope is enemy country, FROM scope is our country.
+	## cardinality = 0..1
 	## replace_scope = { this = country root = country from = country }
 	country_trigger = {
 		## cardinality = ~1..inf
@@ -418,8 +420,10 @@ alias[ai_strategy_rule:ai_strategy] = {
 	## cardinality = 0..inf
 	strategic_region = <strategic_region>
 	### Target a specific ai area. Can specify multiple.
+	## cardinality = 0..inf
 	area = <ai_area>
 	### Trigger to check against a specific country. Scope is enemy country, FROM scope is our country.
+	## cardinality = 0..1
 	## replace_scope = { this = country root = country from = country }
 	country_trigger = {
 		## cardinality = ~1..inf

Config/common/buildings.cwt

@@ -14,6 +14,12 @@ types = {
 				province_max = scalar
 			}
 		}
+		subtype[landmark] = {
+			spawn_point = landmark_spawn
+		}
+		subtype[canal] = {
+			spawn_point = locks_spawn
+		}
 		subtype[state] = {
 		}
 	}

Config/common/national_focus.cwt

@@ -84,6 +84,17 @@ focus_tree = {
 		y = int
 	}
 
+	## cardinality = 0..inf
+	shortcut = {
+		name = localisation
+		target = <focus>
+		scroll_wheel_factor = float
+		## cardinality = 0..1
+		trigger = {
+			alias_name[trigger] = alias_match_left[trigger]
+		}
+	}
+
 	## cardinality = 0..1
 	initial_show_position = {
 		## cardinality = 0..1

Config/common/raids.cwt

@@ -24,7 +24,7 @@ raid_category = {
         alias_name[trigger] = alias_match_left[trigger]
     }
     ## cardinality = 1..1
-    intel_source = enum[intel_types]
+    intel_source = enum[intel_types_raid]
     # default is no
     ## cardinality = 0..1
     free_targeting = bool
@@ -383,6 +383,12 @@ single_alias[raid_factors] = {
 }
 
 enums = {
+    enum[intel_types_raid] = {
+        air
+        naval
+        army
+        civilian
+    }
     enum[raid_unit_model] = {
         equipment
         transport

Config/common/special_projects.cwt

@@ -49,6 +49,13 @@ special_project = {
             ## cardinality = 0..inf
             has_dlc = enum[dlc]
         }
+        ### KR DLC triggers
+        ## cardinality = 0..inf
+        has_dlc_got = yes
+        ## cardinality = 0..inf
+        has_dlc_mtg = yes
+        ## cardinality = 0..inf
+        has_dlc_nsb = yes
     }
 
 	# Optional
@@ -329,8 +336,10 @@ single_alias[sp_proto_reward] = { # Dynamic token for the reward (i.e. identifie
     ## cardinality = 0..1
     ## replace_scope = { root = project this = project from = country }
     weight = {
-        ## cardinality = ~1..1
+        ## cardinality = 0..1
 		base = float
+        ## cardinality = 0..1
+		factor = float
         ## cardinality = 0..inf
 		modifier = {
             ## cardinality = 0..1

Config/effects.cwt

@@ -20,7 +20,7 @@ alias[effect:custom_effect_tooltip] = single_alias_right[bindable_loc]
 alias[effect:custom_effect_tooltip] = character_name|<character>
 ### Shows just a custom tooltip.
 ## scope = any
-alias[effect:custom_effect_tooltip] = tech_effect|<technology
+alias[effect:custom_effect_tooltip] = tech_effect|<technology>
 
 ### Shows event option tooltip
 ## scope = any

Config/effects_gtd.cwt

@@ -3,8 +3,7 @@
 alias[effect:add_breakthrough_points] = {
     specialization = <specialization>
     specialization = all
-    value = int
-
+    value = float
 }
 
 ### Requires raid as ROOT scope. Reduce progress to the special project in state. Root scope is raid instance scope. The input value is a ratio of the total needed progress to complete the special project, i.e. a decimal number between 0 and 1.

Config/history/states.cwt

@@ -36,6 +36,22 @@ state = {
 			enum[provinces] = {
 				## cardinality = 0..inf
 				<building> = int[0..20]
+				## cardinality = 0..1
+				<building.landmark> = {
+					## cardinality = 0..1
+					allowed = {
+						alias_name[trigger] = alias_match_left[trigger]
+					}
+					level = int
+				}
+				## cardinality = 0..1
+				<building.canal> = {
+					## cardinality = 0..1
+					allowed = {
+						alias_name[trigger] = alias_match_left[trigger]
+					}
+					level = int
+				}
 			}
 		}
 		alias_name[effect] = alias_match_left[effect]

Config/sound.cwt

@@ -1,4 +1,10 @@
 types = {
+    ## type_key_filter = category
+    type[soundcategory] = {
+		path = "sound"
+        name_field = "name"
+		path_extension = .asset
+    }
     ## type_key_filter = soundeffect
     type[soundeffect] = {
 		path = "sound"
@@ -26,6 +32,7 @@ soundeffect = {
     name = scalar
     ## cardinality = 0..1
     falloff = scalar #falloff type
+    ## cardinality = 0..inf
     sounds = {
         ## cardinality = 0..inf
         sound = scalar #<sound> does not properly check for voices and other misc sounds and soundefects in mods since those are dlc files
@@ -76,4 +83,31 @@ soundeffect = {
     }
     ## cardinality = 0..1
 	prevent_random_repetition = bool
+}
+
+soundcategory = {
+    name = scalar
+    soundeffects = {
+        ## cardinality = ~1..inf
+        scalar
+    }
+    ## cardinality = 0..1
+    compressor = {
+        ## cardinality = 0..1
+        enabled = bool
+        ## cardinality = 0..1
+        pregain = float
+        ## cardinality = 0..1
+        postgain = float
+        ## cardinality = 0..1
+        ratio = float
+        ## cardinality = 0..1
+        threshold = float
+        ## cardinality = 0..1
+        attacktime = float
+        ## cardinality = 0..1
+        releasetime = float
+    }
+    ## cardinality = 0..1
+    compressor = scalar
 }