misc

1.5/Defs/FactionDefs/FCP_NCR.xml

@@ -148,7 +148,7 @@
                     <FCP_Animal_NCR_Guard_Dog MayRequire="Rick.FCP.Animals">8</FCP_Animal_NCR_Guard_Dog>
                     <FCP_NCR_Trooper>15</FCP_NCR_Trooper>
                     <FCP_NCR_Officer>2</FCP_NCR_Officer>
-                    <FCP_NCR_President>1</FCP_NCR_President>
+                    <FCP_NCR_General>1</FCP_NCR_General>
                 </options>
             </li>
 
@@ -164,7 +164,7 @@
                     <FCP_Animal_NCR_Guard_Dog MayRequire="Rick.FCP.Animals">4</FCP_Animal_NCR_Guard_Dog>
                     <FCP_NCR_Scout_Recon>8</FCP_NCR_Scout_Recon>
                     <FCP_NCR_Officer>1</FCP_NCR_Officer>
-                    <FCP_NCR_President>1</FCP_NCR_President>
+                    <FCP_NCR_General>1</FCP_NCR_General>
                 </options>
             </li>
 
@@ -179,7 +179,7 @@
                 <options>
                     <FCP_Animal_NCR_Guard_Dog MayRequire="Rick.FCP.Animals">4</FCP_Animal_NCR_Guard_Dog>
                     <FCP_NCR_Trooper_Heavy>10</FCP_NCR_Trooper_Heavy>
-                    <FCP_NCR_President>1</FCP_NCR_President>
+                    <FCP_NCR_General>1</FCP_NCR_General>
                 </options>
             </li>
 
@@ -195,7 +195,7 @@
                     <FCP_Animal_NCR_Guard_Dog MayRequire="Rick.FCP.Animals">3</FCP_Animal_NCR_Guard_Dog>
                     <FCP_NCR_Trooper>5</FCP_NCR_Trooper>
                     <FCP_NCR_Ranger_Volunteer>8</FCP_NCR_Ranger_Volunteer>
-                    <FCP_NCR_President>1</FCP_NCR_President>
+                    <FCP_NCR_General>1</FCP_NCR_General>
                 </options>
             </li>
 
@@ -211,7 +211,7 @@
                     <FCP_Animal_NCR_Guard_Dog MayRequire="Rick.FCP.Animals">3</FCP_Animal_NCR_Guard_Dog>
                     <FCP_NCR_Trooper>5</FCP_NCR_Trooper>
                     <FCP_NCR_Ranger_Patrolman>8</FCP_NCR_Ranger_Patrolman>
-                    <FCP_NCR_President>1</FCP_NCR_President>
+                    <FCP_NCR_General>1</FCP_NCR_General>
                 </options>
             </li>
 
@@ -227,7 +227,7 @@
                     <FCP_Animal_NCR_Guard_Dog MayRequire="Rick.FCP.Animals">3</FCP_Animal_NCR_Guard_Dog>
                     <FCP_NCR_Trooper>2</FCP_NCR_Trooper>
                     <FCP_NCR_Ranger_Veteran>8</FCP_NCR_Ranger_Veteran>
-                    <FCP_NCR_President>1</FCP_NCR_President>
+                    <FCP_NCR_General>1</FCP_NCR_General>
                 </options>
             </li>
 
@@ -242,7 +242,6 @@
                     <FCP_NCR_Officer>1</FCP_NCR_Officer>
                     <FCP_NCR_Ranger_Veteran>3</FCP_NCR_Ranger_Veteran>
                     <FCP_NCR_General>1</FCP_NCR_General>
-                    <FCP_NCR_President>1</FCP_NCR_President>
                 </options>
             </li>
 
@@ -352,7 +351,7 @@
                     <FCP_NCR_Ranger_Volunteer>5</FCP_NCR_Ranger_Volunteer>
                     <FCP_NCR_MP>12</FCP_NCR_MP>
                     <FCP_NCR_Ambassador>2</FCP_NCR_Ambassador>
-                    <FCP_NCR_President>1</FCP_NCR_President>
+                    <FCP_NCR_President_Kimball>1</FCP_NCR_President_Kimball>
                 </options>
             </li>
         </pawnGroupMakers>

1.5/Defs/PawnKindDefs/PawnKinds.xml

@@ -158,7 +158,6 @@
     <PawnKindDef ParentName="FCP_NCRkindBase">
         <defName>FCP_NCR_Chief_Hanlon</defName>
         <label>Chief Hanlon</label>
-        <factionLeader>true</factionLeader>
         <combatPower>120</combatPower>
         <apparelMoney>0</apparelMoney>
         <apparelRequired>
@@ -1194,7 +1193,7 @@
 
     <!-- President -->
 
-    <PawnKindDef ParentName="FCP_NCRkindBase">
+    <!-- <PawnKindDef ParentName="FCP_NCRkindBase">
         <defName>FCP_NCR_President</defName>
         <label>NCR President</label>
         <factionLeader>true</factionLeader>
@@ -1202,7 +1201,7 @@
         <apparelRequired>
             <li>FCP_Apparel_NCR_Presidents_Suit</li>
         </apparelRequired>
-        <!-- <weaponMoney>1000~1001</weaponMoney> -->
+        <weaponMoney>1000~1001</weaponMoney>
         <initialWillRange>3~5</initialWillRange>
         <initialResistanceRange>19~30</initialResistanceRange>
         <backstoryFiltersOverride>
@@ -1217,7 +1216,7 @@
             </li>
         </backstoryFiltersOverride>
         <pawnGroupDevelopmentStage>Adult</pawnGroupDevelopmentStage>
-    </PawnKindDef>
+    </PawnKindDef> -->
 
     <!--___ Military ___-->
 
@@ -1389,7 +1388,7 @@
                     <li>FCP_Wastelander_Child</li>
                 </categoriesChildhood>
                 <categoriesAdulthood>
-                    <li>FCP_NCR_Trooper</li>
+                    <li>FCP_NCR_Heavy_Trooper</li>
                 </categoriesAdulthood>
             </li>
         </backstoryFiltersOverride>
@@ -1452,6 +1451,7 @@
         <label>NCR General</label>
         <combatPower>190</combatPower>
         <apparelMoney>9999</apparelMoney>
+        <factionLeader>true</factionLeader>
         <apparelTags>
             <li>FCP_NCR_General</li>
         </apparelTags>

1.5/Defs/ThingDefs_Buildings/FCP_NCR_Vertibirds.xml

@@ -156,7 +156,7 @@
                             <drawSize>(6,6)</drawSize>
                         </bladeGraphic>
                         <positionOffset>(1, 0, -2.5)</positionOffset>
-                        <spinRate>5</spinRate>
+                        <spinRate>15</spinRate>
                     </li>
                     <li>
                         <bladeGraphic>
@@ -165,7 +165,7 @@
                             <drawSize>(6,6)</drawSize>
                         </bladeGraphic>
                         <positionOffset>(1, 0, 3.7)</positionOffset>
-                        <spinRate>5</spinRate>
+                        <spinRate>15</spinRate>
                     </li>
                 </bladeGraphicsData>
             </li>