From c67315b2964ff58bbfe04772ee2dc3747b5093a1 Mon Sep 17 00:00:00 2001 From: "ProjectKoi-Kalo\\Kalo" Date: Mon, 20 Nov 2023 20:39:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98=20=E7=89=B9=E8=B4=A8?= =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RG_combat_skill_effects.txt | 2 +- .../RG_gray_leader_init_effects.txt | 2 +- common/traits/!_RG_gray_goo_traits.txt | 57 +++++++++++-------- events/RG_combat_skill_events.txt | 6 +- events/z_RG_placeholder_event.txt | 2 + .../simp_chinese/RG_l_simp_chinese.yml | 6 +- 6 files changed, 43 insertions(+), 32 deletions(-) diff --git a/common/scripted_effects/RG_combat_skill_effects.txt b/common/scripted_effects/RG_combat_skill_effects.txt index f4218a7..1289429 100644 --- a/common/scripted_effects/RG_combat_skill_effects.txt +++ b/common/scripted_effects/RG_combat_skill_effects.txt @@ -5,7 +5,7 @@ RG_leader_trait_tempest_incoming_random_kill_effect = { any_ground_combat_$SIDE_A$ = { exists = leader leader = { - has_trait = RG_leader_trait_general_gray_skill + has_trait = RG_leader_trait_admiral_nanorebuild_gray } } } diff --git a/common/scripted_effects/RG_gray_leader_init_effects.txt b/common/scripted_effects/RG_gray_leader_init_effects.txt index fda5a96..5ef1aa8 100644 --- a/common/scripted_effects/RG_gray_leader_init_effects.txt +++ b/common/scripted_effects/RG_gray_leader_init_effects.txt @@ -211,7 +211,7 @@ rg_gray_commander_init = { set_leader_flag = rg_gray_leader add_trait_no_notify = RG_leader_trait_admiral_gray add_trait_no_notify = RG_leader_trait_admiral_nanorebuild_gray - add_trait_no_notify = RG_leader_trait_general_gray_skill + # add_trait_no_notify = RG_leader_trait_general_gray_skill # 缺少特质RG_leader_trait_admiral_gray将导致小灰改造项目无法完成 add_trait_no_notify = subclass_commander_councilor add_trait_no_notify = leader_trait_carrier_specialization diff --git a/common/traits/!_RG_gray_goo_traits.txt b/common/traits/!_RG_gray_goo_traits.txt index 3757a57..437d17d 100644 --- a/common/traits/!_RG_gray_goo_traits.txt +++ b/common/traits/!_RG_gray_goo_traits.txt @@ -397,6 +397,14 @@ RG_leader_trait_admiral_nanorebuild_gray = { ship_hull_regen_add_perc = 0.5 ship_armor_regen_add_perc = 0.5 } + triggered_army_modifier = { + potential = { + always = yes + } + army_damage_mult = 0.05 + army_health = 0.05 + mult = owner.rg_general_skill_combat_daypassed_variable + } leader_class = { commander } initial = no randomized = no @@ -466,30 +474,31 @@ RG_leader_trait_scientist_gray = { # randomized = no # } -RG_leader_trait_general_gray_skill = { - destiny_trait = yes - inline_script = { - script = trait/icon_psionic - CLASS = commander - ICON = "GFX_leader_trait_supreme_warrior" - RARITY = paragon - COUNCIL = no - TIER = none - } - custom_tooltip_with_modifiers = RG_leader_trait_tempest_incoming_effect - triggered_army_modifier = { - potential = { - always = yes - } - army_damage_mult = 0.05 - army_health = 0.05 - mult = owner.rg_general_skill_combat_daypassed_variable - } - leader_class = { commander } - initial = no - randomized = no - destiny_background_icon = "GFX_leader_background_destiny_1" -} +# 与舰长技能合并，弃用 +# RG_leader_trait_general_gray_skill = { +# destiny_trait = yes +# inline_script = { +# script = trait/icon_psionic +# CLASS = commander +# ICON = "GFX_leader_trait_supreme_warrior" +# RARITY = paragon +# COUNCIL = no +# TIER = none +# } +# custom_tooltip_with_modifiers = RG_leader_trait_tempest_incoming_effect +# triggered_army_modifier = { +# potential = { +# always = yes +# } +# army_damage_mult = 0.05 +# army_health = 0.05 +# mult = owner.rg_general_skill_combat_daypassed_variable +# } +# leader_class = { commander } +# initial = no +# randomized = no +# destiny_background_icon = "GFX_leader_background_destiny_1" +# } RG_leader_trait_admiral_fake_dragon = { cost = 0 diff --git a/events/RG_combat_skill_events.txt b/events/RG_combat_skill_events.txt index 7bf5294..0ace858 100644 --- a/events/RG_combat_skill_events.txt +++ b/events/RG_combat_skill_events.txt @@ -388,7 +388,7 @@ planet_event = { exists = leader leader = { #leader - has_trait = RG_leader_trait_general_gray_skill + has_trait = RG_leader_trait_admiral_nanorebuild_gray owner = { #country save_event_target_as = attacking_general_country @@ -452,7 +452,7 @@ country_event = { exists = leader leader = { OR = { - has_trait = RG_leader_trait_general_gray_skill + has_trait = RG_leader_trait_admiral_nanorebuild_gray } } } @@ -547,7 +547,7 @@ country_event = { exists = leader leader = { OR = { - has_trait = RG_leader_trait_general_gray_skill + has_trait = RG_leader_trait_admiral_nanorebuild_gray } } if = { diff --git a/events/z_RG_placeholder_event.txt b/events/z_RG_placeholder_event.txt index a9b3936..88339e9 100644 --- a/events/z_RG_placeholder_event.txt +++ b/events/z_RG_placeholder_event.txt @@ -1,5 +1,7 @@ namespace = wg_affection +# 3.9引用空事件崩溃问题占位 +# 3.10已弃用 country_event = { id = wg_affection.30000 title = wg_affection.30000.name diff --git a/localisation/simp_chinese/RG_l_simp_chinese.yml b/localisation/simp_chinese/RG_l_simp_chinese.yml index 152b631..4aeaf6a 100644 --- a/localisation/simp_chinese/RG_l_simp_chinese.yml +++ b/localisation/simp_chinese/RG_l_simp_chinese.yml @@ -19,10 +19,10 @@ RG_leader_trait_general_gray_desc:0 "$NAME_Gray$本质上是由千千万万纳米机械所组成的个体，这让她可以辅助星域资源调度和研究资源调度。可不要让她做奇怪的事情哦？" RG_leader_trait_general_gray_skill:0 "§Y风暴将至§!" RG_leader_trait_general_gray_skill_desc:0 "灰色风暴在L星团中席卷无数纪元。倘若风暴再度到来，想必那星球上的人们所看到的景色一定永生难忘吧。" - RG_leader_trait_tempest_incoming_effect:0 "$ARMY_EFFECTS_TXT$:\n$t$每击杀一支敌对陆军:\n$tt$$MOD_ARMY_DAMAGE_MULT$: §G+5%§!\n$tt$$MOD_ARMY_HEALTH$: §G+5%§!\n$tt$直接击杀一支敌对陆军的概率: §G+1%§!\n当前BUFF层数: §Y[owner.rg_general_skill_combat_daypassed_variable]§!\n当前概率为: §Y[owner.rg_general_skill_combat_killed_variable]%§!" + RG_leader_trait_tempest_incoming_effect:0 "$ARMY_EFFECTS_TXT$:\n$t$每击杀一支敌对陆军:\n$tt$$MOD_ARMY_DAMAGE_MULT$: §G+5%§!\n$tt$$MOD_ARMY_HEALTH$: §G+5%§!\n$tt$§Y直接击杀一支敌对陆军的概率§!: §G+1%§!\n$t$当前§YBUFF层数§!: §Y[owner.rg_general_skill_combat_daypassed_variable]§!\n$t$当前§Y直接击杀一支敌对陆军的概率§!为: §Y[owner.rg_general_skill_combat_killed_variable]%§!" RG_leader_trait_admiral_nanorebuild_gray:0 "§Y灰质重塑§!" - RG_leader_trait_admiral_nanorebuild_gray_desc:0 "创造与解构，纳米机器席卷之处我们无所不能。" - RG_leader_trait_admiral_nanorebuild_effect:0 "$FLEET_EFFECTS_TXT$:\n$t$每摧毁一艘敌军舰船:\n$tt$§Y计数器层数§!: §G+1§!\n$t$这位领袖所在舰队损失舰船时:\n$tt$消耗§Y计数器层数§!立即重建舰船。\n$t$当前§Y计数器层数§!: §Y[owner.rg_nanorebuild_counter]§!\n$t$§Y$NAME_Gray$§!无法被该技能重组。" + RG_leader_trait_admiral_nanorebuild_gray_desc:0 "灰色风暴在L星团中席卷无数纪元。\n创造与解构，纳米机器席卷之处我们无所不能。" + RG_leader_trait_admiral_nanorebuild_effect:0 "$FLEET_EFFECTS_TXT$:\n$t$每摧毁一艘敌军舰船:\n$tt$§Y重塑计数器层数§!: §G+1§!\n$t$这位领袖所在舰队损失舰船时:\n$tt$消耗§Y重塑计数器层数§!立即重建舰船。\n$t$当前§Y重塑计数器层数§!: §Y[owner.rg_nanorebuild_counter]§!\n$t$§Y$NAME_Gray$§!无法被该技能重建。\n\n$RG_leader_trait_tempest_incoming_effect$" RG_leader_trait_ruler_gray_tt:0 "§E随每技能等级提升的效果:§!" RG_leader_trait_variable_tt:0 "§E随变量层数提升的效果:§!"