From fa25e73ceccf31a8d6020d4a6982f33d8fabba65 Mon Sep 17 00:00:00 2001
From: RickGrymes <81042907+RickGrymes@users.noreply.github.com>
Date: Sun, 4 Jan 2026 15:42:50 -0600
Subject: [PATCH] Add Wastelander and Scavenger trader pawn kinds

Introduces new PawnKindDefs for Wastelander Trader and Scavenger Trader, updates faction and caravan trader lists to use these new pawn kinds, and adjusts backstory filters for trader roles. This enhances trader variety and improves consistency in trader definitions for Wastelander factions.
---
 .../FactionDefs/FCP_Wastelander_Factions.xml  |  5 +-
 1.6/Defs/PawnkindDefs/PawnkindDefs.xml        | 80 ++++++++++++++++++-
 2 files changed, 82 insertions(+), 3 deletions(-)

diff --git a/1.6/Defs/FactionDefs/FCP_Wastelander_Factions.xml b/1.6/Defs/FactionDefs/FCP_Wastelander_Factions.xml
index d6a957b..1396601 100644
--- a/1.6/Defs/FactionDefs/FCP_Wastelander_Factions.xml
+++ b/1.6/Defs/FactionDefs/FCP_Wastelander_Factions.xml
@@ -38,6 +38,7 @@
 			</li>
 		</backstoryFilters>
 		<caravanTraderKinds>
+			<li>FCP_Caravan_Power_Armor_Trader</li>
 			<li>Caravan_Outlander_BulkGoods</li>
 			<li>Caravan_Outlander_CombatSupplier</li>
 		</caravanTraderKinds>
@@ -74,7 +75,7 @@
 			<li>
 				<kindDef>Trader</kindDef>
 				<traders>
-					<FCP_Pawnkind_Wastelander_Citizen>1</FCP_Pawnkind_Wastelander_Citizen>
+					<FCP_Pawnkind_Wastelander_Trader>1</FCP_Pawnkind_Wastelander_Trader>
 				</traders>
 				<carriers>
 					<Muffalo>6</Muffalo>
@@ -167,7 +168,7 @@
 			<li>
 				<kindDef>Trader</kindDef>
 				<traders>
-					<FCP_Pawnkind_Scavenger>1</FCP_Pawnkind_Scavenger>
+					<FCP_Pawnkind_Scavenger_Trader>1</FCP_Pawnkind_Scavenger_Trader>
 				</traders>
 				<carriers>
 					<Muffalo>6</Muffalo>
diff --git a/1.6/Defs/PawnkindDefs/PawnkindDefs.xml b/1.6/Defs/PawnkindDefs/PawnkindDefs.xml
index a97a63c..0c59b50 100644
--- a/1.6/Defs/PawnkindDefs/PawnkindDefs.xml
+++ b/1.6/Defs/PawnkindDefs/PawnkindDefs.xml
@@ -42,7 +42,7 @@
                     <li>FCP_Backstory_Wastelander_Child</li>
                 </categoriesChildhood>
                 <categoriesAdulthood >
-                    <li>FCP_Backstory_Wastelander_Caravan_Guard</li>
+                    <li>FCP_Backstory_Wastelander</li>
                 </categoriesAdulthood>
             </li>
         </backstoryFiltersOverride>
@@ -387,4 +387,82 @@
         <pawnGroupDevelopmentStage>Adult</pawnGroupDevelopmentStage>
     </PawnKindDef>
 
+    <!-- Wastelander Trader -->
+
+    <PawnKindDef ParentName="FCP_WastelanderkindBase" MayRequire="Rick.FCP.Wastelanders">
+        <defName>FCP_Pawnkind_Wastelander_Trader</defName>
+        <label>Wastelander Trader</label>
+        <trader>true</trader>
+        <combatPower>30</combatPower>
+        <itemQuality>Poor</itemQuality>
+        <gearHealthRange>0.5~1.8</gearHealthRange>
+        <apparelMoney>600~1000</apparelMoney>
+        <weaponMoney>600</weaponMoney>
+        <weaponTags>
+            <li>Gun</li>
+            <li MayRequire="Rick.FCP.BallisticWeapons">FCP_Pipe_Weapons</li>
+            <li MayRequire="Rick.FCP.BallisticWeapons">FCP_Pistol</li>
+        </weaponTags>
+        <techHediffsMoney>50~50</techHediffsMoney>
+        <techHediffsTags>
+            <li>Poor</li>
+        </techHediffsTags>
+        <techHediffsChance>0.03</techHediffsChance>
+        <initialWillRange>1~3</initialWillRange>
+        <initialResistanceRange>15~24</initialResistanceRange>
+        <backstoryFiltersOverride>
+            <li>
+                <categoriesChildhood>
+                    <li>FCP_Backstory_Wastelander_Child</li>
+                </categoriesChildhood>
+                <categoriesAdulthood>
+                    <li>FCP_Backstory_Wastelander</li>
+                </categoriesAdulthood>
+            </li>
+        </backstoryFiltersOverride>
+    </PawnKindDef>
+
+    <!-- Scavenger Trader -->
+
+    <PawnKindDef ParentName="FCP_WastelanderkindBase">
+        <defName>FCP_Pawnkind_Scavenger_Trader</defName>
+        <label>Scavenger Trader</label>
+        <trader>true</trader>
+        <combatPower>45</combatPower>
+        <itemQuality>Poor</itemQuality>
+        <gearHealthRange>0.4~1.5</gearHealthRange>
+        <apparelMoney>400~800</apparelMoney>
+        <weaponMoney>500</weaponMoney>
+        <weaponTags>
+            <li>Gun</li>
+            <li MayRequire="Rick.FCP.BallisticWeapons">FCP_Pipe_Weapons</li>
+            <li MayRequire="Rick.FCP.BallisticWeapons">FCP_Pistol</li>
+            <li MayRequire="Rick.FCP.BallisticWeapons">FCP_SMG</li>
+            <li MayRequire="Rick.FCP.BallisticWeapons">FCP_Shotgun</li>
+            <li MayRequire="Rick.FCP.Tools">FCP_Melee_Blunt</li>
+            <li MayRequire="Rick.FCP.Tools">FCP_Melee_Bladed</li>
+        </weaponTags>
+        <requiredWorkTags>
+            <li>Violent</li>
+        </requiredWorkTags>
+        <techHediffsMoney>50~50</techHediffsMoney>
+        <techHediffsTags>
+            <li>Poor</li>
+        </techHediffsTags>
+        <techHediffsChance>0.02</techHediffsChance>
+        <initialWillRange>1~3</initialWillRange>
+        <initialResistanceRange>10~20</initialResistanceRange>
+        <backstoryFiltersOverride>
+            <li>
+                <categoriesChildhood>
+                    <li>FCP_Backstory_Wastelander_Child</li>
+                </categoriesChildhood>
+                <categoriesAdulthood>
+                    <li>FCP_Backstory_Wastelander</li>
+                </categoriesAdulthood>
+            </li>
+        </backstoryFiltersOverride>
+        <pawnGroupDevelopmentStage>Adult</pawnGroupDevelopmentStage>
+    </PawnKindDef>
+
 </Defs>
\ No newline at end of file