Various fixs

1.5/Defs/BackstoryDefs/BackstoryDefs_NCR.xml

@@ -161,9 +161,8 @@
 		<spawnCategories>
 			<li>FCP_NCR_Trooper</li>
 		</spawnCategories>
-		<bodyTypeGlobal>Fat</bodyTypeGlobal>
+		<bodyTypeFemale>Female</bodyTypeFemale>
-		<bodyTypeFemale>Fat</bodyTypeFemale>
+		<bodyTypeMale>Male</bodyTypeMale>
-		<bodyTypeMale>Fat</bodyTypeMale>
         <possessions>
         </possessions>
 	</BackstoryDef>
@@ -212,9 +211,8 @@
 		<spawnCategories>
 			<li>FCP_NCR_Ambassador</li>
 		</spawnCategories>
-		<bodyTypeGlobal>Thin</bodyTypeGlobal>
+		<bodyTypeFemale>Female</bodyTypeFemale>
-		<bodyTypeFemale>Thin</bodyTypeFemale>
+		<bodyTypeMale>Male</bodyTypeMale>
-		<bodyTypeMale>Thin</bodyTypeMale>
         <possessions>
         </possessions>
 	</BackstoryDef>
@@ -400,9 +398,8 @@
 		<spawnCategories>
 			<li>FCP_NCR_Trooper</li>
 		</spawnCategories>
-		<bodyTypeGlobal>Thin</bodyTypeGlobal>
+		<bodyTypeFemale>Female</bodyTypeFemale>
-		<bodyTypeFemale>Thin</bodyTypeFemale>
+		<bodyTypeMale>Male</bodyTypeMale>
-		<bodyTypeMale>Thin</bodyTypeMale>
         <possessions>
         </possessions>
 	</BackstoryDef>
@@ -427,9 +424,8 @@
 			<li>FCP_NCR_Citizen</li>
 			<li>FCP_Wastelander</li>
 		</spawnCategories>
-		<bodyTypeGlobal>Fat</bodyTypeGlobal>
+		<bodyTypeFemale>Female</bodyTypeFemale>
-		<bodyTypeFemale>Fat</bodyTypeFemale>
+		<bodyTypeMale>Male</bodyTypeMale>
-		<bodyTypeMale>Fat</bodyTypeMale>
         <possessions>
         </possessions>
 	</BackstoryDef>
@@ -538,9 +534,8 @@
 			<li>FCP_NCR_Citizen</li>
 			<li>FCP_Wastelander</li>
 		</spawnCategories>
-		<bodyTypeGlobal>Hulk</bodyTypeGlobal>
+		<bodyTypeFemale>Female</bodyTypeFemale>
-		<bodyTypeFemale>Hulk</bodyTypeFemale>
+		<bodyTypeMale>Male</bodyTypeMale>
-		<bodyTypeMale>Hulk</bodyTypeMale>
         <possessions>
         </possessions>
 	</BackstoryDef>
@@ -565,7 +560,7 @@
 			<li>FCP_NCR_Citizen</li>
 			<li>FCP_Wastelander</li>
 		</spawnCategories>
-		<bodyTypeFemale>Male</bodyTypeFemale>
+		<bodyTypeFemale>Female</bodyTypeFemale>
 		<bodyTypeMale>Male</bodyTypeMale>
         <possessions>
         </possessions>
@@ -589,8 +584,7 @@
 		<workDisables>Violent</workDisables>
 		<requiredWorkTags>None</requiredWorkTags>
 		<spawnCategories>
-			<li>FCP_NCR_Citizen</li>
+			<li>FCP_NCR_Tax_Collector</li>
-			<li>FCP_Wastelander</li>
 		</spawnCategories>
 		<bodyTypeGlobal>Fat</bodyTypeGlobal>
 		<bodyTypeFemale>Fat</bodyTypeFemale>
@@ -618,9 +612,8 @@
 			<li>FCP_NCR_Citizen</li>
 			<li>FCP_Wastelander</li>
 		</spawnCategories>
-		<bodyTypeGlobal>Hulk</bodyTypeGlobal>
+		<bodyTypeFemale>Female</bodyTypeFemale>
-		<bodyTypeFemale>Hulk</bodyTypeFemale>
+		<bodyTypeMale>Male</bodyTypeMale>
-		<bodyTypeMale>Hulk</bodyTypeMale>
         <possessions>
         </possessions>
 	</BackstoryDef>

1.5/Defs/FactionDefs/FCP_NCR.xml

@@ -10,7 +10,7 @@
         <label>New California Republic</label>
         <description>The New California Republic is a faction based out of Shady Sands in the former state of California. It is a federal parliamentary republic, similar to the pre-war USA before it descended into authoritarianism. They represent the old world and its values. Roads, taxes, prisons, elections, and other phenomena long forgotten made a comeback with the NCR’s rise to power. It is seen by its citizens to be the sole haven of civilisation, democracy, and freedom in the wasteland. While there certainly is truth to that notion, the NCR also suffers from widespread corruption and oligarchic tendencies, for much power is held by exceedingly rich ranchers and farm owners. Furthermore, it uses its vast military, well supplied by their industrial centres, to aggressively expand their territory and claim the resources of neighbouring regions to sate the ever-growing hunger of its population.</description>
         <royalTitleTags>
-            <li>FCP_NCR_Title</li>
+            <li>FCP_Title_NCR</li>
         </royalTitleTags>
         <royalFavorLabel>Service Points</royalFavorLabel>
         <royalTitleInheritanceWorkerClass>RoyalTitleInheritanceWorker</royalTitleInheritanceWorkerClass>
@@ -276,7 +276,7 @@
                 <!-- Tax Collection -->
                 <kindDef>FCP_PawnGroupKind_TaxCollector</kindDef>
                 <traders>
-                    <FCP_NCR_Ambassador>1</FCP_NCR_Ambassador>
+                    <FCP_NCR_Tax_Collector>1</FCP_NCR_Tax_Collector>
                 </traders>
                 <carriers>
                     <FCP_Animal_Brahmin>2</FCP_Animal_Brahmin>
@@ -371,4 +371,4 @@
         </root>
     </ThingSetMakerDef>
 
-</Defs>
+</Defs>

1.5/Defs/IncidentDefs/NCR_Incidents.xml

@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Defs>
+
+    <!--__________ Incidents __________-->
+
+    <!-- California Grizzly Incident -->
+
     <IncidentDef>
         <defName>FCP_Incident_GrizzliesPass</defName>
         <label>grizzlies pass</label>
@@ -16,11 +21,12 @@
             <li Class="FCP.Core.ModExtension_AnimalPassesConfig">
                 <animalThing>Bear_Grizzly</animalThing> <!-- TODO Replace when grizzly def is done -->
                 <animalPawnKind>Bear_Grizzly</animalPawnKind> <!-- TODO Replace when grizzly def is done -->
-                <minCount>2</minCount>
+                <minCount>1</minCount>
                 <maxRangeInclusive>3~6</maxRangeInclusive>
                 <ignoreTemperature>false</ignoreTemperature>
                 <ignoreToxicFallout>true</ignoreToxicFallout>
             </li>
         </modExtensions>
     </IncidentDef>
+
 </Defs>

1.5/Defs/PawnKindDefs/PawnKinds.xml

@@ -45,7 +45,7 @@
     <PawnKindDef ParentName="FCP_NCRkindBase">
         <defName>FCP_NCR_Citizen</defName>
         <label>NCR Citizen</label>
-        <combatPower>20</combatPower>
+        <combatPower>55</combatPower>
         <itemQuality>Poor</itemQuality>
         <gearHealthRange>0.5~1.8</gearHealthRange>
         <apparelMoney>400~600</apparelMoney>
@@ -117,7 +117,7 @@
     <PawnKindDef ParentName="FCP_NCRkindBase">
         <defName>FCP_NCR_NCRCF_Guard</defName>
         <label>NCRCF Guard</label>
-        <combatPower>35</combatPower>
+        <combatPower>60</combatPower>
         <itemQuality>Poor</itemQuality>
         <gearHealthRange>0.5~1.8</gearHealthRange>
         <apparelAllowHeadgearChance>1</apparelAllowHeadgearChance>
@@ -157,7 +157,7 @@
         <defName>FCP_NCR_NCRCF_Warden</defName>
         <label>NCRCF Warden</label>
         <trader>true</trader>
-        <combatPower>35</combatPower>
+        <combatPower>65</combatPower>
         <itemQuality>Poor</itemQuality>
         <apparelAllowHeadgearChance>1</apparelAllowHeadgearChance>
         <apparelRequired>
@@ -215,6 +215,33 @@
 
     <!--___ Politicians ___-->
 
+    <!-- Tax Collector -->
+
+    <PawnKindDef ParentName="FCP_NCRkindBase">
+        <defName>FCP_NCR_Tax_Collector</defName>
+        <label>NCR Tax Collector</label>
+        <trader>true</trader>
+        <combatPower>30</combatPower>
+        <apparelMoney>400~600</apparelMoney>
+        <apparelTags>
+            <li>FCP_NCR_Ambassador</li>
+        </apparelTags>
+        <initialWillRange>1~3</initialWillRange>
+        <initialResistanceRange>10~17</initialResistanceRange>
+        <backstoryFiltersOverride>
+            <li>
+                <categoriesChildhood>
+                    <li>FCP_NCR_Child</li>
+                    <li>FCP_Wastelander_Child</li>
+                </categoriesChildhood>
+                <categoriesAdulthood>
+                    <li>FCP_NCR_Tax_Collector</li>
+                </categoriesAdulthood>
+            </li>
+        </backstoryFiltersOverride>
+        <pawnGroupDevelopmentStage>Adult</pawnGroupDevelopmentStage>
+    </PawnKindDef>
+
     <!-- Ambassador -->
 
     <PawnKindDef ParentName="FCP_NCRkindBase">
@@ -276,7 +303,7 @@
     <PawnKindDef ParentName="FCP_NCRkindBase">
         <defName>FCP_NCR_Trooper</defName>
         <label>NCR trooper</label>
-        <combatPower>45</combatPower>
+        <combatPower>65</combatPower>
         <itemQuality>Poor</itemQuality>
         <gearHealthRange>0.5~1.8</gearHealthRange>
         <apparelMoney>9999</apparelMoney>
@@ -320,7 +347,7 @@
     <PawnKindDef ParentName="FCP_NCRkindBase">
         <defName>FCP_NCR_MP</defName>
         <label>NCR Military Police</label>
-        <combatPower>50</combatPower>
+        <combatPower>60</combatPower>
         <itemQuality>Poor</itemQuality>
         <gearHealthRange>0.5~1.8</gearHealthRange>
         <apparelMoney>400~9999</apparelMoney>
@@ -364,7 +391,7 @@
     <PawnKindDef ParentName="FCP_NCRkindBase">
         <defName>FCP_NCR_Scout_Recon</defName>
         <label>NCR 1st Recon Scout</label>
-        <combatPower>65</combatPower>
+        <combatPower>75</combatPower>
         <gearHealthRange>0.5~1.8</gearHealthRange>
         <apparelMoney>9999</apparelMoney>
         <apparelAllowHeadgearChance>1</apparelAllowHeadgearChance>
@@ -408,7 +435,7 @@
     <PawnKindDef ParentName="FCP_NCRkindBase">
         <defName>FCP_NCR_Trooper_Heavy</defName>
         <label>NCR Heavy Trooper</label>
-        <combatPower>70</combatPower>
+        <combatPower>90</combatPower>
         <gearHealthRange>0.5~1.8</gearHealthRange>
         <apparelMoney>9999</apparelMoney>
         <apparelAllowHeadgearChance>1</apparelAllowHeadgearChance>
@@ -454,7 +481,7 @@
     <PawnKindDef ParentName="FCP_NCRkindBase">
         <defName>FCP_NCR_Officer</defName>
         <label>NCR Officer</label>
-        <combatPower>45</combatPower>
+        <combatPower>95</combatPower>
         <gearHealthRange>0.5~1.8</gearHealthRange>
         <apparelMoney>400~600</apparelMoney>
         <apparelAllowHeadgearChance>1</apparelAllowHeadgearChance>
@@ -534,7 +561,7 @@
     <PawnKindDef ParentName="FCP_NCRkindBase">
         <defName>FCP_NCR_Ranger_Volunteer</defName>
         <label>NCR ranger</label>
-        <combatPower>50</combatPower>
+        <combatPower>75</combatPower>
         <gearHealthRange>0.5~1.8</gearHealthRange>
         <apparelTags>
             <li>FCP_NCR_Ranger_Casual</li>
@@ -566,7 +593,7 @@
     <PawnKindDef ParentName="FCP_NCRkindBase">
         <defName>FCP_NCR_Ranger_Patrolman</defName>
         <label>NCR Ranger</label>
-        <combatPower>65</combatPower>
+        <combatPower>80</combatPower>
         <gearHealthRange>0.5~1.8</gearHealthRange>
         <apparelMoney>9999</apparelMoney>
         <apparelAllowHeadgearChance>1</apparelAllowHeadgearChance>
@@ -609,7 +636,7 @@
     <PawnKindDef ParentName="FCP_NCRkindBase">
         <defName>FCP_NCR_Ranger_Veteran</defName>
         <label>NCR Veteran Ranger</label>
-        <combatPower>80</combatPower>
+        <combatPower>85</combatPower>
         <gearHealthRange>0.5~1.8</gearHealthRange>
         <apparelMoney>1</apparelMoney>
         <apparelRequired>

1.5/Defs/Royalty/TitleDefs/Titles_NCR.xml

@@ -21,7 +21,7 @@
         <label>NCR Army Private</label>
         <description>The lowest rank within the New California Republic's military. There isn't a lot of repect in this role, nor is the pay well.</description>
         <tags>
-            <li>FCP_NCR_Title</li>
+            <li>FCP_Title_NCR</li>
         </tags>
         <seniority>0</seniority>
         <favorCost>1</favorCost>
@@ -38,7 +38,7 @@
         <label>NCR Army Sergeant</label>
         <description>The first rank within the New California Republic's non commissioned officer corps. This is the first step in a professional military carrer with reaL power and responsibilities.</description>
         <tags>
-            <li>FCP_NCR_Title</li>
+            <li>FCP_Title_NCR</li>
         </tags>
         <seniority>100</seniority>
         <favorCost>6</favorCost>
@@ -56,7 +56,7 @@
         <label>NCR Army Lieutenant</label>
         <description>The first rank within the New California Republic's commissioned officer corps. This is the lowest command position with the ability to call in reinforcements and supplies much faster and with greater quality and quantity.</description>
         <tags>
-            <li>FCP_NCR_Title</li>
+            <li>FCP_Title_NCR</li>
         </tags>
         <seniority>300</seniority>
         <favorCost>10</favorCost>
@@ -85,7 +85,7 @@
         <label>NCR Army Colonel</label>
         <description>The highest rank that achievable in the New California Republic without a political ally. This is one of the highest command positions with the ability to call in reinforcements at the company level and higher including special forces.</description>
         <tags>
-            <li>FCP_NCR_Title</li>
+            <li>FCP_Title_NCR</li>
         </tags>
         <seniority>600</seniority>
         <favorCost>12</favorCost>
@@ -116,7 +116,7 @@
         <label>NCR Ranger Volunteer</label>
         <description>.</description>
         <tags>
-            <li>FCP_NCR_Title</li>
+            <li>FCP_Title_NCR</li>
         </tags>
         <seniority>650</seniority>
         <favorCost>7</favorCost>
@@ -153,7 +153,7 @@
         <label>NCR Ranger Patrolman</label>
         <description>.</description>
         <tags>
-            <li>FCP_NCR_Title</li>
+            <li>FCP_Title_NCR</li>
         </tags>
         <seniority>700</seniority>
         <favorCost>11</favorCost>
@@ -190,7 +190,7 @@
         <label>NCR Ranger Veteran</label>
         <description>.</description>
         <tags>
-            <li>FCP_NCR_Title</li>
+            <li>FCP_Title_NCR</li>
         </tags>
         <seniority>750</seniority>
         <favorCost>13</favorCost>

1.5/Defs/ScenarioDefs/StartingScenarios.xml

@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <!--__________ Scenarios __________-->
+
+    <!--_____ NCR _____-->
+
+    <ScenarioDef>
+        <defName MayRequire="Rick.FCP.NCR">FCP_Scenario_Lost_Squad</defName>
+        <label>Lost Squad</label>
+        <description>Your outpost was attacked by unknown enemies. Your squad was sent off in the dead of night to get reinforcements, but you have now become lost. Will you work your way back to the NCR? Or will you stay where you are and survive as new citizens of this desolate wasteland?</description>
+        <scenario>
+            <summary>Five lost soldiers of the New California Republic attempt to start anew.</summary>
+            <playerFaction>
+                <def>PlayerFaction</def>
+                <factionDef>PlayerColony</factionDef>
+            </playerFaction>
+            <parts>
+
+                <!-- Config pages -->
+                <li Class="ScenPart_ConfigPage_ConfigureStartingPawns_KindDefs">
+                    <def>ConfigurePawnsKindDefs</def>
+                    <pawnChoiceCount>8</pawnChoiceCount>
+                    <leftBehindPawnKind>FCP_NCR_Trooper</leftBehindPawnKind>
+                    <kindCounts>
+                        <li>
+                            <kindDef>FCP_NCR_Officer</kindDef>
+                            <count>1</count>
+                            <requiredAtStart>true</requiredAtStart>
+                        </li>
+                        <li>
+                            <kindDef>FCP_NCR_Trooper</kindDef>
+                            <count>3</count>
+                            <requiredAtStart>false</requiredAtStart>
+                        </li>
+                        <li>
+                            <kindDef>FCP_NCR_Scout_Recon</kindDef>
+                            <count>1</count>
+                            <requiredAtStart>false</requiredAtStart>
+                        </li>
+                    </kindCounts>
+                </li>
+
+                <!-- Player starting stuff spawn method-->
+                <li Class="ScenPart_PlayerPawnsArriveMethod">
+                    <def>PlayerPawnsArriveMethod</def>
+                    <method>Standing</method>
+                </li>
+
+                <!-- Player pawns modifiers -->
+                <li Class="ScenPart_ForcedHediff">
+                    <def>ForcedHediff</def>
+                    <visible>false</visible>
+                    <context>PlayerStarter</context>
+                    <chance>0.5</chance>
+                    <hediff>Malnutrition</hediff>
+                    <severityRange>0.2~0.4</severityRange>
+                </li>
+                <li Class="ScenPart_SetNeedLevel">
+                    <def>SetNeedLevel</def>
+                    <visible>false</visible>
+                    <context>PlayerStarter</context>
+                    <chance>1.0</chance>
+                    <need>Food</need>
+                    <levelRange>0~0.1</levelRange>
+                </li>
+
+                <!-- Player starting things -->
+                <li Class="ScenPart_StartingThing_Defined">
+                    <def>StartingThing_Defined</def>
+                    <thingDef>FCP_Currency_NCR_Dollar</thingDef>
+                    <count>200</count>
+                </li>
+                <li Class="ScenPart_StartingThing_Defined">
+                    <def>StartingThing_Defined</def>
+                    <thingDef>FCP_Currency_Caps</thingDef>
+                    <count>100</count>
+                </li>
+                <li Class="ScenPart_StartingThing_Defined">
+                    <def>StartingThing_Defined</def>
+                    <thingDef>FCP_Food_Crate</thingDef>
+                    <count>2</count>
+                </li>
+                <li Class="ScenPart_StartingThing_Defined">
+                    <def>StartingThing_Defined</def>
+                    <thingDef>FCP_Weapon_Army_Crate</thingDef>
+                    <count>1</count>
+                </li>
+                <li Class="ScenPart_StartingThing_Defined">
+                    <def>StartingThing_Defined</def>
+                    <thingDef>FCP_Uniform_Army_Crate</thingDef>
+                    <count>1</count>
+                </li>
+                <!-- <li Class="ScenPart_StartingAnimal">
+                    <def>StartingAnimal</def>
+                    <count>3</count>
+                </li> -->
+
+                <!-- Scatter some things near player start -->
+                <li Class="ScenPart_ScatterThingsNearPlayerStart">
+                    <def>ScatterThingsNearPlayerStart</def>
+                    <thingDef>WoodLog</thingDef>
+                    <count>500</count>
+                </li>
+
+                <!-- Game start dialog -->
+                <li Class="ScenPart_GameStartDialog">
+                    <def>GameStartDialog</def>
+                    <text>The enemy relentless. They came in the night, silent with blades and spears. They cut through the outpost, slashing and killing troopers as if they were killing for fun.\n\nOnly you and your squad escaped, having been sent to gather reinfrocements.\n\nAfter wandering the wastes going in what appears to be circles you find your next spot to make camp. Do you rest for the night, or stay and create a new home for yourselves?</text>
+                    <closeSound>FCP_War_Never_Changes</closeSound>
+                </li>
+
+            </parts>
+        </scenario>
+    </ScenarioDef>
+
+    <!--_____ Legion _____-->
+
+
+
+    <!--_____ Wastelander _____-->
+
+
+
+</Defs>

Common/Languages/English/Keyed/NCRKeyed.xml

@@ -2,5 +2,5 @@
 <LanguageData>
 	<!-- California Grizzlies -->
 	<FCP_LetterLabel_GrizzliesPass>California grizzlies</FCP_LetterLabel_GrizzliesPass>
-	<FCP_Letter_GrizzliesPass>A small herd of ranger ricks have entered the area and converted your colony into a member of the Rimworld Collaboration Project (desc TBD).\n\nThe bears will leave the area in a few days.</FCP_Letter_GrizzliesPass>
+	<FCP_Letter_GrizzliesPass>A large bear has come to your settlement. It has 2 large heads, massive paws and thick fur. This animal is a California grizzly bear, known from legend and extremly rare. It is the main symbol of the New California Republic. Depending on your thoughts or ideologies this is a great omen! Or a hint of death...</FCP_Letter_GrizzliesPass>
 </LanguageData>