From 87764231db84415b1a0617577d1c1fe72a2a2c37 Mon Sep 17 00:00:00 2001 From: "ProjectKoi-Kalo\\Kalo" Date: Mon, 23 Sep 2024 14:39:43 +0800 Subject: [PATCH] =?UTF-8?q?trigger=E5=8E=8B=E7=BC=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../events/rg_graygoo/rg_graygoo.4.txt | 10 ++--- .../events/rg_graygoo/rg_graygoo.500.txt | 9 ++--- .../events/rg_graygoo/rg_graygoo.501.txt | 8 +--- .../events/rg_graygoo/rg_graygoo.502.txt | 3 +- .../events/rg_graygoo/rg_graygoo.503.txt | 3 +- .../events/rg_graygoo/rg_graygoo.504.txt | 4 +- .../events/rg_graygoo/rg_graygoo.505.txt | 3 +- .../RG_leader_scripted_triggers.txt | 12 +++++- events/!_RG_gray_goo_event_overwrite.txt | 17 +++------ events/RG_events.txt | 2 +- events/RG_gray_goo_events.txt | 37 +++++++------------ 11 files changed, 47 insertions(+), 61 deletions(-) diff --git a/common/inline_scripts/events/rg_graygoo/rg_graygoo.4.txt b/common/inline_scripts/events/rg_graygoo/rg_graygoo.4.txt index 2e91635..a66acd8 100644 --- a/common/inline_scripts/events/rg_graygoo/rg_graygoo.4.txt +++ b/common/inline_scripts/events/rg_graygoo/rg_graygoo.4.txt @@ -11,7 +11,7 @@ option = { name = rg_event.4.a trigger = { NOT = { - has_country_flag = gray_reforming + RG_gray_is_reforming_trigger = yes } } allow = { @@ -48,7 +48,7 @@ option = { name = rg_event.4.b trigger = { NOT = { - has_country_flag = gray_reforming + RG_gray_is_reforming_trigger = yes } } allow = { @@ -74,7 +74,7 @@ option = { name = rg_event.4.g trigger = { NOT = { - has_country_flag = gray_reforming + RG_gray_is_reforming_trigger = yes } } allow = { @@ -100,7 +100,7 @@ option = { name = rg_event.4.h trigger = { NOT = { - has_country_flag = gray_reforming + RG_gray_is_reforming_trigger = yes } } allow = { @@ -126,7 +126,7 @@ option = { name = rg_event.4.c trigger = { NOT = { - has_country_flag = gray_reforming + RG_gray_is_reforming_trigger = yes } } hidden_effect = { diff --git a/common/inline_scripts/events/rg_graygoo/rg_graygoo.500.txt b/common/inline_scripts/events/rg_graygoo/rg_graygoo.500.txt index 77cec36..4136738 100644 --- a/common/inline_scripts/events/rg_graygoo/rg_graygoo.500.txt +++ b/common/inline_scripts/events/rg_graygoo/rg_graygoo.500.txt @@ -18,12 +18,10 @@ trigger = { is_same_value = event_target:gray_owner NOR = { RG_gray_scientist_active_trigger = yes - has_country_flag = gray_official_active - has_country_flag = gray_governor_active #旧版flag + RG_gray_official_active_trigger = yes #旧版flag RG_gray_warship_active_trigger = yes RG_gray_army_active_trigger = yes - has_country_flag = gray_reforming - has_country_flag = gray_diplomacy_engaged + RG_gray_not_avaliable_trigger = yes has_country_flag = ban_commu_with_gray } } @@ -33,8 +31,7 @@ option = { response_text = graygoo.500.a.response trigger = { NOR = { - has_country_flag = gray_official_active - has_country_flag = gray_governor_active #旧版flag + RG_gray_official_active_trigger = yes #旧版flag } } allow = { diff --git a/common/inline_scripts/events/rg_graygoo/rg_graygoo.501.txt b/common/inline_scripts/events/rg_graygoo/rg_graygoo.501.txt index 4751644..abbad77 100644 --- a/common/inline_scripts/events/rg_graygoo/rg_graygoo.501.txt +++ b/common/inline_scripts/events/rg_graygoo/rg_graygoo.501.txt @@ -6,13 +6,9 @@ trigger = { } } is_same_value = event_target:gray_owner - OR = { - has_country_flag = gray_official_active - has_country_flag = gray_governor_active #旧版flag - } + RG_gray_official_active_trigger = yes NOR = { - has_country_flag = gray_reforming - has_country_flag = gray_diplomacy_engaged + RG_gray_not_avaliable_trigger = yes } exists = event_target:gray_governor } diff --git a/common/inline_scripts/events/rg_graygoo/rg_graygoo.502.txt b/common/inline_scripts/events/rg_graygoo/rg_graygoo.502.txt index cca85f9..a5c64fe 100644 --- a/common/inline_scripts/events/rg_graygoo/rg_graygoo.502.txt +++ b/common/inline_scripts/events/rg_graygoo/rg_graygoo.502.txt @@ -8,8 +8,7 @@ trigger = { is_same_value = event_target:gray_owner has_country_flag = gray_warship_active NOR = { - has_country_flag = gray_reforming - has_country_flag = gray_diplomacy_engaged + RG_gray_not_avaliable_trigger = yes } exists = event_target:gray_warship any_owned_fleet = { diff --git a/common/inline_scripts/events/rg_graygoo/rg_graygoo.503.txt b/common/inline_scripts/events/rg_graygoo/rg_graygoo.503.txt index ae807bd..be0fbe5 100644 --- a/common/inline_scripts/events/rg_graygoo/rg_graygoo.503.txt +++ b/common/inline_scripts/events/rg_graygoo/rg_graygoo.503.txt @@ -7,8 +7,7 @@ trigger = { } RG_gray_army_active_trigger = yes NOR = { - has_country_flag = gray_reforming - has_country_flag = gray_diplomacy_engaged + RG_gray_not_avaliable_trigger = yes } is_same_value = event_target:gray_owner any_owned_army = { diff --git a/common/inline_scripts/events/rg_graygoo/rg_graygoo.504.txt b/common/inline_scripts/events/rg_graygoo/rg_graygoo.504.txt index 5af8615..56935fe 100644 --- a/common/inline_scripts/events/rg_graygoo/rg_graygoo.504.txt +++ b/common/inline_scripts/events/rg_graygoo/rg_graygoo.504.txt @@ -6,7 +6,7 @@ trigger = { } } is_same_value = event_target:gray_owner - has_country_flag = gray_reforming + RG_gray_is_reforming_trigger = yes } option = { name = OK @@ -15,7 +15,7 @@ inline_script = "events/rg_wsg_marry_gray_option_504_scripts" # option = { # name = rg_graygoo.504.a # allow = { -# has_country_flag = gray_reforming +# RG_gray_is_reforming_trigger = yes # resource_stockpile_compare = { # resource = nanites # value >= 1000 diff --git a/common/inline_scripts/events/rg_graygoo/rg_graygoo.505.txt b/common/inline_scripts/events/rg_graygoo/rg_graygoo.505.txt index f03c498..1144565 100644 --- a/common/inline_scripts/events/rg_graygoo/rg_graygoo.505.txt +++ b/common/inline_scripts/events/rg_graygoo/rg_graygoo.505.txt @@ -8,8 +8,7 @@ trigger = { is_same_value = event_target:gray_owner RG_gray_scientist_active_trigger = yes NOR = { - has_country_flag = gray_reforming - has_country_flag = gray_diplomacy_engaged + RG_gray_not_avaliable_trigger = yes } exists = event_target:global_gray_constship any_owned_fleet = { diff --git a/common/scripted_triggers/RG_leader_scripted_triggers.txt b/common/scripted_triggers/RG_leader_scripted_triggers.txt index 8054f1c..c8d8483 100644 --- a/common/scripted_triggers/RG_leader_scripted_triggers.txt +++ b/common/scripted_triggers/RG_leader_scripted_triggers.txt @@ -105,7 +105,7 @@ RG_gray_mod2_allow_trigger = { } RG_gray_mod3_trigger = { NOR = { - has_country_flag = gray_reforming + RG_gray_is_reforming_trigger = yes has_country_flag = rg_juggernaut_fired } has_country_flag = rg_gray_level_3 @@ -144,5 +144,15 @@ RG_gray_scientist_active_trigger = { RG_gray_harbitat_active_trigger = { has_country_flag = rg_habitat_enabled } +RG_gray_not_avaliable_trigger = { + OR = { + RG_gray_is_reforming_trigger = yes + has_country_flag = gray_diplomacy_engaged + } +} +#小灰噶了 +RG_gray_is_reforming_trigger = { + has_country_flag = gray_reforming +} diff --git a/events/!_RG_gray_goo_event_overwrite.txt b/events/!_RG_gray_goo_event_overwrite.txt index 87ae21a..24d3064 100644 --- a/events/!_RG_gray_goo_event_overwrite.txt +++ b/events/!_RG_gray_goo_event_overwrite.txt @@ -1113,8 +1113,7 @@ country_event = { RG_gray_official_active_trigger = yes RG_gray_warship_active_trigger = yes RG_gray_army_active_trigger = yes - has_country_flag = gray_reforming - has_country_flag = gray_diplomacy_engaged + RG_gray_not_avaliable_trigger = yes } } immediate = { @@ -1149,8 +1148,7 @@ country_event = { is_same_value = event_target:gray_owner RG_gray_official_active_trigger = yes NOR = { - has_country_flag = gray_reforming - has_country_flag = gray_diplomacy_engaged + RG_gray_not_avaliable_trigger = yes } exists = event_target:gray_governor } @@ -1186,8 +1184,7 @@ country_event = { is_same_value = event_target:gray_owner RG_gray_warship_active_trigger = yes NOR = { - has_country_flag = gray_reforming - has_country_flag = gray_diplomacy_engaged + RG_gray_not_avaliable_trigger = yes } exists = event_target:gray_warship any_owned_fleet = { @@ -1228,8 +1225,7 @@ country_event = { } RG_gray_army_active_trigger = yes NOR = { - has_country_flag = gray_reforming - has_country_flag = gray_diplomacy_engaged + RG_gray_not_avaliable_trigger = yes } is_same_value = event_target:gray_owner any_owned_army = { @@ -1275,7 +1271,7 @@ country_event = { } } is_same_value = event_target:gray_owner - has_country_flag = gray_reforming + RG_gray_is_reforming_trigger = yes } immediate = { if = { @@ -1309,8 +1305,7 @@ country_event = { is_same_value = event_target:gray_owner RG_gray_scientist_active_trigger = yes NOR = { - has_country_flag = gray_reforming - has_country_flag = gray_diplomacy_engaged + RG_gray_not_avaliable_trigger = yes } exists = event_target:global_gray_constship any_owned_fleet = { diff --git a/events/RG_events.txt b/events/RG_events.txt index 0dfcfe0..2d877eb 100644 --- a/events/RG_events.txt +++ b/events/RG_events.txt @@ -1014,7 +1014,7 @@ country_event = { # is_triggered_only = yes # trigger = { # is_same_value = event_target:gray_owner -# has_country_flag = gray_reforming +# RG_gray_is_reforming_trigger = yes # } # immediate = { # if = { diff --git a/events/RG_gray_goo_events.txt b/events/RG_gray_goo_events.txt index e38af77..b9bb251 100644 --- a/events/RG_gray_goo_events.txt +++ b/events/RG_gray_goo_events.txt @@ -27,12 +27,10 @@ country_event = { is_same_value = event_target:gray_owner NOR = { RG_gray_scientist_active_trigger = yes - has_country_flag = gray_official_active - has_country_flag = gray_governor_active #旧版flag - has_country_flag = gray_warship_active + RG_gray_official_active_trigger = yes + RG_gray_warship_active_trigger = yes RG_gray_army_active_trigger = yes - has_country_flag = gray_reforming - has_country_flag = gray_diplomacy_engaged + RG_gray_not_avaliable_trigger = yes } } country_event = { @@ -49,13 +47,9 @@ country_event = { } } is_same_value = event_target:gray_owner - OR = { - has_country_flag = gray_official_active - has_country_flag = gray_governor_active #旧版flag - } - NOR = { - has_country_flag = gray_reforming - has_country_flag = gray_diplomacy_engaged + RG_gray_official_active_trigger = yes + NOT = { + RG_gray_not_avaliable_trigger = yes } exists = event_target:gray_governor } @@ -73,10 +67,9 @@ country_event = { } } is_same_value = event_target:gray_owner - has_country_flag = gray_warship_active - NOR = { - has_country_flag = gray_reforming - has_country_flag = gray_diplomacy_engaged + RG_gray_warship_active_trigger = yes + NOT = { + RG_gray_not_avaliable_trigger = yes } exists = event_target:gray_warship any_owned_fleet = { @@ -100,9 +93,8 @@ country_event = { } } RG_gray_army_active_trigger = yes - NOR = { - has_country_flag = gray_reforming - has_country_flag = gray_diplomacy_engaged + NOT = { + RG_gray_not_avaliable_trigger = yes } is_same_value = event_target:gray_owner any_owned_army = { @@ -133,9 +125,8 @@ country_event = { } is_same_value = event_target:gray_owner RG_gray_scientist_active_trigger = yes - NOR = { - has_country_flag = gray_reforming - has_country_flag = gray_diplomacy_engaged + NOT = { + RG_gray_not_avaliable_trigger = yes } exists = event_target:global_gray_constship any_owned_fleet = { @@ -159,7 +150,7 @@ country_event = { } } is_same_value = event_target:gray_owner - has_country_flag = gray_reforming + RG_gray_is_reforming_trigger = yes } country_event = { id = graygoo.504