From f3fc1da8fc1af3ea9110b2a296bf06cc772f84cd Mon Sep 17 00:00:00 2001
From: VaniatD <188733149@qq.com>
Date: Sat, 4 Apr 2020 09:26:17 +0800
Subject: [PATCH] update for 2593

---
 Core/DefInjected/ThingDef/Hediffs_BodyParts_Prosthetic.xml  | 2 +-
 .../HediffDef/Hediffs_BodyParts_Prosthetic_Empire.xml       | 2 +-
 Royalty/DefInjected/PawnKindDef/PawnKinds_Empire.xml        | 2 +-
 .../QuestScriptDef/Script_BuildMonument_Root_Basic.xml      | 2 +-
 .../QuestScriptDef/Script_BuildMonument_Worker.xml          | 4 +---
 .../DefInjected/QuestScriptDef/Script_ChangeRoyalHeir.xml   | 4 +---
 .../QuestScriptDef/Script_Hospitality_Worker.xml            | 6 ++----
 Royalty/DefInjected/QuestScriptDef/Scripts_Decree.xml       | 4 +---
 .../DefInjected/QuestScriptDef/Scripts_Utility_Helpers.xml  | 4 +++-
 .../ThingDef/Hediffs_BodyParts_Prosthetic_Empire.xml        | 2 +-
 Royalty/Keyed/Misc_Gameplay.xml                             | 2 +-
 11 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/Core/DefInjected/ThingDef/Hediffs_BodyParts_Prosthetic.xml b/Core/DefInjected/ThingDef/Hediffs_BodyParts_Prosthetic.xml
index 7f1e7702..edb23c36 100644
--- a/Core/DefInjected/ThingDef/Hediffs_BodyParts_Prosthetic.xml
+++ b/Core/DefInjected/ThingDef/Hediffs_BodyParts_Prosthetic.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN: cochlear implant -->
diff --git a/Royalty/DefInjected/HediffDef/Hediffs_BodyParts_Prosthetic_Empire.xml b/Royalty/DefInjected/HediffDef/Hediffs_BodyParts_Prosthetic_Empire.xml
index f9e5e878..b2f9b592 100644
--- a/Royalty/DefInjected/HediffDef/Hediffs_BodyParts_Prosthetic_Empire.xml
+++ b/Royalty/DefInjected/HediffDef/Hediffs_BodyParts_Prosthetic_Empire.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN: drill arm -->
diff --git a/Royalty/DefInjected/PawnKindDef/PawnKinds_Empire.xml b/Royalty/DefInjected/PawnKindDef/PawnKinds_Empire.xml
index 4f8e1ed5..5d311e59 100644
--- a/Royalty/DefInjected/PawnKindDef/PawnKinds_Empire.xml
+++ b/Royalty/DefInjected/PawnKindDef/PawnKinds_Empire.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN: imperial citizen -->
diff --git a/Royalty/DefInjected/QuestScriptDef/Script_BuildMonument_Root_Basic.xml b/Royalty/DefInjected/QuestScriptDef/Script_BuildMonument_Root_Basic.xml
index a251153b..6420a3fb 100644
--- a/Royalty/DefInjected/QuestScriptDef/Script_BuildMonument_Root_Basic.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Script_BuildMonument_Root_Basic.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN:
diff --git a/Royalty/DefInjected/QuestScriptDef/Script_BuildMonument_Worker.xml b/Royalty/DefInjected/QuestScriptDef/Script_BuildMonument_Worker.xml
index 51ad0c4d..3a5c0dea 100644
--- a/Royalty/DefInjected/QuestScriptDef/Script_BuildMonument_Worker.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Script_BuildMonument_Worker.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN: Monument completed -->
@@ -11,8 +11,6 @@
   <BuildMonumentWorker.root.nodes.IsTrue-2.elseNode.elseNode.nodes.IsNull.elseNode.node.nodes.monumentMarkerMonumentDestroyed.node.nodes.Letter.text.slateRef>你在完成纪念碑之后让它被破坏得太快了， 这冒犯了 [asker_nameDef]。\n\n你与 [asker_faction_name] 的关系下降了 [goodwillChangeIfMonumentDestroyed]。</BuildMonumentWorker.root.nodes.IsTrue-2.elseNode.elseNode.nodes.IsNull.elseNode.node.nodes.monumentMarkerMonumentDestroyed.node.nodes.Letter.text.slateRef>
   <!-- EN: Do not destroy the monument for {0} -->
   <BuildMonumentWorker.root.nodes.IsTrue-2.elseNode.elseNode.nodes.IsNull.elseNode.node.nodes.Delay.expiryInfoPart.slateRef>不要破坏纪念碑{0}</BuildMonumentWorker.root.nodes.IsTrue-2.elseNode.elseNode.nodes.IsNull.elseNode.node.nodes.Delay.expiryInfoPart.slateRef>
-  <!-- EN: Do not destroy the monument for {0} -->
-  <BuildMonumentWorker.root.nodes.IsTrue-2.elseNode.elseNode.nodes.IsNull.elseNode.node.nodes.Delay.expiryInfoPartTip.slateRef>不要破坏纪念碑{0}</BuildMonumentWorker.root.nodes.IsTrue-2.elseNode.elseNode.nodes.IsNull.elseNode.node.nodes.Delay.expiryInfoPartTip.slateRef>
   <!-- EN: Keep monument {0} -->
   <BuildMonumentWorker.root.nodes.IsTrue-2.elseNode.elseNode.nodes.IsNull.elseNode.node.nodes.Delay.inspectString.slateRef>保护纪念碑 {0}</BuildMonumentWorker.root.nodes.IsTrue-2.elseNode.elseNode.nodes.IsNull.elseNode.node.nodes.Delay.inspectString.slateRef>
   <!-- EN: The monument for the quest '[resolvedQuestName]' has been violated. Punishment will now occur. -->
diff --git a/Royalty/DefInjected/QuestScriptDef/Script_ChangeRoyalHeir.xml b/Royalty/DefInjected/QuestScriptDef/Script_ChangeRoyalHeir.xml
index 8c250160..904db295 100644
--- a/Royalty/DefInjected/QuestScriptDef/Script_ChangeRoyalHeir.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Script_ChangeRoyalHeir.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN:
@@ -37,8 +37,6 @@
   <ChangeRoyalHeir.root.nodes.monumentMarkerMonumentCompleted.node.nodes.Letter.text.slateRef>[titleHeir_nameDef]是[titleHolder_nameDef]新的继承人。</ChangeRoyalHeir.root.nodes.monumentMarkerMonumentCompleted.node.nodes.Letter.text.slateRef>
   <!-- EN: Do not destroy the monument for {0} -->
   <ChangeRoyalHeir.root.nodes.monumentMarkerMonumentCompleted.node.nodes.Delay.expiryInfoPart.slateRef>不要破坏纪念碑{0}</ChangeRoyalHeir.root.nodes.monumentMarkerMonumentCompleted.node.nodes.Delay.expiryInfoPart.slateRef>
-  <!-- EN: Do not destroy the monument for {0} -->
-  <ChangeRoyalHeir.root.nodes.monumentMarkerMonumentCompleted.node.nodes.Delay.expiryInfoPartTip.slateRef>不要破坏纪念碑{0}</ChangeRoyalHeir.root.nodes.monumentMarkerMonumentCompleted.node.nodes.Delay.expiryInfoPartTip.slateRef>
   <!-- EN: Keep monument {0} -->
   <ChangeRoyalHeir.root.nodes.monumentMarkerMonumentCompleted.node.nodes.Delay.inspectString.slateRef>保护纪念碑{0}</ChangeRoyalHeir.root.nodes.monumentMarkerMonumentCompleted.node.nodes.Delay.inspectString.slateRef>
   
diff --git a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Worker.xml b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Worker.xml
index 6b120a00..2de398e1 100644
--- a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Worker.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Worker.xml
@@ -31,8 +31,6 @@
   <Hospitality_Util_Worker.root.nodes.lodgersLeftMap.node.nodes.Letter.label.slateRef>访客失踪：{SUBJECT_definite}</Hospitality_Util_Worker.root.nodes.lodgersLeftMap.node.nodes.Letter.label.slateRef>
   <!-- EN: [letterSubject], who you were charged to protect, is gone. [remainingWillNowLeave][failLetterEndingCommon] -->
   <Hospitality_Util_Worker.root.nodes.lodgersLeftMap.node.nodes.Letter.text.slateRef>指定由你保护的[letterSubject]不见了。[remainingWillNowLeave][failLetterEndingCommon]</Hospitality_Util_Worker.root.nodes.lodgersLeftMap.node.nodes.Letter.text.slateRef>
-  <!-- EN: Guest lost: {SUBJECT_definite} -->
-  <Hospitality_Util_Worker.root.nodes.AnySignal.node.node.nodes.Letter.label.slateRef>访客失踪：{SUBJECT_definite}</Hospitality_Util_Worker.root.nodes.AnySignal.node.node.nodes.Letter.label.slateRef>
   <!-- EN: [letterSubject], who you were charged to protect, has joined another faction. [remainingWillNowLeave][failLetterEndingCommon] -->
   <Hospitality_Util_Worker.root.nodes.AnySignal.node.node.nodes.Letter.text.slateRef>指定由你保护的[letterSubject]已经加入了另一个派系。[remainingWillNowLeave][failLetterEndingCommon]</Hospitality_Util_Worker.root.nodes.AnySignal.node.node.nodes.Letter.text.slateRef>
   <!-- EN: Shuttle destroyed -->
@@ -50,7 +48,7 @@
   
   <!-- EN: Shuttle destroyed -->
   <Util_ArriveByDropPodsOrShuttle.root.nodes.HasRoyalTitleInCurrentFaction.node.nodes.arrivalShuttleDestroyed.node.nodes.Letter.label.slateRef>穿梭机被破坏</Util_ArriveByDropPodsOrShuttle.root.nodes.HasRoyalTitleInCurrentFaction.node.nodes.arrivalShuttleDestroyed.node.nodes.Letter.label.slateRef>
-  <!-- EN: The shuttle sent to drop off [lodgersLabelSingOrPluralDef] has been destroyed. You have failed the quest '[resolvedQuestName]'.\n\nYour relations with [asker_faction_name] have changed by [goodwillChangeOnShuttleDestroyed]. -->
-  <Util_ArriveByDropPodsOrShuttle.root.nodes.HasRoyalTitleInCurrentFaction.node.nodes.arrivalShuttleDestroyed.node.nodes.Letter.text.slateRef>被派遣来运输[lodgersLabelSingOrPluralDef]的穿梭机已被破坏。 任务'[resolvedQuestName]'已经失效。\n\n你和[asker_faction_name]的关系受到了影响（[goodwillChangeOnShuttleDestroyed]）。</Util_ArriveByDropPodsOrShuttle.root.nodes.HasRoyalTitleInCurrentFaction.node.nodes.arrivalShuttleDestroyed.node.nodes.Letter.text.slateRef>
+  <!-- EN: The shuttle sent to drop off [pawnsLabelDef] has been destroyed. You have failed the quest '[resolvedQuestName]'.\n\nYour relations with [asker_faction_name] have changed by [goodwillChangeOnShuttleDestroyed]. -->
+  <Util_ArriveByDropPodsOrShuttle.root.nodes.HasRoyalTitleInCurrentFaction.node.nodes.arrivalShuttleDestroyed.node.nodes.Letter.text.slateRef>被派遣来运输[pawnsLabelDef]的穿梭机已被破坏。 任务'[resolvedQuestName]'已经失效。\n\n你和[asker_faction_name]的关系受到了影响（[goodwillChangeOnShuttleDestroyed]）。</Util_ArriveByDropPodsOrShuttle.root.nodes.HasRoyalTitleInCurrentFaction.node.nodes.arrivalShuttleDestroyed.node.nodes.Letter.text.slateRef>
   
 </LanguageData>
\ No newline at end of file
diff --git a/Royalty/DefInjected/QuestScriptDef/Scripts_Decree.xml b/Royalty/DefInjected/QuestScriptDef/Scripts_Decree.xml
index 2e90fb58..631ac6e0 100644
--- a/Royalty/DefInjected/QuestScriptDef/Scripts_Decree.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Scripts_Decree.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN:
@@ -27,8 +27,6 @@
   <Decree_BuildMonument.root.nodes.monumentMarkerMonumentCompleted.node.nodes.monumentMarkerMonumentDestroyed.node.nodes.Letter.text.slateRef>你在建造完纪念碑后太快让它被破坏的举动惹恼了 [asker_nameDef]。\n\n[asker_pronoun] 对此感到非常不开心。</Decree_BuildMonument.root.nodes.monumentMarkerMonumentCompleted.node.nodes.monumentMarkerMonumentDestroyed.node.nodes.Letter.text.slateRef>
   <!-- EN: Do not destroy the monument for {0} -->
   <Decree_BuildMonument.root.nodes.monumentMarkerMonumentCompleted.node.nodes.Delay.expiryInfoPart.slateRef>不要破坏纪念碑{0}</Decree_BuildMonument.root.nodes.monumentMarkerMonumentCompleted.node.nodes.Delay.expiryInfoPart.slateRef>
-  <!-- EN: Do not destroy the monument for {0} -->
-  <Decree_BuildMonument.root.nodes.monumentMarkerMonumentCompleted.node.nodes.Delay.expiryInfoPartTip.slateRef>不要破坏纪念碑{0}</Decree_BuildMonument.root.nodes.monumentMarkerMonumentCompleted.node.nodes.Delay.expiryInfoPartTip.slateRef>
   <!-- EN: Keep monument {0} -->
   <Decree_BuildMonument.root.nodes.monumentMarkerMonumentCompleted.node.nodes.Delay.inspectString.slateRef>保护纪念碑{0}</Decree_BuildMonument.root.nodes.monumentMarkerMonumentCompleted.node.nodes.Delay.inspectString.slateRef>
   
diff --git a/Royalty/DefInjected/QuestScriptDef/Scripts_Utility_Helpers.xml b/Royalty/DefInjected/QuestScriptDef/Scripts_Utility_Helpers.xml
index 87e6a95e..758d8a31 100644
--- a/Royalty/DefInjected/QuestScriptDef/Scripts_Utility_Helpers.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Scripts_Utility_Helpers.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN:
@@ -31,6 +31,8 @@
   <Util_MaybeGenerateHelpers.root.nodes.IsNull.elseNode.elseNode.node.nodes.IsTrueOrUnset.node.parms.customLetterLabel.value.slateRef>[helpersLabelSingOrPlural]已抵达</Util_MaybeGenerateHelpers.root.nodes.IsNull.elseNode.elseNode.node.nodes.IsTrueOrUnset.node.parms.customLetterLabel.value.slateRef>
   <!-- EN: The [helpersLabelSingOrPlural] sent by [asker_nameDef] [helpersHasHave] arrived to aid you with the quest '[resolvedQuestName]'. -->
   <Util_MaybeGenerateHelpers.root.nodes.IsNull.elseNode.elseNode.node.nodes.IsTrueOrUnset.node.parms.customLetterText.value.slateRef>[asker_nameDef][helpersHasHave]向你派出[helpersLabelSingOrPlural]进行支援，随后将协助你执行'[resolvedQuestName]'任务。</Util_MaybeGenerateHelpers.root.nodes.IsNull.elseNode.elseNode.node.nodes.IsTrueOrUnset.node.parms.customLetterText.value.slateRef>
+  <!-- EN: the [helpersLabelSingOrPlural] -->
+  <Util_MaybeGenerateHelpers.root.nodes.IsNull.elseNode.elseNode.node.nodes.IsTrueOrUnset.node.parms.arrivingPawnsLabelDef.value.slateRef>[helpersLabelSingOrPlural]</Util_MaybeGenerateHelpers.root.nodes.IsNull.elseNode.elseNode.node.nodes.IsTrueOrUnset.node.parms.arrivingPawnsLabelDef.value.slateRef>
   <!-- EN: [helpersLabelSingOrPlural] leaving -->
   <Util_MaybeGenerateHelpers.root.nodes.IsNull.elseNode.elseNode.node.nodes.GreaterOrEqual.node.node.nodes.Letter.label.slateRef>[helpersLabelSingOrPlural]正在离开</Util_MaybeGenerateHelpers.root.nodes.IsNull.elseNode.elseNode.node.nodes.GreaterOrEqual.node.node.nodes.Letter.label.slateRef>
   <!-- EN: The [helpersLabelSingOrPlural] sent by [asker_nameDef] to aid you [helpersHasHave] spent too much time with you, and [helpersIsAre] now leaving. -->
diff --git a/Royalty/DefInjected/ThingDef/Hediffs_BodyParts_Prosthetic_Empire.xml b/Royalty/DefInjected/ThingDef/Hediffs_BodyParts_Prosthetic_Empire.xml
index c2a5640f..1c7202ce 100644
--- a/Royalty/DefInjected/ThingDef/Hediffs_BodyParts_Prosthetic_Empire.xml
+++ b/Royalty/DefInjected/ThingDef/Hediffs_BodyParts_Prosthetic_Empire.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN: drill arm -->
diff --git a/Royalty/Keyed/Misc_Gameplay.xml b/Royalty/Keyed/Misc_Gameplay.xml
index bdb5fedb..aaa15989 100644
--- a/Royalty/Keyed/Misc_Gameplay.xml
+++ b/Royalty/Keyed/Misc_Gameplay.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
 
   <!-- Royalty and throne -->