From 61f2ddd0cb29a9a2bd746bceded7d061062884a6 Mon Sep 17 00:00:00 2001
From: Cocopomel <79386233+Cocopomel@users.noreply.github.com>
Date: Sun, 29 Aug 2021 02:59:51 +0900
Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=A7=80=EC=9D=B8=20=EC=B9=B4?=
 =?UTF-8?q?=EB=9D=BC=EB=B0=98=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TraderKindDefs/TraderKinds_CaravanPnL     | 16 ----
 .../TraderKindDefs/TraderKinds_CaravanPnL.xml | 73 +++++++++++++++++++
 .../TraderKindDefs/TraderKinds_OrbitalPnL.xml |  2 +-
 1.3/Patches/Vanilla.xml                       | 18 ++---
 4 files changed, 82 insertions(+), 27 deletions(-)
 delete mode 100644 1.3/Defs/TraderKindDefs/TraderKinds_CaravanPnL
 create mode 100644 1.3/Defs/TraderKindDefs/TraderKinds_CaravanPnL.xml

diff --git a/1.3/Defs/TraderKindDefs/TraderKinds_CaravanPnL b/1.3/Defs/TraderKindDefs/TraderKinds_CaravanPnL
deleted file mode 100644
index 89a3b78..0000000
--- a/1.3/Defs/TraderKindDefs/TraderKinds_CaravanPnL
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-  <TraderKindDef>
-    <defName>PN_Caravan_Outlander_PnL</defName>
-    <label>PnL Salesman</label>
-    <stockGenerators>
-
-      <li Class="StockGenerator_SingleDef">
-        <thingDef>Silver</thingDef>
-        <countRange>750~1200</countRange>
-      </li>
-
-
-    </stockGenerators>
-  </TraderKindDef>
-</Defs>
\ No newline at end of file
diff --git a/1.3/Defs/TraderKindDefs/TraderKinds_CaravanPnL.xml b/1.3/Defs/TraderKindDefs/TraderKinds_CaravanPnL.xml
new file mode 100644
index 0000000..7ad9b5a
--- /dev/null
+++ b/1.3/Defs/TraderKindDefs/TraderKinds_CaravanPnL.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+  <TraderKindDef>
+    <defName>PN_Caravan_PnLindustry</defName>
+    <label>PnL salesman</label>
+    <stockGenerators>
+
+      <!-- Resources -->
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>Silver</thingDef>
+        <countRange>750~1200</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>ComponentIndustrial</thingDef>
+        <countRange>8~16</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>ComponentSpacer</thingDef>
+        <countRange>2~4</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>Steel</thingDef>
+        <countRange>150~300</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>Chemfuel</thingDef>
+        <countRange>50~150</countRange>
+      </li>
+
+      <!-- Drugs -->
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>PN_AutomatonFuel</thingDef>
+        <countRange>50~150</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>PN_antibiotics</thingDef>
+        <countRange>0~1</countRange>
+      </li>
+
+      <!-- Automaton -->
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>PN_RepairKit</thingDef>
+        <countRange>2~6</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>PN_SelfRepairKit</thingDef>
+        <countRange>-8~1</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>PN_BrainCasing</thingDef>
+        <countRange>1~2</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>Leather_Automaton</thingDef>
+        <countRange>20~60</countRange>
+      </li>
+
+      <!-- Weapons -->
+
+      <!-- Apparel -->
+
+      <!-- Implants -->
+
+      <!-- Buildings -->
+
+      <!-- Animals -->
+
+      <!-- Buying -->
+      <li Class="StockGenerator_BuyExpensiveSimple" />
+
+    </stockGenerators>
+  </TraderKindDef>
+</Defs>
\ No newline at end of file
diff --git a/1.3/Defs/TraderKindDefs/TraderKinds_OrbitalPnL.xml b/1.3/Defs/TraderKindDefs/TraderKinds_OrbitalPnL.xml
index 0b1a9ea..df47ef7 100644
--- a/1.3/Defs/TraderKindDefs/TraderKinds_OrbitalPnL.xml
+++ b/1.3/Defs/TraderKindDefs/TraderKinds_OrbitalPnL.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
   <TraderKindDef>
-    <defName>PNOrbital_PnLindustry</defName>
+    <defName>PN_Orbital_PnLindustry</defName>
     <label>PnL Industry</label>
     <orbital>true</orbital>
     <stockGenerators>
diff --git a/1.3/Patches/Vanilla.xml b/1.3/Patches/Vanilla.xml
index 1fa3fb1..dab1e64 100644
--- a/1.3/Patches/Vanilla.xml
+++ b/1.3/Patches/Vanilla.xml
@@ -6,20 +6,18 @@
       <li>PN_AutomatonBench</li>
     </value>
   </Operation>
-  <!--<Operation Class="PatchOperationAdd">
-    <xpath>*/WorkGiverDef[defName="ChatWithPrisoner"]</xpath>
+  <Operation Class="PatchOperationAdd">
+    <xpath>Defs/FactionDef[defName = "OutlanderCivil"]</xpath>
     <value>
-      <workTags>
-        <li>PN_noPrisoner</li>
-      </workTags>
+      <caravanTraderKinds>
+        <li>PN_Caravan_PnLindustry</li>
+      </caravanTraderKinds>
     </value>
   </Operation>
-  <Operation Class="PatchOperationAdd">
-    <xpath>*/WorkGiverDef[defName="Research"]</xpath>
+  <!--<Operation Class="PatchOperationAdd">
+    <xpath>*/FactionDef[defName="OutlanderRough"]/caravanTraderKinds</xpath>
     <value>
-      <workTags>
-        <li>PN_noResearch</li>
-      </workTags>
+        <li>PN_Caravan_PnLindustry</li>
     </value>
   </Operation>-->
 </Patch>
\ No newline at end of file