Fixed pawngroups

1.5/Defs/FactionDefs/FCP_NCR.xml

@@ -140,7 +140,7 @@
                     <li>Siege</li>
                 </disallowedStrategies>
                 <options>
-                    <FCP_NCR_Scout_Recon>6</FCP_NCR_Scout_Recon>
+                    <FCP_NCR_Scout_Recon>8</FCP_NCR_Scout_Recon>
                     <FCP_NCR_Officer>1</FCP_NCR_Officer>
                     <FCP_NCR_President>1</FCP_NCR_President>
                 </options>
@@ -159,7 +159,7 @@
                     <li>Siege</li>
                 </disallowedStrategies>
                 <options>
-                    <FCP_NCR_Trooper_Heavy>5</FCP_NCR_Trooper_Heavy>
+                    <FCP_NCR_Trooper_Heavy>10</FCP_NCR_Trooper_Heavy>
                     <FCP_NCR_President>1</FCP_NCR_President>
                 </options>
             </li>
@@ -178,7 +178,7 @@
                 </disallowedStrategies>
                 <options>
                     <FCP_NCR_Trooper>5</FCP_NCR_Trooper>
-                    <FCP_NCR_Ranger_Volunteer>3</FCP_NCR_Ranger_Volunteer>
+                    <FCP_NCR_Ranger_Volunteer>8</FCP_NCR_Ranger_Volunteer>
                     <FCP_NCR_President>1</FCP_NCR_President>
                 </options>
             </li>
@@ -197,7 +197,7 @@
                 </disallowedStrategies>
                 <options>
                     <FCP_NCR_Trooper>5</FCP_NCR_Trooper>
-                    <FCP_NCR_Ranger_Patrolman>5</FCP_NCR_Ranger_Patrolman>
+                    <FCP_NCR_Ranger_Patrolman>8</FCP_NCR_Ranger_Patrolman>
                     <FCP_NCR_President>1</FCP_NCR_President>
                 </options>
             </li>
@@ -216,7 +216,7 @@
                 </disallowedStrategies>
                 <options>
                     <FCP_NCR_Trooper>2</FCP_NCR_Trooper>
-                    <FCP_NCR_Ranger_Veteran>3</FCP_NCR_Ranger_Veteran>
+                    <FCP_NCR_Ranger_Veteran>8</FCP_NCR_Ranger_Veteran>
                     <FCP_NCR_President>1</FCP_NCR_President>
                 </options>
             </li>
@@ -271,7 +271,6 @@
                 </carriers>
                 <guards>
                     <FCP_NCR_Citizen>5</FCP_NCR_Citizen>
-                    <FCP_NCR_President>1</FCP_NCR_President>
                 </guards>
             </li>
 
@@ -290,7 +289,6 @@
                 </carriers>
                 <guards>
                     <FCP_NCR_NCRCF_Guard>4</FCP_NCR_NCRCF_Guard>
-                    <FCP_NCR_President>1</FCP_NCR_President>
                 </guards>
             </li>
 

1.5/Defs/PawnKindDefs/PawnKinds.xml

@@ -136,11 +136,12 @@
         <combatPower>35</combatPower>
         <itemQuality>Poor</itemQuality>
         <gearHealthRange>0.5~1.8</gearHealthRange>
-        <apparelMoney>400~600</apparelMoney>
         <apparelAllowHeadgearChance>1</apparelAllowHeadgearChance>
-        <apparelTags>
-            <li>FCP_NCRCF_Guard</li>
-        </apparelTags>
+        <apparelRequired>
+            <li>FCP_Apparel_NCR_Trooper_MP_Uniform</li>
+            <li>FCP_Apparel_NCRCF_Guard_Vest</li>
+            <li>FCP_Apparel_NCRCF_Guard_Helmet</li>
+        </apparelRequired>
         <techHediffsMoney>50~50</techHediffsMoney>
         <techHediffsTags>
             <li>Poor</li>
@@ -174,7 +175,6 @@
         <trader>true</trader>
         <combatPower>35</combatPower>
         <itemQuality>Poor</itemQuality>
-        <apparelMoney>400~600</apparelMoney>
         <apparelAllowHeadgearChance>1</apparelAllowHeadgearChance>
         <apparelRequired>
             <li>FCP_Apparel_NCR_Trooper_MP_Uniform</li>
@@ -196,20 +196,19 @@
                 </categoriesChildhood>
                 <categoriesAdulthood>
                     <li>FCP_NCR_Trooper</li>
-                    <li>FCP_NCR_Citizen</li>
-                    <li>FCP_Wastelander</li>
                 </categoriesAdulthood>
             </li>
         </backstoryFiltersOverride>
         <pawnGroupDevelopmentStage>Adult</pawnGroupDevelopmentStage>
     </PawnKindDef>
 
+    <!-- Crimson Caravan Trader -->
+    
     <PawnKindDef ParentName="FCP_NCRkindBase">
         <defName>FCP_NCR_Crimson_Caravan_Trader</defName>
         <label>NCR Crimson Caravan Trader</label>
         <trader>true</trader>
         <combatPower>30</combatPower>
-        <apparelMoney>400~600</apparelMoney>
         <apparelRequired>
             <li>FCP_Apparel_Caravaneer_Outfit</li>
         </apparelRequired>
@@ -223,6 +222,7 @@
                 </categoriesChildhood>
                 <categoriesAdulthood>
                     <li>FCP_NCR_Caravaneer</li>
+                    <li>FCP_Wasteland_Trader</li>
                 </categoriesAdulthood>
             </li>
         </backstoryFiltersOverride>

1.5/Defs/ThingDefs_Misc/ThingDefs_Apparel.xml

@@ -370,7 +370,6 @@
             <wornGraphicPath>Apparel/NCR_Troopers/NCR_Trooper_MP_Uniform/FCP_NCR_MP_Uniform</wornGraphicPath>
             <layers>
                 <li>OnSkin</li>
-                <li>Middle</li>
             </layers>
             <tags>
                 <li>FCP_NCR_MP</li>

1.5/Defs/ThingDefs_Misc/ThingDefs_Headgear.xml

@@ -9,7 +9,7 @@
 
     <!-- NCRCF Guard Helmet -->
 
-    <ThingDef ParentName="ArmorHelmetMakeableBase" Name="FCP_NCR_Trooper_Helmet">
+    <ThingDef ParentName="ArmorHelmetMakeableBase">
         <defName>FCP_Apparel_NCRCF_Guard_Helmet</defName>
         <label>NCRCF Guard Helmet</label>
         <description>A riot helmet once worn by the guards of the NCRCF. Like many other parts of their gear, it has been apprehended by the Powder Gangers. It offers good protection, especially against blunt damage.</description>