From a08aacd777800046a1b41b96a79dc505d8293eb0 Mon Sep 17 00:00:00 2001 From: Pelmen323 Date: Fri, 15 Nov 2024 01:29:54 +0400 Subject: [PATCH 01/13] Updates to `special_projects` file --- Config/common/special_projects.cwt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Config/common/special_projects.cwt b/Config/common/special_projects.cwt index 20182e31..d0a77324 100644 --- a/Config/common/special_projects.cwt +++ b/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 From 4a0b6029014675e190928f2c8311cc8f857e3dc0 Mon Sep 17 00:00:00 2001 From: BiscuitCookies <25040791+BiscuitCookies@users.noreply.github.com> Date: Thu, 14 Nov 2024 22:44:58 +0100 Subject: [PATCH 02/13] added sound category validation --- Config/sound.cwt | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/Config/sound.cwt b/Config/sound.cwt index 33e1a1c1..dcce718e 100644 --- a/Config/sound.cwt +++ b/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" @@ -76,4 +82,29 @@ 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 + } } \ No newline at end of file From 62301371e3a6e9db9f189f74f55c57550fb2509f Mon Sep 17 00:00:00 2001 From: BiscuitCookies <25040791+BiscuitCookies@users.noreply.github.com> Date: Thu, 14 Nov 2024 22:46:47 +0100 Subject: [PATCH 03/13] can have as many sounds in soundeffect as desired (haven't checked if there is a limit --- Config/sound.cwt | 1 + 1 file changed, 1 insertion(+) diff --git a/Config/sound.cwt b/Config/sound.cwt index dcce718e..36aef572 100644 --- a/Config/sound.cwt +++ b/Config/sound.cwt @@ -32,6 +32,7 @@ soundeffect = { name = scalar ## cardinality = 0..1 falloff = scalar #falloff type + ## cardinality = 0..inf sounds = { ## cardinality = 0..inf sound = scalar # does not properly check for voices and other misc sounds and soundefects in mods since those are dlc files From c8a90b6dc4b3ef1a5217a62523c468f885fd44fc Mon Sep 17 00:00:00 2001 From: BiscuitCookies <25040791+BiscuitCookies@users.noreply.github.com> Date: Thu, 14 Nov 2024 22:50:52 +0100 Subject: [PATCH 04/13] can also take a compressor in compressor.asset --- Config/sound.cwt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Config/sound.cwt b/Config/sound.cwt index 36aef572..bb81976c 100644 --- a/Config/sound.cwt +++ b/Config/sound.cwt @@ -108,4 +108,6 @@ soundcategory = { ## cardinality = 0..1 releasetime = float } + ## cardinality = 0..1 + compressor = scalar } \ No newline at end of file From 32c9ab057f162dae7d8241903e3f056f66746b30 Mon Sep 17 00:00:00 2001 From: BiscuitCookies <25040791+BiscuitCookies@users.noreply.github.com> Date: Fri, 15 Nov 2024 00:15:12 +0100 Subject: [PATCH 05/13] raid uses different intel type name --- Config/common/raids.cwt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Config/common/raids.cwt b/Config/common/raids.cwt index d1e97b8e..79668368 100644 --- a/Config/common/raids.cwt +++ b/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 From c6b7968e4ee38db52bdeaa1b561b74e354c60648 Mon Sep 17 00:00:00 2001 From: Pelmen323 Date: Fri, 15 Nov 2024 13:29:14 +0400 Subject: [PATCH 06/13] Update `force_concentration` strategies --- Config/common/ai_strategy.cwt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Config/common/ai_strategy.cwt b/Config/common/ai_strategy.cwt index fac887f4..866edc28 100644 --- a/Config/common/ai_strategy.cwt +++ b/Config/common/ai_strategy.cwt @@ -386,6 +386,7 @@ alias[ai_strategy_rule:ai_strategy] = { ## cardinality = 0..inf strategic_region = ### Target a specific ai area. Can specify multiple. + ## cardinality = 0..inf area = ### Trigger to check against a specific country. Scope is enemy country, FROM scope is our country. ## replace_scope = { this = country root = country from = country } @@ -418,6 +419,7 @@ alias[ai_strategy_rule:ai_strategy] = { ## cardinality = 0..inf strategic_region = ### Target a specific ai area. Can specify multiple. + ## cardinality = 0..inf area = ### Trigger to check against a specific country. Scope is enemy country, FROM scope is our country. ## replace_scope = { this = country root = country from = country } From 336c73cae8099f1aca4c326a71da64e41d652c5d Mon Sep 17 00:00:00 2001 From: Pelmen323 Date: Fri, 15 Nov 2024 13:35:50 +0400 Subject: [PATCH 07/13] More updates to new strategies --- Config/common/ai_strategy.cwt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Config/common/ai_strategy.cwt b/Config/common/ai_strategy.cwt index 866edc28..e9c31598 100644 --- a/Config/common/ai_strategy.cwt +++ b/Config/common/ai_strategy.cwt @@ -389,6 +389,7 @@ alias[ai_strategy_rule:ai_strategy] = { ## cardinality = 0..inf 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 @@ -422,6 +423,7 @@ alias[ai_strategy_rule:ai_strategy] = { ## cardinality = 0..inf 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 From 044b966576b4898ae5faf4b62d7997476b435cde Mon Sep 17 00:00:00 2001 From: Pelmen323 Date: Fri, 15 Nov 2024 13:57:28 +0400 Subject: [PATCH 08/13] Add shortcut support for focus trees --- Config/common/national_focus.cwt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Config/common/national_focus.cwt b/Config/common/national_focus.cwt index 27b11ca8..ef8b9ac4 100644 --- a/Config/common/national_focus.cwt +++ b/Config/common/national_focus.cwt @@ -84,6 +84,17 @@ focus_tree = { y = int } + ## cardinality = 0..1 + shortcut = { + name = localisation + target = + scroll_wheel_factor = float + ## cardinality = 0..1 + trigger = { + alias_name[trigger] = alias_match_left[trigger] + } + } + ## cardinality = 0..1 initial_show_position = { ## cardinality = 0..1 From 3dd03d4d99be8fd08ead977168c00277ae09b281 Mon Sep 17 00:00:00 2001 From: Pelmen323 Date: Fri, 15 Nov 2024 14:03:13 +0400 Subject: [PATCH 09/13] Add float support to `add_breakthrough_points` --- Config/effects_gtd.cwt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Config/effects_gtd.cwt b/Config/effects_gtd.cwt index fb07d062..c8b8abc2 100644 --- a/Config/effects_gtd.cwt +++ b/Config/effects_gtd.cwt @@ -3,8 +3,7 @@ alias[effect:add_breakthrough_points] = { 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. From 49429f4043e01b820e740114ff4c761dedb5e606 Mon Sep 17 00:00:00 2001 From: Pelmen323 Date: Fri, 15 Nov 2024 14:12:03 +0400 Subject: [PATCH 10/13] Add landmark support to history files --- Config/common/buildings.cwt | 3 +++ Config/history/states.cwt | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/Config/common/buildings.cwt b/Config/common/buildings.cwt index 827a241c..38936a2e 100644 --- a/Config/common/buildings.cwt +++ b/Config/common/buildings.cwt @@ -14,6 +14,9 @@ types = { province_max = scalar } } + subtype[landmark] = { + spawn_point = landmark_spawn + } subtype[state] = { } } diff --git a/Config/history/states.cwt b/Config/history/states.cwt index ca93e6fc..78397b2a 100644 --- a/Config/history/states.cwt +++ b/Config/history/states.cwt @@ -36,6 +36,14 @@ state = { enum[provinces] = { ## cardinality = 0..inf = int[0..20] + ## cardinality = 0..inf + = { + ## cardinality = 0..1 + allowed = { + alias_name[trigger] = alias_match_left[trigger] + } + level = int + } } } alias_name[effect] = alias_match_left[effect] From a778b3298a92b99fbec96733796273738e8ca5ac Mon Sep 17 00:00:00 2001 From: Pelmen323 Date: Fri, 15 Nov 2024 14:16:51 +0400 Subject: [PATCH 11/13] Experimental support for canals spawned in history files --- Config/common/buildings.cwt | 3 +++ Config/history/states.cwt | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Config/common/buildings.cwt b/Config/common/buildings.cwt index 38936a2e..9c3960b6 100644 --- a/Config/common/buildings.cwt +++ b/Config/common/buildings.cwt @@ -17,6 +17,9 @@ types = { subtype[landmark] = { spawn_point = landmark_spawn } + subtype[canal] = { + spawn_point = locks_spawn + } subtype[state] = { } } diff --git a/Config/history/states.cwt b/Config/history/states.cwt index 78397b2a..37b0d42d 100644 --- a/Config/history/states.cwt +++ b/Config/history/states.cwt @@ -36,7 +36,7 @@ state = { enum[provinces] = { ## cardinality = 0..inf = int[0..20] - ## cardinality = 0..inf + ## cardinality = 0..1 = { ## cardinality = 0..1 allowed = { @@ -44,6 +44,14 @@ state = { } level = int } + ## cardinality = 0..1 + = { + ## cardinality = 0..1 + allowed = { + alias_name[trigger] = alias_match_left[trigger] + } + level = int + } } } alias_name[effect] = alias_match_left[effect] From 3bc4e716bab0917e52f3d7c8eb18778a1005a470 Mon Sep 17 00:00:00 2001 From: Pelmen323 Date: Fri, 15 Nov 2024 14:19:49 +0400 Subject: [PATCH 12/13] Fix a typo in `tech_effect|` --- Config/effects.cwt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config/effects.cwt b/Config/effects.cwt index 4f78eca5..4f2aef41 100644 --- a/Config/effects.cwt +++ b/Config/effects.cwt @@ -20,7 +20,7 @@ alias[effect:custom_effect_tooltip] = single_alias_right[bindable_loc] alias[effect:custom_effect_tooltip] = character_name| ### Shows just a custom tooltip. ## scope = any -alias[effect:custom_effect_tooltip] = tech_effect| ### Shows event option tooltip ## scope = any From 96402838445ab8be363289a83316edbfd7034025 Mon Sep 17 00:00:00 2001 From: Pelmen323 Date: Fri, 15 Nov 2024 14:24:39 +0400 Subject: [PATCH 13/13] We can have more than one shortcut in focus tree --- Config/common/national_focus.cwt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config/common/national_focus.cwt b/Config/common/national_focus.cwt index ef8b9ac4..d9dc468e 100644 --- a/Config/common/national_focus.cwt +++ b/Config/common/national_focus.cwt @@ -84,7 +84,7 @@ focus_tree = { y = int } - ## cardinality = 0..1 + ## cardinality = 0..inf shortcut = { name = localisation target =