From 0d10ffdb6e973749d60e0f616fb62e3a8f1977d6 Mon Sep 17 00:00:00 2001 From: "ProjectKoi-Kalo\\Kalo" Date: Fri, 27 Sep 2024 17:54:38 +0800 Subject: [PATCH] =?UTF-8?q?Changes=20=E4=BF=AE=E9=93=81=E7=81=AD=E5=85=84?= =?UTF-8?q?=E5=BC=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/scripted_effects/RG_event_effects.txt | 10 +++++++++ .../scripted_effects/RG_scripted_effects.txt | 2 +- .../RG_species_archetypes.txt | 1 + .../RG_citizenship_types.txt | 21 +++++++++++++++++++ common/traits/RG_machine_species_trait.txt | 2 +- .../simp_chinese/RG_l_simp_chinese.yml | 4 ++++ .../RG_tooltips_l_simp_chinese.yml | 3 ++- 7 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 common/species_rights/citizenship_types/RG_citizenship_types.txt diff --git a/common/scripted_effects/RG_event_effects.txt b/common/scripted_effects/RG_event_effects.txt index 6690ba7..1239c4d 100644 --- a/common/scripted_effects/RG_event_effects.txt +++ b/common/scripted_effects/RG_event_effects.txt @@ -200,6 +200,10 @@ rg_event_effect_planet2027_spawn_maid_species = { } effect = { save_global_event_target_as = rg_owner_main_maid_species + set_citizenship_type = { + type = citizenship_full_rg_maid + country = event_target:gray_owner + } } } } @@ -227,6 +231,12 @@ rg_event_effect_planet2027_spawn_maid_species_non_gray = { trait = trait_robot_streamlined_protocols trait = trait_robot_luxurious } + effect = { + set_citizenship_type = { + type = citizenship_full_rg_maid + country = event_target:gray_owner + } + } } } } diff --git a/common/scripted_effects/RG_scripted_effects.txt b/common/scripted_effects/RG_scripted_effects.txt index f98b19c..e06541d 100644 --- a/common/scripted_effects/RG_scripted_effects.txt +++ b/common/scripted_effects/RG_scripted_effects.txt @@ -2802,7 +2802,7 @@ rg_gray_country_after_init = { id = rg_grayleader.7 days = -1 } - rg_juggernaut_habitat_init = yes + # rg_juggernaut_habitat_init = yes } rg_timeline_attract_field_init = { diff --git a/common/species_archetypes/RG_species_archetypes.txt b/common/species_archetypes/RG_species_archetypes.txt index 0495106..0cb3e7a 100644 --- a/common/species_archetypes/RG_species_archetypes.txt +++ b/common/species_archetypes/RG_species_archetypes.txt @@ -18,4 +18,5 @@ RG_MACHINE = { species_trait_points = 10 species_max_traits = 6 robotic = yes + inherit_traits_from = { BIOLOGICAL ROBOT MACHINE } } \ No newline at end of file diff --git a/common/species_rights/citizenship_types/RG_citizenship_types.txt b/common/species_rights/citizenship_types/RG_citizenship_types.txt new file mode 100644 index 0000000..0c876cb --- /dev/null +++ b/common/species_rights/citizenship_types/RG_citizenship_types.txt @@ -0,0 +1,21 @@ +citizenship_full_rg_maid = { + is_full_citizenship = yes + + potential = { + exists = from + from = { is_same_value = event_target:gray_owner } + } + + allow = { + hidden_trigger = { exists = from } + custom_tooltip = { + fail_text = RG_MACHINE_SPECIES_NOT_MACHINE + OR = { + has_trait = trait_rg_machine_unit + } + } + } + ai_will_do = { + factor = 100 + } +} \ No newline at end of file diff --git a/common/traits/RG_machine_species_trait.txt b/common/traits/RG_machine_species_trait.txt index 3cb7eb6..81e5628 100644 --- a/common/traits/RG_machine_species_trait.txt +++ b/common/traits/RG_machine_species_trait.txt @@ -102,7 +102,7 @@ trait_rg_machine_unit = { } icon = "gfx/interface/icons/traits/trait_machine_unit.dds" - allowed_archetypes = { RG_MACHINE } + allowed_archetypes = { ROBOT MACHINE BIOLOGICAL LITHOID RG_MACHINE } immortal_leaders = no diff --git a/localisation/simp_chinese/RG_l_simp_chinese.yml b/localisation/simp_chinese/RG_l_simp_chinese.yml index e0ad477..9deefd9 100644 --- a/localisation/simp_chinese/RG_l_simp_chinese.yml +++ b/localisation/simp_chinese/RG_l_simp_chinese.yml @@ -21,6 +21,10 @@ RG_AUTOCONST_HANGER_desc:0 "预载的工蜂工程舰可以在星系调查完成后自动建造恒星基地。" RG_const_country:0 "$NAME_Gray$-自动工程队" + citizenship_full_rg_maid: "$RG_MACHINE$" + citizenship_full_rg_maid_tooltip: "该物种人口是完全自定义化用于工业生产的人工生命。" + citizenship_full_rg_maid_tooltip_delayed: "§L进行直接控制。§!" + rg_nothing:0 "" rg_nothing_desc:0 "" diff --git a/localisation/simp_chinese/RG_tooltips_l_simp_chinese.yml b/localisation/simp_chinese/RG_tooltips_l_simp_chinese.yml index 20001e9..3f2eb02 100644 --- a/localisation/simp_chinese/RG_tooltips_l_simp_chinese.yml +++ b/localisation/simp_chinese/RG_tooltips_l_simp_chinese.yml @@ -18,4 +18,5 @@ MESSAGE_KOGASA_VIRUS_EXTERMINATED:0 "§R检测到伞病毒威胁§!" rg_kogasa_exterminated_desc:0 "守护进程检测到$NAME_Gray$人格完整性遭到篡改，污染目标已被净化，处理方案:无害化处理。" rg_levelup_2.tooltip:0 "§Y如果我们中途中止改造项目，将无法得到退款！§!" - rg_need_manual_toggle:0 "§Y注意，更改舰种后你需要手动切换一次$NAME_Gray$的形态§!" \ No newline at end of file + rg_need_manual_toggle:0 "§Y注意，更改舰种后你需要手动切换一次$NAME_Gray$的形态§!" + RG_MACHINE_SPECIES_NOT_MACHINE: "$TRIGGER_FAIL$物种必须是§Y$trait_rg_machine_unit$§!。" \ No newline at end of file