From 45d42ccdd61dd2dc36a26e5de7a1d16cf5d4d8b5 Mon Sep 17 00:00:00 2001
From: VaniatD <188733149@qq.com>
Date: Thu, 5 Mar 2020 13:22:21 +0800
Subject: [PATCH] update for 1.1.2564

---
 Core/DefInjected/TerrainDef/Terrain_Special.xml           | 2 +-
 Core/Keyed/Letters.xml                                    | 8 ++++----
 Core/Keyed/MainTabs.xml                                   | 4 +++-
 Core/Keyed/Messages.xml                                   | 6 +++---
 Core/Keyed/Misc_Gameplay.xml                              | 8 ++++++++
 Core/Keyed/Time.xml                                       | 2 +-
 .../QuestScriptDef/Script_EndGame_RoyalAscent.xml         | 2 +-
 Royalty/DefInjected/QuestScriptDef/Scripts_Decree.xml     | 8 ++++++--
 .../DefInjected/QuestScriptDef/Scripts_Decree_Utility.xml | 6 +++++-
 .../QuestScriptDef/Scripts_Utility_Helpers.xml            | 2 +-
 Royalty/Keyed/Dialogs_Various.xml                         | 2 +-
 Royalty/Keyed/Letters.xml                                 | 2 +-
 12 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/Core/DefInjected/TerrainDef/Terrain_Special.xml b/Core/DefInjected/TerrainDef/Terrain_Special.xml
index 2f82c219..d739281c 100644
--- a/Core/DefInjected/TerrainDef/Terrain_Special.xml
+++ b/Core/DefInjected/TerrainDef/Terrain_Special.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN: bridge -->
diff --git a/Core/Keyed/Letters.xml b/Core/Keyed/Letters.xml
index ee1870f0..1fce63a8 100644
--- a/Core/Keyed/Letters.xml
+++ b/Core/Keyed/Letters.xml
@@ -338,16 +338,16 @@
   <!-- EN: Legendary Work -->
   <LetterCraftedLegendaryLabel>传奇作品</LetterCraftedLegendaryLabel>
   <!-- EN: {WORKER_labelShort} has created a {CRAFTED_labelShort}.\n\nNews of this valuable artifact will spread across the world. -->
-  <LetterCraftedLegendaryMessage>{WORKER_labelShort}创造出了一个{CRAFTED_labelShort}。\n\n这件价值连城的作品的诞生将很快为全世界所知晓。</LetterCraftedLegendaryMessage>
+  <LetterCraftedLegendaryMessage>{WORKER_labelShort}制作出了一个{CRAFTED_labelShort}。\n\n这件价值连城的作品的诞生将很快为全世界所知晓。</LetterCraftedLegendaryMessage>
   <!-- EN: {WORKER_labelShort} has created a {CRAFTED_labelShort}.\n\n{0}\n\nNews of this valuable artifact will spread across the world. -->
-  <LetterCraftedLegendaryMessageArt>{WORKER_labelShort}创造出了一个{CRAFTED_labelShort}。\n\n{0}\n\n这件价值连城的作品的诞生将很快为全世界所知晓。</LetterCraftedLegendaryMessageArt>
+  <LetterCraftedLegendaryMessageArt>{WORKER_labelShort}制作出了一个{CRAFTED_labelShort}。\n\n{0}\n\n这件价值连城的作品的诞生将很快为全世界所知晓。</LetterCraftedLegendaryMessageArt>
 
   <!-- EN: Masterwork -->
   <LetterCraftedMasterworkLabel>杰作</LetterCraftedMasterworkLabel>
   <!-- EN: {WORKER_labelShort} has created a {CRAFTED_labelShort}. -->
-  <LetterCraftedMasterworkMessage>{WORKER_labelShort}创造出了一个{CRAFTED_labelShort}。</LetterCraftedMasterworkMessage>
+  <LetterCraftedMasterworkMessage>{WORKER_labelShort}制作出了一个{CRAFTED_labelShort}。</LetterCraftedMasterworkMessage>
   <!-- EN: {WORKER_labelShort} has created a {CRAFTED_labelShort}.\n\n{0} -->
-  <LetterCraftedMasterworkMessageArt>{WORKER_labelShort}创造出了一个{CRAFTED_labelShort}.\n\n{0}</LetterCraftedMasterworkMessageArt>
+  <LetterCraftedMasterworkMessageArt>{WORKER_labelShort}制作出了一个{CRAFTED_labelShort}.\n\n{0}</LetterCraftedMasterworkMessageArt>
 
   <!-- Pawns lost because map closed -->
   <!-- EN: Caravan lost -->
diff --git a/Core/Keyed/MainTabs.xml b/Core/Keyed/MainTabs.xml
index 76072b91..9027cccf 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 -->
@@ -246,6 +246,8 @@
   <QuestOutcomeInfo_Failed>你未完成此任务。</QuestOutcomeInfo_Failed>
   <!-- EN: Jump to {0} -->
   <JumpToTargetCustom>跳转至{0}</JumpToTargetCustom>
+  <!-- EN: Select hives -->
+  <SelectHiveTargets>选择虫巢</SelectHiveTargets>
   <!-- EN: Challenge rating. This is a general rating for how difficult the quest will be relative to your current strength. More challenging quests give greater rewards.\n\n1: Normal\n2: Hard\n3: Extreme\n4: Ultimate -->
   <QuestChallengeRatingTip>挑战等级。这是一个综合的难易度评级，显示该任务相对于你当前的实力有多少差距。更具挑战性的任务会带来更大的奖励。\n\n1: 普通\n2: 困难\n3: 极难\n4: 终极</QuestChallengeRatingTip>
   <!-- EN: To accept this quest, you need -->
diff --git a/Core/Keyed/Messages.xml b/Core/Keyed/Messages.xml
index 3e87f1b6..203de3da 100644
--- a/Core/Keyed/Messages.xml
+++ b/Core/Keyed/Messages.xml
@@ -582,9 +582,6 @@
   <!-- EN: {0} are leaving. -->
   <MessagePawnsLeaving>{0}离开了。</MessagePawnsLeaving>
 
-  <!-- EN: Warning: {0_label} can't be moved once installed. -->
-  <MessageThingInstalledPermanently>警告: {0_label}安装后不能移动。</MessageThingInstalledPermanently>
-
   <!-- EN: The monument has been destroyed because you've built a disallowed building inside. -->
   <MessageMonumentDestroyedBecauseOfDisallowedBuilding>纪念碑被毁了，因为你在其中建了一座不被允许的建筑。</MessageMonumentDestroyedBecauseOfDisallowedBuilding>
 
@@ -604,4 +601,7 @@
   <!-- EN: {0_label} is currently hidden. -->
   <MessageCannotSelectInvisibleStat>{0_label}当前是隐藏的。</MessageCannotSelectInvisibleStat>
 
+  <!-- UNUSED -->
+  <MessageThingInstalledPermanently>警告: {0_label}安装后不能移动。</MessageThingInstalledPermanently>
+
 </LanguageData>
\ No newline at end of file
diff --git a/Core/Keyed/Misc_Gameplay.xml b/Core/Keyed/Misc_Gameplay.xml
index 7c832945..d9deb24f 100644
--- a/Core/Keyed/Misc_Gameplay.xml
+++ b/Core/Keyed/Misc_Gameplay.xml
@@ -447,6 +447,14 @@
   <!-- EN: {0} left -->
   <DurationLeft>{0}剩余</DurationLeft>
 
+  <!-- Scanning -->
+  <!-- EN: User scanning speed -->
+  <UserScanAbility>扫描速度</UserScanAbility>
+  <!-- EN: Random find interval -->
+  <ScanAverageInterval>矿物发现间隔</ScanAverageInterval>
+  <!-- EN: Progress to guaranteed find -->
+  <ScanningProgressToGuaranteedFind>扫描进度</ScanningProgressToGuaranteedFind>
+
   <!-- Fermentation barrel -->
   <!-- EN: Contains {0} / {1} wort. -->
   <ContainsWort>装有麦芽汁: {0} / {1}</ContainsWort>
diff --git a/Core/Keyed/Time.xml b/Core/Keyed/Time.xml
index 2003963a..70838373 100644
--- a/Core/Keyed/Time.xml
+++ b/Core/Keyed/Time.xml
@@ -11,7 +11,7 @@
   <LetterSecond>秒</LetterSecond>
   <!-- EN: y -->
   <LetterYear>年</LetterYear>
-  
+
   <!-- EN: days -->
   <DaysLower>天</DaysLower>
   <!-- EN: hours -->
diff --git a/Royalty/DefInjected/QuestScriptDef/Script_EndGame_RoyalAscent.xml b/Royalty/DefInjected/QuestScriptDef/Script_EndGame_RoyalAscent.xml
index 782cc4c6..81efc480 100644
--- a/Royalty/DefInjected/QuestScriptDef/Script_EndGame_RoyalAscent.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Script_EndGame_RoyalAscent.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/Scripts_Decree.xml b/Royalty/DefInjected/QuestScriptDef/Scripts_Decree.xml
index f63b3a7a..23bfc3ac 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:
@@ -14,8 +14,12 @@
     <li>questName->纪念碑法令</li>
   </Decree_BuildMonument.questNameRules.rulesStrings>
   <!-- EN: New monument marker arrived -->
-  <Decree_BuildMonument.root.nodes.monumentMarkerCancelled.node.nodes.Letter.label.slateRef>新的纪念碑标记已送达</Decree_BuildMonument.root.nodes.monumentMarkerCancelled.node.nodes.Letter.label.slateRef>
+  <Decree_BuildMonument.root.nodes.monumentMarkerDestroyed.node.nodes.Letter.label.slateRef>新的纪念碑标记已送达</Decree_BuildMonument.root.nodes.monumentMarkerDestroyed.node.nodes.Letter.label.slateRef>
   <!-- EN: Since the monument marker has been destroyed, a new one has been sent. -->
+  <Decree_BuildMonument.root.nodes.monumentMarkerDestroyed.node.nodes.Letter.text.slateRef>由于纪念碑标记已损毁，一个新的标记被送出。</Decree_BuildMonument.root.nodes.monumentMarkerDestroyed.node.nodes.Letter.text.slateRef>
+  
+  <!-- UNUSED -->
+  <Decree_BuildMonument.root.nodes.monumentMarkerCancelled.node.nodes.Letter.label.slateRef>新的纪念碑标记已送达</Decree_BuildMonument.root.nodes.monumentMarkerCancelled.node.nodes.Letter.label.slateRef>
   <Decree_BuildMonument.root.nodes.monumentMarkerCancelled.node.nodes.Letter.text.slateRef>由于纪念碑标记已损毁，一个新的标记被送出。</Decree_BuildMonument.root.nodes.monumentMarkerCancelled.node.nodes.Letter.text.slateRef>
   
   <!-- EN:
diff --git a/Royalty/DefInjected/QuestScriptDef/Scripts_Decree_Utility.xml b/Royalty/DefInjected/QuestScriptDef/Scripts_Decree_Utility.xml
index 132d4c54..2767d3aa 100644
--- a/Royalty/DefInjected/QuestScriptDef/Scripts_Decree_Utility.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Scripts_Decree_Utility.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN:
@@ -13,5 +13,9 @@
   <DecreeSetup.root.nodes.Delay.node.nodes.Letter.label.slateRef>[asker_nameDef]的法令被遗忘</DecreeSetup.root.nodes.Delay.node.nodes.Letter.label.slateRef>
   <!-- EN: [asker_nameDef] has forgotten about [asker_possessive] decree. -->
   <DecreeSetup.root.nodes.Delay.node.nodes.Letter.text.slateRef>[asker_nameDef]已经遗忘[asker_possessive]法令。</DecreeSetup.root.nodes.Delay.node.nodes.Letter.text.slateRef>
+  <!-- EN: Decree cancelled -->
+  <DecreeSetup.root.nodes.Incompletable.node.nodes.Letter.label.slateRef>法令已取消</DecreeSetup.root.nodes.Incompletable.node.nodes.Letter.label.slateRef>
+  <!-- EN: [asker_nameDef] has grudgingly cancelled the decree '[resolvedQuestName]' since it cannot be completed. text_todo -->
+  <DecreeSetup.root.nodes.Incompletable.node.nodes.Letter.text.slateRef>[asker_nameDef]勉强取消了无法完成的法令'[resolvedQuestName]'。 text_todo</DecreeSetup.root.nodes.Incompletable.node.nodes.Letter.text.slateRef>
   
 </LanguageData>
\ No newline at end of file
diff --git a/Royalty/DefInjected/QuestScriptDef/Scripts_Utility_Helpers.xml b/Royalty/DefInjected/QuestScriptDef/Scripts_Utility_Helpers.xml
index 4d11ef3a..21621675 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: helperKind -->
diff --git a/Royalty/Keyed/Dialogs_Various.xml b/Royalty/Keyed/Dialogs_Various.xml
index df0bded3..5813f5db 100644
--- a/Royalty/Keyed/Dialogs_Various.xml
+++ b/Royalty/Keyed/Dialogs_Various.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
 
   <!-- Royal Titles -->
diff --git a/Royalty/Keyed/Letters.xml b/Royalty/Keyed/Letters.xml
index a51aae3d..552b3774 100644
--- a/Royalty/Keyed/Letters.xml
+++ b/Royalty/Keyed/Letters.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
 
   <!-- Royal titles -->