From a42199f840b2de1993e9e848352bf619cee6bcd6 Mon Sep 17 00:00:00 2001
From: VaniatD <188733149@qq.com>
Date: Sat, 28 Mar 2020 09:32:09 +0800
Subject: [PATCH 1/2] update for 2586

---
 Core/DefInjected/JobDef/Jobs_Misc.xml                  |  6 +++---
 .../DefInjected/QuestScriptDef/Script_TradeRequest.xml |  2 +-
 .../SpecialThingFilterDef/SpecialThingFilters.xml      |  2 +-
 Core/Keyed/Dialog_StatsReports.xml                     |  2 +-
 Core/Keyed/MainTabs.xml                                |  7 ++++---
 Core/Keyed/Misc_Gameplay.xml                           |  2 +-
 .../QuestScriptDef/Script_BuildMonument_Root_Basic.xml |  4 ++--
 .../QuestScriptDef/Script_BuildMonument_Worker.xml     |  6 ++----
 .../QuestScriptDef/Script_ChangeRoyalHeir.xml          |  6 ++----
 .../QuestScriptDef/Script_EndGame_RoyalAscent.xml      |  2 +-
 .../QuestScriptDef/Script_Hospitality_Worker.xml       |  7 +++++--
 Royalty/DefInjected/QuestScriptDef/Scripts_Decree.xml  | 10 ++++------
 .../QuestScriptDef/Scripts_Utility_Helpers.xml         |  2 +-
 Royalty/DefInjected/ThingDef/Buildings_Misc.xml        |  2 +-
 .../DefInjected/ThoughtDef/Thoughts_Memory_Special.xml |  2 +-
 15 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/Core/DefInjected/JobDef/Jobs_Misc.xml b/Core/DefInjected/JobDef/Jobs_Misc.xml
index 05f6b09e..bc553119 100644
--- a/Core/DefInjected/JobDef/Jobs_Misc.xml
+++ b/Core/DefInjected/JobDef/Jobs_Misc.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
-  <!-- EN: applying techprint TargetB. -->
-  <ApplyTechprint.reportString>对TargetB使用神器。</ApplyTechprint.reportString>
+  <!-- EN: applying TargetB. -->
+  <ApplyTechprint.reportString>使用TargetB。</ApplyTechprint.reportString>
   
   <!-- EN: melee attacking TargetA. -->
   <AttackMelee.reportString>近身攻击TargetA。</AttackMelee.reportString>
diff --git a/Core/DefInjected/QuestScriptDef/Script_TradeRequest.xml b/Core/DefInjected/QuestScriptDef/Script_TradeRequest.xml
index 75ce7b33..4557976c 100644
--- a/Core/DefInjected/QuestScriptDef/Script_TradeRequest.xml
+++ b/Core/DefInjected/QuestScriptDef/Script_TradeRequest.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN:
diff --git a/Core/DefInjected/SpecialThingFilterDef/SpecialThingFilters.xml b/Core/DefInjected/SpecialThingFilterDef/SpecialThingFilters.xml
index 4dfb1055..8049b7b9 100644
--- a/Core/DefInjected/SpecialThingFilterDef/SpecialThingFilters.xml
+++ b/Core/DefInjected/SpecialThingFilterDef/SpecialThingFilters.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN: allow biocoded apparel -->
diff --git a/Core/Keyed/Dialog_StatsReports.xml b/Core/Keyed/Dialog_StatsReports.xml
index 383c6de3..83cd8aec 100644
--- a/Core/Keyed/Dialog_StatsReports.xml
+++ b/Core/Keyed/Dialog_StatsReports.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
 
   <!-- EN: Tool -->
diff --git a/Core/Keyed/MainTabs.xml b/Core/Keyed/MainTabs.xml
index c51a0a75..c2198cc7 100644
--- a/Core/Keyed/MainTabs.xml
+++ b/Core/Keyed/MainTabs.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
 
   <!-- Work tab -->
@@ -210,8 +210,6 @@
   <NoQuestSelected>未选择任务</NoQuestSelected>
   <!-- EN: Appeared {0} days ago -->
   <AppearedDaysAgo>在{0}天前出现</AppearedDaysAgo>
-  <!-- EN: Decree given {0} days ago -->
-  <DecreeGivenDaysAgo>{0}天前颁布的法令</DecreeGivenDaysAgo>
   <!-- EN: Appeared on {0} -->
   <AppearedOn>出现在{0}</AppearedOn>
   <!-- EN: Accepted {0} ago -->
@@ -269,4 +267,7 @@
   <!-- EN: You are currently opting out of receiving {FACTION_royalFavorLabel}. -->
   <RoyalFavorOff>当前选择不接受{FACTION_royalFavorLabel}。</RoyalFavorOff>
   
+  <!-- UNUSED -->
+  <DecreeGivenDaysAgo>{0}天前颁布的法令</DecreeGivenDaysAgo>
+
 </LanguageData>
\ No newline at end of file
diff --git a/Core/Keyed/Misc_Gameplay.xml b/Core/Keyed/Misc_Gameplay.xml
index 2cdf167d..51f554ec 100644
--- a/Core/Keyed/Misc_Gameplay.xml
+++ b/Core/Keyed/Misc_Gameplay.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
 
   <!-- Various -->
diff --git a/Royalty/DefInjected/QuestScriptDef/Script_BuildMonument_Root_Basic.xml b/Royalty/DefInjected/QuestScriptDef/Script_BuildMonument_Root_Basic.xml
index 6a729b35..2903a368 100644
--- a/Royalty/DefInjected/QuestScriptDef/Script_BuildMonument_Root_Basic.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Script_BuildMonument_Root_Basic.xml
@@ -4,12 +4,12 @@
   <!-- EN:
     <li>commonEnding->The monument is [monumentSize] in size and will require these resources (total value [monumentRequiredResourcesMarketValue_money]):\n\n[monumentRequiredResources]\n\nConstruction must be completed within [constructionTimeoutTicks_duration] of accepting the task. Upon completion, [allRewardsDescriptions][dontDestroyMonument]</li>
     <li>dontDestroyMonument(priority=-10)-></li>
-    <li>dontDestroyMonument->\n\nIf the monument is destroyed within [keepMonumentDays] days of construction, your relations with [asker_factionName] will fall by [goodwillChangeIfMonumentDestroyed].</li>
+    <li>dontDestroyMonument->\n\nIf the monument is destroyed within [keepMonumentTicks_duration] days of construction, your relations with [asker_factionName] will fall by [goodwillChangeIfMonumentDestroyed].</li>
   -->
   <BuildMonument_Basic.questDescriptionRules.rulesStrings>
     <li>commonEnding->这个 [monumentSize] 尺寸的纪念碑需要这些资源（总价值 [monumentRequiredResourcesMarketValue_money]）：\n\n[monumentRequiredResources]\n\n这个结构必须在接受任务后的 [constructionTimeoutTicks_duration] 内完成。 完成后， [allRewardsDescriptions] [dontDestroyMonument]</li>
     <li>dontDestroyMonument(priority=-10)-></li>
-    <li>dontDestroyMonument->\n\n如果在15天内这个纪念碑结构被破坏， 你和 [asker_factionName] 的关系会下降 [goodwillChangeIfMonumentDestroyed]。 text_todo</li>
+    <li>dontDestroyMonument->\n\n如果在[keepMonumentTicks_duration]天内这个纪念碑结构被破坏， 你和 [asker_factionName] 的关系会下降 [goodwillChangeIfMonumentDestroyed]。</li>
   </BuildMonument_Basic.questDescriptionRules.rulesStrings>
   
 </LanguageData>
\ No newline at end of file
diff --git a/Royalty/DefInjected/QuestScriptDef/Script_BuildMonument_Worker.xml b/Royalty/DefInjected/QuestScriptDef/Script_BuildMonument_Worker.xml
index 5c8be006..9566c4da 100644
--- a/Royalty/DefInjected/QuestScriptDef/Script_BuildMonument_Worker.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Script_BuildMonument_Worker.xml
@@ -3,16 +3,14 @@
   
   <!-- EN: Monument completed -->
   <BuildMonumentWorker.root.nodes.IsTrue-2.elseNode.elseNode.nodes.IsNull.elseNode.node.nodes.Letter.label.slateRef>纪念碑完工</BuildMonumentWorker.root.nodes.IsTrue-2.elseNode.elseNode.nodes.IsNull.elseNode.node.nodes.Letter.label.slateRef>
-  <!-- EN: You completed construction of the monument.\n\nYou must not destroy it for at least [keepMonumentDays] days, otherwise you will anger [asker_factionName] ([goodwillChangeIfMonumentDestroyed] goodwill). -->
-  <BuildMonumentWorker.root.nodes.IsTrue-2.elseNode.elseNode.nodes.IsNull.elseNode.node.nodes.Letter.text.slateRef>你完成了纪念碑结构的建造。\n\n你在之后的[keepMonumentDays]天内不能将它摧毁， 否则会激怒 [asker_factionName] （[goodwillChangeIfMonumentDestroyed] 好感度）。</BuildMonumentWorker.root.nodes.IsTrue-2.elseNode.elseNode.nodes.IsNull.elseNode.node.nodes.Letter.text.slateRef>
+  <!-- EN: You completed construction of the monument.\n\nYou must not destroy it for at least [keepMonumentTicks_duration] days, otherwise you will anger [asker_factionName] ([goodwillChangeIfMonumentDestroyed] goodwill). -->
+  <BuildMonumentWorker.root.nodes.IsTrue-2.elseNode.elseNode.nodes.IsNull.elseNode.node.nodes.Letter.text.slateRef>你完成了纪念碑结构的建造。\n\n你在之后的[keepMonumentTicks_duration]天内不能将它摧毁， 否则会激怒 [asker_factionName] （[goodwillChangeIfMonumentDestroyed] 好感度）。</BuildMonumentWorker.root.nodes.IsTrue-2.elseNode.elseNode.nodes.IsNull.elseNode.node.nodes.Letter.text.slateRef>
   <!-- EN: Monument destroyed -->
   <BuildMonumentWorker.root.nodes.IsTrue-2.elseNode.elseNode.nodes.IsNull.elseNode.node.nodes.monumentMarkerMonumentDestroyed.node.nodes.Letter.label.slateRef>纪念碑被摧毁</BuildMonumentWorker.root.nodes.IsTrue-2.elseNode.elseNode.nodes.IsNull.elseNode.node.nodes.monumentMarkerMonumentDestroyed.node.nodes.Letter.label.slateRef>
   <!-- EN: [asker_nameDef] is offended that you allowed the monument to be ruined so soon after completion.\n\nYour relations with [asker_faction_name] have fallen by [goodwillChangeIfMonumentDestroyed]. -->
   <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 0bda08d3..e4715fa4 100644
--- a/Royalty/DefInjected/QuestScriptDef/Script_ChangeRoyalHeir.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Script_ChangeRoyalHeir.xml
@@ -2,10 +2,10 @@
 <LanguageData>
   
   <!-- EN:
-    <li>questDescription->\nIn order to consecrate making [titleHeir_nameFull] the heir of [titleHolder_nameFull]'s title, you must build a monument.\n\nThe monument will be [monumentSize] in size and will require these resources (total value [monumentRequiredResourcesMarketValue_money]):\n\n[monumentRequiredResources]\n\nFailing to finish the monument within 20 days is considered to profane the ritual. Your relations with [asker_factionName] will fall by 25, and the heir will not be changed.\n\nIf the monument is destroyed within [keepMonumentDays] days after completion, your relations with [asker_factionName] will fall by [goodwillChangeIfMonumentDestroyed].</li>
+    <li>questDescription->\nIn order to consecrate making [titleHeir_nameFull] the heir of [titleHolder_nameFull]'s title, you must build a monument.\n\nThe monument will be [monumentSize] in size and will require these resources (total value [monumentRequiredResourcesMarketValue_money]):\n\n[monumentRequiredResources]\n\nFailing to finish the monument within 20 days is considered to profane the ritual. Your relations with [asker_factionName] will fall by 25, and the heir will not be changed.\n\nIf the monument is destroyed within [keepMonumentTicks_duration] days after completion, your relations with [asker_factionName] will fall by [goodwillChangeIfMonumentDestroyed].</li>
   -->
   <ChangeRoyalHeir.questDescriptionRules.rulesStrings>
-    <li>questDescription->\n为了让 [titleHeir_nameFull] 名正言顺的承袭 [titleHolder_nameFull] 头衔， 你必须为此建造一座纪念碑。\n\n建造这个 [monumentSize] 纪念碑需要如下资源 （总价值：[monumentRequiredResourcesMarketValue_money]）：\n\n[monumentRequiredResources]\n\n如果你没能在20天内完成这项工作， 将被视为对此仪式的一种亵渎。 与 [asker_factionName] 的关系将下降25， 承袭人也不会有任何改变。\n\n如果在纪念碑完成后[keepMonumentDays]天内被破坏， 那么你与 [asker_factionName] 的关系会下降[goodwillChangeIfMonumentDestroyed]。</li>
+    <li>questDescription->\n为了让 [titleHeir_nameFull] 名正言顺的承袭 [titleHolder_nameFull] 头衔， 你必须为此建造一座纪念碑。\n\n建造这个 [monumentSize] 纪念碑需要如下资源 （总价值：[monumentRequiredResourcesMarketValue_money]）：\n\n[monumentRequiredResources]\n\n如果你没能在20天内完成这项工作， 将被视为对此仪式的一种亵渎。 与 [asker_factionName] 的关系将下降25， 承袭人也不会有任何改变。\n\n如果在纪念碑完成后[keepMonumentTicks_duration]天内被破坏， 那么你与 [asker_factionName] 的关系会下降[goodwillChangeIfMonumentDestroyed]。</li>
   </ChangeRoyalHeir.questDescriptionRules.rulesStrings>
   <!-- EN:
     <li>questName->[titleHeir_nameDef]'s inheritance</li>
@@ -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_EndGame_RoyalAscent.xml b/Royalty/DefInjected/QuestScriptDef/Script_EndGame_RoyalAscent.xml
index dd8e1541..24ccd328 100644
--- a/Royalty/DefInjected/QuestScriptDef/Script_EndGame_RoyalAscent.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Script_EndGame_RoyalAscent.xml
@@ -9,7 +9,7 @@
     <li>threatsInfo-></li>
   -->
   <EndGame_RoyalAscent.questDescriptionRules.rulesStrings>
-    <li>questDescription->[intro] [asker_faction_name] 的 [asker_faction_leaderTitle]， [asker_nameFull]， 将会应邀对[asker_possessive]一个伯爵领地进行常规访问。 邀请[asker_objective]前来访问， 并且在[shuttleDelayTicks_duration]内持续满足[asker_possessive]各种需求， 然后所有人都可以乘坐穿梭机前往帝国舰队驻地。 你可以选择加入帝国， 或者逃离星球开始新生活。\n\n你可以通过完成任务来获取 [asker_faction_name] 的 [asker_faction_royalFavorLabel] 头衔。 这也意味着你可能需要很多年才能完成这项事业。 \n\n在[asker_possessive]访问期间， 你必须保证[asker_nameDef]的情绪程度高于[lodgersMoodThreshold_percent]。 这也意味着你必须提供很多特权内容， 例如准备一间豪华行宫等。 [threatsInfo]\n\n[asker_nameDef]带来的一些[asker_possessive]私人护卫将暂时听命于你。 虽然[asker_nameDef]不会在意这些人的生死哀乐， 但你仍需要为这些护卫提供住处。 \n\n你必须保证访客们一直呆在[map_definite]， 也不能把他们送离。 如果你这次任务失败或者自行迁徙， 也不会影响你以后获取同样任务的机会。</li>
+    <li>questDescription->[intro] [asker_faction_name] 的 [asker_faction_leaderTitle]， [asker_nameFull]， 将会应邀对[asker_possessive]一个伯爵领地进行常规访问。 邀请[asker_objective]前来访问， 并且在[shuttleDelayTicks_duration]内持续满足[asker_possessive]各种需求， 然后所有人都可以乘坐穿梭机前往帝国舰队驻地。 你可以选择加入帝国， 或者逃离星球开始新生活。\n\n你可以通过完成任务来获取 [asker_faction_name] 的 [asker_faction_royalFavorLabel] 头衔。 这也意味着你可能需要很多年才能完成这项事业。 \n\n在[asker_possessive]访问期间， 你必须保证[asker_nameDef]的情绪程度高于[lodgersMoodThreshold_percent]。 这也意味着你必须提供很多特权内容， 例如准备一间豪华行宫等。 [threatsInfo]\n\n[asker_nameDef] 带来的一些[asker_possessive]私人护卫将暂时听命于你。 虽然 [asker_nameDef] 不会在意这些人的生死哀乐， 但你仍需要为这些护卫提供住处。 \n\n你必须保证访客们一直呆在[map_definite]， 也不能把他们送离。 如果你这次任务失败或者自行迁徙， 也不会影响你以后获取同样任务的机会。</li>
     <li>intro(sameQuestsCount==0)->你现在知晓了一种逃离这个星球的方法！\n\n</li>
     <li>intro(sameQuestsCount>=1)->你又得到了一次荣誉提升的机会。\n\n</li>
     <li>threatsInfo(allowViolentQuests==true,priority=1)->\n\n其他人终于有机会杀死[asker_faction_leaderTitle]，你马上会迎来巨量的饱和式攻击。赶快准备防御力量吧！</li>
diff --git a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Worker.xml b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Worker.xml
index 9b9c45e8..92d47c5e 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 -->
@@ -48,4 +46,9 @@
   <Hospitality_Util_Worker.root.nodes.DropPods.customLetterLabel.slateRef>[lodgersLabelSingOrPlural]抵达</Hospitality_Util_Worker.root.nodes.DropPods.customLetterLabel.slateRef>
   <Hospitality_Util_Worker.root.nodes.DropPods.customLetterText.slateRef>[lodgersLabelSingOrPluralDef][lodgersHasHave]已经抵达。在[shuttleDelayTicks_duration]内保护他们直到穿梭机抵达。[helpersArrivalLetterEnd]</Hospitality_Util_Worker.root.nodes.DropPods.customLetterText.slateRef>
   
+  <!-- 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. [failLetterEndingCommon] -->
+  <Util_ArriveByDropPodsOrShuttle.root.nodes.HasRoyalTitleInCurrentFaction.node.nodes.arrivalShuttleDestroyed.node.nodes.Letter.text.slateRef>被派遣来运输[lodgersLabelSingOrPluralDef]的穿梭机已被破坏。 [failLetterEndingCommon]</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 8294710f..877f8539 100644
--- a/Royalty/DefInjected/QuestScriptDef/Scripts_Decree.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Scripts_Decree.xml
@@ -2,10 +2,10 @@
 <LanguageData>
   
   <!-- EN:
-    <li>questDescription->[decreeIntro]\n\nYou must build a monument. It is [monumentSize] in size and will require these resources (total value [monumentRequiredResourcesMarketValue_money]):\n\n[monumentRequiredResources]\n\n[decreeThreatInfo]\n\nYou must keep the monument safe for [keepMonumentDays] days after completion, otherwise [asker_nameDef] will be unhappy.</li>
+    <li>questDescription->[decreeIntro]\n\nYou must build a monument. It is [monumentSize] in size and will require these resources (total value [monumentRequiredResourcesMarketValue_money]):\n\n[monumentRequiredResources]\n\n[decreeThreatInfo]\n\nYou must keep the monument safe for [keepMonumentTicks_duration] days after completion, otherwise [asker_nameDef] will be unhappy.</li>
   -->
   <Decree_BuildMonument.questDescriptionRules.rulesStrings>
-    <li>questDescription->[decreeIntro]\n\n你必须建造一个纪念碑。建造这个[monumentSize]的纪念碑需要以下资源（总价值：[monumentRequiredResourcesMarketValue_money]）：\n\n[monumentRequiredResources]\n\n[decreeThreatInfo]\n\n你在建造完成后[keepMonumentDays]天内不能破坏这个纪念碑， 否则 [asker_nameDef] 会不开心。</li>
+    <li>questDescription->[decreeIntro]\n\n你必须建造一个纪念碑。建造这个[monumentSize]的纪念碑需要以下资源（总价值：[monumentRequiredResourcesMarketValue_money]）：\n\n[monumentRequiredResources]\n\n[decreeThreatInfo]\n\n你在建造完成后[keepMonumentTicks_duration]天内不能破坏这个纪念碑， 否则 [asker_nameDef] 会不开心。</li>
   </Decree_BuildMonument.questDescriptionRules.rulesStrings>
   <!-- EN:
     <li>questName->monument decree</li>
@@ -19,16 +19,14 @@
   <Decree_BuildMonument.root.nodes.monumentMarkerDestroyed.node.nodes.Letter.text.slateRef>由于纪念碑标记已损毁，一个新的标记被送出。</Decree_BuildMonument.root.nodes.monumentMarkerDestroyed.node.nodes.Letter.text.slateRef>
   <!-- EN: Monument completed -->
   <Decree_BuildMonument.root.nodes.monumentMarkerMonumentCompleted.node.nodes.Letter.label.slateRef>纪念碑完工</Decree_BuildMonument.root.nodes.monumentMarkerMonumentCompleted.node.nodes.Letter.label.slateRef>
-  <!-- EN: You have completed construction of the monument.\n\nYou must keep it safe for [keepMonumentDays] days, otherwise [asker_nameDef] will be displeased. -->
-  <Decree_BuildMonument.root.nodes.monumentMarkerMonumentCompleted.node.nodes.Letter.text.slateRef>你完成了这个纪念碑结构。\n\n在接下来的[keepMonumentDays]天内不要让它被破坏， 否则 [asker_nameDef] 会不开心。text_todo</Decree_BuildMonument.root.nodes.monumentMarkerMonumentCompleted.node.nodes.Letter.text.slateRef>
+  <!-- EN: You have completed construction of the monument.\n\nYou must keep it safe for [keepMonumentTicks_duration] days, otherwise [asker_nameDef] will be displeased. -->
+  <Decree_BuildMonument.root.nodes.monumentMarkerMonumentCompleted.node.nodes.Letter.text.slateRef>你完成了这个纪念碑结构。\n\n在接下来的[keepMonumentTicks_duration]天内不要让它被破坏， 否则 [asker_nameDef] 会不开心。text_todo</Decree_BuildMonument.root.nodes.monumentMarkerMonumentCompleted.node.nodes.Letter.text.slateRef>
   <!-- EN: Monument destroyed -->
   <Decree_BuildMonument.root.nodes.monumentMarkerMonumentCompleted.node.nodes.monumentMarkerMonumentDestroyed.node.nodes.Letter.label.slateRef>纪念碑被破坏</Decree_BuildMonument.root.nodes.monumentMarkerMonumentCompleted.node.nodes.monumentMarkerMonumentDestroyed.node.nodes.Letter.label.slateRef>
   <!-- EN: [asker_nameDef] is offended that you allowed the monument to be ruined so soon after completion.\n\n[asker_pronoun] will be unhappy about this. -->
   <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 aeffabc3..8be69075 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>
   
   <!-- UNUSED -->
diff --git a/Royalty/DefInjected/ThingDef/Buildings_Misc.xml b/Royalty/DefInjected/ThingDef/Buildings_Misc.xml
index e8cb90ab..8945e791 100644
--- a/Royalty/DefInjected/ThingDef/Buildings_Misc.xml
+++ b/Royalty/DefInjected/ThingDef/Buildings_Misc.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN: ship landing beacon -->
diff --git a/Royalty/DefInjected/ThoughtDef/Thoughts_Memory_Special.xml b/Royalty/DefInjected/ThoughtDef/Thoughts_Memory_Special.xml
index 576fea82..7c59e49c 100644
--- a/Royalty/DefInjected/ThoughtDef/Thoughts_Memory_Special.xml
+++ b/Royalty/DefInjected/ThoughtDef/Thoughts_Memory_Special.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN: decree failed -->

From 1cfc182a26f793a0532f1113bd3975613298fb13 Mon Sep 17 00:00:00 2001
From: VaniatD <188733149@qq.com>
Date: Sat, 28 Mar 2020 10:35:09 +0800
Subject: [PATCH 2/2] typos fix

---
 .../QuestScriptDef/Scripts_Utility_ThreatsCore.xml            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Core/DefInjected/QuestScriptDef/Scripts_Utility_ThreatsCore.xml b/Core/DefInjected/QuestScriptDef/Scripts_Utility_ThreatsCore.xml
index 5bd51b4e..84439cbc 100644
--- a/Core/DefInjected/QuestScriptDef/Scripts_Utility_ThreatsCore.xml
+++ b/Core/DefInjected/QuestScriptDef/Scripts_Utility_ThreatsCore.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN: <rulesStrings><li>root(priority=1,sitePart==ClimateAdjuster)->there's a climate adjuster machine there shifting the regional temperature by [temperatureOffset]</li><li>root(priority=1,sitePart==PsychicDroner)->there's a psychic droner machine there tuned to the [affectedGender] gender</li><li>root(priority=1,sitePart==PsychicSuppressor)->there's a psychic suppressor machine there tuned to the [affectedGender] gender</li><li>root(priority=1,sitePart==WeatherController)->there's a weather controller machine there forcing weather in the whole region to [weather_label]</li><li>root(priority=1,sitePart==SmokeSpewer)->there's a smoke spewer machine there belching smoke over the whole region</li><li>root(priority=1,sitePart==SunBlocker)->there's a sun blocker machine there shadowing the whole region</li><li>root(priority=1,sitePart==EMIDynamo)->there's an EMI dynamo machine there which can disable electrical devices across the region</li><li>root(priority=1,sitePart==ToxicSpewer)->there's a toxic spewer machine there blanketing the whole region in poison</li><li>root(priority=1,sitePart==RaidSource)->there's a military staging area guarded by [enemiesCount] enemies that will launch raids on you every [mtbDays]</li><li>root(priority=1,sitePart==Outpost)->there's an enemy outpost at the site guarded by [enemiesCount] enemies</li><li>root(priority=1,sitePart==BanditCamp)->there's a bandit camp at the site guarded by [enemiesCount] enemies</li><li>root(priority=1,sitePart==Manhunters,count==1)->a manhunting [kindLabel] are wandering nearby</li><li>root(priority=1,sitePart==Manhunters,count>1)->[count] manhunting [kindLabel] are wandering nearby</li><li>root(priority=1,sitePart==SleepingMechanoids,count==1)->a mechanoid is sleeping nearby</li><li>root(priority=1,sitePart==SleepingMechanoids,count>1)->[count] mechanoids are sleeping nearby</li><li>root(priority=1,sitePart==Turrets)->[threatsInfo] defend the site</li><li>root(priority=1,sitePart==AmbushEdge)->an enemy force is waiting to ambush anyone who comes near</li><li>root(priority=1,sitePart==AmbushHidden)->an enemy force is waiting to ambush anyone who comes near</li><li>root(priority=1,sitePart==MechCluster)->there's a cluster of hostile mechanoid structures</li><li>root(priority=1,sitePart==PossibleUnknownThreatMarker)->there may be an unknown threat</li><li>root->there's [label]</li></rulesStrings> -->
@@ -32,7 +32,7 @@
     <li>threatDescription->a mech cluster will land at [map_definite] containing:\n\n[allThreats]</li>
   -->
   <Util_MechCluster.questDescriptionRules.rulesStrings>
-    <li>threatDescription->一个机械集群将会空降至[map_definite]其中包扩：\n\n[allThreats]</li>
+    <li>threatDescription->一个机械集群将会空降至 [map_definite] 其中包括：\n\n[allThreats]</li>
   </Util_MechCluster.questDescriptionRules.rulesStrings>
   
   <!-- EN: