From fe9448f9cbf38549f0b865291bf29899b98d4746 Mon Sep 17 00:00:00 2001
From: Cocopomel <79386233+Cocopomel@users.noreply.github.com>
Date: Tue, 27 Jul 2021 01:42:40 +0900
Subject: [PATCH] 1.2 last

---
 1.2/Defs/BackStoryDefs/BackStoryDefs.xml  |  4 ++--
 1.2/Defs/BodyAndPartDefs/Body.xml         |  6 +++---
 1.2/Defs/BodyAndPartDefs/Bodyparts.xml    |  8 ++++----
 1.2/Defs/HediffDefs/Hediffs_Automaton.xml |  1 +
 1.2/Defs/ThingDef/ThingDef_Misc.xml       |  8 ++++----
 1.2/Defs/ThingDef/ThingDef_PanielRace.xml | 11 ++++++++---
 1.2/Patches/Vanilla.xml                   | 14 ++++++++++++--
 7 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/1.2/Defs/BackStoryDefs/BackStoryDefs.xml b/1.2/Defs/BackStoryDefs/BackStoryDefs.xml
index 4941004..9d15dfa 100644
--- a/1.2/Defs/BackStoryDefs/BackStoryDefs.xml
+++ b/1.2/Defs/BackStoryDefs/BackStoryDefs.xml
@@ -4,11 +4,11 @@
   <AlienRace.BackstoryDef Abstract="True" Name="BasePanielBackStory">
     <bodyTypeMale>Female</bodyTypeMale>
     <bodyTypeFemale>Female</bodyTypeFemale>
-    <!--<forcedHediffs>
+    <forcedHediffs>
 			<li>PanielBaseHediff</li>
 			<li>PN_AutomatonFuel_Addiction</li>
 			<li>PN_Maintenance</li>
-		</forcedHediffs>-->
+		</forcedHediffs>
     <spawnCategories>
       <li>PN_storys</li>
     </spawnCategories>
diff --git a/1.2/Defs/BodyAndPartDefs/Body.xml b/1.2/Defs/BodyAndPartDefs/Body.xml
index f9f499f..0f87c9d 100644
--- a/1.2/Defs/BodyAndPartDefs/Body.xml
+++ b/1.2/Defs/BodyAndPartDefs/Body.xml
@@ -71,7 +71,7 @@
         </li>
         <li>
           <def>PNCore</def>
-          <customLabel>automaton core</customLabel>
+          <customLabel>engine core</customLabel>
           <coverage>0.020</coverage>
           <depth>Inside</depth>
           <groups>
@@ -134,7 +134,7 @@
           </groups>
           <parts>
             <li>
-              <def>Head</def>
+              <def>PNHead</def>
               <customLabel>head case</customLabel>
               <coverage>0.80</coverage>
               <groups>
@@ -155,7 +155,7 @@
                   <parts>
                     <li>
                       <def>PNBrain</def>
-                      <customLabel>automaton brain</customLabel>
+                      <customLabel>brain core</customLabel>
                       <coverage>0.8</coverage>
                       <groups>
                         <li>UpperHead</li>
diff --git a/1.2/Defs/BodyAndPartDefs/Bodyparts.xml b/1.2/Defs/BodyAndPartDefs/Bodyparts.xml
index 0a17818..818e95b 100644
--- a/1.2/Defs/BodyAndPartDefs/Bodyparts.xml
+++ b/1.2/Defs/BodyAndPartDefs/Bodyparts.xml
@@ -90,7 +90,7 @@
 
   <BodyPartDef>
     <defName>PNCore</defName>
-    <label>automaton core</label>
+    <label>engine core</label>
     <hitPoints>15</hitPoints>
     <bleedRate>5</bleedRate>
     <skinCovered>false</skinCovered>
@@ -152,14 +152,14 @@
     <canSuggestAmputation>false</canSuggestAmputation>
   </BodyPartDef>
 
-  <!--<BodyPartDef>
+  <BodyPartDef>
         <defName>PNHead</defName>
         <label>head case</label>
         <hitPoints>25</hitPoints>
         <skinCovered>true</skinCovered>
         <canSuggestAmputation>false</canSuggestAmputation>
         <bleedRate>2</bleedRate>
-    </BodyPartDef>-->
+    </BodyPartDef>
 
   <BodyPartDef>
     <defName>PNSkull</defName>
@@ -175,7 +175,7 @@
 
   <BodyPartDef>
     <defName>PNBrain</defName>
-    <label>automaton brain</label>
+    <label>brain core</label>
     <hitPoints>10</hitPoints>
     <permanentInjuryChanceFactor>9999999</permanentInjuryChanceFactor>
     <delicate>true</delicate>
diff --git a/1.2/Defs/HediffDefs/Hediffs_Automaton.xml b/1.2/Defs/HediffDefs/Hediffs_Automaton.xml
index 00fd213..b6019f3 100644
--- a/1.2/Defs/HediffDefs/Hediffs_Automaton.xml
+++ b/1.2/Defs/HediffDefs/Hediffs_Automaton.xml
@@ -183,6 +183,7 @@
           <li>Scaria</li>
           <li>FoodPoisoning</li>
           <li>ResurrectionSickness</li>
+          <li>PsychiteAddiction</li>
         </hediffToNullify>
         <showMessage>true</showMessage>
         <nullifyKey>PN_HediffNullifier</nullifyKey>
diff --git a/1.2/Defs/ThingDef/ThingDef_Misc.xml b/1.2/Defs/ThingDef/ThingDef_Misc.xml
index 357e03c..8d08771 100644
--- a/1.2/Defs/ThingDef/ThingDef_Misc.xml
+++ b/1.2/Defs/ThingDef/ThingDef_Misc.xml
@@ -34,14 +34,14 @@
       <li Class="CompProperties_Explosive">
         <compClass>AutomataRace.CompExplosiveInstant</compClass>
         <explosiveRadius>1.5</explosiveRadius>
-        <explosiveDamageType>PN_CorpseBomb</explosiveDamageType>
-        <requiredDamageTypeToExplode>PN_CorpseBomb</requiredDamageTypeToExplode>
+        <explosiveDamageType>Bomb</explosiveDamageType>
+        <requiredDamageTypeToExplode>Bomb</requiredDamageTypeToExplode>
         <wickTicks>200~750</wickTicks>
       </li>
     </comps>
   </AutomataRace.ThingDefInjectDef>
 
-  <DamageDef>
+  <!--<DamageDef>
     <defName>PN_CorpseBomb</defName>
     <label>bomb</label>
     <workerClass>DamageWorker_AddInjury</workerClass>
@@ -66,7 +66,7 @@
     <explosionColorEdge>(0.6, 0.5, 0.4)</explosionColorEdge>
     <soundExplosion>Explosion_Bomb</soundExplosion>
     <combatLogRules>Damage_Bomb</combatLogRules>
-  </DamageDef>
+  </DamageDef>-->
 
   <!--==================================== 고어 설정 ====================================-->
   <ThingDef ParentName="BaseFilth">
diff --git a/1.2/Defs/ThingDef/ThingDef_PanielRace.xml b/1.2/Defs/ThingDef/ThingDef_PanielRace.xml
index 530385b..11d1074 100644
--- a/1.2/Defs/ThingDef/ThingDef_PanielRace.xml
+++ b/1.2/Defs/ThingDef/ThingDef_PanielRace.xml
@@ -161,6 +161,7 @@
           <useGenderedHeads>false</useGenderedHeads>
           <customDrawSize>(1, 1)</customDrawSize>
           <customPortraitDrawSize>(1, 1)</customPortraitDrawSize>
+          <headBodyPartDef>PNHead</headBodyPartDef>
           <!--색상관련-->
           <colorChannels>
             <li>
@@ -335,7 +336,7 @@
             <li Class="MoharCustomHAR.MoharBodyAddon">
               <drawSize>1</drawSize>
               <path>Paniel/Face/Face</path>
-              <bodyPart>Head</bodyPart>
+              <bodyPart>head case</bodyPart>
               <shaderType>CutoutComplex</shaderType>
               <inFrontOfBody>false</inFrontOfBody>
               <layerInvert>false</layerInvert>
@@ -476,7 +477,6 @@
           <li>ReleasedHealthyPrisoner</li>
           <li>KnowGuestOrganHarvested</li>
           <li>MyOrganHarvested</li>
-          <li>Nuzzled</li>
           <li>SoakingWet</li>
           <li>ButcheredHumanlikeCorpse</li>
           <li>KnowButcheredHumanlikeCorpse</li>
@@ -792,7 +792,12 @@
         </li>
       </startingColonists>
       <alienslavekinds>
-
+        <li>
+          <kindDefs>
+            <li>Paniel_ColonistPawn</li>
+          </kindDefs>
+          <chance>100.0</chance>
+        </li>
       </alienslavekinds>
       <alienrefugeekinds>
 
diff --git a/1.2/Patches/Vanilla.xml b/1.2/Patches/Vanilla.xml
index e045b80..1fa3fb1 100644
--- a/1.2/Patches/Vanilla.xml
+++ b/1.2/Patches/Vanilla.xml
@@ -7,9 +7,19 @@
     </value>
   </Operation>
   <!--<Operation Class="PatchOperationAdd">
-    <xpath>*[defName = "Corpse_Paniel_Race"]</xpath>
+    <xpath>*/WorkGiverDef[defName="ChatWithPrisoner"]</xpath>
     <value>
-      <alwaysHaulable>false</alwaysHaulable>
+      <workTags>
+        <li>PN_noPrisoner</li>
+      </workTags>
+    </value>
+  </Operation>
+  <Operation Class="PatchOperationAdd">
+    <xpath>*/WorkGiverDef[defName="Research"]</xpath>
+    <value>
+      <workTags>
+        <li>PN_noResearch</li>
+      </workTags>
     </value>
   </Operation>-->
 </Patch>
\ No newline at end of file