From 5c37605aec4c2b3caeb486000e4c772bd2a9b003 Mon Sep 17 00:00:00 2001
From: SerGawen <ga@huiji.wiki>
Date: Sun, 28 Aug 2016 14:46:32 +0800
Subject: [PATCH] A15 1276~1278
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

集中处理了1276~1278的更新内容
---
 .../Concepts_NotedOpportunistic.xml           |  3 +++
 DefInjected/HeDiffDefs/Hediffs_Drugs.xml      | 23 +++++++++++--------
 DefInjected/NeedDefs/Needs_Drugs.xml          | 14 +++++------
 .../ResearchProjects_Tier2_Misc.xml           |  7 ++++--
 DefInjected/ThingDefs/Drugs.xml               |  8 +++----
 .../ThingDefs/Items_Resource_RawPlant.xml     |  8 +++----
 .../ThingDefs/Plants_Cultivated_Farm.xml      |  8 +++----
 DefInjected/ThoughtDefs/Thoughts_Drugs.xml    | 19 ++++++++-------
 Keyed/Misc_Gameplay.xml                       |  5 +++-
 9 files changed, 55 insertions(+), 40 deletions(-)

diff --git a/DefInjected/ConceptDefs/Concepts_NotedOpportunistic.xml b/DefInjected/ConceptDefs/Concepts_NotedOpportunistic.xml
index c41ee9bf..b34eb45f 100644
--- a/DefInjected/ConceptDefs/Concepts_NotedOpportunistic.xml
+++ b/DefInjected/ConceptDefs/Concepts_NotedOpportunistic.xml
@@ -45,4 +45,7 @@
     <SetGrowingZonePlant.label>配置种植区</SetGrowingZonePlant.label>
     <SetGrowingZonePlant.helpText>你可以决定在种植区里种植的作物，还可以种树！\n\n选择一个种植区，再点击“种植”按钮，然后选择一种植物。</SetGrowingZonePlant.helpText>
 
+    <DrugBurning.label>销毁毒品</DrugBurning.label>
+    <DrugBurning.helpText>为了防范于未然，你可以销毁库存中的毒品。</DrugBurning.helpText>
+
 </LanguageData>
\ No newline at end of file
diff --git a/DefInjected/HeDiffDefs/Hediffs_Drugs.xml b/DefInjected/HeDiffDefs/Hediffs_Drugs.xml
index 4a6c1676..bd36aa45 100644
--- a/DefInjected/HeDiffDefs/Hediffs_Drugs.xml
+++ b/DefInjected/HeDiffDefs/Hediffs_Drugs.xml
@@ -23,17 +23,17 @@
   <AlcoholAddiction.label>酒精成瘾</AlcoholAddiction.label>
   <AlcoholAddiction.stages.1.label>戒断</AlcoholAddiction.stages.1.label>
 
-  <AmphetamineHigh.label>安非他命亢奋</AmphetamineHigh.label>
-  <AmphetamineTolerance.label>安非他命耐受</AmphetamineTolerance.label>
-  <AmphetamineAddiction.label>安非他命成瘾</AmphetamineAddiction.label>
-  <AmphetamineAddiction.stages.0.label>隐藏</AmphetamineAddiction.stages.0.label>
-  <AmphetamineAddiction.stages.1.label>戒断</AmphetamineAddiction.stages.1.label>
+  <WakeUpHigh.label>清醒剂亢奋</WakeUpHigh.label>
+  <WakeUpTolerance.label>清醒剂耐受</WakeUpTolerance.label>
+  <WakeUpAddiction.label>清醒剂成瘾</WakeUpAddiction.label>
+  <WakeUpAddiction.stages.0.label>隐藏</WakeUpAddiction.stages.0.label>
+  <WakeUpAddiction.stages.1.label>戒断</WakeUpAddiction.stages.1.label>
 
-  <CannabisHigh.label>大麻沉醉</CannabisHigh.label>
-  <CannabisAddiction.label>大麻成瘾</CannabisAddiction.label>
-  <CannabisAddiction.stages.0.label>隐藏</CannabisAddiction.stages.0.label>
-  <FlakeHigh.label>薄片亢奋</FlakeHigh.label>
-  <YayoHigh.label>椰油亢奋</YayoHigh.label>
+  <SmokeleafHigh.label>烟叶沉醉</SmokeleafHigh.label>
+  <SmokeleafAddiction.label>烟叶成瘾</SmokeleafAddiction.label>
+  <SmokeleafAddiction.stages.0.label>隐藏</SmokeleafAddiction.stages.0.label>
+  <FlakeHigh.label>精神药物亢奋（薄片）</FlakeHigh.label>
+  <YayoHigh.label>精神药物亢奋（亢奋）</YayoHigh.label>
 
   <CocaineAddiction.label>可卡因成瘾</CocaineAddiction.label>
   <CocaineAddiction.stages.0.label>隐藏</CocaineAddiction.stages.0.label>
@@ -44,6 +44,9 @@
   <GoJuiceAddiction.stages.0.label>未满足</GoJuiceAddiction.stages.0.label>
   <GoJuiceAddiction.stages.1.label>戒断</GoJuiceAddiction.stages.1.label>
 
+  <LuciferiumAddiction.label>恶魔剂成瘾</LuciferiumAddiction.label>
+  <LuciferiumAddiction.stages.0.label>未满足</LuciferiumAddiction.stages.0.label>
+
   <MalariBlockHigh.label>疟疾疫苗</MalariBlockHigh.label>
 
 </LanguageData>
diff --git a/DefInjected/NeedDefs/Needs_Drugs.xml b/DefInjected/NeedDefs/Needs_Drugs.xml
index 3b267efe..bdb92834 100644
--- a/DefInjected/NeedDefs/Needs_Drugs.xml
+++ b/DefInjected/NeedDefs/Needs_Drugs.xml
@@ -4,20 +4,20 @@
   <Chemical_Alcohol.label>酒精</Chemical_Alcohol.label>
   <Chemical_Alcohol.description>由于酒精成瘾，此人需要持续服药以缓解戒断反应。</Chemical_Alcohol.description>
 
-  <Chemical_Amphetamine.label>安非他命</Chemical_Amphetamine.label>
-  <Chemical_Amphetamine.description>由于安非他命成瘾，此人需要持续服药以缓解戒断反应。</Chemical_Amphetamine.description>
+  <Chemical_WakeUp.label>清醒剂</Chemical_WakeUp.label>
+  <Chemical_WakeUp.description>由于清醒剂成瘾，此人需要持续服药以缓解戒断反应。</Chemical_WakeUp.description>
 
-  <Chemical_Cannabis.label>大麻</Chemical_Cannabis.label>
-  <Chemical_Cannabis.description>由于大麻成瘾，此人需要持续服药以缓解戒断反应。</Chemical_Cannabis.description>
+  <Chemical_Smokeleaf.label>烟叶</Chemical_Smokeleaf.label>
+  <Chemical_Smokeleaf.description>由于烟叶成瘾，此人需要持续服药以缓解戒断反应。</Chemical_Smokeleaf.description>
 
-  <Chemical_Cocaine.label>可卡因</Chemical_Cocaine.label>
-  <Chemical_Cocaine.description>由于可卡因成瘾，此人需要持续服药以缓解戒断反应。</Chemical_Cocaine.description>
+  <Chemical_Psychite.label>精神药物</Chemical_Psychite.label>
+  <Chemical_Psychite.description>由于精神药物成瘾，此人需要持续服药以缓解戒断反应。</Chemical_Psychite.description>
 
   <Chemical_GoJuice.label>果味剂</Chemical_GoJuice.label>
   <Chemical_GoJuice.description>由于果味剂成瘾，此人需要持续服药以缓解戒断反应。</Chemical_GoJuice.description>
 
   <Chemical_Luciferium.label>恶魔素</Chemical_Luciferium.label>
-  <Chemical_Luciferium.description>由于恶魔素成瘾，此人需要持续服用恶魔素\n\n如果没有及时服用，会导致大脑受损发狂甚至死亡\n\n恶魔素的依赖效果不会消失。</Chemical_Luciferium.description>    
+  <Chemical_Luciferium.description>由于恶魔素成瘾，此人需要持续服用恶魔素\n\n如果没有及时服用，会导致大脑受损发狂最终死亡\n\n恶魔素的依赖效果不会消失。</Chemical_Luciferium.description>    
   
 
 </LanguageData>
diff --git a/DefInjected/ResearchProjectDefs/ResearchProjects_Tier2_Misc.xml b/DefInjected/ResearchProjectDefs/ResearchProjects_Tier2_Misc.xml
index 4f4c800d..e61e2d5b 100644
--- a/DefInjected/ResearchProjectDefs/ResearchProjects_Tier2_Misc.xml
+++ b/DefInjected/ResearchProjectDefs/ResearchProjects_Tier2_Misc.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
-  <CocaRefining.label>古柯提炼</CocaRefining.label>
-  <CocaRefining.description>允许居民对古柯叶进行精炼，制作薄片和椰油。</CocaRefining.description>
+  <PsychiteRefining.label>精神药物提炼</PsychiteRefining.label>
+  <PsychiteRefining.description>允许居民对古柯叶进行精炼，制作薄片和椰油。</PsychiteRefining.description>
+
+  <WakeUpProduction.label>制造清醒剂</WakeUpProduction.label>
+  <WakeUpProduction.description>允许玩家生产清醒剂，清醒剂可以延长居民的工作时间，使其忘却疲劳，但是带有一些副作用。</WakeUpProduction.description>
 
   <Batteries.label>蓄电池</Batteries.label>
   <Batteries.description>建造蓄电池来存储电力。</Batteries.description>
diff --git a/DefInjected/ThingDefs/Drugs.xml b/DefInjected/ThingDefs/Drugs.xml
index 6240b9b9..7277b9c5 100644
--- a/DefInjected/ThingDefs/Drugs.xml
+++ b/DefInjected/ThingDefs/Drugs.xml
@@ -29,11 +29,11 @@
     <Wort.label>麦芽汁</Wort.label>
     <Wort.description>各种材料混合在一起，还未发酵的啤酒，需要放在发酵桶里酿造后才能变成真正的啤酒。</Wort.description>
 
-    <Amphetamine.label>安非他命</Amphetamine.label>
-    <Amphetamine.description>一种成瘾性极强的兴奋剂，安非他命能够强化使用者的认知能力，使得服用者在短时期内工作时更加集中，忘记疲劳。但是药物成瘾后会使得精神受损，有时还会导致精神崩溃。</Amphetamine.description>
+    <WakeUp.label>清醒剂</WakeUp.label>
+    <WakeUp.description>一种成瘾性极强的兴奋剂，清醒剂能够强化使用者的认知能力，使得服用者在短时期内工作时更加集中，忘记疲劳。但是药物成瘾后会使得精神受损，有时还会导致精神崩溃。</WakeUp.description>
 
-    <Joint.label>大麻烟</Joint.label>
-    <Joint.description>将大麻烟叶卷在纸中点燃来抽，这种烟卷会让人兴奋，但是也会成瘾，减缓使用者的注意力和行动速度，长期使用会产生药物依赖。</Joint.description>
+    <SmokeleafJoint.label>大麻烟</SmokeleafJoint.label>
+    <SmokeleafJoint.description>将大麻烟叶卷在纸中点燃来抽，这种烟卷会让人兴奋，但是也会成瘾，减缓使用者的注意力和行动速度，长期使用会产生药物依赖。</SmokeleafJoint.description>
 
     <Flake.label>薄片</Flake.label>
     <Flake.description>一种薄薄的原料，抽起来会让人精神愉悦，这种东西非常便于制造，有着极强的药物依赖性。</Flake.description>
diff --git a/DefInjected/ThingDefs/Items_Resource_RawPlant.xml b/DefInjected/ThingDefs/Items_Resource_RawPlant.xml
index 73715094..d3c57fb1 100644
--- a/DefInjected/ThingDefs/Items_Resource_RawPlant.xml
+++ b/DefInjected/ThingDefs/Items_Resource_RawPlant.xml
@@ -24,10 +24,10 @@
 
 <!--=============== A15 change ====================-->
 
-  <CocaLeaves.label>古柯叶</CocaLeaves.label>
-  <CocaLeaves.description>新鲜的古柯叶子。</CocaLeaves.description>
+  <PsychoidLeaves.label>精神药用作物叶片</PsychoidLeaves.label>
+  <PsychoidLeaves.description>从精神药用作物上收获的新鲜叶子。</PsychoidLeaves.description>
 
-  <MarijuanaLeaves.label>大麻叶</MarijuanaLeaves.label>
-  <MarijuanaLeaves.description>新鲜的大麻叶</MarijuanaLeaves.description>
+  <SmokeleafLeaves.label>烟叶</SmokeleafLeaves.label>
+  <SmokeleafLeaves.description>新鲜的烟叶作物，用来制作卷烟</SmokeleafLeaves.description>
 
 </LanguageData>
diff --git a/DefInjected/ThingDefs/Plants_Cultivated_Farm.xml b/DefInjected/ThingDefs/Plants_Cultivated_Farm.xml
index c3ed0643..9b0c9683 100644
--- a/DefInjected/ThingDefs/Plants_Cultivated_Farm.xml
+++ b/DefInjected/ThingDefs/Plants_Cultivated_Farm.xml
@@ -30,9 +30,9 @@
   <PlantHops.description>又名蛇麻草，一种开花植物，产出啤酒花，啤酒原料的必需品。</PlantHops.description>
 
 
-   <PlantCoca.label>古柯</PlantCoca.label>
-   <PlantCoca.description>南美洲的植物，叶子可以被制成古柯碱，也就是可卡因。</PlantCoca.description>
+   <PlantPsychoid.label>精神药用作物</PlantPsychoid.label>
+   <PlantPsychoid.description>南美洲的植物，叶子可以被制成精神药物。</PlantPsychoid.description>
 
-   <PlantMarijuana.label>大麻</PlantMarijuana.label>
-   <PlantMarijuana.description>一种多叶植物，可以被制成大麻烟。</PlantMarijuana.description>
+   <PlantSmokeleaf.label>烟叶</PlantSmokeleaf.label>
+   <PlantSmokeleaf.description>一种多叶植物，可以被制成烟卷。</PlantSmokeleaf.description>
 </LanguageData>
diff --git a/DefInjected/ThoughtDefs/Thoughts_Drugs.xml b/DefInjected/ThoughtDefs/Thoughts_Drugs.xml
index 4e3b0a34..993a9818 100644
--- a/DefInjected/ThoughtDefs/Thoughts_Drugs.xml
+++ b/DefInjected/ThoughtDefs/Thoughts_Drugs.xml
@@ -29,23 +29,26 @@
  <!-- <AmphetamineWithdrawal.stages.1.label>安非他命戒断</AmphetamineWithdrawal.stages.1.label>
   <AmphetamineWithdrawal.stages.1.description>我感到头晕眼花，注意力无法集中。</AmphetamineWithdrawal.stages.1.description>
 -->
-  <CannabisHigh.label>大麻沉醉</CannabisHigh.label>
-  <CannabisHigh.description>我感觉……我没有任何感觉了伙计。</CannabisHigh.description>
-  <CannabisWithdrawal.stages.1.label>大麻戒断</CannabisWithdrawal.stages.1.label>
-  <CannabisWithdrawal.stages.1.description>好难受，无法集中注意力...</CannabisWithdrawal.stages.1.description>
+  <SmokeleaHigh.label>烟叶沉醉</SmokeleaHigh.label>
+  <SmokeleaHigh.description>我感觉……我没有任何感觉了伙计。</SmokeleaHigh.description>
+  <SmokeleaWithdrawal.stages.1.label>大麻戒断</SmokeleaWithdrawal.stages.1.label>
+  <SmokeleaWithdrawal.stages.1.description>好难受，无法集中注意力...</SmokeleaWithdrawal.stages.1.description>
 
-  <FlakeHigh.label>薄片亢奋</FlakeHigh.label>
+  <FlakeHigh.label>精神药物亢奋（薄片）</FlakeHigh.label>
   <FlakeHigh.description>太棒了，太棒了。</FlakeHigh.description>
 
-  <YayoHigh.label>椰油亢奋</YayoHigh.label>
+  <YayoHigh.label>精神药物亢奋（椰油）</YayoHigh.label>
   <YayoHigh.description>感觉棒极了！让我们开始吧！</YayoHigh.description>
 
-  <CocaineWithdrawal.stages.1.label>可卡因戒断</CocaineWithdrawal.stages.1.label>
-  <CocaineWithdrawal.stages.1.description>神啊我好累，我什么都感觉不到了。</CocaineWithdrawal.stages.1.description>
+  <PsychiteWithdrawal.stages.1.label>精神药物戒断</PsychiteWithdrawal.stages.1.label>
+  <PsychiteWithdrawal.stages.1.description>神啊我好累，我什么都感觉不到了。</PsychiteWithdrawal.stages.1.description>
 
   <GoJuiceHigh.label>果味剂亢奋</GoJuiceHigh.label>
   <GoJuiceHigh.description>感觉棒极了，但是非常冷静，我是战场中致命的子弹，随时准备取你性命。</GoJuiceHigh.description>
   <GoJuiceWithdrawal.stages.1.label>果味剂戒断</GoJuiceWithdrawal.stages.1.label>
   <GoJuiceWithdrawal.stages.1.description>简直昏头了，无法正常思考，我的腿变得好沉重。为什么我的眼睛什么也看不清？</GoJuiceWithdrawal.stages.1.description>
 
+  <WakeUpWithdrawal.stages.1.label>清醒剂戒断</WakeUpWithdrawal.stages.1.label>
+  <WakeUpWithdrawal.stages.1.description>头昏脑胀，一点都不开心。</WakeUpWithdrawal.stages.1.description>
+
 </LanguageData>
diff --git a/Keyed/Misc_Gameplay.xml b/Keyed/Misc_Gameplay.xml
index 9776a48c..4251428c 100644
--- a/Keyed/Misc_Gameplay.xml
+++ b/Keyed/Misc_Gameplay.xml
@@ -59,7 +59,10 @@
   <CurrentRadius>当前范围</CurrentRadius>
   <RadiusExpandsIn>范围扩展于</RadiusExpandsIn>
   <Permanent>永久</Permanent>
-
+  <Temperature>温度</Temperature>
+  <BadTemperature>不适宜的温度</BadTemperature>
+  <IdealFermentingTemperature>理想的温度</IdealFermentingTemperature>
+  <DrugEffectMultiplier>效果系数：{0}</DrugEffectMultiplier>
 
  <!-- Fermentation barrel -->
  <ContainsWort>包含{0} / {1}麦芽汁</ContainsWort>