From 8bf3c3965a313fb4b4d94ad9253e983f3a4f7c6c Mon Sep 17 00:00:00 2001
From: VaniatD <188733149@qq.com>
Date: Wed, 8 Apr 2020 10:51:25 +0800
Subject: [PATCH] update for 2587

---
 .../ThoughtDef/Thoughts_Situation_Needs.xml            |  2 +-
 Core/Keyed/ITabs.xml                                   |  2 +-
 Core/Keyed/MainTabs.xml                                | 10 ++++++++--
 .../QuestScriptDef/Script_BuildMonument_Worker.xml     |  4 +---
 .../QuestScriptDef/Script_ChangeRoyalHeir.xml          |  4 +---
 .../QuestScriptDef/Script_Hospitality_Worker.xml       |  4 +---
 Royalty/DefInjected/QuestScriptDef/Scripts_Decree.xml  |  4 +---
 .../QuestScriptDef/Scripts_Utility_Helpers.xml         |  2 +-
 8 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/Core/DefInjected/ThoughtDef/Thoughts_Situation_Needs.xml b/Core/DefInjected/ThoughtDef/Thoughts_Situation_Needs.xml
index 3d2a0d9e..7e6b7ac5 100644
--- a/Core/DefInjected/ThoughtDef/Thoughts_Situation_Needs.xml
+++ b/Core/DefInjected/ThoughtDef/Thoughts_Situation_Needs.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN: chemical want -->
diff --git a/Core/Keyed/ITabs.xml b/Core/Keyed/ITabs.xml
index c07b81a5..b2829723 100644
--- a/Core/Keyed/ITabs.xml
+++ b/Core/Keyed/ITabs.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
 
   <!-- ITab titles -->
diff --git a/Core/Keyed/MainTabs.xml b/Core/Keyed/MainTabs.xml
index c2198cc7..a02b4683 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 -->
@@ -258,10 +258,16 @@
   <QuestBedroomRequirementsUnsatisfiedSingle>满足头衔要求的空置卧室</QuestBedroomRequirementsUnsatisfiedSingle>
   <!-- EN: a colonist with the title of {0}. -->
   <QuestNoColonistWithTitle>一名拥有{0}头衔的殖民者。</QuestNoColonistWithTitle>
+  <!-- EN: Choose rewards -->
+  <ChooseRewards>选择奖励</ChooseRewards>
   <!-- EN: Accept {FACTION_royalFavorLabel} -->
   <AcceptRoyalFavor>接受{FACTION_royalFavorLabel}</AcceptRoyalFavor>
   <!-- EN: Whether you wish to be rewarded with {FACTION_royalFavorLabel} from {FACTION_name}.\n\nIf this is disabled, {FACTION_name} will offer other types of rewards instead.\n\nThis setting only affects newly-arriving quests. -->
-  <AcceptRoyalFavorDesc>是否希望从{FACTION_name} 那里接受 {FACTION_royalFavorLabel} 。\n\n如果禁用此功能，{FACTION_name} 将提供其他类型的奖励。该设置只影响新接到的任务。</AcceptRoyalFavorDesc>
+  <AcceptRoyalFavorDesc>是否希望从{FACTION_name}那里接受{FACTION_royalFavorLabel}。\n\n如果禁用此选项，{FACTION_name}将提供其他类型的奖励。\n\n该选项只影响新接到的任务。</AcceptRoyalFavorDesc>
+  <!-- EN: Accept goodwill -->
+  <AcceptGoodwill>接受好感度</AcceptGoodwill>
+  <!-- EN: Whether you wish to be rewarded via improved faction relations with {FACTION_name}.\n\nIf this is disabled, {FACTION_name} will offer other types of rewards instead.\n\nThis setting only affects newly-generated quests. -->
+  <AcceptGoodwillDesc>是否希望与{FACTION_name}改善派系关系。\n\n如果禁用此选项，{FACTION_name}将提供其他类型的奖励。\n\n该选项只会影响到新生成的任务。</AcceptGoodwillDesc>
   <!-- EN: You are currently opting in to receive {FACTION_royalFavorLabel}. -->
   <RoyalFavorOn>当前选择接受{FACTION_royalFavorLabel}。 </RoyalFavorOn>
   <!-- EN: You are currently opting out of receiving {FACTION_royalFavorLabel}. -->
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 6e45057d..a7e9ecb2 100644
--- a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Worker.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Worker.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN: [lodgersLabelSingOrPlural] arrived -->
@@ -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 -->
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 5917f57a..24839602 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: