From efe950f9e6c402294d73908f7af7afd33963bdce Mon Sep 17 00:00:00 2001 From: "ProjectKoi-Kalo\\Kalo" Date: Wed, 25 Sep 2024 10:32:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/scripted_effects/RG_event_effects.txt | 30 +++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/common/scripted_effects/RG_event_effects.txt b/common/scripted_effects/RG_event_effects.txt index 02ed0bf..4ee3103 100644 --- a/common/scripted_effects/RG_event_effects.txt +++ b/common/scripted_effects/RG_event_effects.txt @@ -48,8 +48,11 @@ rg_event_effect_event1_cluster = { rg_event_effect_event1_cluster_galaxy = { if = { limit = { - NOT = { - has_global_flag = origin_rg_gray_1st_global + OR = { + has_global_flag = AG_start_event_mod_active + NOT = { + has_global_flag = origin_rg_gray_1st_global + } } } rg_event_effect_event1_gray_galaxy = yes @@ -91,21 +94,20 @@ rg_event_effect_event1_gray_galaxy = { set_country_flag = rg_gray_level_1 rg_event_effect_event1_to_event2_effect = yes save_global_event_target_as = origin_rg_gray_country - rg_lcluster_spawn_effect = yes + if = { + limit = { + has_global_flag = AG_start_event_mod_active + } + } + else = { + rg_lcluster_spawn_effect = yes + } } rg_event_effect_event1_to_event2_effect = { - if = { - limit = { - RG_AG_has_gray_master_trigger = yes - } - #do nothing - } - else = { - country_event = { - id = rg_event.2 - days = 30 - } + country_event = { + id = rg_event.2 + days = 30 } } rg_event_effect_lcluster_spawn_selecter = { From 17565cd2ba398b719b536b7b900bcedaebc36b7e Mon Sep 17 00:00:00 2001 From: "ProjectKoi-Kalo\\Kalo" Date: Wed, 25 Sep 2024 10:59:34 +0800 Subject: [PATCH 2/4] zc --- .../events/ag_start_event_9998_option_ag_master.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 common/inline_scripts/events/ag_start_event_9998_option_ag_master.txt diff --git a/common/inline_scripts/events/ag_start_event_9998_option_ag_master.txt b/common/inline_scripts/events/ag_start_event_9998_option_ag_master.txt new file mode 100644 index 0000000..e69de29 From fef4de87ea7835969bc2d5df48be09f0a2e69efd Mon Sep 17 00:00:00 2001 From: "ProjectKoi-Kalo\\Kalo" Date: Wed, 25 Sep 2024 10:59:36 +0800 Subject: [PATCH 3/4] zc --- .../ag_start_event_9998_option_ag_master.txt | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/common/inline_scripts/events/ag_start_event_9998_option_ag_master.txt b/common/inline_scripts/events/ag_start_event_9998_option_ag_master.txt index e69de29..f828b57 100644 --- a/common/inline_scripts/events/ag_start_event_9998_option_ag_master.txt +++ b/common/inline_scripts/events/ag_start_event_9998_option_ag_master.txt @@ -0,0 +1,26 @@ +option = { + trigger = { has_civic = civic_AG_gray_master } + name = AG_dooropen_master.option + if = { + limit = { + any_country = { + has_civic = civic_AG_gray + } + } + #do nothing + } + else_if = { + limit = { + NOT = { + any_country = { + has_civic = civic_AG_gray + } + } + has_global_flag = has_rg_mod + } + force_remove_civic = civic_AG_gray_master + } + else = { + country_event = { id = graygoo.499 } + } +} \ No newline at end of file From 58d0be3e2bcb54a4255ec97faff76089e56be07b Mon Sep 17 00:00:00 2001 From: "ProjectKoi-Kalo\\Kalo" Date: Wed, 25 Sep 2024 12:56:40 +0800 Subject: [PATCH 4/4] Changeszc --- .../ag_start_event_9998_option_ag_master.txt | 6 ++- .../events/rg_test_gray_skill_varible.txt | 46 +++++++++++++++++++ common/scripted_effects/RG_event_effects.txt | 6 ++- .../RG_scripted_triggers.txt | 26 +++++++++++ events/RG_origin_event.txt | 6 +-- 5 files changed, 84 insertions(+), 6 deletions(-) create mode 100644 common/inline_scripts/events/rg_test_gray_skill_varible.txt diff --git a/common/inline_scripts/events/ag_start_event_9998_option_ag_master.txt b/common/inline_scripts/events/ag_start_event_9998_option_ag_master.txt index f828b57..1bf9d60 100644 --- a/common/inline_scripts/events/ag_start_event_9998_option_ag_master.txt +++ b/common/inline_scripts/events/ag_start_event_9998_option_ag_master.txt @@ -16,6 +16,9 @@ option = { has_civic = civic_AG_gray } } + any_country = { + has_civic = origin_rg_gray + } has_global_flag = has_rg_mod } force_remove_civic = civic_AG_gray_master @@ -23,4 +26,5 @@ option = { else = { country_event = { id = graygoo.499 } } -} \ No newline at end of file +} + diff --git a/common/inline_scripts/events/rg_test_gray_skill_varible.txt b/common/inline_scripts/events/rg_test_gray_skill_varible.txt new file mode 100644 index 0000000..8882c77 --- /dev/null +++ b/common/inline_scripts/events/rg_test_gray_skill_varible.txt @@ -0,0 +1,46 @@ +# event:graygoo.499 +# 初始化小灰领袖等级 +set_variable = { + which = rg_gray_level + value = 1 +} + +#Country event_target:gray_owner +#存储当前领袖等级 +rg_save_gray_leader_level_effect = { + random_owned_leader = { + #是小灰领袖 + limit = { + has_leader_flag = rg_gray_leader + } + export_trigger_value_to_variable = { + trigger = has_skill + variable = rg_gray_level_temp + } + owner = { + set_variable = { + which = rg_gray_level + value = prev.rg_gray_level_temp + } + } + } +} +#country scope +#用的时候就 +check_variable = { + which = rg_gray_level + value >= 10 +} + +#Country event_target:gray_owner +#等级导入，把存储的领袖等级赋予到领袖身上 +rg_set_varible_as_leader_level_effect = { + random_owned_leader = { + limit = { + has_leader_flag = rg_gray_leader + } + set_skill = owner.rg_gray_level + } +} + + diff --git a/common/scripted_effects/RG_event_effects.txt b/common/scripted_effects/RG_event_effects.txt index 4ee3103..1a45a6f 100644 --- a/common/scripted_effects/RG_event_effects.txt +++ b/common/scripted_effects/RG_event_effects.txt @@ -49,7 +49,7 @@ rg_event_effect_event1_cluster_galaxy = { if = { limit = { OR = { - has_global_flag = AG_start_event_mod_active + rg_has_ag_origin_trigger = yes NOT = { has_global_flag = origin_rg_gray_1st_global } @@ -96,7 +96,7 @@ rg_event_effect_event1_gray_galaxy = { save_global_event_target_as = origin_rg_gray_country if = { limit = { - has_global_flag = AG_start_event_mod_active + rg_has_ag_origin_trigger = yes } } else = { @@ -148,7 +148,9 @@ rg_event_effect_lcluster_open = { has_global_flag = rg_origin_l_cluster # 遥远约定 has_global_flag = gray_origin_activate # 远星之歌 has_global_flag = rg_origin_scion_l_cluster # 未来追迹 + rg_has_ag_origin_trigger = yes # 遥远的故事 } + } country_event = { id = rg_cluster.2 diff --git a/common/scripted_triggers/RG_scripted_triggers.txt b/common/scripted_triggers/RG_scripted_triggers.txt index 51d54e8..8e11adf 100644 --- a/common/scripted_triggers/RG_scripted_triggers.txt +++ b/common/scripted_triggers/RG_scripted_triggers.txt @@ -1,3 +1,23 @@ +rg_all_cluster_mod_check = { + OR = { + has_global_flag = l_cluster_origin # l-cluster plus + has_global_flag = rg_origin_l_cluster # 遥远约定 + has_global_flag = gray_origin_activate # 远星之歌 + has_global_flag = rg_origin_scion_l_cluster # 未来追迹 + rg_has_ag_origin_trigger = yes # 遥远的故事 + } +} + +rg_all_cluster_mod_check_for_scion = { + OR = { + has_global_flag = l_cluster_origin # l-cluster plus + # has_global_flag = rg_origin_l_cluster # 遥远约定 + has_global_flag = gray_origin_activate # 远星之歌 + # has_global_flag = rg_origin_scion_l_cluster # 未来追迹 + rg_has_ag_origin_trigger = yes # 遥远的故事 + } +} + RG_planet_can_auto_build = { OR = { AND = { @@ -48,4 +68,10 @@ rg_is_main_species_with_maid_trait_trigger = { is_same_species = owner_main_species is_subspecies = owner_main_species } +} + +rg_has_ag_origin_trigger = { + any_country = { + has_origin = origin_Asgray + } } \ No newline at end of file diff --git a/events/RG_origin_event.txt b/events/RG_origin_event.txt index a5260ca..de01731 100644 --- a/events/RG_origin_event.txt +++ b/events/RG_origin_event.txt @@ -43,10 +43,10 @@ country_event = { set_country_flag = rg_scion_needs_fe if = { limit ={ - any_playable_country = { - AND = { + OR = { + rg_all_cluster_mod_check_for_scion = yes + any_playable_country = { has_origin = origin_rg_gray - # NOT = { has_global_flag = rg_origin_l_cluster } } } }