From 97c3f5970462f3330dd5c0fc25fc03f94c20f586 Mon Sep 17 00:00:00 2001 From: BiscuitCookies <25040791+BiscuitCookies@users.noreply.github.com> Date: Thu, 25 Apr 2024 13:20:37 +0200 Subject: [PATCH 1/2] no checking if peace conf only triggers are used in the peace conf only --- Config/common/peace_conference.cwt | 40 ++++++++++++++---------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/Config/common/peace_conference.cwt b/Config/common/peace_conference.cwt index 90cf3145..77a4e0f0 100644 --- a/Config/common/peace_conference.cwt +++ b/Config/common/peace_conference.cwt @@ -42,8 +42,6 @@ peace_ai_desires = { enable = { ## cardinality 0..inf alias_name[trigger] = alias_match_left[trigger] - ## cardinality 0..inf - alias_name[pc_trigger] = alias_match_left[pc_trigger] } ai_desire = int } @@ -68,8 +66,6 @@ peace_action_modifiers = { enable = { ## cardinality 0..inf alias_name[trigger] = alias_match_left[trigger] - ## cardinality 0..inf - alias_name[pc_trigger] = alias_match_left[pc_trigger] } cost_multiplier = float[0..inf] } @@ -87,68 +83,68 @@ enums = { ### Checks if country is a winner in peace conference ## scope = country -alias[pc_trigger:pc_is_winner] = bool +alias[trigger:pc_is_winner] = bool ### Checks if the current scope is on the winning side within the peace conference. ## scope = country -alias[pc_trigger:pc_is_on_winning_side] = bool +alias[trigger:pc_is_on_winning_side] = bool ### Checks if country is a loser in peace conference ## scope = country -alias[pc_trigger:pc_is_loser] = bool +alias[trigger:pc_is_loser] = bool ### Checks if the current scope is an untouched loser within the peace conference. ## scope = country -alias[pc_trigger:c_is_untouched_loser] = bool +alias[trigger:c_is_untouched_loser] = bool ### Checks if the current scope is on the same side of the peace conference as the specified country. ## scope = country -alias[pc_trigger:pc_is_on_same_side_as] = enum[country_tags] +alias[trigger:pc_is_on_same_side_as] = enum[country_tags] ### Checks if the current scope is on the same side of the peace conference as the specified country. ## scope = country -alias[pc_trigger:pc_is_on_same_side_as] = scope[country] +alias[trigger:pc_is_on_same_side_as] = scope[country] ### Checks if the current scope has been liberated within the peace conference. ## scope = country -alias[pc_trigger:pc_is_liberated] = bool +alias[trigger:pc_is_liberated] = bool ### Checks if the current scope has been liberated within the peace conference by the specified country. ## scope = country -alias[pc_trigger:pc_is_liberated_by] = enum[country_tags] +alias[trigger:pc_is_liberated_by] = enum[country_tags] ### Checks if the current scope has been liberated within the peace conference by the specified country. ## scope = country -alias[pc_trigger:pc_is_liberated_by] = scope[country] +alias[trigger:pc_is_liberated_by] = scope[country] ### Checks if the current scope has been puppeted within the peace conference. ## scope = country -alias[pc_trigger:pc_is_puppeted] = bool +alias[trigger:pc_is_puppeted] = bool ### Checks if the current scope has been puppeted within the peace conference by the specified country. ## scope = country -alias[pc_trigger:pc_is_puppeted_by] = enum[country_tags] +alias[trigger:pc_is_puppeted_by] = enum[country_tags] ### Checks if the current scope has been puppeted within the peace conference by the specified country. ## scope = country -alias[pc_trigger:pc_is_puppeted_by] = scope[country] +alias[trigger:pc_is_puppeted_by] = scope[country] ### Checks if the current scope has had an enforced government change within the peace conference. ## scope = country -alias[pc_trigger:pc_is_forced_government] = bool +alias[trigger:pc_is_forced_government] = bool ### Checks if the current scope has had an enforced government change within the peace conference demanded by the specified country. ## scope = country -alias[pc_trigger:pc_is_forced_government_by] = enum[country_tags] +alias[trigger:pc_is_forced_government_by] = enum[country_tags] ### Checks if the current scope has had an enforced government change within the peace conference demanded by the specified country. ## scope = country -alias[pc_trigger:pc_is_forced_government_by] = scope[country] +alias[trigger:pc_is_forced_government_by] = scope[country] ### Checks if the current scope has had an enforced government change to the specified ideology group. ## scope = country -alias[pc_trigger:pc_is_forced_government_to] = +alias[trigger:pc_is_forced_government_to] = ### 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[pc_trigger:pc_total_score] = int +alias[trigger:pc_total_score] = int ### Checks if the current scope has the specified amount in current score within the peace conference. ## scope = country -alias[pc_trigger:pc_current_score] = int \ No newline at end of file +alias[trigger:pc_current_score] = int \ No newline at end of file From 004d868e55a9cce496719259aea4563f4ea9f721 Mon Sep 17 00:00:00 2001 From: BiscuitCookies <25040791+BiscuitCookies@users.noreply.github.com> Date: Thu, 25 Apr 2024 13:22:39 +0200 Subject: [PATCH 2/2] added equipment_bonus_type enum for type checking --- Config/common/consolidated_ai.cwt | 1 + 1 file changed, 1 insertion(+) diff --git a/Config/common/consolidated_ai.cwt b/Config/common/consolidated_ai.cwt index a6e860ce..2509c651 100644 --- a/Config/common/consolidated_ai.cwt +++ b/Config/common/consolidated_ai.cwt @@ -347,6 +347,7 @@ ai_equipment_design_group = { 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 + type = enum[equipment_bonus_type] ### The matching requirements on individual module slots. ## cardinality = 0..1