From a76965621e1385f6fe9234a8a2c8d2fbb589e2cf Mon Sep 17 00:00:00 2001
From: Cocopomel <79386233+Cocopomel@users.noreply.github.com>
Date: Sun, 29 Aug 2021 02:27:25 +0900
Subject: [PATCH] =?UTF-8?q?=EC=83=81=EC=84=A0=EC=9A=A9=20=EC=98=A4?=
 =?UTF-8?q?=ED=86=A0=EB=A7=88=ED=86=A4=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

---
 .../PawnKind_Randombox.xml                    |   4 +-
 1.3/Defs/RecipeDefs/Recipes_Production.xml    |  20 +-
 1.3/Defs/ThingDef/ThingDef_Randombox.xml      | 306 +++---------------
 3 files changed, 56 insertions(+), 274 deletions(-)

diff --git a/1.3/Defs/PawnKindsDef_Paniel/PawnKind_Randombox.xml b/1.3/Defs/PawnKindsDef_Paniel/PawnKind_Randombox.xml
index 0a28d6b..f810b2d 100644
--- a/1.3/Defs/PawnKindsDef_Paniel/PawnKind_Randombox.xml
+++ b/1.3/Defs/PawnKindsDef_Paniel/PawnKind_Randombox.xml
@@ -64,7 +64,7 @@
     </techHediffsTags>
   </PawnKindDef>
 
-  <PawnKindDef ParentName="PanielPlayerBasePawnKind">
+  <!--<PawnKindDef ParentName="PanielPlayerBasePawnKind">
     <defName>Paniel_Randombox_Good</defName>
     <label>Paniel Randombox Good</label>
     <chemicalAddictionChance>0</chemicalAddictionChance>
@@ -168,7 +168,7 @@
     <techHediffsTags>
 
     </techHediffsTags>
-  </PawnKindDef>
+  </PawnKindDef>-->
 
   <!--가챠 특화 전투형-->
   <PawnKindDef ParentName="PanielPlayerBasePawnKind" Name="PanielSoldierBasePawnKind" Abstract="True">
diff --git a/1.3/Defs/RecipeDefs/Recipes_Production.xml b/1.3/Defs/RecipeDefs/Recipes_Production.xml
index 2fa5dac..3e995c6 100644
--- a/1.3/Defs/RecipeDefs/Recipes_Production.xml
+++ b/1.3/Defs/RecipeDefs/Recipes_Production.xml
@@ -168,7 +168,7 @@
     <researchPrerequisite>Fabrication</researchPrerequisite>
   </RecipeDef>
 
-  <!--<RecipeDef>
+  <RecipeDef>
     <defName>PN_Disassemble_AutomatonPackage</defName>
     <label>disassemble automaton package</label>
     <description>...</description>
@@ -183,20 +183,22 @@
     <ingredients>
       <li>
         <filter>
-          <thingDefs>
-        <li>Packaged_NormalAutomaton</li>
-      </thingDefs>
+          <categories>
+            <li>PN_PackagedCatagory</li>
+          </categories>
         </filter>
         <count>1</count>
       </li>
     </ingredients>
     <fixedIngredientFilter>
-     <thingDefs>
-        <li>Packaged_NormalAutomaton</li>
-      </thingDefs>
       <categories>
-        <li>PN_AutomatonCatagory</li>
+        <li>PN_PackagedCatagory</li>
       </categories>
+      <!--<disallowedThingDefs>
+        <li>Packaged_NormalAutomatonSoldier</li>
+        <li>Packaged_NormalAutomatonWorker</li>
+        <li>Packaged_NormalAutomatonMaid</li>
+      </disallowedThingDefs>-->
     </fixedIngredientFilter>
     <defaultIngredientFilter>
       <thingDefs>
@@ -213,5 +215,5 @@
     </skillRequirements>
     <workSkill>Crafting</workSkill>
     <researchPrerequisite></researchPrerequisite>
-  </RecipeDef>-->
+  </RecipeDef>
 </Defs>
\ No newline at end of file
diff --git a/1.3/Defs/ThingDef/ThingDef_Randombox.xml b/1.3/Defs/ThingDef/ThingDef_Randombox.xml
index b17056a..528e0a4 100644
--- a/1.3/Defs/ThingDef/ThingDef_Randombox.xml
+++ b/1.3/Defs/ThingDef/ThingDef_Randombox.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
+  <ThingCategoryDef>
+    <defName>PN_PackagedCatagory</defName>
+    <label>packaged automaton</label>
+    <parent>PN_AutomatonCatagory</parent>
+    <iconPath>UI/Icons/ThingCategories/Manufactured</iconPath>
+  </ThingCategoryDef>
+
   <ThingDef Name="BasePackagedAutomaton" Abstract="True">
     <thingClass>ThingWithComps</thingClass>
     <category>Item</category>
@@ -23,48 +30,11 @@
     <pathCost>14</pathCost>
     <allowedArchonexusCount>-1</allowedArchonexusCount>
     <thingCategories Inherit="false">
-      <li>PN_AutomatonCatagory</li>
+      <li>PN_PackagedCatagory</li>
     </thingCategories>
     <smeltable>true</smeltable>
   </ThingDef>
 
-  <!--확률:개별weight값/전체weight합-->
-
-  <!--==================================== 급조 상자 ====================================-->
-  <!--<ThingDef ParentName="BasePackagedAutomaton">
-    <defName>Packaged_ImprovisedAutomaton</defName>
-    <label>packaged improvised automaton</label>
-    <description>test item</description>
-    <statBases>
-      <MarketValue>60</MarketValue>
-    </statBases>
-    <graphicData>
-      <texPath>Things/Item/Special/AIPersonaCore</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-    </graphicData>
-    <comps>
-      <li Class="CompProperties_Usable">
-        <useJob>UseItem</useJob>
-        <useLabel>Unpackage</useLabel>
-      </li>
-      <li Class="AutomataRace.CompProperties_UseEffectGeneratePawn">
-        <samples>
-          <li>
-            <weight>30</weight>
-            <pawnKindDefName>Paniel_Randombox_Awful</pawnKindDefName>
-          </li>
-          <li>
-            <weight>70</weight>
-            <pawnKindDefName>Paniel_Randombox_Poor</pawnKindDefName>
-          </li>
-        </samples>
-      </li>
-      <li Class="CompProperties_UseEffect">
-        <compClass>CompUseEffect_DestroySelf</compClass>
-      </li>
-    </comps>
-  </ThingDef>-->
-
   <!--==================================== 일반 상자 ====================================-->
   <ThingDef ParentName="BasePackagedAutomaton">
     <defName>Packaged_NormalAutomaton</defName>
@@ -93,10 +63,11 @@
     </comps>
   </ThingDef>
 
-  <!--==================================== 고급 상자 ====================================-->
-  <!--<ThingDef ParentName="BasePackagedAutomaton">
-    <defName>Packaged_NobleAutomaton</defName>
-    <label>packaged noble automaton</label>
+  <!--고급부품4짜리-->  <!--확률:개별weight값/전체weight합-->
+  <!--==================================== 전투형 일반 상자 ====================================-->
+  <ThingDef ParentName="BasePackagedAutomaton">
+    <defName>Packaged_NormalAutomatonSoldier</defName>
+    <label>PnL automaton™ (soldier)</label>
     <description>test item</description>
     <statBases>
       <MarketValue>60</MarketValue>
@@ -112,151 +83,38 @@
       </li>
       <li Class="AutomataRace.CompProperties_UseEffectGeneratePawn">
         <samples>
-          <li>
-            <weight>60</weight>
-            <pawnKindDefName>Paniel_Randombox_Good</pawnKindDefName>
-          </li>
           <li>
             <weight>39</weight>
-            <pawnKindDefName>Paniel_Randombox_Excellent</pawnKindDefName>
-          </li>
-          <li>
-            <weight>1</weight>
-            <pawnKindDefName>Paniel_Randombox_MasterworkA</pawnKindDefName>
-          </li>
-        </samples>
-      </li>
-      <li Class="CompProperties_UseEffect">
-        <compClass>CompUseEffect_DestroySelf</compClass>
-      </li>
-    </comps>
-  </ThingDef>-->
-
-  <!--==================================== 로열 상자 ====================================-->
-  <!--<ThingDef ParentName="BasePackagedAutomaton">
-    <defName>Packaged_RoyalAutomaton</defName>
-    <label>packaged royal automaton</label>
-    <description>test item</description>
-    <statBases>
-      <MarketValue>60</MarketValue>
-    </statBases>
-    <graphicData>
-      <texPath>Things/Item/Special/AIPersonaCore</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-    </graphicData>
-    <comps>
-      <li Class="CompProperties_Usable">
-        <useJob>UseItem</useJob>
-        <useLabel>Unpackage</useLabel>
-      </li>
-      <li Class="AutomataRace.CompProperties_UseEffectGeneratePawn">
-        <samples>
-          <li>
-            <weight>9</weight>
-            <pawnKindDefName>Paniel_Randombox_MasterworkB</pawnKindDefName>
-          </li>
-          <li>
-            <weight>1</weight>
-            <pawnKindDefName>Paniel_Randombox_Legendary</pawnKindDefName>
-          </li>
-        </samples>
-      </li>
-      <li Class="CompProperties_UseEffect">
-        <compClass>CompUseEffect_DestroySelf</compClass>
-      </li>
-    </comps>
-  </ThingDef>-->
-
-  <!--==================================== 전투형 일반 상자 ====================================-->
-  <!--<ThingDef ParentName="BasePackagedAutomaton">
-    <defName>Packaged_NormalAutomatonSoldier</defName>
-    <label>packaged automaton soldier</label>
-    <description>test item</description>
-    <statBases>
-      <MarketValue>60</MarketValue>
-    </statBases>
-    <graphicData>
-      <texPath>Things/Item/Special/AIPersonaCore</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-    </graphicData>
-    <comps>
-      <li Class="CompProperties_Usable">
-        <useJob>UseItem</useJob>
-        <useLabel>Unpackage</useLabel>
-      </li>
-      <li Class="AutomataRace.CompProperties_UseEffectGeneratePawn">
-        <samples>
-          <li>
-            <weight>20</weight>
             <pawnKindDefName>Paniel_Randombox_Poor</pawnKindDefName>
           </li>
           <li>
-            <weight>40</weight>
+            <weight>1579</weight>
             <pawnKindDefName>Paniel_Soldier_Normal</pawnKindDefName>
           </li>
           <li>
-            <weight>30</weight>
+            <weight>5428</weight>
             <pawnKindDefName>Paniel_Soldier_Good</pawnKindDefName>
           </li>
           <li>
-            <weight>10</weight>
+            <weight>2740</weight>
             <pawnKindDefName>Paniel_Soldier_Excellent</pawnKindDefName>
           </li>
+          <li>
+            <weight>214</weight>
+            <pawnKindDefName>Paniel_Soldier_Masterwork</pawnKindDefName>
+          </li>
         </samples>
       </li>
       <li Class="CompProperties_UseEffect">
         <compClass>CompUseEffect_DestroySelf</compClass>
       </li>
     </comps>
-  </ThingDef>-->
-
-  <!--==================================== 전투형 고급 상자 ====================================-->
-  <!--<ThingDef ParentName="BasePackagedAutomaton">
-    <defName>Packaged_NobleAutomatonSoldier</defName>
-    <label>packaged noble automaton</label>
-    <description>test item</description>
-    <statBases>
-      <MarketValue>60</MarketValue>
-    </statBases>
-    <graphicData>
-      <texPath>Things/Item/Special/AIPersonaCore</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-    </graphicData>
-    <comps>
-      <li Class="CompProperties_Usable">
-        <useJob>UseItem</useJob>
-        <useLabel>Unpackage</useLabel>
-      </li>
-      <li Class="AutomataRace.CompProperties_UseEffectGeneratePawn">
-        <samples>
-          <li>
-            <weight>45</weight>
-            <pawnKindDefName>Paniel_Soldier_Good</pawnKindDefName>
-          </li>
-          <li>
-            <weight>50</weight>
-            <pawnKindDefName>Paniel_Soldier_Excellent</pawnKindDefName>
-          </li>
-          <li>
-            <weight>4</weight>
-            <pawnKindDefName>Paniel_Soldier_MasterworkA</pawnKindDefName>
-          </li>
-          <li>
-            <weight>1</weight>
-            <pawnKindDefName>Paniel_Soldier_Legendary</pawnKindDefName>
-          </li>
-        </samples>
-      </li>
-      <li Class="CompProperties_UseEffect">
-        <compClass>CompUseEffect_DestroySelf</compClass>
-      </li>
-    </comps>
-  </ThingDef>-->
+  </ThingDef>
 
   <!--==================================== 제작형 일반 상자 ====================================-->
-  <!--<ThingDef ParentName="BasePackagedAutomaton">
+  <ThingDef ParentName="BasePackagedAutomaton">
     <defName>Packaged_NormalAutomatonWorker</defName>
-    <label>packaged automaton worker</label>
+    <label>PnL automaton™ (worker)</label>
     <description>test item</description>
     <statBases>
       <MarketValue>60</MarketValue>
@@ -273,76 +131,37 @@
       <li Class="AutomataRace.CompProperties_UseEffectGeneratePawn">
         <samples>
           <li>
-            <weight>20</weight>
+            <weight>39</weight>
             <pawnKindDefName>Paniel_Randombox_Poor</pawnKindDefName>
           </li>
           <li>
-            <weight>40</weight>
+            <weight>1579</weight>
             <pawnKindDefName>Paniel_Worker_Normal</pawnKindDefName>
           </li>
           <li>
-            <weight>30</weight>
+            <weight>5428</weight>
             <pawnKindDefName>Paniel_Worker_Good</pawnKindDefName>
           </li>
           <li>
-            <weight>10</weight>
+            <weight>3740</weight>
             <pawnKindDefName>Paniel_Worker_Excellent</pawnKindDefName>
           </li>
+          <li>
+            <weight>214</weight>
+            <pawnKindDefName>Paniel_Worker_Masterwork</pawnKindDefName>
+          </li>
         </samples>
       </li>
       <li Class="CompProperties_UseEffect">
         <compClass>CompUseEffect_DestroySelf</compClass>
       </li>
     </comps>
-  </ThingDef>-->
-
-  <!--==================================== 제작형 고급 상자 ====================================-->
-  <!--<ThingDef ParentName="BasePackagedAutomaton">
-    <defName>Packaged_NobleAutomatonWorker</defName>
-    <label>packaged noble automaton worker</label>
-    <description>test item</description>
-    <statBases>
-      <MarketValue>60</MarketValue>
-    </statBases>
-    <graphicData>
-      <texPath>Things/Item/Special/AIPersonaCore</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-    </graphicData>
-    <comps>
-      <li Class="CompProperties_Usable">
-        <useJob>UseItem</useJob>
-        <useLabel>Unpackage</useLabel>
-      </li>
-      <li Class="AutomataRace.CompProperties_UseEffectGeneratePawn">
-        <samples>
-          <li>
-            <weight>45</weight>
-            <pawnKindDefName>Paniel_Worker_Good</pawnKindDefName>
-          </li>
-          <li>
-            <weight>50</weight>
-            <pawnKindDefName>Paniel_Worker_Excellent</pawnKindDefName>
-          </li>
-          <li>
-            <weight>4</weight>
-            <pawnKindDefName>Paniel_Worker_MasterworkA</pawnKindDefName>
-          </li>
-          <li>
-            <weight>1</weight>
-            <pawnKindDefName>Paniel_Worker_Legendary</pawnKindDefName>
-          </li>
-        </samples>
-      </li>
-      <li Class="CompProperties_UseEffect">
-        <compClass>CompUseEffect_DestroySelf</compClass>
-      </li>
-    </comps>
-  </ThingDef>-->
+  </ThingDef>
 
   <!--==================================== 가정형 일반 상자 ====================================-->
-  <!--<ThingDef ParentName="BasePackagedAutomaton">
+  <ThingDef ParentName="BasePackagedAutomaton">
     <defName>Packaged_NormalAutomatonMaid</defName>
-    <label>packaged automaton maid</label>
+    <label>PnL automaton™ (maid)</label>
     <description>test item</description>
     <statBases>
       <MarketValue>60</MarketValue>
@@ -359,69 +178,30 @@
       <li Class="AutomataRace.CompProperties_UseEffectGeneratePawn">
         <samples>
           <li>
-            <weight>20</weight>
+            <weight>39</weight>
             <pawnKindDefName>Paniel_Randombox_Poor</pawnKindDefName>
           </li>
           <li>
-            <weight>40</weight>
+            <weight>1579</weight>
             <pawnKindDefName>Paniel_Maid_Normal</pawnKindDefName>
           </li>
           <li>
-            <weight>30</weight>
+            <weight>5428</weight>
             <pawnKindDefName>Paniel_Maid_Good</pawnKindDefName>
           </li>
           <li>
-            <weight>10</weight>
+            <weight>2740</weight>
             <pawnKindDefName>Paniel_Maid_Excellent</pawnKindDefName>
           </li>
+          <li>
+            <weight>214</weight>
+            <pawnKindDefName>Paniel_Maid_Masterwork</pawnKindDefName>
+          </li>
         </samples>
       </li>
       <li Class="CompProperties_UseEffect">
         <compClass>CompUseEffect_DestroySelf</compClass>
       </li>
     </comps>
-  </ThingDef>-->
-
-  <!--==================================== 가정형 고급 상자 ====================================-->
-  <!--<ThingDef ParentName="BasePackagedAutomaton">
-    <defName>Packaged_NobleAutomatonMaid</defName>
-    <label>packaged noble automaton maid</label>
-    <description>test item</description>
-    <statBases>
-      <MarketValue>60</MarketValue>
-    </statBases>
-    <graphicData>
-      <texPath>Things/Item/Special/AIPersonaCore</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-    </graphicData>
-    <comps>
-      <li Class="CompProperties_Usable">
-        <useJob>UseItem</useJob>
-        <useLabel>Unpackage</useLabel>
-      </li>
-      <li Class="AutomataRace.CompProperties_UseEffectGeneratePawn">
-        <samples>
-          <li>
-            <weight>45</weight>
-            <pawnKindDefName>Paniel_Maid_Good</pawnKindDefName>
-          </li>
-          <li>
-            <weight>50</weight>
-            <pawnKindDefName>Paniel_Maid_Excellent</pawnKindDefName>
-          </li>
-          <li>
-            <weight>4</weight>
-            <pawnKindDefName>Paniel_Maid_MasterworkA</pawnKindDefName>
-          </li>
-          <li>
-            <weight>1</weight>
-            <pawnKindDefName>Paniel_Maid_Legendary</pawnKindDefName>
-          </li>
-        </samples>
-      </li>
-      <li Class="CompProperties_UseEffect">
-        <compClass>CompUseEffect_DestroySelf</compClass>
-      </li>
-    </comps>
-  </ThingDef>-->
+  </ThingDef>
 </Defs>
\ No newline at end of file