From 7a1d71c8a9cf6a02a20759aded3450e5fe8dffec Mon Sep 17 00:00:00 2001 From: "ProjectKoi-Kalo\\Kalo" Date: Wed, 25 Sep 2024 09:10:35 +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 --- .../pop_categories/trait_production.txt | 16 +++++--- common/scripted_effects/RG_event_effects.txt | 40 +++++++++++++++---- .../RG_scripted_triggers.txt | 4 ++ common/traits/RG_machine_species_trait.txt | 2 +- events/RG_events.txt | 13 +----- .../RG_goverment_l_simp_chinese.yml | 2 +- .../RG_tooltips_l_simp_chinese.yml | 1 - .../simp_chinese/RG_traits_l_simp_chinese.yml | 1 + 8 files changed, 50 insertions(+), 29 deletions(-) diff --git a/common/inline_scripts/pop_categories/trait_production.txt b/common/inline_scripts/pop_categories/trait_production.txt index 1d33e4c..d8d7c48 100644 --- a/common/inline_scripts/pop_categories/trait_production.txt +++ b/common/inline_scripts/pop_categories/trait_production.txt @@ -1,11 +1,15 @@ produces = { trigger = { - # exists = planet - # planet = { - # OR = { - # rg_is_pc_nano = yes - # } - # } + exists = planet + planet = { + owner = { + OR = { + RG_gray_harbitat_active_trigger = yes + has_active_tradition = tr_rg_nanotech_5 + } + } + rg_is_pc_nano = yes + } OR = { has_trait = rg_machine_maid_trait } diff --git a/common/scripted_effects/RG_event_effects.txt b/common/scripted_effects/RG_event_effects.txt index 6d25b1c..02ed0bf 100644 --- a/common/scripted_effects/RG_event_effects.txt +++ b/common/scripted_effects/RG_event_effects.txt @@ -65,10 +65,7 @@ rg_event_effect_event1_gray_cluster = { set_country_flag = origin_rg_gray_cluster set_country_flag = origin_rg_gray_1st set_country_flag = rg_gray_level_1 - country_event = { - id = rg_event.2 - days = 30 - } + rg_event_effect_event1_to_event2_effect = yes add_resource = { energy = 1000 minerals = 1000 @@ -92,13 +89,25 @@ rg_event_effect_event1_gray_galaxy = { set_country_flag = origin_rg_gray_galaxy set_country_flag = origin_rg_gray_1st set_country_flag = rg_gray_level_1 - country_event = { - id = rg_event.2 - days = 30 - } + rg_event_effect_event1_to_event2_effect = yes save_global_event_target_as = origin_rg_gray_country 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 + } + } +} rg_event_effect_lcluster_spawn_selecter = { if = { limit = { @@ -203,4 +212,19 @@ rg_event_effect_planet2027_spawn_maid_species_non_gray = { } } } +} + +rg_event_effect_event2_gray_origin_init = { + rg_gray_country_init = yes + country_event = { + id = graygoo.499 + } + give_technology = { + tech = tech_minilaser_gray_1 + message = no + } + give_technology = { + tech = tech_object_gray_5 + message = no + } } \ No newline at end of file diff --git a/common/scripted_triggers/RG_scripted_triggers.txt b/common/scripted_triggers/RG_scripted_triggers.txt index 0b511c8..51d54e8 100644 --- a/common/scripted_triggers/RG_scripted_triggers.txt +++ b/common/scripted_triggers/RG_scripted_triggers.txt @@ -31,6 +31,10 @@ RG_OR_has_wsg_mod_trigger = { } } +RG_AG_has_gray_master_trigger = { + has_civic = civic_AG_gray_master +} + RG_has_gray_cluster_origin_trigger = { OR = { has_country_flag = origin_rg_gray #遥远约定 diff --git a/common/traits/RG_machine_species_trait.txt b/common/traits/RG_machine_species_trait.txt index c6ee0ab..019f139 100644 --- a/common/traits/RG_machine_species_trait.txt +++ b/common/traits/RG_machine_species_trait.txt @@ -31,7 +31,7 @@ rg_machine_maid_trait = { exists = planet planet = { exists = owner - owner = { is_same_value = event_target:gray_owner } + owner = { has_country_flag = gray_owner } } } planet_jobs_produces_mult = 0.1 diff --git a/events/RG_events.txt b/events/RG_events.txt index 1a4ab7b..f453d93 100644 --- a/events/RG_events.txt +++ b/events/RG_events.txt @@ -41,18 +41,7 @@ country_event = { } is_triggered_only = yes immediate = { - rg_gray_country_init = yes - country_event = { - id = graygoo.499 - } - give_technology = { - tech = tech_minilaser_gray_1 - message = no - } - give_technology = { - tech = tech_object_gray_5 - message = no - } + rg_event_effect_event2_gray_origin_init = yes } option = { name = rg_event.2.a diff --git a/localisation/simp_chinese/RG_goverment_l_simp_chinese.yml b/localisation/simp_chinese/RG_goverment_l_simp_chinese.yml index 79d75bb..f1ea282 100644 --- a/localisation/simp_chinese/RG_goverment_l_simp_chinese.yml +++ b/localisation/simp_chinese/RG_goverment_l_simp_chinese.yml @@ -23,7 +23,7 @@ tr_rg_nanotech_2_modifier_desc: "§I解锁巨型结构：§!§Y$RG_habitat_central_complex$§!\n§I解锁巨型结构：§!§Y$rg_nano_ripper_4$§!：可从恒星系内所有行星、卫星和小行星上产出大量的£nanites£§Y$nanites$§!" tr_rg_nanotech_3_modifier_desc: "§Y解锁行星决议：§!$decision_rg_nanotech_swarm_consume_world$\n§Y解锁巨像武器：§!$tech_object_gray_7$：可将星球转变为可殖民的§Y$pc_nanotech$§!" tr_rg_nanotech_4_modifier_desc: "§Y解锁飞升：$rg_ap_nantiematter$\n解锁舰船：§!$RG_graygoo_destroyer$\n§Y获得遗珍：§!§Y$rg_tempest_invocator$§!：允许你召唤宇宙风暴：§Y$graytempest_storm$§!" - tr_rg_nanotech_5_modifier_desc: "§Y解锁净化方式：$purge_nanophage$§!：将非帝国主体人口同化为我们的一部分。\n所有帝国人口将获得§Y纳米特质§!：人口需要£nanites£§Y$nanites$§!维护费。\n每个类型为§Y$pc_nanotech$§!或§Y$pc_rg_grayhabitat$§!的殖民地都将瞬间创建§Y纳米化$pops_with_icon$§!以填补§Y£building£建筑§!和§Y£district£区划§!的£job£岗位需求。" + tr_rg_nanotech_5_modifier_desc: "§Y解锁净化方式：$purge_nanophage$§!：将非帝国主体人口同化为我们的一部分。\n所有帝国人口将获得§Y纳米特质§!：\n每个类型为§Y$pc_nanotech$§!或§Y$pc_rg_grayhabitat$§!的殖民地都将瞬间创建§Y纳米化$pops_with_icon$§!以填补§Y£building£建筑§!和§Y£district£区划§!的£job£岗位需求。§Y纳米化$pops_with_icon$§!§!需要£nanites£§Y$nanites$§!维护费。" tr_rg_nanotech_finish_modifier_desc: "§Y解锁舰船：§!$RG_graygoo_mothership$\n所有境内恒星基地自动获得内置§Y$sm_nanite_harvester$§!。每§Y5§!年§Y$sm_nanite_harvester_plural$§!都会提升，可能是增加$r_nanites$矿藏的规模，或是直接产出一笔$r_nanites$资源。该效果受到矿藏所依附的行星尺寸的限制。" decision_rg_server_shut_down: "§R核心关闭§!" diff --git a/localisation/simp_chinese/RG_tooltips_l_simp_chinese.yml b/localisation/simp_chinese/RG_tooltips_l_simp_chinese.yml index f3f4641..20001e9 100644 --- a/localisation/simp_chinese/RG_tooltips_l_simp_chinese.yml +++ b/localisation/simp_chinese/RG_tooltips_l_simp_chinese.yml @@ -6,7 +6,6 @@ rg_requires_no_nano_ripper: "$TRIGGER_FAIL$无法与现存的§Y$rg_nano_ripper_4$§!在同一个恒星系建造" rg_requires_no_nano_ripper_construction: "$TRIGGER_FAIL$无法与§Y在建的$rg_nano_ripper_4$§!在同一星系建造" allow_rg_nano_ripper: "§H解锁巨型结构：§!$rg_nano_ripper_4$" - rg_machine_maid_trait_effect_tooltip: "每个在线的$pops_with_icon$§!产生0.3£nanites£$nanites$§Y维护费§!。\n人口住房使用：§G-90%§!\n物种最低宜居性：§G+25%§!\n在$NAME_Gray$国家工作时:$TABBED_NEW_LINE$$mod_planet_jobs_produces_mult$：§G+10%§!" concept_rg_scion: "$preset_rg_scion$" concept_rg_scion_desc: "$preset_rg_scion_desc$" concept_rg_gray: "$NAME_Gray$" diff --git a/localisation/simp_chinese/RG_traits_l_simp_chinese.yml b/localisation/simp_chinese/RG_traits_l_simp_chinese.yml index b032ae8..09d5e7b 100644 --- a/localisation/simp_chinese/RG_traits_l_simp_chinese.yml +++ b/localisation/simp_chinese/RG_traits_l_simp_chinese.yml @@ -1,6 +1,7 @@ l_simp_chinese: rg_machine_maid_trait:0 "§Y菠萝包网络§!" rg_machine_maid_trait_desc:0 "这种机械体似乎是由纳米机械所构造的。她们只有有限的个体智能，但每个个体似乎都将心智互相链接组成了一个强大的意识网络。个体的数量越多她们的意识就越强大。" + rg_machine_maid_trait_effect_tooltip: "§Y行星类型§!为§Y$pc_nanotech$§!或§Y$pc_rg_grayhabitat$§!时：$TABBED_NEW_LINE$每个在线的$pops_with_icon$§!产生0.3£nanites£$nanites$§Y维护费§!。\n人口住房使用：§G-90%§!\n物种最低宜居性：§G+25%§!\n在$NAME_Gray$$TRIGGER_OWNER$国家工作时:$TABBED_NEW_LINE$$mod_planet_jobs_produces_mult$：§G+10%§!" RG_leader_trait_admiral_gray:0 "$rg_nanite_leader$" RG_leader_trait_admiral_gray_desc:0 "$NAME_Gray$本质上是由千千万万纳米机械所组成的个体，这让她可以自由变换形态重组或快速修复自身。" RG_leader_trait_admiral_gray_1:0 "$rg_nanite_leader$"