From 9d4f3c7075d18aebfab35008493e90e8e46b4bef Mon Sep 17 00:00:00 2001
From: Cocopomel <79386233+Cocopomel@users.noreply.github.com>
Date: Thu, 16 Sep 2021 20:30:34 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9A=94=EC=A7=81=20=EC=BB=A8=ED=85=90?=
 =?UTF-8?q?=EC=B8=A0=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AutomataRaceSettings/AutomataGoreDef.xml  | 42 ------------
 1.3/Defs/RecipeDefs/Recipes_Surgery.xml       | 35 ----------
 1.3/Defs/ReserchDefs/Reserch_ProjectDefs.xml  | 37 -----------
 1.3/Defs/ThingDef/ThingDef_Item.xml           | 64 +------------------
 .../TraderKindDefs/TraderKinds_CaravanPnL.xml |  2 +-
 .../TraderKindDefs/TraderKinds_OrbitalPnL.xml |  4 +-
 LoadFolders.xml                               |  1 +
 SoPnL/Defs/SoPnL_Recipes_Surgery.xml          | 52 +++++++++++++++
 SoPnL/Defs/SoPnL_Reserch_ProjectDefs.xml      | 36 +++++++++++
 SoPnL/Defs/SoPnL_ThingDef_Item.xml            | 50 +++++++++++++++
 10 files changed, 143 insertions(+), 180 deletions(-)
 create mode 100644 SoPnL/Defs/SoPnL_Recipes_Surgery.xml
 create mode 100644 SoPnL/Defs/SoPnL_Reserch_ProjectDefs.xml
 create mode 100644 SoPnL/Defs/SoPnL_ThingDef_Item.xml

diff --git a/1.3/Defs/AutomataRaceSettings/AutomataGoreDef.xml b/1.3/Defs/AutomataRaceSettings/AutomataGoreDef.xml
index 9c73618..16f2f29 100644
--- a/1.3/Defs/AutomataRaceSettings/AutomataGoreDef.xml
+++ b/1.3/Defs/AutomataRaceSettings/AutomataGoreDef.xml
@@ -1,20 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-  <!--=================================== 레시피 설정 ===================================-->
-  <AutomataRace.ThingDefInjectDef>
-    <defName>Recipe_PN_RemoveBrain_Inject</defName>
-    <conditions>
-      <li Class="AutomataRace.ThingDefInject.IsHumanlike"></li>
-      <li Class="AutomataRace.ThingDefInject.IsFlesh"></li>
-      <li Class="AutomataRace.ThingDefInject.IsDefNameEqual">
-        <not>true</not>
-        <defName>Paniel_Race</defName>
-      </li>
-    </conditions>
-    <recipes>
-      <li>PN_ExtractBrain</li>
-    </recipes>
-  </AutomataRace.ThingDefInjectDef>
 
   <!--==================================== 시체 설정 ====================================-->
   <AutomataRace.ThingDefInjectDef>
@@ -43,33 +28,6 @@
     </comps>
   </AutomataRace.ThingDefInjectDef>
 
-  <!--<DamageDef>
-    <defName>PN_CorpseBomb</defName>
-    <label>bomb</label>
-    <workerClass>DamageWorker_AddInjury</workerClass>
-    <externalViolence>true</externalViolence>
-    <isExplosive>true</isExplosive>
-    <deathMessage>{0} has died in an explosion.</deathMessage>
-    <hediff>Shredded</hediff>
-    <hediffSolid>Crack</hediffSolid>
-    <harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
-    <impactSoundType>Blunt</impactSoundType>
-    <armorCategory>Sharp</armorCategory>
-    <minDamageToFragment>15</minDamageToFragment>
-    <defaultDamage>10</defaultDamage>
-    <defaultStoppingPower>0.5</defaultStoppingPower>
-    <defaultArmorPenetration>0.0</defaultArmorPenetration>
-    <buildingDamageFactor>1</buildingDamageFactor>
-    <plantDamageFactor>1</plantDamageFactor>
-    <explosionAffectOutsidePartsOnly>false</explosionAffectOutsidePartsOnly>
-    <explosionHeatEnergyPerCell>5</explosionHeatEnergyPerCell>
-    <explosionCellMote>Mote_BlastDry</explosionCellMote>
-    <explosionColorCenter>(1, 0.5, 0.3)</explosionColorCenter>
-    <explosionColorEdge>(0.6, 0.5, 0.4)</explosionColorEdge>
-    <soundExplosion>Explosion_Bomb</soundExplosion>
-    <combatLogRules>Damage_Bomb</combatLogRules>
-  </DamageDef>-->
-
   <!--==================================== 고어 설정 ====================================-->
   <ThingDef ParentName="BaseFilth">
     <defName>Paniel_Oil</defName>
diff --git a/1.3/Defs/RecipeDefs/Recipes_Surgery.xml b/1.3/Defs/RecipeDefs/Recipes_Surgery.xml
index 1ad2b97..f272a31 100644
--- a/1.3/Defs/RecipeDefs/Recipes_Surgery.xml
+++ b/1.3/Defs/RecipeDefs/Recipes_Surgery.xml
@@ -85,39 +85,4 @@
     <targetsBodyPart>false</targetsBodyPart>
     <surgerySuccessChanceFactor>1.0</surgerySuccessChanceFactor>
   </RecipeDef>
-
-  <RecipeDef ParentName="SurgeryFlesh">
-    <defName>PN_ExtractBrain</defName>
-    <label>extract central nervous</label>
-    <description>extract central nervous.</description>
-    <workerClass>AutomataRace.Recipe_RemoveBrain</workerClass>
-    <jobString>Remove central nervous.</jobString>
-    <workAmount>2000</workAmount>
-    <surgerySuccessChanceFactor>1.0</surgerySuccessChanceFactor>
-    <researchPrerequisite>PNRP_Brain</researchPrerequisite>
-    <uiIconThing>PN_Brain</uiIconThing>
-    <ingredients>
-      <li>
-        <filter>
-          <categories>
-            <li>Medicine</li>
-          </categories>
-        </filter>
-        <count>1</count>
-      </li>
-      <li>
-        <filter>
-          <thingDefs>
-            <li>PN_BrainEmpty</li>
-          </thingDefs>
-        </filter>
-        <count>1</count>
-      </li>
-    </ingredients>
-    <fixedIngredientFilter>
-      <categories>
-        <li>Medicine</li>
-      </categories>
-    </fixedIngredientFilter>
-  </RecipeDef>
 </Defs>
\ No newline at end of file
diff --git a/1.3/Defs/ReserchDefs/Reserch_ProjectDefs.xml b/1.3/Defs/ReserchDefs/Reserch_ProjectDefs.xml
index 53add90..62d38d9 100644
--- a/1.3/Defs/ReserchDefs/Reserch_ProjectDefs.xml
+++ b/1.3/Defs/ReserchDefs/Reserch_ProjectDefs.xml
@@ -30,40 +30,6 @@
     </tags>
   </ResearchProjectDef>
 
-  <ResearchProjectDef>
-    <defName>PNRP_Brain</defName>
-    <label>core analysis</label>
-    <description>...</description>
-    <tab>PN_technology</tab>
-    <baseCost>2500</baseCost>
-    <techLevel>Industrial</techLevel>
-    <prerequisites>
-      <li>PNRP_Production</li>
-      <li>Prosthetics</li>
-      <li>MicroelectronicsBasics</li>
-    </prerequisites>
-    <researchViewX>3.0</researchViewX>
-    <researchViewY>0</researchViewY>
-    <tags>
-      <li>PanielStart</li>
-    </tags>
-  </ResearchProjectDef>
-
-  <ResearchProjectDef>
-    <defName>PNRP_BrainCasing</defName>
-    <label>core casing</label>
-    <description>...</description>
-    <tab>PN_technology</tab>
-    <baseCost>500</baseCost>
-    <techLevel>Spacer</techLevel>
-    <prerequisites>
-      <li>PNRP_Brain</li>
-      <li>Bionics</li>
-    </prerequisites>
-    <researchViewX>5.0</researchViewX>
-    <researchViewY>0</researchViewY>
-  </ResearchProjectDef>
-
   <!--==================================== 수리 키트 ====================================-->
 
   <ResearchProjectDef>
@@ -201,9 +167,6 @@
       <li>PNRP_Cannon</li>
       <li>HeavyTurrets</li>
     </prerequisites>
-    <hiddenPrerequisites>
-      <li>PNRP_BrainCasing</li>
-    </hiddenPrerequisites>
     <researchViewX>5.0</researchViewX>
     <researchViewY>4.2</researchViewY>
   </ResearchProjectDef>
diff --git a/1.3/Defs/ThingDef/ThingDef_Item.xml b/1.3/Defs/ThingDef/ThingDef_Item.xml
index 6c6113c..98f17c0 100644
--- a/1.3/Defs/ThingDef/ThingDef_Item.xml
+++ b/1.3/Defs/ThingDef/ThingDef_Item.xml
@@ -56,54 +56,6 @@
     <iconPath>Things/Item/PNBrainCore</iconPath>
   </ThingCategoryDef>
 
-  <ThingDef ParentName="BodyPartBase">
-    <defName>PN_BrainEmpty</defName>
-    <label>Empty case</label>
-    <description>...</description>
-    <graphicData Inherit="false">
-      <texPath>Things/Item/PNCentralnervous_empty</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-      <drawSize>1</drawSize>
-    </graphicData>
-    <isTechHediff>false</isTechHediff>
-    <thingCategories Inherit="false">
-      <li>PN_AutomatonCatagory</li>
-    </thingCategories>
-    <statBases>
-      <Mass>1</Mass>
-      <WorkToMake>700</WorkToMake>
-      <Flammability>0.7</Flammability>
-    </statBases>
-    <stackLimit>10</stackLimit>
-    <uiIconForStackCount>1</uiIconForStackCount>
-    <drawGUIOverlay>true</drawGUIOverlay>
-    <costList>
-      <ComponentIndustrial>1</ComponentIndustrial>
-      <Steel>5</Steel>
-      <PN_AutomatonFuel>1</PN_AutomatonFuel>
-    </costList>
-    <tradeTags Inherit="false">
-
-    </tradeTags>
-    <recipeMaker>
-      <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-      <workSkill>Crafting</workSkill>
-      <effectWorking>Smith</effectWorking>
-      <soundWorking>Recipe_Smith</soundWorking>
-      <unfinishedThingDef>UnfinishedComponent</unfinishedThingDef>
-      <skillRequirements>
-        <Crafting>6</Crafting>
-      </skillRequirements>
-      <researchPrerequisite>PNRP_Brain</researchPrerequisite>
-      <recipeUsers>
-        <li>PN_AutomatonBench</li>
-      </recipeUsers>
-    </recipeMaker>
-    <comps>
-
-    </comps>
-  </ThingDef>
-
   <ThingDef ParentName="BodyPartBase">
     <defName>PN_Brain</defName>
     <label>central nervous</label>
@@ -114,7 +66,7 @@
       <drawSize>1</drawSize>
     </graphicData>
     <thingCategories Inherit="false">
-      <li>PN_BrainCoreCatagory</li>
+      <li>BodyPartsNatural</li>
     </thingCategories>
     <statBases>
       <MarketValue>548</MarketValue>
@@ -161,20 +113,6 @@
     <tradeTags Inherit="false">
 
     </tradeTags>
-    <recipeMaker>
-      <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-      <workSkill>Crafting</workSkill>
-      <effectWorking>Smith</effectWorking>
-      <soundWorking>Recipe_Smith</soundWorking>
-      <unfinishedThingDef>UnfinishedHealthItemBionic</unfinishedThingDef>
-      <skillRequirements>
-        <Crafting>8</Crafting>
-      </skillRequirements>
-      <researchPrerequisite>PNRP_BrainCasing</researchPrerequisite>
-      <recipeUsers>
-        <li>PN_AutomatonBench</li>
-      </recipeUsers>
-    </recipeMaker>
     <comps>
 
     </comps>
diff --git a/1.3/Defs/TraderKindDefs/TraderKinds_CaravanPnL.xml b/1.3/Defs/TraderKindDefs/TraderKinds_CaravanPnL.xml
index 8cc1e1e..eecfa1d 100644
--- a/1.3/Defs/TraderKindDefs/TraderKinds_CaravanPnL.xml
+++ b/1.3/Defs/TraderKindDefs/TraderKinds_CaravanPnL.xml
@@ -48,7 +48,7 @@
       </li>
       <li Class="StockGenerator_SingleDef">
         <thingDef>PN_BrainCasing</thingDef>
-        <countRange>0~2</countRange>
+        <countRange>1~3</countRange>
       </li>
       <li Class="StockGenerator_SingleDef">
         <thingDef>Leather_Automaton</thingDef>
diff --git a/1.3/Defs/TraderKindDefs/TraderKinds_OrbitalPnL.xml b/1.3/Defs/TraderKindDefs/TraderKinds_OrbitalPnL.xml
index 23fae06..dc005f5 100644
--- a/1.3/Defs/TraderKindDefs/TraderKinds_OrbitalPnL.xml
+++ b/1.3/Defs/TraderKindDefs/TraderKinds_OrbitalPnL.xml
@@ -61,7 +61,7 @@
       </li>
       <li Class="StockGenerator_SingleDef">
         <thingDef>PN_BrainCasing</thingDef>
-        <countRange>2~6</countRange>
+        <countRange>3~6</countRange>
       </li>
       <li Class="StockGenerator_SingleDef">
         <thingDef>Leather_Automaton</thingDef>
@@ -81,7 +81,7 @@
       <!-- Weapons -->
       <li Class="StockGenerator_SingleDef">
         <thingDef>PN_PrototypeRailGun</thingDef>
-        <countRange>1~3</countRange>
+        <countRange>0~1</countRange>
       </li>
 
       <!-- Apparel -->
diff --git a/LoadFolders.xml b/LoadFolders.xml
index b388a8d..1c011ca 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -5,5 +5,6 @@
     <li>Content</li>
     <li IfModActive="Ludeon.Rimworld.Royalty">Royalty</li>
     <li IfModActive="Ludeon.RimWorld.Ideology">Ideology</li>
+    <li IfModActive="AhnDemi.PanieltheSecretofPnL">SoPnL</li>
   </v1.3>
 </loadFolders>
\ No newline at end of file
diff --git a/SoPnL/Defs/SoPnL_Recipes_Surgery.xml b/SoPnL/Defs/SoPnL_Recipes_Surgery.xml
new file mode 100644
index 0000000..2a22b7a
--- /dev/null
+++ b/SoPnL/Defs/SoPnL_Recipes_Surgery.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+  <AutomataRace.ThingDefInjectDef>
+    <defName>Recipe_PN_RemoveBrain_Inject</defName>
+    <conditions>
+      <li Class="AutomataRace.ThingDefInject.IsHumanlike"></li>
+      <li Class="AutomataRace.ThingDefInject.IsFlesh"></li>
+      <li Class="AutomataRace.ThingDefInject.IsDefNameEqual">
+        <not>true</not>
+        <defName>Paniel_Race</defName>
+      </li>
+    </conditions>
+    <recipes>
+      <li>PN_ExtractBrain</li>
+    </recipes>
+  </AutomataRace.ThingDefInjectDef>
+
+  <RecipeDef ParentName="SurgeryFlesh">
+    <defName>PN_ExtractBrain</defName>
+    <label>extract central nervous</label>
+    <description>extract central nervous.</description>
+    <workerClass>AutomataRace.Recipe_RemoveBrain</workerClass>
+    <jobString>Remove central nervous.</jobString>
+    <workAmount>2000</workAmount>
+    <surgerySuccessChanceFactor>1.0</surgerySuccessChanceFactor>
+    <researchPrerequisite>PNRP_Brain</researchPrerequisite>
+    <uiIconThing>PN_Brain</uiIconThing>
+    <ingredients>
+      <li>
+        <filter>
+          <categories>
+            <li>Medicine</li>
+          </categories>
+        </filter>
+        <count>1</count>
+      </li>
+      <li>
+        <filter>
+          <thingDefs>
+            <li>PN_BrainEmpty</li>
+          </thingDefs>
+        </filter>
+        <count>1</count>
+      </li>
+    </ingredients>
+    <fixedIngredientFilter>
+      <categories>
+        <li>Medicine</li>
+      </categories>
+    </fixedIngredientFilter>
+  </RecipeDef>
+</Defs>
\ No newline at end of file
diff --git a/SoPnL/Defs/SoPnL_Reserch_ProjectDefs.xml b/SoPnL/Defs/SoPnL_Reserch_ProjectDefs.xml
new file mode 100644
index 0000000..cde6916
--- /dev/null
+++ b/SoPnL/Defs/SoPnL_Reserch_ProjectDefs.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+  <ResearchProjectDef>
+    <defName>PNRP_Brain</defName>
+    <label>core analysis</label>
+    <description>...</description>
+    <tab>PN_technology</tab>
+    <baseCost>2500</baseCost>
+    <techLevel>Industrial</techLevel>
+    <prerequisites>
+      <li>PNRP_Production</li>
+      <li>Prosthetics</li>
+      <li>MicroelectronicsBasics</li>
+    </prerequisites>
+    <researchViewX>3.0</researchViewX>
+    <researchViewY>0</researchViewY>
+    <tags>
+      <li>PanielStart</li>
+    </tags>
+  </ResearchProjectDef>
+
+  <ResearchProjectDef>
+    <defName>PNRP_BrainCasing</defName>
+    <label>core casing</label>
+    <description>...</description>
+    <tab>PN_technology</tab>
+    <baseCost>500</baseCost>
+    <techLevel>Spacer</techLevel>
+    <prerequisites>
+      <li>PNRP_Brain</li>
+      <li>Bionics</li>
+    </prerequisites>
+    <researchViewX>5.0</researchViewX>
+    <researchViewY>0</researchViewY>
+  </ResearchProjectDef>
+</Defs>
\ No newline at end of file
diff --git a/SoPnL/Defs/SoPnL_ThingDef_Item.xml b/SoPnL/Defs/SoPnL_ThingDef_Item.xml
new file mode 100644
index 0000000..ccafcb6
--- /dev/null
+++ b/SoPnL/Defs/SoPnL_ThingDef_Item.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+  <ThingDef ParentName="BodyPartBase">
+    <defName>PN_BrainEmpty</defName>
+    <label>Empty case</label>
+    <description>...</description>
+    <graphicData Inherit="false">
+      <texPath>Things/Item/PNCentralnervous_empty</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+      <drawSize>1</drawSize>
+    </graphicData>
+    <isTechHediff>false</isTechHediff>
+    <thingCategories Inherit="false">
+      <li>PN_AutomatonCatagory</li>
+    </thingCategories>
+    <statBases>
+      <Mass>1</Mass>
+      <WorkToMake>700</WorkToMake>
+      <Flammability>0.7</Flammability>
+    </statBases>
+    <stackLimit>10</stackLimit>
+    <uiIconForStackCount>1</uiIconForStackCount>
+    <drawGUIOverlay>true</drawGUIOverlay>
+    <costList>
+      <ComponentIndustrial>1</ComponentIndustrial>
+      <Steel>5</Steel>
+      <PN_AutomatonFuel>1</PN_AutomatonFuel>
+    </costList>
+    <recipeMaker>
+      <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+      <workSkill>Crafting</workSkill>
+      <effectWorking>Smith</effectWorking>
+      <soundWorking>Recipe_Smith</soundWorking>
+      <unfinishedThingDef>UnfinishedComponent</unfinishedThingDef>
+      <skillRequirements>
+        <Crafting>6</Crafting>
+      </skillRequirements>
+      <researchPrerequisite>PNRP_Brain</researchPrerequisite>
+      <recipeUsers>
+        <li>PN_AutomatonBench</li>
+      </recipeUsers>
+    </recipeMaker>
+    <tradeTags Inherit="false">
+
+    </tradeTags>
+    <comps>
+
+    </comps>
+  </ThingDef>
+</Defs>
\ No newline at end of file