Merge pull request #185 from BiscuitCookies/master

Update for ToA

Config/common/achievements.cwt

@@ -0,0 +1,30 @@
+types = {
+	type[achievement] = {
+		path = "game/common/achievements"
+        unique = yes
+    }
+}
+
+## replace_scope = { ROOT = country THIS = country }
+achievement = {
+	possible = {
+		## cardinality = ~1..inf
+		alias_name[trigger] = alias_match_left[trigger]
+	}
+
+	happened = {
+		## cardinality = ~1..inf
+		alias_name[trigger] = alias_match_left[trigger]
+	}
+}
+
+enums = {
+	complex_enum[mod_achievement_id] = {
+		path = "game/common/achievements"
+        unique = yes
+		start_from_root = yes		
+		name = {
+			unique_id = enum_name
+		}
+	}
+}

Config/common/ai_strategy.cwt

@@ -221,7 +221,7 @@ alias[ai_strategy_rule:ai_strategy] = {
 	value = int
 }
 alias[ai_strategy_rule:ai_strategy] = {
-	type = research_tech
+	type = enum[research_strats]
 	id = <technology>
 	id = int
 	value = int
@@ -358,13 +358,20 @@ enums = {
 	enum[ai_diplo_strats] = {
 		alliance
 		antagonize
+		avoid_starting_wars
+		asking_foreign_garrison
 		befriend
 		conquer
 		consider_weak
 		contain
 		declare_war
+		diplo_action_acceptance
+		diplo_action_desire
 		dont_defend_ally_borders
+		dont_join_wars_with
+		equipment_market_trade_desire
 		force_defend_ally_borders
+		front_armor_score
 		ignore
 		ignore_claim
 		influence
@@ -375,9 +382,6 @@ enums = {
 		send_lend_lease_desire
 		send_volunteers_desire
 		support
-		front_armor_score
-		equipment_market_trade_desire
-		avoid_starting_wars
 	}
 	enum[equipment_strats] = {
 		equipment_variant_production_factor
@@ -387,7 +391,8 @@ enums = {
 		equipment_market_buying_threshold
 		equipment_market_for_sale_threshold
 		equipment_market_for_sale_factor
-		equipment_market_min_for_sale	
+		equipment_market_min_for_sale
+		equipment_market_max_for_sale
 	}
 	enum[no_id_strats] = {
 		added_military_to_civilian_factory_ratio
@@ -441,6 +446,7 @@ enums = {
 		naval_convoy_raid_region
 		naval_avoid_region
 		strategic_air_importance
+		strike_force_home_base
 	}
 	enum[strat_region_strats_without_value] = {
 		strike_force_home_base
@@ -458,6 +464,7 @@ enums = {
 	enum[ai_role_strats] = {
 		role_ratio
 		build_army
+		build_airplane
 	}
 	enum[building_strats] = {
 		building_target
@@ -501,4 +508,8 @@ enums = {
 	enum[market_seller_strats] = {
 		equipment_market_buy
 	}
+	enum[research_strats] = {
+		research_tech
+		research_weight_factor
+	}
 }

Config/common/bookmarks.cwt

@@ -47,6 +47,9 @@ bookmark = {
 
 	## cardinality = ~0..1
 	"---" = {
+		## cardinality = 0..1
+		minor = yes
+
 		history = localisation
 	}
 

Config/common/buildings.cwt

@@ -1,6 +1,6 @@
 types = {
 	type[building] = {
-		path = "game/common/building"
+		path = "game/common/buildings"
 		skip_root_key = buildings
 		localisation = {
 			## required

Config/common/characters.cwt

@@ -39,7 +39,7 @@ types = {
 			## cardinality = ~2..inf
 			instance = {
 				corps_commander = {
-					
+
 				}
 			}
         }
@@ -98,8 +98,8 @@ character = {
 			## cardinality = ~1..2
 			enum[character_portrait_types] = {
 				### Portrait(s), large (leader) and/or small (advisor)
-				## cardinality = ~1..2
-				enum[character_portrait_sizes] = scalar
+					## cardinality = ~1..2
+					alias_name[portraitset] = alias_match_left[portraitset]
 			}
 		}
 		## cardinality = 0..1
@@ -111,6 +111,10 @@ character = {
 		name = localisation
 		## cardinality = 0..1
 		gender = female
+		## cardinality = 0..1
+		gender = male
+		## cardinality = 0..1
+		gender = undefined
 	}
 	subtype[country_leader] = {
 		## cardinality = 1..inf
@@ -321,7 +325,7 @@ character = {
 		instance = {
 			## replace_scope = { this = character root = country }
 			allowed = {
-				alias_name[trigger] = alias_match_left[trigger]				
+				alias_name[trigger] = alias_match_left[trigger]
 			}
 			name = localisation
 			### Should have at least one portrait defined
@@ -331,14 +335,18 @@ character = {
 				enum[character_portrait_types] = {
 					### Portrait(s), large and/or small
 					## cardinality = ~1..2
-					enum[character_portrait_sizes] = scalar
+					alias_name[portraitset] = alias_match_left[portraitset]
 				}
 			}
 			## cardinality = 0..1
 			name = localisation
 			## cardinality = 0..1
 			gender = female
 			## cardinality = 0..1
+			gender = male
+			## cardinality = 0..1
+			gender = undefined
+			## cardinality = 0..1
 			## replace_scope = { this = character root = country }
 			allowed_civil_war = {
 				alias_name[trigger] = alias_match_left[trigger]
@@ -562,3 +570,10 @@ enums = {
 		small
 	}
 }
+
+
+
+alias[portraitset:large] = <spriteType>
+alias[portraitset:large] = filepath
+alias[portraitset:small] = <spriteType>
+alias[portraitset:small] = filepath

Config/common/combat_tactics.cwt

@@ -55,6 +55,7 @@ enums = {
 
 		# MD Phase
 		main
+		city_combat
 	}
 	enum[attack_defend] = {
 		attacker

Config/common/consolidated_ai.cwt

@@ -150,6 +150,7 @@ ai_peace = {
 }
 
 ai_template = {
+	### The role token that this role-level template entry targets. These tokens are defined by script and are targeted by the 'role_ratio' AI strategy. (This is technically a list but AI is bad at handling AI templates that target multiple roles, so sticking to just one is recommended.)
 	roles = {
 		## cardinality = ~1..inf
 		value_set[ai_roles]
@@ -168,8 +169,11 @@ ai_template = {
 		enum[country_tags]
 	}
 
+	### Deprecated but currently necessary. This parameter has no significant effect, but hasn't been removed yet.
 	match_to_count = float
-
+
+	### The role-level upgrade prio is used for weighted-random selection when the AI chooses which role to upgrade templates for. Set it to zero to prevent the AI from spending XP on upgrading templates for this role.
+	### Example: If three role-level templates [A, B, C] have upgrade prio [1, 2, 1] respectively, then the probabilities for upgrading each template is [25%, 50%, 25%] respectively.
 	upgrade_prio = {
 		enum[base_factor] = float
 		alias_name[modifier_rule] = alias_match_left[modifier_rule]
@@ -342,6 +346,7 @@ ai_equipment_design_group = {
 			type = <equipment>
 			type = value[nsb_armor_variants]
 			type = value[bba_air_variants]
+			type = enum[md_unique_dupe_archetypes] 	# TODO: Remove this once we have  system for creating custom duplicate archetype things
 
 			### The matching requirements on individual module slots.
 			## cardinality = 0..1
@@ -447,7 +452,20 @@ values = {
 		modern_armor
 
 		# planes
+		fighter
 		cas
+		naval_bomber
+		tactical_bomber
+		heavy_fighter
+		interceptor
+		scout_plane
+		suicide
+		strategic_bomber
+		cv_fighter
+		cv_cas
+		cv_naval_bomber
+		cv_suicide
+		cv_interceptor
 
 		# ships
 		naval_capital

Config/common/countries.cwt

@@ -18,6 +18,17 @@ types = {
 		subtype[cosmetic] = {
 		}
 	}
+	type[country_tag_file] = {
+		path = "game/common/country_tags"
+		type_per_file = yes
+	}
+}
+
+country_tag_file = {
+	## cardinality = 0..1
+	dynamic_tags = yes
+	## cardinality = ~1..inf
+	scalar = filepath[common/]
 }
 
 country_file = {

Config/common/country_tag_aliases.cwt

@@ -4,15 +4,12 @@ types = {
 		subtype[variable] = {
 			variable = variable_field
 		}
-		## only_if_not = { variable }
 		subtype[global_event_target] = {
 			global_event_target = value[global_event_target]
 		}
-		## only_if_not = { variable global_event_target }
 		subtype[event_target] = {
 			event_target = value[event_target]
 		}
-		## only_if_not = { variable global_event_target event_target }
 		subtype[triggered] = {
 
 		}

Config/common/decisions.cwt

@@ -10,13 +10,34 @@ types = {
 			state_target = yes
 			days_mission_timeout = scalar
 		}
+		subtype[state_mission] = {
+			state_target = enum[continents]
+			days_mission_timeout = scalar
+		}
+		subtype[state_mission] = {
+			state_target = any_owned_state
+			days_mission_timeout = scalar
+		}
+		subtype[state_mission] = {
+			state_target = any_controlled_state
+			days_mission_timeout = scalar
+		}
 		## only_if_not = { state_mission }
 		subtype[mission] = {
 			days_mission_timeout = scalar
 		}
 		subtype[state_targeted] = {
 			state_target = yes
 		}
+		subtype[state_targeted] = {
+			state_target = enum[continents]
+		}
+		subtype[state_targeted] = {
+			state_target = any_owned_state
+		}
+		subtype[state_targeted] = {
+			state_target = any_controlled_state
+		}
 		## only_if_not = { state_targeted }
 		subtype[targeted] = {
 			target_trigger = {
@@ -217,6 +238,10 @@ decision = {
 	### Tell the AI how much the decision would cost if it had a normal PP cost (use when custom_cost_trigger is used)
 	## cardinality = 0..1
 	ai_hint_pp_cost = int
+	## error_if_only_match = This is the default value and can be omitted
+	## severity = info
+	## cardinality = 0..1
+	state_target = no
 
 	subtype[country] = {
 		### Check if this decision can be activated.
@@ -396,6 +421,15 @@ decision = {
 			alias_name[effect] = alias_match_left[effect]
 		}
 
+		## cardinality = 0..1
+		state_target = yes
+		## cardinality = 0..1
+		state_target = enum[continents]
+		## cardinality = 0..1
+		state_target = any_owned_state
+		## cardinality = 0..1
+		state_target = any_controlled_state
+
 		### Can select this mission like a regular decision.
 		## cardinality = 0..1
 		selectable_mission = bool
@@ -538,7 +572,14 @@ decision = {
 			alias_name[trigger] = alias_match_left[trigger]
 		}
 
+		## cardinality = 0..1
 		state_target = yes
+		## cardinality = 0..1
+		state_target = enum[continents]
+		## cardinality = 0..1
+		state_target = any_owned_state
+		## cardinality = 0..1
+		state_target = any_controlled_state
 
 		## cardinality = 0..1
 		targets = {
@@ -590,6 +631,7 @@ enums = {
 
 	enum[targeted_decisions_state_map_modes] = {
 		map_only
+		decision_view_only
 		map_and_decisions_view
 	}
 }