From ee26ceef84bc538dc31b4d08927166ac71a2158a Mon Sep 17 00:00:00 2001
From: VaniatD <188733149@qq.com>
Date: Fri, 6 Mar 2020 14:21:12 +0800
Subject: [PATCH] update for 1.1.2565

---
 Core/DefInjected/FactionDef/Factions_Misc.xml |  2 +-
 .../Script_LongRangeMineralScannerLump.xml    | 46 ++++++++++++++-----
 Core/Keyed/Dialog_Trees.xml                   |  2 +-
 Core/Keyed/ITabs.xml                          |  2 +-
 Core/Keyed/MainTabs.xml                       |  2 +-
 Core/Keyed/Misc_Gameplay.xml                  |  2 +
 .../QuestScriptDef/Scripts_Decree.xml         |  2 +-
 .../QuestScriptDef/Scripts_Decree_Utility.xml |  2 +-
 .../Scripts_Utility_Helpers.xml               |  8 ++--
 .../Hediffs_BodyParts_Prosthetic_Empire.xml   | 10 ++--
 .../ThoughtDef/Thoughts_Memory_Special.xml    |  2 +-
 Royalty/Keyed/Dialog_Trees.xml                |  2 +-
 12 files changed, 55 insertions(+), 27 deletions(-)

diff --git a/Core/DefInjected/FactionDef/Factions_Misc.xml b/Core/DefInjected/FactionDef/Factions_Misc.xml
index 2624ea77..85bea048 100644
--- a/Core/DefInjected/FactionDef/Factions_Misc.xml
+++ b/Core/DefInjected/FactionDef/Factions_Misc.xml
@@ -57,7 +57,7 @@
   <TribeRough.pawnsPlural>部众</TribeRough.pawnsPlural>
   
   <!-- EN: savage tribe -->
-  <TribeSavage.label>野蛮的部落</TribeSavage.label>
+  <TribeSavage.label>野蛮人</TribeSavage.label>
   <!-- EN: These people have been here a very long time. Maybe their ancestors crashed here a thousand years ago. Maybe they survived some cataclysm that destroyed a technological civilization here. In any case, the tribals are mostly nomadic people who live off the land using primitive tools and weapons.\n\nDespite their apparent technological weakness, the tribals can be dangerous enemies because of their skill with low-tech warfare, their numbers, and their hardiness.\n\nThis particular tribe is driven by a blood-and-honor culture; you will not be able to ally with them! -->
   <TribeSavage.description>这些人在这里已经存在了很长时间。也许他们的祖先于千年以前坠毁在这里，也许他们是某场毁灭文明的大灾难中的幸存者。不管怎样，这些部落原住民大部分是土生土长的游牧民族，他们使用着原始的工具和武器。\n\n尽管在技术方面明显落后，但因为拥有人数、勇气，以及低科技战争的技巧，这些部落将会成为危险的敌人。\n\n这个部落充斥着血与荣耀的文化，和他们永远都不会成为朋友。</TribeSavage.description>
   <!-- EN: tribesman -->
diff --git a/Core/DefInjected/QuestScriptDef/Script_LongRangeMineralScannerLump.xml b/Core/DefInjected/QuestScriptDef/Script_LongRangeMineralScannerLump.xml
index c4c11750..89f960ba 100644
--- a/Core/DefInjected/QuestScriptDef/Script_LongRangeMineralScannerLump.xml
+++ b/Core/DefInjected/QuestScriptDef/Script_LongRangeMineralScannerLump.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN:
@@ -8,18 +8,42 @@
     <li>questDescription->通过使用远距离矿物扫描仪，[worker_definite]发现了附近的一块[targetMineable_label]。\n\n很遗憾，它不会持续很久——如果我们不尽快开采，其他势力将会在[timeoutTicks_duration]后开采并带走这些资源。\n\n[allSitePartsDescriptionsExceptFirst]</li>
   </LongRangeMineralScannerLump.questDescriptionRules.rulesStrings>
   <!-- EN:
-    <li>questName->[distant] resources</li>
-    <li>questName->[distant] minerals</li>
-    <li>distant->distant</li>
-    <li>distant->far</li>
-    <li>distant->long-range</li>
+    <li>questName->The [subName]</li>
+    <li>questName->[subName]</li>
+    <li>subName->[adj] Resources</li>
+    <li>subName->[adj] Minerals</li>
+    <li>subName->[adj] Ores</li>
+    <li>subName->[adj] Wealth</li>
+    <li>subName->[adj] Mineables</li>
+    <li>subName->[adj] Lump</li>
+    <li>subName->[adj] Mining Project</li>
+    <li>adj->Distant</li>
+    <li>adj->Far</li>
+    <li>adj->Long-Range</li>
+    <li>adj->Unknown</li>
+    <li>adj->Discovered</li>
+    <li>adj->Scanned</li>
+    <li>adj->Detected</li>
+    <li>adj->Found</li>
   -->
   <LongRangeMineralScannerLump.questNameRules.rulesStrings>
-    <li>questName->[distant]资源</li>
-    <li>questName->[distant]矿物</li>
-    <li>distant->远方的</li>
-    <li>distant->很远的</li>
-    <li>distant->远距离的</li>
+    <li>questName->有[subName]</li>
+    <li>questName->[subName]</li>
+    <li>subName->[adj]资源</li>
+    <li>subName->[adj]矿物</li>
+    <li>subName->[adj]矿石</li>
+    <li>subName->[adj]财富</li>
+    <li>subName->[adj]可开采物</li>
+    <li>subName->[adj]矿物地块</li>
+    <li>subName->[adj]开采项目</li>
+    <li>adj->远处的</li>
+    <li>adj->遥远的</li>
+    <li>adj->远方的</li>
+    <li>adj->未知的</li>
+    <li>adj->未发现的</li>
+    <li>adj->扫描出的</li>
+    <li>adj->检测到的</li>
+    <li>adj->找到的</li>
   </LongRangeMineralScannerLump.questNameRules.rulesStrings>
   <!-- EN: Quest expired: [resolvedQuestName] -->
   <LongRangeMineralScannerLump.root.nodes.WorldObjectTimeout.node.nodes.Letter.label.slateRef>任务已失效：[resolvedQuestName]</LongRangeMineralScannerLump.root.nodes.WorldObjectTimeout.node.nodes.Letter.label.slateRef>
diff --git a/Core/Keyed/Dialog_Trees.xml b/Core/Keyed/Dialog_Trees.xml
index cf63131b..994917c8 100644
--- a/Core/Keyed/Dialog_Trees.xml
+++ b/Core/Keyed/Dialog_Trees.xml
@@ -63,6 +63,6 @@
   <!-- EN: {0} apologizes and says they won't be able to arrive in time.\n\n(This faction's technology level is too low for transport pods) -->
   <CantSendMilitaryAidInTime>{0} 向你道歉并说他们无法及时赶来。\n\n（此派系的科技等级太低，无法使用运输舱。）</CantSendMilitaryAidInTime>
   <!-- EN: hostile visitors present -->
-  <HostileVisitorsPresent>在场的敌对访客</HostileVisitorsPresent>
+  <HostileVisitorsPresent>有敌对派系的访客在场</HostileVisitorsPresent>
 
 </LanguageData>
\ No newline at end of file
diff --git a/Core/Keyed/ITabs.xml b/Core/Keyed/ITabs.xml
index fd98e0fc..b3414282 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 9027cccf..a91779d3 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/Core/Keyed/Misc_Gameplay.xml b/Core/Keyed/Misc_Gameplay.xml
index d9deb24f..2caabc44 100644
--- a/Core/Keyed/Misc_Gameplay.xml
+++ b/Core/Keyed/Misc_Gameplay.xml
@@ -72,6 +72,8 @@
   <Ineffective>无效</Ineffective>
   <!-- EN: illegal -->
   <Illegal>非法</Illegal>
+  <!-- EN: detection chance -->
+  <DetectionChance>侦测几率</DetectionChance>
   <!-- EN: Race -->
   <Race>种族</Race>
   <!-- EN: Description -->
diff --git a/Royalty/DefInjected/QuestScriptDef/Scripts_Decree.xml b/Royalty/DefInjected/QuestScriptDef/Scripts_Decree.xml
index 23bfc3ac..3439b239 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:
diff --git a/Royalty/DefInjected/QuestScriptDef/Scripts_Decree_Utility.xml b/Royalty/DefInjected/QuestScriptDef/Scripts_Decree_Utility.xml
index 2767d3aa..4c7d3da7 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:
diff --git a/Royalty/DefInjected/QuestScriptDef/Scripts_Utility_Helpers.xml b/Royalty/DefInjected/QuestScriptDef/Scripts_Utility_Helpers.xml
index 21621675..c1f09384 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 -->
@@ -35,11 +35,13 @@
   <!-- 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.DropPods.customLetterText.slateRef>[asker_nameDef][helpersHasHave]向你派出[helpersLabelSingOrPlural]进行支援，随后将协助你执行'[resolvedQuestName]'任务。</Util_MaybeGenerateHelpers.root.nodes.IsNull.elseNode.elseNode.node.nodes.DropPods.customLetterText.slateRef>
   <!-- EN: [helpersLabelSingOrPlural] leaving -->
-  <Util_MaybeGenerateHelpers.root.nodes.IsNull.elseNode.elseNode.node.nodes.IsTrueOrUnset.node.node.nodes.Letter.label.slateRef>[helpersLabelSingOrPlural]正在离开</Util_MaybeGenerateHelpers.root.nodes.IsNull.elseNode.elseNode.node.nodes.IsTrueOrUnset.node.node.nodes.Letter.label.slateRef>
+  <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. -->
-  <Util_MaybeGenerateHelpers.root.nodes.IsNull.elseNode.elseNode.node.nodes.IsTrueOrUnset.node.node.nodes.Letter.text.slateRef>由[asker_nameDef]向你派出以支援任务工作的[helpersLabelSingOrPlural][helpersHasHave]在你这里消耗了太多时间，现在[helpersIsAre]离开的时候了。</Util_MaybeGenerateHelpers.root.nodes.IsNull.elseNode.elseNode.node.nodes.IsTrueOrUnset.node.node.nodes.Letter.text.slateRef>
+  <Util_MaybeGenerateHelpers.root.nodes.IsNull.elseNode.elseNode.node.nodes.GreaterOrEqual.node.node.nodes.Letter.text.slateRef>[asker_nameDef]向你派出以支援任务的[helpersLabelSingOrPlural][helpersHasHave]消耗了太多的时间，现在[helpersIsAre]离开的时候了。</Util_MaybeGenerateHelpers.root.nodes.IsNull.elseNode.elseNode.node.nodes.GreaterOrEqual.node.node.nodes.Letter.text.slateRef>
   
   <!-- UNUSED -->
+  <Util_MaybeGenerateHelpers.root.nodes.IsNull.elseNode.elseNode.node.nodes.IsTrueOrUnset.node.node.nodes.Letter.label.slateRef>[helpersLabelSingOrPlural]正在离开</Util_MaybeGenerateHelpers.root.nodes.IsNull.elseNode.elseNode.node.nodes.IsTrueOrUnset.node.node.nodes.Letter.label.slateRef>
+  <Util_MaybeGenerateHelpers.root.nodes.IsNull.elseNode.elseNode.node.nodes.IsTrueOrUnset.node.node.nodes.Letter.text.slateRef>由[asker_nameDef]向你派出以支援任务工作的[helpersLabelSingOrPlural][helpersHasHave]在你这里消耗了太多时间，现在[helpersIsAre]离开的时候了。</Util_MaybeGenerateHelpers.root.nodes.IsNull.elseNode.elseNode.node.nodes.IsTrueOrUnset.node.node.nodes.Letter.text.slateRef>
   <Util_MaybeGenerateHelpers.root.nodes.IsNull.elseNode.elseNode.node.nodes.Delay.node.nodes.Letter.label.slateRef>[helpersLabelSingOrPlural]正在离开</Util_MaybeGenerateHelpers.root.nodes.IsNull.elseNode.elseNode.node.nodes.Delay.node.nodes.Letter.label.slateRef>
   <Util_MaybeGenerateHelpers.root.nodes.IsNull.elseNode.elseNode.node.nodes.Delay.node.nodes.Letter.text.slateRef>由[asker_nameDef]向你派出以支援任务工作的[helpersLabelSingOrPlural][helpersHasHave]在你这里消耗了太多时间，现在[helpersIsAre]离开的时候了。</Util_MaybeGenerateHelpers.root.nodes.IsNull.elseNode.elseNode.node.nodes.Delay.node.nodes.Letter.text.slateRef>
   
diff --git a/Royalty/DefInjected/ThingDef/Hediffs_BodyParts_Prosthetic_Empire.xml b/Royalty/DefInjected/ThingDef/Hediffs_BodyParts_Prosthetic_Empire.xml
index 3e85ecd6..67b438e2 100644
--- a/Royalty/DefInjected/ThingDef/Hediffs_BodyParts_Prosthetic_Empire.xml
+++ b/Royalty/DefInjected/ThingDef/Hediffs_BodyParts_Prosthetic_Empire.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN: drill arm -->
   <DrillArm.label>挖掘臂</DrillArm.label>
-  <!-- EN: A mechanical arm replacement for speeding up mining. It has a built-in snake drill, which allows the miner to rapidly find and exploit weak lines in the rock. It also has a general-purpose manipulator which, while not useless for non-mining tasks, is inferior to a natural hand. -->
-  <DrillArm.description>一款加快挖掘速度的机械手臂。内置了蛇形钻杆，可以帮助矿工更快地找到岩石中的弱点。此外还配备了通用机械手，虽然对挖掘外的工作有点用处，但不如自然的手便利。</DrillArm.description>
+  <!-- EN: A mechanical arm replacement for speeding up mining. It has a built-in snake drill, which allows the miner to rapidly find and exploit weak lines in the rock. It also has a general-purpose manipulator. It is somewhat ungainly, which slows down movement slightly. -->
+  <DrillArm.description>一款加快挖掘速度的机械手臂。内置了蛇形钻杆，可以帮助矿工更快地找到岩石中的弱点。此外还配备了通用机械手，它有点笨拙，这会稍微影响到移动能力。</DrillArm.description>
   
   <!-- EN: elbow blade -->
   <ElbowBlade.label>肘刀</ElbowBlade.label>
@@ -13,8 +13,8 @@
   
   <!-- EN: field hand -->
   <FieldHand.label>务农手</FieldHand.label>
-  <!-- EN: This mechanical hand replacement is made to speed up the sowing and harvesting tasks of a farmer. Multiple telescoping finger-like protrusions can simultaneously harvest from several points on the same plant, or precisely sow several holes at once. It can also be used for other tasks, but for this purpose is inferior to a natural hand. -->
-  <FieldHand.description>一款可以加快播种和收割的机械手掌，多个可收缩的指状凸起可以从一株的多个点进行收货，或者同时播种多棵植物。虽然也可以用于其他用途，但不如自然的手便利。</FieldHand.description>
+  <!-- EN: This mechanical hand replacement is made to speed up the sowing and harvesting tasks of a farmer. Multiple telescoping finger-like protrusions can simultaneously harvest from several points on the same plant, or precisely sow several holes at once. It also has a general-purpose manipulator. It is somewhat ungainly, which slows down movement slightly. -->
+  <FieldHand.description>一款可以加快播种和收割的机械手掌，多个可收缩的指状凸起可以从一株的多个点进行收货，或者同时播种多棵植物。此外还配备了通用机械手，它有点笨拙，这会稍微影响到移动能力。</FieldHand.description>
   
   <!-- EN: hand talon -->
   <HandTalon.label>手爪</HandTalon.label>
diff --git a/Royalty/DefInjected/ThoughtDef/Thoughts_Memory_Special.xml b/Royalty/DefInjected/ThoughtDef/Thoughts_Memory_Special.xml
index b7f8d561..8cf742b7 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 satisfied -->
diff --git a/Royalty/Keyed/Dialog_Trees.xml b/Royalty/Keyed/Dialog_Trees.xml
index 79c18440..a7aad640 100644
--- a/Royalty/Keyed/Dialog_Trees.xml
+++ b/Royalty/Keyed/Dialog_Trees.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
 
   <!-- Royalty -->