Merge pull request #232 from Kaiserreich/master

Update Hoi4 CWTools config - NCNS update - 1.17.1 compatibility

Author: Pelmen323

Config/common/ai_strategy.cwt

@@ -168,7 +168,7 @@ alias[ai_strategy_rule:ai_strategy] = {
 	value = int
 }
 alias[ai_strategy_rule:ai_strategy] = {
-	type = area_priority
+	type = enum[ai_area_id_strats]
 	id = <ai_area>
 	value = int
 }
@@ -183,6 +183,11 @@ alias[ai_strategy_rule:ai_strategy] = {
 	target = <ai_area>
 	value = int
 }
+alias[ai_strategy_rule:ai_strategy] = {
+	type = enum[ai_diplo_strats_no_value]
+	id = enum[country_tags]
+	id = scope[country]
+}
 alias[ai_strategy_rule:ai_strategy] = {
 	type = recruit_scientist
 	id = <specialization>
@@ -203,6 +208,12 @@ alias[ai_strategy_rule:ai_strategy] = {
 	id = <strategic_region>
 	value = int
 }
+alias[ai_strategy_rule:add_ai_strategy] = {
+	type = naval_dominance
+	id = <strategic_region>
+	id = <ai_area>
+	value = int
+}
 alias[ai_strategy_rule:ai_strategy] = {
 	type = enum[strat_region_strats_without_value]
 	id = <strategic_region>
@@ -342,6 +353,9 @@ alias[ai_strategy_rule:ai_strategy] = {
 		alias_name[trigger] = alias_match_left[trigger]
 	}
 	value = int
+	### Untested - be careful
+	## cardinality = 0..1
+	ratio = float
 }
 alias[ai_strategy_rule:ai_strategy] = {
 	type = intelligence_agency_branch_desire_factor
@@ -504,6 +518,11 @@ enums = {
 		support
 		raid_target_country
 	}
+	enum[ai_diplo_strats_no_value] = {
+		conquer
+		antagonize
+		befriend
+	}
 	enum[equipment_strats] = {
 		equipment_variant_production_factor
 		save_equipment
@@ -514,6 +533,7 @@ enums = {
 		equipment_market_for_sale_factor
 		equipment_market_min_for_sale
 		equipment_market_max_for_sale
+		equipment_market_spend_factories
 	}
 	enum[no_id_strats] = {
 		added_military_to_civilian_factory_ratio
@@ -580,6 +600,10 @@ enums = {
 	enum[strat_region_strats_without_value] = {
 		strike_force_home_base
 	}
+	enum[ai_area_id_strats] = {
+		naval_dominance
+		area_priority
+	}
 	enum[state_strats] = {
 		theatre_distribution_demand_increase
 		factory_build_score_factor

Config/common/characters.cwt

@@ -5,7 +5,7 @@ types = {
 		path_strict = yes
 		skip_root_key = any
 		subtype[instanced] = {
-			## cardinality = ~2..inf
+			## cardinality = ~1..inf
 			instance = {
 
 			}
@@ -21,7 +21,7 @@ types = {
 			}
 		}
 		subtype[country_leader] = {
-			## cardinality = ~2..inf
+			## cardinality = ~1..inf
 			instance = {
 				## cardinality = 1..inf
 				country_leader = {
@@ -36,7 +36,7 @@ types = {
         }
 		## only_if_not = { field_marshal navy_leader }
 		subtype[corps_commander] = {
-			## cardinality = ~2..inf
+			## cardinality = ~1..inf
 			instance = {
 				corps_commander = {
 
@@ -51,7 +51,7 @@ types = {
 		}
 		## only_if_not = { corps_commander navy_leader }
 		subtype[field_marshal] = {
-			## cardinality = ~2..inf
+			## cardinality = ~1..inf
 			instance = {
 				field_marshal = {
 				}
@@ -65,7 +65,7 @@ types = {
 		}
 		## only_if_not = { corps_commander field_marshal }
 		subtype[navy_leader] = {
-			## cardinality = ~2..inf
+			## cardinality = ~1..inf
 			instance = {
 				navy_leader = {
 				}
@@ -84,7 +84,7 @@ types = {
 			}
 		}
 		subtype[advisor] = {
-			## cardinality = ~2..inf
+			## cardinality = ~1..inf
 			instance = {
 				## cardinality = 1..inf
 				advisor = {
@@ -350,7 +350,7 @@ character = {
 	}
 	subtype[instanced] = {
 		### Character instance, for use on startup checks (i.e. has_dlc, and similar) to create alternate versions of a character, usually two
-		## cardinality = ~2..inf
+		## cardinality = ~1..inf
 		instance = {
 			## replace_scope = { this = character root = country }
 			allowed = {

Config/common/consolidated_ai.cwt

@@ -30,28 +30,10 @@ types = {
 	type[ai_equipment_design_group] = {
 		path = "game/common/ai_equipment"
 	}
-	type[ai_equipment_design] = {
-		path = "game/common/ai_equipment"
-		skip_root_key = any
-		subtype[design] = {
-			target_variant = {
-
-			}
-		}
-	}
 	type[ai_faction_theater] = {
 		path = "game/common/ai_faction_theaters"
 	}
 }
-	# complex_enum[ai_equipment_design] = {
-	# 	path = "game/common/ai_equipment"
-	# 	name = {
-	# 		enum_name = {
-	# 			target_variant = {
-	# 			}
-	# 		}
-	# 	}
-	# }
 
 ai_area = {
 	## cardinality = 0..1
@@ -269,14 +251,14 @@ ai_equipment_design_group = {
 	### Exclusionary list of countries that will not use this design group.
 	## cardinality = 0..1
 	blocked_for = {
-		## cardinality = ~1..inf
+		## cardinality = 0..inf
 		enum[country_tags]
 	}
 
 	### Inclusionary list of countries that will use this design group. If this list is empty, all countries not in the block list will be allowed. If this list is not empty, only countries that are in this list and not in the blocked list will be allowed.
 	## cardinality = 0..1
 	available_for = {
-		## cardinality = ~1..inf
+		## cardinality = 0..inf
 		enum[country_tags]
 	}
 
@@ -294,7 +276,7 @@ ai_equipment_design_group = {
 
 	### One or more specifications of designs belonging to this design group.
 	## cardinality = 1..inf
-	<ai_equipment_design.design> = {
+	value_set[ai_equipment_design_option] = {
 		### Further priority for creating this design specifically or for creating or upgrading equipment to use this design.
 		priority = {
 			## cardinality = 0..1
@@ -534,13 +516,4 @@ enums = {
 			}
 		}
 	}
-	complex_enum[ai_equipment_design] = {
-		path = "game/common/ai_equipment"
-		name = {
-			enum_name = {
-				target_variant = {
-				}
-			}
-		}
-	}
 }

Config/common/countries.cwt

@@ -1,9 +1,4 @@
 types = {
-	# better to use a value_set with set_cosmetic_tag, since a cosmetic tag doesn't need to be defined in cosmetic.txt
-	#type[cosmetic_tag] = {
-	#	path = "game/common/countries"
-	#	path_file = "cosmetic.txt"
-	#}
 	type[country_file] = {
 		path = "game/common/countries"
 		type_per_file = yes
@@ -72,16 +67,6 @@ country_file = {
 		}
 	}
 }
-#cosmetic_tag = {
-#	color = {
-#		colour[rgb]
-#		colour[hsv]
-#	}
-#	color_ui = {
-#		colour[rgb]
-#		colour[hsv]
-#	}
-#}
 enums = {
 	# country tags + country tag aliases
 	complex_enum[country_tags] = {
@@ -99,13 +84,4 @@ enums = {
 			enum_name = scalar
 		}
 	}
-	#complex_enum[comsmetic_tags] = {
-	#	path = "game/common/countries"
-	#	path_file = "cosmetic.txt"
-	#	start_from_root = yes
-	#	name = {
-	#		enum_name = {
-	#		}
-	#	}
-	#}
 }

Config/common/doctrine_grand_doctrines.cwt

@@ -42,7 +42,7 @@ grand_doctrine = {
 	description = localisation
 	icon = <spriteType>
 	xp_cost = int
-	xp_type = enum[xp_type]
+	xp_type = enum[experience_types]
 
 	## cardinality = 0..1
 	available = {
@@ -72,6 +72,14 @@ grand_doctrine = {
 		<doctrine_track>
 	}
 
+	### Optional: unlimited by default
+	## cardinality = 0..1
+    max_track_rows = int 
+
+	### Optional: unlimited by default
+	## cardinality = 0..1
+    max_track_columns = int #
+
 	#### Scripting Activation Effects - Sync this between Grand Doctrines, Milestones, Subdoctrines, Rewards
 	### Any scripted effects
 	## cardinality = 0..1
@@ -113,16 +121,7 @@ grand_doctrine = {
 		alias_name[naval_stat] = alias_match_left[naval_stat]
 		alias_name[air_stat] = alias_match_left[air_stat]
 		## cardinality = 0..inf
-		battalion_mult = {
-			## cardinality = 1..inf
-			category = enum[unit_category]
-			## cardinality = 1..inf
-			alias_name[unit_stat] = alias_match_left[unit_stat]
-			## cardinality = 0..1
-			add = bool
-			## cardinality = 0..1
-			display_as_percentage = bool
-		}
+		battalion_mult = single_alias_right[battalion_mult]
 	}
 	### Add unit stat bonuses - units
 	## cardinality = 0..inf
@@ -131,16 +130,7 @@ grand_doctrine = {
 		alias_name[naval_stat] = alias_match_left[naval_stat]
 		alias_name[air_stat] = alias_match_left[air_stat]
 		## cardinality = 0..inf
-		battalion_mult = {
-			## cardinality = 1..inf
-			category = enum[unit_category]
-			## cardinality = 1..inf
-			alias_name[unit_stat] = alias_match_left[unit_stat]
-			## cardinality = 0..1
-			add = bool
-			## cardinality = 0..1
-			display_as_percentage = bool
-		}
+		battalion_mult = single_alias_right[battalion_mult]
 	}
 
 	### Enabling tactics
@@ -204,16 +194,7 @@ grand_doctrine = {
 				alias_name[naval_stat] = alias_match_left[naval_stat]
 				alias_name[air_stat] = alias_match_left[air_stat]
 				## cardinality = 0..inf
-				battalion_mult = {
-					## cardinality = 1..inf
-					category = enum[unit_category]
-					## cardinality = 1..inf
-					alias_name[unit_stat] = alias_match_left[unit_stat]
-					## cardinality = 0..1
-					add = bool
-					## cardinality = 0..1
-					display_as_percentage = bool
-				}
+				battalion_mult = single_alias_right[battalion_mult]
 			}
 			### Add unit stat bonuses - units
 			## cardinality = 0..inf
@@ -222,16 +203,7 @@ grand_doctrine = {
 				alias_name[naval_stat] = alias_match_left[naval_stat]
 				alias_name[air_stat] = alias_match_left[air_stat]
 				## cardinality = 0..inf
-				battalion_mult = {
-					## cardinality = 1..inf
-					category = enum[unit_category]
-					## cardinality = 1..inf
-					alias_name[unit_stat] = alias_match_left[unit_stat]
-					## cardinality = 0..1
-					add = bool
-					## cardinality = 0..1
-					display_as_percentage = bool
-				}
+				battalion_mult = single_alias_right[battalion_mult]
 			}
 
 			### Enabling tactics
@@ -251,15 +223,14 @@ grand_doctrine = {
 	}
 }
 
-enums = {
-	enum[xp_type] = {
-		army
-		air
-		navy
-	}
-	enum[doctrine_folder] = {
-		land
-		air
-		naval
-	}
+
+single_alias[battalion_mult] = {
+	## cardinality = 1..inf
+	category = enum[unit_category]
+	## cardinality = 1..inf
+	alias_name[unit_stat] = alias_match_left[unit_stat]
+	## cardinality = 0..1
+	add = bool
+	## cardinality = 0..1
+	display_as_percentage = bool
 }