From 2ab420f11d342a7fbdc13bb74650f936e54c8137 Mon Sep 17 00:00:00 2001
From: VaniatD <188733149@qq.com>
Date: Sun, 8 Mar 2020 22:41:42 +0800
Subject: [PATCH] update to 1.1.2567

---
 Core/DefInjected/RaidStrategyDef/RaidStrategies.xml    |  6 +++---
 Core/DefInjected/ThoughtDef/Thoughts_Memory_Lost.xml   |  2 +-
 Core/DefInjected/TipSetDef/Tips.xml                    |  4 +++-
 Core/Keyed/Misc_Gameplay.xml                           |  2 +-
 .../QuestScriptDef/Script_Hospitality_Root_Joiners.xml | 10 +++++-----
 .../QuestScriptDef/Scripts_Decree_Utility.xml          |  2 +-
 .../DefInjected/ThingDef/Buildings_Mech_Turrets.xml    |  6 +++---
 Royalty/DefInjected/TipSetDef/Tips.xml                 |  4 +++-
 Royalty/Keyed/Dialogs_Various.xml                      |  2 +-
 Royalty/Keyed/Letters.xml                              |  2 +-
 10 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/Core/DefInjected/RaidStrategyDef/RaidStrategies.xml b/Core/DefInjected/RaidStrategyDef/RaidStrategies.xml
index 4fae8398..7ac63c22 100644
--- a/Core/DefInjected/RaidStrategyDef/RaidStrategies.xml
+++ b/Core/DefInjected/RaidStrategyDef/RaidStrategies.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN: They are attacking immediately. -->
@@ -42,8 +42,8 @@
   <!-- EN: Friendlies -->
   <Siege.letterLabelFriendly>友军</Siege.letterLabelFriendly>
   
-  <!-- EN: Rather than attack directly, the mechanoids are setting up a mech cluster near the colony. You must attack them in order to finally remove the threat. -->
-  <SiegeMechanoid.arrivalTextEnemy>机械族看起来不是直接攻击你的基地而是在附近建立了一个机械集群，你必须主动出击才能消除威胁。</SiegeMechanoid.arrivalTextEnemy>
+  <!-- EN: Rather than attack directly, the mechanoids are setting up a mech cluster near the colony. You must attack it to finally remove the threat.\n\nThe cluster will be initially dormant, so you can take time to decide how to attack it.\n\nIt may remain dormant until disturbed, or it may have a timer or proximity activators.\n\nEven dormant mech clusters aren't harmless. A dormant cluster may assemble mechanoid attackers from time to time, or have some broader negative effect that must be dealt with eventually. -->
+  <SiegeMechanoid.arrivalTextEnemy>机械族看起来不是直接攻击你的基地而是在附近建立了一个机械集群，你必须主动出击才能消除威胁。\n\n机械集群最初处于休眠状态，你可以对进攻方案深思熟虑。\n\n它也有可能在受到干扰之前一直休眠下去，也可以被定时激活器或探测激活器所激活。\n\n虽然机械集群处于休眠状态，但它也并不是完全无害的。休眠的机械集群会时不时地装配新的机械单位，或者对整片区域产生一些负面的影响。\n\n说到底，最终你还是得想办法处理它们。</SiegeMechanoid.arrivalTextEnemy>
   <!-- EN: Mechanoid Siege -->
   <SiegeMechanoid.letterLabelEnemy>围攻（机械）</SiegeMechanoid.letterLabelEnemy>
   
diff --git a/Core/DefInjected/ThoughtDef/Thoughts_Memory_Lost.xml b/Core/DefInjected/ThoughtDef/Thoughts_Memory_Lost.xml
index 59f0923b..a31874ba 100644
--- a/Core/DefInjected/ThoughtDef/Thoughts_Memory_Lost.xml
+++ b/Core/DefInjected/ThoughtDef/Thoughts_Memory_Lost.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN: bonded animal {0} lost -->
diff --git a/Core/DefInjected/TipSetDef/Tips.xml b/Core/DefInjected/TipSetDef/Tips.xml
index 73d5c7db..6df31a8e 100644
--- a/Core/DefInjected/TipSetDef/Tips.xml
+++ b/Core/DefInjected/TipSetDef/Tips.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN: You can dismiss letters by right-clicking on them. -->
@@ -121,5 +121,7 @@
   <GameplayTips.tips.58>爆炸能扑灭爆炸半径范围内的火焰。这使迫击炮弹在没有其他选择的情况下可以用于灭火。</GameplayTips.tips.58>
   <!-- EN: Even serious setbacks don't mean the game has to end. Try playing out a lost battle - often the best stories come from the darkest situations. -->
   <GameplayTips.tips.59>即使遭遇重创也不意味着故事结束。尝试将一场失败的战斗进行到底——梅花香自苦寒来。</GameplayTips.tips.59>
+  <!-- EN: Clean labs with sterile tile give research speed bonuses. -->
+  <GameplayTips.tips.60>干净整洁实验室能够让你的研究更省时省力，铺满无菌地砖是个好主意。</GameplayTips.tips.60>
   
 </LanguageData>
\ No newline at end of file
diff --git a/Core/Keyed/Misc_Gameplay.xml b/Core/Keyed/Misc_Gameplay.xml
index 554795f2..d124e213 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_Hospitality_Root_Joiners.xml b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Joiners.xml
index 544d4958..6e69151c 100644
--- a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Joiners.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Joiners.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN:
@@ -37,7 +37,7 @@
     <li>questDescription(asker_factionLeader==True,lodgersCount>=2,generateThreats==false)->[asker_nameFull], [asker_faction_leaderTitle] of [asker_faction_name], recently rescued [lodgersCount] [asker_faction_pawnsPlural] from an enemy jail. [asker_nameDef] wants you to guard them at [map_definite] for [shuttleDelayTicks_duration] until [asker_pronoun] can send a shuttle to collect them. [allLodgerInfo]\n\n[commonDescEnding] [joinerEnding]</li>
     <li>questDescription(asker_factionLeader==True,lodgersCount>=2,generateThreats==true,allowedThreats==Raids,enemyFaction!=Mechanoid)->[asker_nameFull], [asker_faction_leaderTitle] of [asker_faction_name], recently rescued [lodgersCount] [asker_faction_pawnsPlural] from the prisons of [enemyFaction_name]. [asker_nameDef] wants you to guard them at [map_definite] for [shuttleDelayTicks_duration] until [asker_pronoun] can send a shuttle to collect them. [allLodgerInfo]\n\nThe [asker_faction_pawnsPlural] know secrets about the [secretInfo] of [enemyFaction_name], so they will be hunted. [enemyGroupsParagraph]\n\n[commonDescEnding] [joinerEnding]</li>
     <li>questDescription(asker_factionLeader==True,lodgersCount>=2,generateThreats==true,allowedThreats==Raids,enemyFaction==Mechanoid)->[asker_nameFull], [asker_faction_leaderTitle] of [asker_faction_name], recently rescued [lodgersCount] [asker_faction_pawnsPlural] from a crytosleep vault. [asker_nameDef] wants you to guard them at [map_definite] for [shuttleDelayTicks_duration] until [asker_pronoun] can send a shuttle to collect them. [allLodgerInfo]\n\nThe [asker_faction_pawnsPlural] will be hunted by mechanoids. [enemyGroupsParagraph]\n\n[commonDescEnding] [joinerEnding]</li>
-    <li>questDescription(asker_factionLeader==True,lodgersCount>=2,generateThreats==true,allowedThreats==MechClusters)->[asker_nameFull], [asker_faction_leaderTitle] of [asker_faction_name], recently rescued [lodgersCount] [asker_faction_pawnsPlural] from a mechanoid hive's holding pen. [asker_nameDef] wants you to guard them at [map_definite] for [shuttleDelayTicks_duration] until [asker_pronoun] can send a shuttle to collect them. [allLodgerInfo]\n\nThe mechs are tracking their former prisoners. As long as the [asker_faction_pawnsPlural] are with you, mechanoid combat clusters will drop onto [map_definite] on a regular basis.\n\n[commonDescEnding] [joinerEnding]</li>
+    <li>questDescription(asker_factionLeader==True,lodgersCount>=2,generateThreats==true,allowedThreats==MechClusters)->[asker_nameFull], [asker_faction_leaderTitle] of [asker_faction_name], recently rescued [lodgersCount] [asker_faction_pawnsPlural] from a mechanoid hive's holding pen. [asker_nameDef] wants you to guard them at [map_definite] for [shuttleDelayTicks_duration] until [asker_pronoun] can send a shuttle to collect them. [allLodgerInfo]\n\nThe mechs are tracking their former prisoners. As long as the [asker_faction_pawnsPlural] are with you, mechanoid combat clusters will drop near [map_definite] on a regular basis.\n\n[commonDescEnding] [joinerEnding]</li>
     <li>secretInfo->military capabilities</li>
     <li>secretInfo->moral transgressions</li>
     <li>secretInfo->weapons research</li>
@@ -46,7 +46,7 @@
     <li>questDescription(asker_royalInCurrentFaction==True,lodgersCount==1)->[asker_nameFull], a [asker_royalTitleInCurrentFaction] of [asker_faction_name], is fleeing a troubling political situation and wants to hide out at [map_definite] for [shuttleDelayTicks_duration]. [allLodgerInfo][threatsInfo5]\n\n[commonDescEnding] [joinerEnding]</li>
     <li>threatsInfo5(generateThreats==true,allowedThreats==Raids,enemyFaction!=Mechanoid)->\n\n[asker_nameDef]'s enemies have hired [enemyFaction_name] to hunt [asker_objective]. They will attack repeatedly as long as [asker_nameDef] is present. [enemyGroupsParagraph]</li>
     <li>threatsInfo5(generateThreats==true,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n[asker_nameDef]'s enemies provoked mechanoids into to hunting [asker_objective]. The mechs will attack repeatedly as long as [asker_nameDef] is present. [enemyGroupsParagraph]</li>
-    <li>threatsInfo5(generateThreats==true,allowedThreats==MechClusters)->\n\n[asker_nameDef]'s enemies have somehow provoked mechanoids into hunting [asker_objective], so mech combat clusters will drop onto [map_definite] repeatedly as long as [asker_nameDef] is present.</li>
+    <li>threatsInfo5(generateThreats==true,allowedThreats==MechClusters)->\n\n[asker_nameDef]'s enemies have somehow provoked mechanoids into hunting [asker_objective], so mech combat clusters will drop near [map_definite] repeatedly as long as [asker_nameDef] is present.</li>
     <li>threatsInfo5(generateThreats==false)-></li>
     <li>questDescription(asker_royalInCurrentFaction==True,lodgersCount>=2)->[asker_nameFull], a [asker_royalTitleInCurrentFaction] of [asker_faction_name], wants to stay at [map_definite] for [shuttleDelayTicks_duration] with [lodgersCountMinusOne] court [allyAllies]. [allLodgerInfo][threatsInfo6]\n\n[commonDescEnding] [joinerEnding]</li>
     <li>threatsInfo6(generateThreats==true,allowedThreats==Raids,enemyFaction!=Mechanoid)->\n\n[asker_nameDef] and [asker_possessive] [allyAllies] have been targeted for death and need a safe place to stay until they can purge their court. However, [asker_nameDef]'s enemies have hired [enemyFaction_name] to hunt [asker_objective]. They will attack repeatedly until [asker_nameDef] leaves. [enemyGroupsParagraph]</li>
@@ -84,7 +84,7 @@
     <li>questDescription(asker_factionLeader==True,lodgersCount>=2,generateThreats==false)->[asker_faction_name]的[asker_faction_leaderTitle][asker_nameFull]最近从敌人的监狱中救出了[lodgersCount] [asker_faction_pawnsPlural]。[asker_nameDef]希望你能在[map_definite]保护[asker_pronoun][shuttleDelayTicks_duration]，以便派出穿梭机接走他们。[allLodgerInfo]\n\n[commonDescEnding] [joinerEnding]</li>
     <li>questDescription(asker_factionLeader==True,lodgersCount>=2,generateThreats==true,allowedThreats==Raids,enemyFaction!=Mechanoid)->[asker_faction_name]的[asker_faction_leaderTitle][asker_nameFull]最近从敌人的监狱中救出了[lodgersCount] [asker_faction_pawnsPlural]。[asker_nameDef]希望你能在[map_definite]保护[asker_pronoun][shuttleDelayTicks_duration]，以便派出穿梭机接走他们。[allLodgerInfo]\n\n[asker_faction_pawnsPlural]知晓[enemyFaction_name]关于[secretInfo]的机密，因此会对其进行抓捕。[enemyGroupsParagraph]\n\n[commonDescEnding] [joinerEnding]</li>
     <li>questDescription(asker_factionLeader==True,lodgersCount>=2,generateThreats==true,allowedThreats==Raids,enemyFaction==Mechanoid)->[asker_faction_name]的[asker_faction_leaderTitle][asker_nameFull]最近从低温休眠仓中救出了[lodgersCount] [asker_faction_pawnsPlural]。[asker_nameDef]希望你能在[map_definite]保护[asker_pronoun][shuttleDelayTicks_duration]，以便派出穿梭机接走他们。[allLodgerInfo]\n\n[asker_faction_pawnsPlural]会被机械族猎杀。 [enemyGroupsParagraph]\n\n[commonDescEnding] [joinerEnding]</li>
-    <li>questDescription(asker_factionLeader==True,lodgersCount>=2,generateThreats==true,allowedThreats==MechClusters)->[asker_faction_name]的[asker_faction_leaderTitle][asker_nameFull]最近从机械族巢穴的候宰栏中救出了[lodgersCount] [asker_faction_pawnsPlural]。[asker_nameDef]希望你能在[map_definite]保护[asker_pronoun][shuttleDelayTicks_duration]，以便派出穿梭机接走他们。[allLodgerInfo]\n\n机械族正在追捕它们的逃犯。只要你和[asker_faction_pawnsPlural]在一起，机械战斗集群就会定期降落到[map_definite]上。\n\n[commonDescEnding] [joinerEnding]</li>
+    <li>questDescription(asker_factionLeader==True,lodgersCount>=2,generateThreats==true,allowedThreats==MechClusters)->[asker_faction_name]的[asker_faction_leaderTitle][asker_nameFull]最近从机械族巢穴的候宰栏中救出了[lodgersCount] [asker_faction_pawnsPlural]。[asker_nameDef]希望你能在[map_definite]保护[asker_pronoun][shuttleDelayTicks_duration]，以便派出穿梭机接走他们。[allLodgerInfo]\n\n机械族正在追捕它们的逃犯。只要你和[asker_faction_pawnsPlural]在一起，机械战斗集群就会定期降落到[map_definite]附近。\n\n[commonDescEnding] [joinerEnding]</li>
     <li>secretInfo->军事势力</li>
     <li>secretInfo->不道德行为</li>
     <li>secretInfo->武器研究</li>
@@ -93,7 +93,7 @@
     <li>questDescription(asker_royalInCurrentFaction==True,lodgersCount==1)->[asker_faction_name]的[asker_royalTitleInCurrentFaction][asker_nameFull]正在逃避令人不安的政治局势，并想在[map_definite]躲藏[shuttleDelayTicks_duration]。[allLodgerInfo][threatsInfo5]\n\n[commonDescEnding] [joinerEnding]</li>
     <li>threatsInfo5(generateThreats==true,allowedThreats==Raids,enemyFaction!=Mechanoid)->\n\n[asker_nameDef]的敌人雇佣了[enemyFaction_name]来拘捕[asker_objective]。只要[asker_nameDef]还在那里，他们就会不断地进攻。\n [enemyGroupsParagraph]</li>
     <li>threatsInfo5(generateThreats==true,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n[asker_nameDef]的敌人引来机械族猎杀[asker_objective]。只要[asker_nameDef]还在那里，它们就会不断地进攻。 [enemyGroupsParagraph]</li>
-    <li>threatsInfo5(generateThreats==true,allowedThreats==MechClusters)->\n\n[asker_nameDef]的敌人用某种未知的方式引来机械集群猎杀[asker_objective]。只要[asker_nameDef]还在那里，机械战斗集群就会不断地在[asker_nameDef]降落。</li>
+    <li>threatsInfo5(generateThreats==true,allowedThreats==MechClusters)->\n\n[asker_nameDef]的敌人用某种未知的方式引来机械集群猎杀[asker_objective]。只要[asker_nameDef]还在那里，机械战斗集群就会不断地在[map_definite]附近降落。</li>
     <li>threatsInfo5(generateThreats==false)-></li>
     <li>questDescription(asker_royalInCurrentFaction==True,lodgersCount>=2)->[asker_faction_name]的[asker_royalTitleInCurrentFaction]，[asker_nameFull]想在[map_definite]和[lodgersCountMinusOne]名被审判的[allyAllies]停留[shuttleDelayTicks_duration]。 [allLodgerInfo][threatsInfo6]\n\n[commonDescEnding] [joinerEnding]</li>
     <li>threatsInfo6(generateThreats==true,allowedThreats==Raids,enemyFaction!=Mechanoid)->\n\n[asker_nameDef]和[asker_possessive][allyAllies]被列上了暗杀名单，他们需要一个安全的庇护所直到他们可以免于被审判。然而，[asker_nameDef]的敌人雇佣了[enemyFaction_name]来追捕[asker_objective]。他们会不断进攻，直到[asker_nameDef]离开。[enemyGroupsParagraph]</li>
diff --git a/Royalty/DefInjected/QuestScriptDef/Scripts_Decree_Utility.xml b/Royalty/DefInjected/QuestScriptDef/Scripts_Decree_Utility.xml
index 12c8051f..35f70d7d 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/ThingDef/Buildings_Mech_Turrets.xml b/Royalty/DefInjected/ThingDef/Buildings_Mech_Turrets.xml
index 4009d63e..66cadee3 100644
--- a/Royalty/DefInjected/ThingDef/Buildings_Mech_Turrets.xml
+++ b/Royalty/DefInjected/ThingDef/Buildings_Mech_Turrets.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN: auto-mortar -->
@@ -34,9 +34,9 @@
   <!-- EN: mini-slugger -->
   <Gun_MiniTurretMech.verbs.Verb_Shoot.label>小型冲击枪</Gun_MiniTurretMech.verbs.Verb_Shoot.label>
   
-  <!-- EN: auto charge blaster turret -->
+  <!-- EN: auto charge turret -->
   <Turret_AutoChargeBlaster.label>自动电荷冲击炮塔</Turret_AutoChargeBlaster.label>
-  <!-- EN: A self-powered turret mounted with a heavy charge blaster. It cannot sense targets at very short ranges. -->
+  <!-- EN: A self-powered turret mounted with a charge blaster. It cannot sense targets at very short ranges. -->
   <Turret_AutoChargeBlaster.description>一个装配有电荷冲击炮的自供电炮塔。它无法在很近的距离感知目标。</Turret_AutoChargeBlaster.description>
   
   <!-- EN: auto inferno turret -->
diff --git a/Royalty/DefInjected/TipSetDef/Tips.xml b/Royalty/DefInjected/TipSetDef/Tips.xml
index fd5bc049..20493aef 100644
--- a/Royalty/DefInjected/TipSetDef/Tips.xml
+++ b/Royalty/DefInjected/TipSetDef/Tips.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
   <!-- EN: Some royal titles allow the holder to call for military aid. This can save you in a tough moment. -->
@@ -41,5 +41,7 @@
   <RoyaltyTips.tips.18>某些机械群集在受干扰前会保持休眠状态。利用这段时间做好准备。</RoyaltyTips.tips.18>
   <!-- EN: The Imperial royal tribute collector arrives twice per year, and accepts prisoners and gold in exchange for royal favor. -->
   <RoyaltyTips.tips.19>帝国征募官每年将造访两次，你可以用囚犯或金币换取荣誉点数。</RoyaltyTips.tips.19>
+  <!-- EN: You can safely walk right past a dormant mech cluster, as long as you don't attack it or trigger a proximity activator. -->
+  <RoyaltyTips.tips.20>你可以安全地从一个休眠的机械集群里穿过，当然这得在你没有攻击他们或者触发激活器的情况下。</RoyaltyTips.tips.20>
   
 </LanguageData>
\ No newline at end of file
diff --git a/Royalty/Keyed/Dialogs_Various.xml b/Royalty/Keyed/Dialogs_Various.xml
index 8b9fdcb1..6fa26013 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 b6c05c92..ff056fe8 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 -->