From 7f928c6f678dcda2313cfefb8167b3f1cf61f2db Mon Sep 17 00:00:00 2001 From: "ProjectKoi-Kalo\\Kalo" Date: Sun, 22 Sep 2024 19:32:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rg_wsg_marry_gray_option_500_scripts.txt | 42 ++- .../rg_wsg_marry_gray_option_504_scripts.txt | 39 +-- .../rg_wsg_marry_gray_option_scripts.txt | 1 + .../RG_scripted_triggers.txt | 16 +- events/!_RG_gray_goo_events.txt | 53 +-- events/RG_gray_leader_event.txt | 109 +++--- events/RG_wsg_graygoo_event.txt | 309 ++---------------- .../simp_chinese/RG_event_l_simp_chinese.yml | 1 + .../simp_chinese/RG_l_simp_chinese.yml | 3 +- 9 files changed, 139 insertions(+), 434 deletions(-) diff --git a/common/inline_scripts/events/rg_wsg_marry_gray_option_500_scripts.txt b/common/inline_scripts/events/rg_wsg_marry_gray_option_500_scripts.txt index e37ed9f..d631d06 100644 --- a/common/inline_scripts/events/rg_wsg_marry_gray_option_500_scripts.txt +++ b/common/inline_scripts/events/rg_wsg_marry_gray_option_500_scripts.txt @@ -1,9 +1,14 @@ option = { name = marry_gray trigger = { - has_global_flag = has_wsg_mod - check_variable = { which = wg_gray_affection value > @wg_gray_affection_to_lv4 } - NOT = { has_country_flag = married_gray } + RG_OR_has_wsg_mod_trigger = yes + check_variable = { + which = wg_gray_affection + value > @wg_gray_affection_to_lv4 + } + NOT = { + has_country_flag = married_gray + } } allow = { OR = { @@ -19,19 +24,40 @@ option = { } } custom_tooltip = { - check_variable = { which = wsg_rings value >= 1 } + check_variable = { + which = wsg_rings + value >= 1 + } fail_text = not_enough_engagement_rings } } + custom_tooltip = { + fail_text = gray_become_ruler + NOT = { + ruler = { + has_leader_flag = "gray_leader" + } + } + } } if = { - limit = { has_wg_special_authority = yes } - subtract_variable = { which = wsg_rings value = 1 } - } else = { + limit = { + has_wg_special_authority = yes + } + subtract_variable = { + which = wsg_rings + value = 1 + } + } + else = { add_resource = { sr_living_metal = -100 rare_crystals = -1000 } } - hidden_effect = { country_event = { id = wg_affection.30000 }} + hidden_effect = { + country_event = { + id = wg_affection.30000 + } + } } \ No newline at end of file diff --git a/common/inline_scripts/events/rg_wsg_marry_gray_option_504_scripts.txt b/common/inline_scripts/events/rg_wsg_marry_gray_option_504_scripts.txt index a2d156c..e494882 100644 --- a/common/inline_scripts/events/rg_wsg_marry_gray_option_504_scripts.txt +++ b/common/inline_scripts/events/rg_wsg_marry_gray_option_504_scripts.txt @@ -1,7 +1,7 @@ option = { name = marry_gray trigger = { - has_global_flag = has_wsg_mod + RG_OR_has_wsg_mod_trigger = yes check_variable = { which = wg_gray_affection value > @wg_gray_affection_to_lv4 @@ -12,17 +12,7 @@ option = { } allow = { OR = { - AND = { - has_wg_special_authority = no - resource_stockpile_compare = { - resource = sr_living_metal - value >= 100 - } - resource_stockpile_compare = { - resource = rare_crystals - value >= 1000 - } - } + has_wg_special_authority = no custom_tooltip = { check_variable = { which = wsg_rings @@ -31,29 +21,10 @@ option = { fail_text = not_enough_engagement_rings } } - custom_tooltip = { - fail_text = gray_become_ruler - NOT = { - ruler = { - has_leader_flag = "gray_leader" - } - } - } } - if = { - limit = { - has_wg_special_authority = yes - } - subtract_variable = { - which = wsg_rings - value = 1 - } - } - else = { - add_resource = { - sr_living_metal = -100 - rare_crystals = -1000 - } + subtract_variable = { + which = wsg_rings + value = 1 } hidden_effect = { country_event = { diff --git a/common/inline_scripts/events/rg_wsg_marry_gray_option_scripts.txt b/common/inline_scripts/events/rg_wsg_marry_gray_option_scripts.txt index 35d50c4..35e6653 100644 --- a/common/inline_scripts/events/rg_wsg_marry_gray_option_scripts.txt +++ b/common/inline_scripts/events/rg_wsg_marry_gray_option_scripts.txt @@ -1,6 +1,7 @@ option = { name = marry_gray trigger = { + RG_OR_has_wsg_mod_trigger = yes check_variable = { which = wg_gray_affection value > @wg_gray_affection_to_lv4 } NOT = { has_country_flag = married_gray } } diff --git a/common/scripted_triggers/RG_scripted_triggers.txt b/common/scripted_triggers/RG_scripted_triggers.txt index d112a22..a15d89b 100644 --- a/common/scripted_triggers/RG_scripted_triggers.txt +++ b/common/scripted_triggers/RG_scripted_triggers.txt @@ -22,4 +22,18 @@ RG_planet_can_auto_build = { has_deposit = d_trade_value_10 has_planet_flag = RG_work_bees_built } -} \ No newline at end of file +} + +RG_NOR_has_wsg_mod_trigger = { + NOR = { + has_global_flag = has_wsg_mod + has_global_flag = kdc_event_mod_active + } +} + +RG_OR_has_wsg_mod_trigger = { + OR = { + has_global_flag = has_wsg_mod + has_global_flag = kdc_event_mod_active + } +} diff --git a/events/!_RG_gray_goo_events.txt b/events/!_RG_gray_goo_events.txt index d3662a5..1aaa0cf 100644 --- a/events/!_RG_gray_goo_events.txt +++ b/events/!_RG_gray_goo_events.txt @@ -314,7 +314,7 @@ country_event = { rg_gray_country_init = yes #创建国家 } rg_gray_country_after_init = yes - set_country_flag = machine_age_nanites_studied + set_country_flag = machine_age_nanites_studied create_message = { type = MESSAGE_RECRUITED_LEADER localization = "rg_event.2.desc" @@ -346,7 +346,7 @@ country_event = { has_country_flag = gray_constship_active OR = { has_country_flag = gray_official_active - has_country_flag = gray_governor_active #旧版flag + has_country_flag = gray_governor_active #旧版flag } has_country_flag = gray_warship_active has_country_flag = gray_army_active @@ -357,10 +357,7 @@ country_event = { immediate = { if = { limit = { - OR = { - has_global_flag = has_wsg_mod - has_global_flag = kdc_event_mod_active - } + RG_OR_has_wsg_mod_trigger = yes } country_event = { id = rg_graygoo.500 @@ -389,7 +386,7 @@ country_event = { is_same_value = event_target:gray_owner OR = { has_country_flag = gray_official_active - has_country_flag = gray_governor_active #旧版flag + has_country_flag = gray_governor_active #旧版flag } NOR = { has_country_flag = gray_reforming @@ -400,10 +397,7 @@ country_event = { immediate = { if = { limit = { - OR = { - has_global_flag = has_wsg_mod - has_global_flag = kdc_event_mod_active - } + RG_OR_has_wsg_mod_trigger = yes } country_event = { id = rg_graygoo.501 @@ -446,10 +440,7 @@ country_event = { immediate = { if = { limit = { - OR = { - has_global_flag = has_wsg_mod - has_global_flag = kdc_event_mod_active - } + RG_OR_has_wsg_mod_trigger = yes } country_event = { id = rg_graygoo.502 @@ -497,10 +488,7 @@ country_event = { immediate = { if = { limit = { - OR = { - has_global_flag = has_wsg_mod - has_global_flag = kdc_event_mod_active - } + RG_OR_has_wsg_mod_trigger = yes } country_event = { id = rg_graygoo.503 @@ -532,10 +520,7 @@ country_event = { immediate = { if = { limit = { - OR = { - has_global_flag = has_wsg_mod - has_global_flag = kdc_event_mod_active - } + RG_OR_has_wsg_mod_trigger = yes } country_event = { id = rg_graygoo.504 @@ -578,10 +563,7 @@ country_event = { immediate = { if = { limit = { - OR = { - has_global_flag = has_wsg_mod - has_global_flag = kdc_event_mod_active - } + RG_OR_has_wsg_mod_trigger = yes } country_event = { id = rg_graygoo.505 @@ -638,8 +620,8 @@ event = { } immediate = { event_target:gray_owner = { - remove_country_flag = gray_official_active #新版flag - remove_country_flag = gray_governor_active #旧版flag #总督 + remove_country_flag = gray_official_active #新版flag + remove_country_flag = gray_governor_active #旧版flag #总督 remove_country_flag = gray_warship_active #旗舰 remove_country_flag = gray_army_active #陆军 remove_country_flag = gray_constship_active #科舰 @@ -648,8 +630,13 @@ event = { modifier = "gray_scattered" days = 3600 } - country_event = { id = graygoo.511 } - country_event = { id = graygoo.512 days = 3600 } + country_event = { + id = graygoo.511 + } + country_event = { + id = graygoo.512 + days = 3600 + } } } } @@ -674,20 +661,16 @@ country_event = { desc = "graygoo.512.a.desc" desc = "graygoo.512.b.desc" desc = "graygoo.512.c.desc" - event_window_type = leader_story picture = GFX_evt_gray_gooed_planet picture_event_data = { portrait = event_target:rg_gray_country_leader room = root } - is_triggered_only = yes - immediate = { remove_country_flag = gray_reforming } - option = { name = graygoo.512.a } diff --git a/events/RG_gray_leader_event.txt b/events/RG_gray_leader_event.txt index 2b88480..c701e3b 100644 --- a/events/RG_gray_leader_event.txt +++ b/events/RG_gray_leader_event.txt @@ -6,10 +6,7 @@ country_event = { hide_window = yes is_triggered_only = yes trigger = { - NOR = { - has_global_flag = has_wsg_mod - has_global_flag = kdc_event_mod_active - } + RG_NOR_has_wsg_mod_trigger = yes fromfrom = { OR = { is_country_type = gray @@ -22,10 +19,7 @@ country_event = { if = { limit = { #500.initial - NOR = { - has_global_flag = has_wsg_mod - has_global_flag = kdc_event_mod_active - } + RG_NOR_has_wsg_mod_trigger = yes fromfrom = { OR = { is_country_type = gray @@ -36,7 +30,7 @@ country_event = { NOR = { has_country_flag = gray_constship_active has_country_flag = gray_official_active - has_country_flag = gray_governor_active #旧版flag + has_country_flag = gray_governor_active #旧版flag has_country_flag = gray_warship_active has_country_flag = gray_army_active has_country_flag = gray_reforming @@ -50,10 +44,7 @@ country_event = { else_if = { #501.governor limit = { - NOR = { - has_global_flag = has_wsg_mod - has_global_flag = kdc_event_mod_active - } + RG_NOR_has_wsg_mod_trigger = yes fromfrom = { OR = { is_country_type = gray @@ -63,7 +54,7 @@ country_event = { is_same_value = event_target:gray_owner OR = { has_country_flag = gray_official_active - has_country_flag = gray_governor_active #旧版flag + has_country_flag = gray_governor_active #旧版flag } NOR = { has_country_flag = gray_reforming @@ -78,10 +69,7 @@ country_event = { else_if = { #502.warship limit = { - NOR = { - has_global_flag = has_wsg_mod - has_global_flag = kdc_event_mod_active - } + RG_NOR_has_wsg_mod_trigger = yes fromfrom = { OR = { is_country_type = gray @@ -109,10 +97,7 @@ country_event = { else_if = { #503.army limit = { - NOR = { - has_global_flag = has_wsg_mod - has_global_flag = kdc_event_mod_active - } + RG_NOR_has_wsg_mod_trigger = yes fromfrom = { OR = { is_country_type = gray @@ -145,10 +130,7 @@ country_event = { else_if = { #505.scienceship limit = { - NOR = { - has_global_flag = has_wsg_mod - has_global_flag = kdc_event_mod_active - } + RG_NOR_has_wsg_mod_trigger = yes fromfrom = { OR = { is_country_type = gray @@ -176,10 +158,7 @@ country_event = { else_if = { #504.gale limit = { - NOR = { - has_global_flag = has_wsg_mod - has_global_flag = kdc_event_mod_active - } + RG_NOR_has_wsg_mod_trigger = yes fromfrom = { OR = { is_country_type = gray @@ -223,10 +202,7 @@ country_event = { } } trigger = { - NOR = { - has_global_flag = has_wsg_mod - has_global_flag = kdc_event_mod_active - } + RG_NOR_has_wsg_mod_trigger = yes fromfrom = { OR = { is_country_type = gray @@ -237,7 +213,7 @@ country_event = { NOR = { has_country_flag = gray_constship_active has_country_flag = gray_official_active - has_country_flag = gray_governor_active #旧版flag + has_country_flag = gray_governor_active #旧版flag has_country_flag = gray_warship_active has_country_flag = gray_army_active has_country_flag = gray_reforming @@ -251,7 +227,7 @@ country_event = { trigger = { NOR = { has_country_flag = gray_official_active - has_country_flag = gray_governor_active #旧版flag + has_country_flag = gray_governor_active #旧版flag } } hidden_effect = { @@ -370,6 +346,7 @@ country_event = { } } } + inline_script = "events/rg_wsg_marry_gray_option_500_scripts" option = { name = graygoo.500.d tag = hire_leader @@ -398,15 +375,12 @@ country_event = { event_window_type = leader_recruit picture_event_data = { portrait = event_target:gray_governor - planet_background = event_target:gray_governor_planet + planet_background = event_target:gray_official_planet room = root } is_triggered_only = yes trigger = { - NOR = { - has_global_flag = has_wsg_mod - has_global_flag = kdc_event_mod_active - } + RG_NOR_has_wsg_mod_trigger = yes fromfrom = { OR = { is_country_type = gray @@ -416,7 +390,7 @@ country_event = { is_same_value = event_target:gray_owner OR = { has_country_flag = gray_official_active - has_country_flag = gray_governor_active #旧版flag + has_country_flag = gray_governor_active #旧版flag } NOR = { has_country_flag = gray_reforming @@ -429,25 +403,25 @@ country_event = { if = { limit = { any_owned_planet = { - exists = sector.leader - sector.leader = { - is_same_value = event_target:gray_governor + exists = leader + leader = { + is_same_value = event_target:gray_official } } } random_owned_planet = { limit = { - exists = sector.leader - sector.leader = { - is_same_value = event_target:gray_governor + exists = leader + leader = { + is_same_value = event_target:gray_official } } - save_event_target_as = gray_governor_planet + save_event_target_as = gray_official_planet } } else = { capital_scope = { - save_event_target_as = gray_governor_planet + save_event_target_as = gray_official_planet } } } @@ -464,7 +438,8 @@ country_event = { allow = { hidden_trigger = { exists = event_target:gray_governor - } # To prevent exploit + } + # To prevent exploit } hidden_effect = { rg_create_gray_warship = yes @@ -558,6 +533,7 @@ country_event = { } } } + inline_script = "events/rg_wsg_marry_gray_option_scripts" option = { name = graygoo.500.d tag = hire_leader @@ -590,10 +566,7 @@ country_event = { } is_triggered_only = yes trigger = { - NOR = { - has_global_flag = has_wsg_mod - has_global_flag = kdc_event_mod_active - } + RG_NOR_has_wsg_mod_trigger = yes fromfrom = { OR = { is_country_type = gray @@ -925,6 +898,7 @@ country_event = { } } } + inline_script = "events/rg_wsg_marry_gray_option_scripts" option = { name = graygoo.500.d tag = hire_leader @@ -957,10 +931,7 @@ country_event = { } is_triggered_only = yes trigger = { - NOR = { - has_global_flag = has_wsg_mod - has_global_flag = kdc_event_mod_active - } + RG_NOR_has_wsg_mod_trigger = yes fromfrom = { OR = { is_country_type = gray @@ -1245,7 +1216,7 @@ country_event = { has_country_flag = rg_habitat_enabled } allow = { - has_country_flag = rg_juggernaut_fired # To prevent exploit + has_country_flag = rg_juggernaut_fired # To prevent exploit } custom_tooltip = rg_need_manual_toggle hidden_effect = { @@ -1300,6 +1271,7 @@ country_event = { } } } + inline_script = "events/rg_wsg_marry_gray_option_scripts" option = { name = graygoo.500.d tag = hire_leader @@ -1324,10 +1296,7 @@ country_event = { diplomatic = yes is_triggered_only = yes trigger = { - NOR = { - has_global_flag = has_wsg_mod - has_global_flag = kdc_event_mod_active - } + RG_NOR_has_wsg_mod_trigger = yes from = { OR = { is_country_type = gray @@ -1340,6 +1309,7 @@ country_event = { option = { name = OK } + inline_script = "events/rg_wsg_marry_gray_option_504_scripts" # option = { # name = rg_graygoo.504.a # allow = { @@ -1380,10 +1350,7 @@ country_event = { } is_triggered_only = yes trigger = { - NOR = { - has_global_flag = has_wsg_mod - has_global_flag = kdc_event_mod_active - } + RG_NOR_has_wsg_mod_trigger = yes fromfrom = { OR = { is_country_type = gray @@ -1562,6 +1529,7 @@ country_event = { } } } + inline_script = "events/rg_wsg_marry_gray_option_scripts" # option = { # 开启建造中继器 # name = rg_event.5.e # trigger = { @@ -1834,6 +1802,7 @@ country_event = { } } +# 私房钱榨干了 country_event = { id = rg_grayleader.6 title = "graygoo.500.title" @@ -1873,6 +1842,7 @@ country_event = { } } +# 衣柜事件 country_event = { id = rg_grayleader.7 title = "graygoo.500.title" @@ -1954,6 +1924,7 @@ country_event = { } } +#动态灰风-立绘选择 country_event = { id = rg_grayleader.8 title = "graygoo.500.title" @@ -2037,4 +2008,4 @@ country_event = { } } } -} \ No newline at end of file +} diff --git a/events/RG_wsg_graygoo_event.txt b/events/RG_wsg_graygoo_event.txt index feba58d..7dbffb9 100644 --- a/events/RG_wsg_graygoo_event.txt +++ b/events/RG_wsg_graygoo_event.txt @@ -23,10 +23,7 @@ country_event = { } } trigger = { - OR = { - has_global_flag = has_wsg_mod - has_global_flag = kdc_event_mod_active - } + RG_OR_has_wsg_mod_trigger = yes fromfrom = { OR = { is_country_type = gray @@ -37,7 +34,7 @@ country_event = { NOR = { has_country_flag = gray_constship_active has_country_flag = gray_official_active - has_country_flag = gray_governor_active #旧版flag + has_country_flag = gray_governor_active #旧版flag has_country_flag = gray_warship_active has_country_flag = gray_army_active has_country_flag = gray_reforming @@ -52,7 +49,7 @@ country_event = { trigger = { NOR = { has_country_flag = gray_official_active - has_country_flag = gray_governor_active #旧版flag + has_country_flag = gray_governor_active #旧版flag } } allow = { @@ -197,10 +194,9 @@ country_event = { option = { name = marry_gray trigger = { - has_global_flag = has_wsg_mod check_variable = { - which = gray_affection_level - value >= 4 + which = wg_gray_affection + value > @wg_gray_affection_to_lv4 } NOT = { has_country_flag = married_gray @@ -276,10 +272,7 @@ country_event = { custom_gui_option = wg_new_commu_option is_triggered_only = yes trigger = { - OR = { - has_global_flag = has_wsg_mod - has_global_flag = kdc_event_mod_active - } + RG_OR_has_wsg_mod_trigger = yes fromfrom = { OR = { is_country_type = gray @@ -289,7 +282,7 @@ country_event = { is_same_value = event_target:gray_owner OR = { has_country_flag = gray_official_active - has_country_flag = gray_governor_active #旧版flag + has_country_flag = gray_governor_active #旧版flag } NOR = { has_country_flag = gray_reforming @@ -303,25 +296,25 @@ country_event = { if = { limit = { any_owned_planet = { - exists = sector.leader - sector.leader = { - is_same_value = event_target:gray_governor + exists = leader + leader = { + is_same_value = event_target:gray_official } } } random_owned_planet = { limit = { - exists = sector.leader - sector.leader = { - is_same_value = event_target:gray_governor + exists = leader + leader = { + is_same_value = event_target:gray_official } } - save_event_target_as = gray_governor_planet + save_event_target_as = gray_official_planet } } else = { capital_scope = { - save_event_target_as = gray_governor_planet + save_event_target_as = gray_official_planet } } } @@ -451,61 +444,7 @@ country_event = { } } } - option = { - name = marry_gray - trigger = { - has_global_flag = has_wsg_mod - check_variable = { - which = gray_affection_level - value >= 4 - } - NOT = { - has_country_flag = married_gray - } - } - allow = { - OR = { - AND = { - has_wg_special_authority = no - resource_stockpile_compare = { - resource = sr_living_metal - value >= 100 - } - resource_stockpile_compare = { - resource = rare_crystals - value >= 1000 - } - } - custom_tooltip = { - check_variable = { - which = wsg_rings - value >= 1 - } - fail_text = not_enough_engagement_rings - } - } - } - if = { - limit = { - has_wg_special_authority = yes - } - subtract_variable = { - which = wsg_rings - value = 1 - } - } - else = { - add_resource = { - sr_living_metal = -100 - rare_crystals = -1000 - } - } - hidden_effect = { - country_event = { - id = wg_affection.30000 - } - } - } + inline_script = "events/rg_wsg_marry_gray_option_scripts" option = { name = graygoo.500.d default_hide_option = yes @@ -525,10 +464,7 @@ country_event = { custom_gui_option = wg_new_commu_option is_triggered_only = yes trigger = { - OR = { - has_global_flag = has_wsg_mod - has_global_flag = kdc_event_mod_active - } + RG_OR_has_wsg_mod_trigger = yes fromfrom = { OR = { is_country_type = gray @@ -878,61 +814,7 @@ country_event = { } } } - option = { - name = marry_gray - trigger = { - has_global_flag = has_wsg_mod - check_variable = { - which = gray_affection_level - value >= 4 - } - NOT = { - has_country_flag = married_gray - } - } - allow = { - OR = { - AND = { - has_wg_special_authority = no - resource_stockpile_compare = { - resource = sr_living_metal - value >= 100 - } - resource_stockpile_compare = { - resource = rare_crystals - value >= 1000 - } - } - custom_tooltip = { - check_variable = { - which = wsg_rings - value >= 1 - } - fail_text = not_enough_engagement_rings - } - } - } - if = { - limit = { - has_wg_special_authority = yes - } - subtract_variable = { - which = wsg_rings - value = 1 - } - } - else = { - add_resource = { - sr_living_metal = -100 - rare_crystals = -1000 - } - } - hidden_effect = { - country_event = { - id = wg_affection.30000 - } - } - } + inline_script = "events/rg_wsg_marry_gray_option_scripts" option = { name = graygoo.500.d default_hide_option = yes @@ -952,10 +834,7 @@ country_event = { custom_gui_option = wg_new_commu_option is_triggered_only = yes trigger = { - OR = { - has_global_flag = has_wsg_mod - has_global_flag = kdc_event_mod_active - } + RG_OR_has_wsg_mod_trigger = yes fromfrom = { OR = { is_country_type = gray @@ -1278,60 +1157,7 @@ country_event = { } } } - option = { - name = marry_gray - trigger = { - check_variable = { - which = gray_affection_level - value >= 4 - } - NOT = { - has_country_flag = married_gray - } - } - allow = { - OR = { - AND = { - has_wg_special_authority = no - resource_stockpile_compare = { - resource = sr_living_metal - value >= 100 - } - resource_stockpile_compare = { - resource = rare_crystals - value >= 1000 - } - } - custom_tooltip = { - check_variable = { - which = wsg_rings - value >= 1 - } - fail_text = not_enough_engagement_rings - } - } - } - if = { - limit = { - has_wg_special_authority = yes - } - subtract_variable = { - which = wsg_rings - value = 1 - } - } - else = { - add_resource = { - sr_living_metal = -100 - rare_crystals = -1000 - } - } - hidden_effect = { - country_event = { - id = wg_affection.30000 - } - } - } + inline_script = "events/rg_wsg_marry_gray_option_scripts" option = { name = graygoo.500.d default_hide_option = yes @@ -1361,40 +1187,7 @@ country_event = { option = { name = OK } - option = { - name = marry_gray - trigger = { - has_global_flag = has_wsg_mod - check_variable = { - which = gray_affection_level - value >= 4 - } - NOT = { - has_country_flag = married_gray - } - } - allow = { - OR = { - has_wg_special_authority = no - custom_tooltip = { - check_variable = { - which = wsg_rings - value >= 1 - } - fail_text = not_enough_engagement_rings - } - } - } - subtract_variable = { - which = wsg_rings - value = 1 - } - hidden_effect = { - country_event = { - id = wg_affection.30000 - } - } - } + inline_script = "events/rg_wsg_marry_gray_option_504_scripts" # option = { # name = rg_graygoo.504.a # allow = { @@ -1432,10 +1225,7 @@ country_event = { custom_gui_option = wg_new_commu_option is_triggered_only = yes trigger = { - OR = { - has_global_flag = has_wsg_mod - has_global_flag = kdc_event_mod_active - } + RG_OR_has_wsg_mod_trigger = yes fromfrom = { OR = { is_country_type = gray @@ -1624,60 +1414,7 @@ country_event = { rg_clear_harbitat = yes } } - option = { - name = marry_gray - trigger = { - check_variable = { - which = gray_affection_level - value >= 4 - } - NOT = { - has_country_flag = married_gray - } - } - allow = { - OR = { - AND = { - has_wg_special_authority = no - resource_stockpile_compare = { - resource = sr_living_metal - value >= 100 - } - resource_stockpile_compare = { - resource = rare_crystals - value >= 1000 - } - } - custom_tooltip = { - check_variable = { - which = wsg_rings - value >= 1 - } - fail_text = not_enough_engagement_rings - } - } - } - if = { - limit = { - has_wg_special_authority = yes - } - subtract_variable = { - which = wsg_rings - value = 1 - } - } - else = { - add_resource = { - sr_living_metal = -100 - rare_crystals = -1000 - } - } - hidden_effect = { - country_event = { - id = wg_affection.30000 - } - } - } + inline_script = "events/rg_wsg_marry_gray_option_scripts" option = { name = graygoo.500.d default_hide_option = yes diff --git a/localisation/simp_chinese/RG_event_l_simp_chinese.yml b/localisation/simp_chinese/RG_event_l_simp_chinese.yml index fa219f7..f62eaf1 100644 --- a/localisation/simp_chinese/RG_event_l_simp_chinese.yml +++ b/localisation/simp_chinese/RG_event_l_simp_chinese.yml @@ -139,6 +139,7 @@ rg_event.8.b:0 "§B科学家-$NAME_Gray$§!" rg_event.8.c:0 "§G关闭手动选择立绘§!" rg_event.8.d:0 "§Y算了§!" + rg_event.8.a.desc: "§H灰风扩展（动态灰风）/灰风肖像美化§!\n\n立绘选择页面。选择你想要的$NAME_Gray$立绘。" rg_graygoo.4:0 "我需要一些帮助" rg_graygoo.4.a.desc:0 "我可以帮你建造一些舰队，或是一些其他我能帮得上的忙。你想让我做什么？" diff --git a/localisation/simp_chinese/RG_l_simp_chinese.yml b/localisation/simp_chinese/RG_l_simp_chinese.yml index 7d4835f..ed02a11 100644 --- a/localisation/simp_chinese/RG_l_simp_chinese.yml +++ b/localisation/simp_chinese/RG_l_simp_chinese.yml @@ -1,5 +1,5 @@ l_simp_chinese: - NAME_Gray:0 "灰风" + NAME_Gray:0 "小灰" GRAY_SPECIES:0 "$NAME_Gray$" RG_MACHINE:0 "§Y纳米构造体§!" gray_army_desc:0 "$NAME_Gray$和她的纳米作战母舰，可以轻易扫平一颗星球" @@ -30,6 +30,7 @@ preset_rg_scion: "§Y誓约计划国§!" preset_rg_scion_desc: "出于某种不可告人的目的，远古堕落帝国将其视若己出。他们的远古宗主不会允许其誓约国受到任何外部干扰。" + gray_become_ruler: "$NAME_Gray$不能是统治者" ### NANOTECH tradition_rg_nanotech: "§Y纳米重构§!"