From 1db78b5c6e77a206aef77a0b30807873e41f56e8 Mon Sep 17 00:00:00 2001 From: VaniatD <188733149@qq.com> Date: Fri, 20 Mar 2020 22:40:38 +0800 Subject: [PATCH 1/2] update 2578 --- Core/DefInjected/HediffDef/Hediffs_Local_Infections.xml | 2 +- .../QuestScriptDef/Scripts_Utility_RewardsCore.xml | 2 +- Core/DefInjected/RulePackDef/RulePacks_CombatIncludes.xml | 2 +- Core/DefInjected/ThingCategoryDef/ThingCategories.xml | 2 +- Core/Keyed/Letters.xml | 2 +- Core/Keyed/Messages.xml | 8 ++++++-- Core/Keyed/Misc_Gameplay.xml | 4 ++-- .../QuestScriptDef/Script_Hospitality_Root_Joiners.xml | 2 +- .../QuestScriptDef/Script_Hospitality_Worker.xml | 4 +--- Royalty/DefInjected/ThingDef/MeleeBladelink.xml | 6 +++--- Royalty/Keyed/Dialogs_Various.xml | 2 +- 11 files changed, 19 insertions(+), 17 deletions(-) diff --git a/Core/DefInjected/HediffDef/Hediffs_Local_Infections.xml b/Core/DefInjected/HediffDef/Hediffs_Local_Infections.xml index 9b0a15e5..a7b5a59b 100644 --- a/Core/DefInjected/HediffDef/Hediffs_Local_Infections.xml +++ b/Core/DefInjected/HediffDef/Hediffs_Local_Infections.xml @@ -47,7 +47,7 @@ 肠道蠕虫 - + 由肠道中的寄生虫引起的疾病。患者会因为营养流失变的更容易饥饿。 diff --git a/Core/DefInjected/QuestScriptDef/Scripts_Utility_RewardsCore.xml b/Core/DefInjected/QuestScriptDef/Scripts_Utility_RewardsCore.xml index 6b1e47c5..4a646a6f 100644 --- a/Core/DefInjected/QuestScriptDef/Scripts_Utility_RewardsCore.xml +++ b/Core/DefInjected/QuestScriptDef/Scripts_Utility_RewardsCore.xml @@ -1,4 +1,4 @@ - + diff --git a/Core/Keyed/Letters.xml b/Core/Keyed/Letters.xml index a47bc587..a43e6d30 100644 --- a/Core/Keyed/Letters.xml +++ b/Core/Keyed/Letters.xml @@ -1,4 +1,4 @@ - + diff --git a/Core/Keyed/Messages.xml b/Core/Keyed/Messages.xml index 33216208..4ace0065 100644 --- a/Core/Keyed/Messages.xml +++ b/Core/Keyed/Messages.xml @@ -1,4 +1,4 @@ - + @@ -466,7 +466,7 @@ 对{TARGET_labelShort}使用了{ITEM_labelShort} - 在 {0} 上使用 {1} + 对 {1} 使用 {0} 割取了{0}的器官 @@ -503,6 +503,10 @@ 出售{0_labelShort} 安乐死 {PAWN_labelShort} + + TODO + + TODO {0}接受了你的礼物,但并无谢意。 diff --git a/Core/Keyed/Misc_Gameplay.xml b/Core/Keyed/Misc_Gameplay.xml index 9d96163a..3dfe8010 100644 --- a/Core/Keyed/Misc_Gameplay.xml +++ b/Core/Keyed/Misc_Gameplay.xml @@ -1,4 +1,4 @@ - + @@ -601,7 +601,7 @@ 看极光。 - 在{1}上使用{0}。 + 对{1}使用{0}。 区域 diff --git a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Joiners.xml b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Joiners.xml index c16d0473..42bc28cf 100644 --- a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Joiners.xml +++ b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Joiners.xml @@ -1,4 +1,4 @@ - + @@ -31,8 +31,6 @@ 访客失踪:{SUBJECT_definite} 指定由你保护的[letterSubject]不见了。[remainingWillNowLeave][failLetterEndingCommon] - - 访客失踪:{SUBJECT_definite} 指定由你保护的[letterSubject]已经加入了另一个派系。[remainingWillNowLeave][failLetterEndingCommon] diff --git a/Royalty/DefInjected/ThingDef/MeleeBladelink.xml b/Royalty/DefInjected/ThingDef/MeleeBladelink.xml index 354d97db..deebab53 100644 --- a/Royalty/DefInjected/ThingDef/MeleeBladelink.xml +++ b/Royalty/DefInjected/ThingDef/MeleeBladelink.xml @@ -3,7 +3,7 @@ Δ'单分子剑 - + 一把单分子晶金长剑,它的单分子刃部依靠自身附带的纳米机械进行维护。可以轻易的洞穿任何重型盔甲,而且轻便灵活,攻击速度很快。\n\n这件武器自身具备智能人格只能与一名使用者进行绑定。持有者和智能武器可以同调两者之间的本能反应以及攻击步调、准确性、创造力。一但与持有者绑定,这件武器的智能人格将拒绝其它人的使用。 剑柄 @@ -14,7 +14,7 @@ Δ'等离子剑 - + 这是一把锐利的金属剑,它的剑身被由能量力场约束的等离子体包裹着。攻击目标时对方在承受剑刃的伤害的同时也会被等离子体灼伤或点燃。\n\n这件武器自身具备智能人格只能与一名使用者进行绑定。持有者和智能武器可以同调两者之间的本能反应以及攻击步调、准确性、创造力。一但与持有者绑定,这件武器的智能人格将拒绝其它人的使用。 剑柄 @@ -25,7 +25,7 @@ Δ'宙斯锤 - + 一把内置EMP装置的战锤,被它击中时,除了会受到物理伤害,同时还附带EMP冲击。\n\n这件武器自身具备智能人格只能与一名使用者进行绑定。持有者和智能武器可以同调两者之间的本能反应以及攻击步调、准确性、创造力。一但与持有者绑定,这件武器的智能人格将拒绝其它人的使用。 锤柄 diff --git a/Royalty/Keyed/Dialogs_Various.xml b/Royalty/Keyed/Dialogs_Various.xml index 9d763bc0..70bd50cd 100644 --- a/Royalty/Keyed/Dialogs_Various.xml +++ b/Royalty/Keyed/Dialogs_Various.xml @@ -1,4 +1,4 @@ - + From 653433e19532584dff65cc482ccb222b4c7b4ee5 Mon Sep 17 00:00:00 2001 From: VaniatD <188733149@qq.com> Date: Sat, 21 Mar 2020 08:28:20 +0800 Subject: [PATCH 2/2] update to 2579 --- Core/Keyed/Dialogs_Various.xml | 6 +++--- .../QuestScriptDef/Script_Hospitality_Worker.xml | 4 +++- Royalty/Keyed/Designators.xml | 6 +++--- Royalty/Keyed/ITabs.xml | 10 +++++----- Royalty/Keyed/Letters.xml | 8 ++++---- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/Core/Keyed/Dialogs_Various.xml b/Core/Keyed/Dialogs_Various.xml index 0fb985a7..84de7b80 100644 --- a/Core/Keyed/Dialogs_Various.xml +++ b/Core/Keyed/Dialogs_Various.xml @@ -1,4 +1,4 @@ - + @@ -530,8 +530,8 @@ 礼物模式 - 向{0}馈赠礼物。 回到交易模式。 - - {FACTION_name}拒绝派遣远征队,{NEGOTIATOR_nameDef}没有合法的头衔(至少是{TITLE})。text_todo + + {FACTION_name}拒绝派遣远征队,因为{NEGOTIATOR_nameDef}没有合法的头衔(至少是{TITLE})。 diff --git a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Worker.xml b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Worker.xml index a13674d9..2a5b40c4 100644 --- a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Worker.xml +++ b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Worker.xml @@ -1,4 +1,4 @@ - + @@ -31,6 +31,8 @@ 访客失踪:{SUBJECT_definite} 指定由你保护的[letterSubject]不见了。[remainingWillNowLeave][failLetterEndingCommon] + + 访客失踪:{SUBJECT_definite} 指定由你保护的[letterSubject]已经加入了另一个派系。[remainingWillNowLeave][failLetterEndingCommon] diff --git a/Royalty/Keyed/Designators.xml b/Royalty/Keyed/Designators.xml index 4405717a..94dbf06f 100644 --- a/Royalty/Keyed/Designators.xml +++ b/Royalty/Keyed/Designators.xml @@ -1,7 +1,7 @@ - + - - 蓝图将与纪念碑标记冲突。 + + 蓝图与纪念碑标记重叠。 \ No newline at end of file diff --git a/Royalty/Keyed/ITabs.xml b/Royalty/Keyed/ITabs.xml index ee5d8c72..ab1bd481 100644 --- a/Royalty/Keyed/ITabs.xml +++ b/Royalty/Keyed/ITabs.xml @@ -1,13 +1,13 @@ - + {PAWN_labelShort}当前具有头衔{TITLE},由{FACTION_name}授予。 - - {PAWN_labelShort}将索求此头衔的所有特权。text_todo - - {PAWN_labelShort}对此头衔的某些特权不太在意。text_todo + + {PAWN_labelShort}将索求此头衔的所有特权。 + + {PAWN_labelShort}对此头衔的某些特权不太在意。 下一个头衔 diff --git a/Royalty/Keyed/Letters.xml b/Royalty/Keyed/Letters.xml index f1dc4f61..4ee7b476 100644 --- a/Royalty/Keyed/Letters.xml +++ b/Royalty/Keyed/Letters.xml @@ -1,4 +1,4 @@ - + @@ -14,13 +14,13 @@ {PAWN_possessive}期望值永远不会低于“{1}”。 - - {PAWN_labelShort}将索求此头衔的所有特权(由于{1})。{PAWN_pronoun}可能会拒绝进行某些工作,不吃低品质的食物并且会颁布法令。text_todo + + {PAWN_labelShort}将索求此头衔的所有特权(由于{1})。{PAWN_pronoun}可能会拒绝进行某些工作,不吃低品质的食物并且会颁布法令。 {PAWN_labelShort}从{FACTION_name}获得了{TITLE}的头衔! - {PAWN_labelShort}不再带有{FACTION_name}的{TITLE}头衔。 + {PAWN_labelShort}不再保有{FACTION_name}的{TITLE}头衔。 赏赐