From 7becdd90c4ce633e8a0f45050e0b9164c09387ae Mon Sep 17 00:00:00 2001
From: "duduluu@outlook.com" <duduluu@outlook.com>
Date: Thu, 18 May 2017 12:33:19 +0800
Subject: [PATCH] Update to 0.17.1541 rev932 (development build)

---
 DefInjected/IncidentDef/Incidents_Map_Misc.xml      |  4 ++--
 .../IncidentDef/Incidents_World_Conditions.xml      | 13 +++++++++++++
 ...ts_World_Misc.xml => Incidents_World_Quests.xml} | 13 -------------
 Keyed/FloatMenu.xml                                 |  3 +--
 Keyed/Misc_Gameplay.xml                             |  1 +
 5 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100644 DefInjected/IncidentDef/Incidents_World_Conditions.xml
 rename DefInjected/IncidentDef/{Incidents_World_Misc.xml => Incidents_World_Quests.xml} (66%)

diff --git a/DefInjected/IncidentDef/Incidents_Map_Misc.xml b/DefInjected/IncidentDef/Incidents_Map_Misc.xml
index 4de07b01..d09d9a35 100644
--- a/DefInjected/IncidentDef/Incidents_Map_Misc.xml
+++ b/DefInjected/IncidentDef/Incidents_Map_Misc.xml
@@ -40,11 +40,11 @@
   <VolcanicWinter.letterLabel>火山冬天</VolcanicWinter.letterLabel>
 
   <HeatWave.label>热浪</HeatWave.label>
-  <HeatWave.letterText>一场罕见的热浪开始了。小心中暑。</HeatWave.letterText>
+  <HeatWave.letterText>一场罕见的热浪开始了。\n\n在热浪中如果中暑，极易死亡。建造冷却器来降温或呆在清凉的山洞深处。</HeatWave.letterText>
   <HeatWave.letterLabel>热浪</HeatWave.letterLabel>
 
   <ColdSnap.label>寒流</ColdSnap.label>
-  <ColdSnap.letterText>一场罕见的寒流开始了。小心体温过低和作物死亡。</ColdSnap.letterText>
+  <ColdSnap.letterText>一场罕见的寒流开始了。\n\n寒流中，低温病是致命的。确保室内的热量才能生存下去，穿上合适的衣物，并且设法在作物冻死之前进行收获。</ColdSnap.letterText>
   <ColdSnap.letterLabel>寒流</ColdSnap.letterLabel>
 
   <Flashstorm.label>闪电风暴</Flashstorm.label>
diff --git a/DefInjected/IncidentDef/Incidents_World_Conditions.xml b/DefInjected/IncidentDef/Incidents_World_Conditions.xml
new file mode 100644
index 00000000..815f3513
--- /dev/null
+++ b/DefInjected/IncidentDef/Incidents_World_Conditions.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+
+  <Eclipse.label>日蚀</Eclipse.label>
+  <Eclipse.letterText>这个星球的月亮挡在了太阳和星球之间。日蚀已经开始。</Eclipse.letterText>
+  <Eclipse.letterLabel>日蚀</Eclipse.letterLabel>
+
+  <SolarFlare.label>太阳耀斑</SolarFlare.label>
+  <SolarFlare.letterText>一场太阳耀斑开始了。\n\n极强的辐射让所有电气设施无法运转。\n\n它应该会在一天内结束。</SolarFlare.letterText>
+  <SolarFlare.letterLabel>太阳耀斑</SolarFlare.letterLabel>
+
+
+</LanguageData>
\ No newline at end of file
diff --git a/DefInjected/IncidentDef/Incidents_World_Misc.xml b/DefInjected/IncidentDef/Incidents_World_Quests.xml
similarity index 66%
rename from DefInjected/IncidentDef/Incidents_World_Misc.xml
rename to DefInjected/IncidentDef/Incidents_World_Quests.xml
index 5b0eaa28..bc6fbd63 100644
--- a/DefInjected/IncidentDef/Incidents_World_Misc.xml
+++ b/DefInjected/IncidentDef/Incidents_World_Quests.xml
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
-  <!-- World conditions -->
-
-  <Eclipse.label>日蚀</Eclipse.label>
-  <Eclipse.letterText>这个星球的月亮挡在了太阳和星球之间。日蚀已经开始。</Eclipse.letterText>
-  <Eclipse.letterLabel>日蚀</Eclipse.letterLabel>
-
-  <SolarFlare.label>太阳耀斑</SolarFlare.label>
-  <SolarFlare.letterText>一场太阳耀斑开始了。\n\n极强的辐射让所有电气设施无法运转。\n\n它应该会在一天内结束。</SolarFlare.letterText>
-  <SolarFlare.letterLabel>太阳耀斑</SolarFlare.letterLabel>
-
-
-  <!-- Site destination spawners -->
-
   <QuestBanditCamp.label>匪徒营地机会</QuestBanditCamp.label>
   <QuestBanditCamp.letterText>{2}的{1}，{0}，给我们发送了一条消息。\n\n附近一个营地中的匪徒基地袭击了他们的远行队。他们请求我们将其摧毁，这意味着要消灭所有敌人和炮塔。\n\n成功后，关系将会得到提升，并且他们会发送给我们以下报酬：\n\n{3}</QuestBanditCamp.letterText>
   <QuestBanditCamp.letterLabel>匪徒营地机会</QuestBanditCamp.letterLabel>
diff --git a/Keyed/FloatMenu.xml b/Keyed/FloatMenu.xml
index 31a10ee0..80a8a6c5 100644
--- a/Keyed/FloatMenu.xml
+++ b/Keyed/FloatMenu.xml
@@ -29,8 +29,6 @@
   <ForbiddenLower>已禁用</ForbiddenLower>
   <ForbiddenOutsideAllowedAreaLower>位于允许活动区域外</ForbiddenOutsideAllowedAreaLower>
   <NotInHomeArea>位于居住区外</NotInHomeArea>
-  <SociallyImproperLower>不礼貌</SociallyImproperLower>
-  <PrisonerRoomLower>囚犯房间</PrisonerRoomLower>
   <BurningLower>燃烧中</BurningLower>
   <NoEmptyPlaceLower>未配置空余的、可到达的储存点</NoEmptyPlaceLower>
   <AlreadyFilledLower>已装满</AlreadyFilledLower>
@@ -47,6 +45,7 @@
   <TheOnlyAvailableFoodIsInStorageOfHigherPriority>可用的食物位于更高优先级的储存器中</TheOnlyAvailableFoodIsInStorageOfHigherPriority>
   <NoFoodToFillHopper>缺少合适的食物</NoFoodToFillHopper>
   <SelfTendDisabled>自我治疗已禁用</SelfTendDisabled>
+  <ReservedForPrisoners>已预留给囚犯</ReservedForPrisoners>
 
   <ConsumeThing>享用{0}</ConsumeThing>
 
diff --git a/Keyed/Misc_Gameplay.xml b/Keyed/Misc_Gameplay.xml
index 9a9aec72..e914ef1a 100644
--- a/Keyed/Misc_Gameplay.xml
+++ b/Keyed/Misc_Gameplay.xml
@@ -73,6 +73,7 @@
   <CaravanDaysOfFoodRot>给养天数：{0}，{1}天后变质</CaravanDaysOfFoodRot>
   <CaravanMemberMentalBreak>停止原因：{0}精神崩溃。</CaravanMemberMentalBreak>
   <AllCaravanMembersDowned>停止原因：全员无行动能力。</AllCaravanMembersDowned>
+  <AllCaravanMembersMentalBreak>停止原因：全员精神崩溃。</AllCaravanMembersMentalBreak>
   <CaravanTraveling>行进中。</CaravanTraveling>
   <CaravanWaiting>等待中。</CaravanWaiting>
   <CaravanHoursPerTile>小时 / 地图格</CaravanHoursPerTile>