From db37dd7db7fcb02422e2cbabdedf3e3c37776d50 Mon Sep 17 00:00:00 2001
From: VaniatD <188733149@qq.com>
Date: Thu, 9 Apr 2020 09:14:27 +0800
Subject: [PATCH] update for 2589

---
 Core/Keyed/MainTabs.xml                       |  2 +-
 .../Script_BuildMonument_Worker.xml           |  4 ++-
 .../QuestScriptDef/Script_ChangeRoyalHeir.xml |  4 ++-
 .../Script_Hospitality_Worker.xml             |  4 ++-
 .../QuestScriptDef/Scripts_Decree.xml         |  4 ++-
 .../QuestScriptDef/Scripts_RewardRaid.xml     | 26 ++++++++++++++++---
 6 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/Core/Keyed/MainTabs.xml b/Core/Keyed/MainTabs.xml
index a02b4683..d535fdca 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 -->
diff --git a/Royalty/DefInjected/QuestScriptDef/Script_BuildMonument_Worker.xml b/Royalty/DefInjected/QuestScriptDef/Script_BuildMonument_Worker.xml
index 3a5c0dea..51ad0c4d 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,6 +11,8 @@
   <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 904db295..8c250160 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,6 +37,8 @@
   <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 a7e9ecb2..6e45057d 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,6 +31,8 @@
   <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 631ac6e0..2e90fb58 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,6 +27,8 @@
   <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_RewardRaid.xml b/Royalty/DefInjected/QuestScriptDef/Scripts_RewardRaid.xml
index 9e9364c3..f1606369 100644
--- a/Royalty/DefInjected/QuestScriptDef/Scripts_RewardRaid.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Scripts_RewardRaid.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN:
@@ -16,8 +16,11 @@
   <!-- EN:
     <li>questName->[enemyFaction_pawnsPlural] of Fortune</li>
     <li>questName->[violence] of Fortune</li>
+    <li>questName->[violence] for Hire</li>
+    <li>questName->[violence] for Profit</li>
     <li>questName->Rewarded [violence]</li>
     <li>questName->Paid [violence]</li>
+    <li>questName->Compensated [violence]</li>
     <li>questName(reward==royalFavor)->[enemyFaction_pawnsPlural] for Favor</li>
     <li>questName(reward==royalFavor)->[violence] for Favor</li>
     <li>violence->Violence</li>
@@ -25,19 +28,34 @@
     <li>violence->Combat</li>
     <li>violence->War</li>
     <li>violence->Fighting</li>
+    <li>violence->Bloodshed</li>
+    <li>violence->Attack</li>
+    <li>violence->Defense</li>
+    <li>violence->Conflict</li>
+    <li>violence->Hostility</li>
+    <li>violence->Warfare</li>
   -->
   <ThreatReward_Raid_MiscReward.questNameRules.rulesStrings>
     <li>questName->[enemyFaction_pawnsPlural]的财富</li>
     <li>questName->[violence]财富</li>
+    <li>questName->[violence]雇佣</li>
+    <li>questName->利益[violence]</li>
     <li>questName->[violence]奖励</li>
-    <li>questName->支付[violence]</li>
-    <li>questName(reward==royalFavor)->[enemyFaction_pawnsPlural]偏好</li>
-    <li>questName(reward==royalFavor)->[violence]偏好</li>
+    <li>questName->有偿[violence]</li>
+    <li>questName->[violence]赔偿</li>
+    <li>questName(reward==royalFavor)->荣誉[enemyFaction_pawnsPlural]</li>
+    <li>questName(reward==royalFavor)->荣誉[violence]</li>
     <li>violence->暴行</li>
     <li>violence->战斗</li>
     <li>violence->作战</li>
     <li>violence->战争</li>
     <li>violence->作战</li>
+    <li>violence->喋血</li>
+    <li>violence->袭击</li>
+    <li>violence->防御</li>
+    <li>violence->冲突</li>
+    <li>violence->对抗</li>
+    <li>violence->战火</li>
   </ThreatReward_Raid_MiscReward.questNameRules.rulesStrings>
   
 </LanguageData>
\ No newline at end of file