From 7ece3e44b15df6b86fb74db4df191cf7d24f90af Mon Sep 17 00:00:00 2001
From: Cocopomel <79386233+Cocopomel@users.noreply.github.com>
Date: Sun, 29 Aug 2021 04:12:29 +0900
Subject: [PATCH] =?UTF-8?q?=EC=98=A4=ED=86=A0=EB=A7=88=ED=86=A4=20?=
 =?UTF-8?q?=EC=99=84=EC=A0=9C=ED=92=88=20=EC=83=81=EC=9E=90=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1.3/Defs/ThingDef/ThingDef_Randombox.xml      | 39 ++++++++++++++-----
 .../TraderKindDefs/TraderKinds_CaravanPnL.xml | 10 ++++-
 .../TraderKindDefs/TraderKinds_OrbitalPnL.xml |  6 +++
 3 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/1.3/Defs/ThingDef/ThingDef_Randombox.xml b/1.3/Defs/ThingDef/ThingDef_Randombox.xml
index 528e0a4..5c09f56 100644
--- a/1.3/Defs/ThingDef/ThingDef_Randombox.xml
+++ b/1.3/Defs/ThingDef/ThingDef_Randombox.xml
@@ -7,6 +7,13 @@
     <iconPath>UI/Icons/ThingCategories/Manufactured</iconPath>
   </ThingCategoryDef>
 
+  <ThingCategoryDef>
+    <defName>PN_TMPackagedCatagory</defName>
+    <label>PnL automaton™</label>
+    <parent>PN_PackagedCatagory</parent>
+    <iconPath>UI/Icons/ThingCategories/Manufactured</iconPath>
+  </ThingCategoryDef>
+
   <ThingDef Name="BasePackagedAutomaton" Abstract="True">
     <thingClass>ThingWithComps</thingClass>
     <category>Item</category>
@@ -14,12 +21,12 @@
     <useHitPoints>true</useHitPoints>
     <selectable>true</selectable>
     <altitudeLayer>Item</altitudeLayer>
-    <tradeability>None</tradeability>
     <stackLimit>1</stackLimit>
     <statBases>
       <MaxHitPoints>100</MaxHitPoints>
       <Mass>80.0</Mass>
       <Flammability>0.2</Flammability>
+      <WorkToMake>48000</WorkToMake>
     </statBases>
     <comps>
       <li Class="CompProperties_Forbiddable"/>
@@ -30,9 +37,17 @@
     <pathCost>14</pathCost>
     <allowedArchonexusCount>-1</allowedArchonexusCount>
     <thingCategories Inherit="false">
-      <li>PN_PackagedCatagory</li>
+      <li>PN_TMPackagedCatagory</li>
     </thingCategories>
-    <smeltable>true</smeltable>
+    <costList>
+      <Steel>75</Steel>
+      <Plasteel>75</Plasteel>
+      <ComponentIndustrial>4</ComponentIndustrial>
+      <ComponentSpacer>4</ComponentSpacer>
+      <PN_BrainCasing>1</PN_BrainCasing>
+      <Leather_Automaton>50</Leather_Automaton>
+      <Chemfuel>20</Chemfuel>
+    </costList>
   </ThingDef>
 
   <!--==================================== 일반 상자 ====================================-->
@@ -40,8 +55,9 @@
     <defName>Packaged_NormalAutomaton</defName>
     <label>packaged automaton</label>
     <description>test item</description>
+    <tradeability>None</tradeability>
     <statBases>
-      <MarketValue>60</MarketValue>
+      <MarketValue>1520</MarketValue>
     </statBases>
     <graphicData>
       <texPath>Things/Item/Special/AIPersonaCore</texPath>
@@ -61,16 +77,19 @@
         <compClass>CompUseEffect_DestroySelf</compClass>
       </li>
     </comps>
+    <thingCategories Inherit="false">
+      <li>PN_PackagedCatagory</li>
+    </thingCategories>
   </ThingDef>
 
   <!--고급부품4짜리-->  <!--확률:개별weight값/전체weight합-->
   <!--==================================== 전투형 일반 상자 ====================================-->
   <ThingDef ParentName="BasePackagedAutomaton">
     <defName>Packaged_NormalAutomatonSoldier</defName>
-    <label>PnL automaton™ (soldier)</label>
+    <label>PnL automaton™ (Combat)</label>
     <description>test item</description>
     <statBases>
-      <MarketValue>60</MarketValue>
+
     </statBases>
     <graphicData>
       <texPath>Things/Item/Special/AIPersonaCore</texPath>
@@ -114,10 +133,10 @@
   <!--==================================== 제작형 일반 상자 ====================================-->
   <ThingDef ParentName="BasePackagedAutomaton">
     <defName>Packaged_NormalAutomatonWorker</defName>
-    <label>PnL automaton™ (worker)</label>
+    <label>PnL automaton™ (Engineer)</label>
     <description>test item</description>
     <statBases>
-      <MarketValue>60</MarketValue>
+
     </statBases>
     <graphicData>
       <texPath>Things/Item/Special/AIPersonaCore</texPath>
@@ -161,10 +180,10 @@
   <!--==================================== 가정형 일반 상자 ====================================-->
   <ThingDef ParentName="BasePackagedAutomaton">
     <defName>Packaged_NormalAutomatonMaid</defName>
-    <label>PnL automaton™ (maid)</label>
+    <label>PnL automaton™ (Domestic)</label>
     <description>test item</description>
     <statBases>
-      <MarketValue>60</MarketValue>
+
     </statBases>
     <graphicData>
       <texPath>Things/Item/Special/AIPersonaCore</texPath>
diff --git a/1.3/Defs/TraderKindDefs/TraderKinds_CaravanPnL.xml b/1.3/Defs/TraderKindDefs/TraderKinds_CaravanPnL.xml
index 7ad9b5a..fd794d0 100644
--- a/1.3/Defs/TraderKindDefs/TraderKinds_CaravanPnL.xml
+++ b/1.3/Defs/TraderKindDefs/TraderKinds_CaravanPnL.xml
@@ -16,7 +16,7 @@
       </li>
       <li Class="StockGenerator_SingleDef">
         <thingDef>ComponentSpacer</thingDef>
-        <countRange>2~4</countRange>
+        <countRange>-1~2</countRange>
       </li>
       <li Class="StockGenerator_SingleDef">
         <thingDef>Steel</thingDef>
@@ -48,13 +48,19 @@
       </li>
       <li Class="StockGenerator_SingleDef">
         <thingDef>PN_BrainCasing</thingDef>
-        <countRange>1~2</countRange>
+        <countRange>1</countRange>
       </li>
       <li Class="StockGenerator_SingleDef">
         <thingDef>Leather_Automaton</thingDef>
         <countRange>20~60</countRange>
       </li>
 
+      <li Class="StockGenerator_Category">
+        <categoryDef>PN_TMPackagedCatagory</categoryDef>
+        <thingDefCountRange>-2~1</thingDefCountRange>
+        <totalPriceRange>3000~4000</totalPriceRange>
+      </li>
+
       <!-- Weapons -->
 
       <!-- Apparel -->
diff --git a/1.3/Defs/TraderKindDefs/TraderKinds_OrbitalPnL.xml b/1.3/Defs/TraderKindDefs/TraderKinds_OrbitalPnL.xml
index df47ef7..229cf82 100644
--- a/1.3/Defs/TraderKindDefs/TraderKinds_OrbitalPnL.xml
+++ b/1.3/Defs/TraderKindDefs/TraderKinds_OrbitalPnL.xml
@@ -64,6 +64,12 @@
         <countRange>50~200</countRange>
       </li>
 
+      <li Class="StockGenerator_Category">
+        <categoryDef>PN_TMPackagedCatagory</categoryDef>
+        <thingDefCountRange>3~3</thingDefCountRange>
+        <totalPriceRange>3000~4000</totalPriceRange>
+      </li>
+
       <!-- Weapons -->
 
       <!-- Apparel -->