falloutcollab/FCP-NCR
0
0
Fork 0
mirror of https://github.com/FalloutCollaborationProject/FCP-NCR.git synced 2026-07-27 17:00:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

Various fixes/changes

Browse Source
This commit is contained in:
RickGrymes
2024-12-03 23:18:59 -06:00
parent c9abeaf4dc
commit 5358d8bd58
7 changed files with 164 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files
1.5/Defs/BackstoryDefs/BackstoryDefs_NCR.xml
+1 -1
View File
@@ -1080,4 +1080,4 @@
</possessions>
</BackstoryDef>
</Defs>
</Defs>
1.5/Defs/FactionDefs/FCP_NCR.xml
+2 -2
View File
@@ -115,7 +115,7 @@
<li>FCP_Caravan_Pre_War_Goods_Trader</li>
<li>FCP_Caravan_NCRCF_Prisoner_Exchange</li>
<li>FCP_Caravan_Brahmin_Herder</li>
<!-- <li>Base_Outlander_Standard</li> -->
<!-- <li>Base_Outlander_Standard</li> -->
</baseTraderKinds>
<!-- Trader Kind Arrival Options -->
@@ -280,7 +280,7 @@
<FCP_Animal_Brahmin>2</FCP_Animal_Brahmin>
</carriers>
<guards>
<FCP_NCR_Caravan_Guard>5</FCP_NCR_Caravan_Guard>
<FCP_Armored_Wastelander_Combat_Armor>5</FCP_Armored_Wastelander_Combat_Armor>
</guards>
</li>
1.5/Defs/PawnKindDefs/PawnKinds.xml
+42 -227
View File
File diff suppressed because it is too large Load Diff
1.5/Defs/ThingDefs_Apparel/ThingDefs_Accessories.xml
+7 -2
View File
@@ -52,9 +52,11 @@
<li>Soldier</li>
</defaultOutfitTags>
</apparel>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
<!-- Trooper Mantle -->
<ThingDef ParentName="ArmorMachineableBase">
@@ -84,7 +86,7 @@
<WorkToMake>1000</WorkToMake>
<Mass>4.0</Mass>
<EquipDelay>1.2</EquipDelay>
<Insulation_Heat>7</Insulation_Heat>
<Insulation_Heat>7</Insulation_Heat>
</statBases>
<costList>
<Cloth>35</Cloth>
@@ -104,6 +106,9 @@
<li>Soldier</li>
</defaultOutfitTags>
</apparel>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
</Defs>
1.5/Defs/ThingDefs_Apparel/ThingDefs_Apparel.xml
+69 -6
View File
@@ -66,6 +66,9 @@
<li>Worker</li>
</defaultOutfitTags>
</apparel>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
<!--___ Politicians ___-->
@@ -133,6 +136,9 @@
<li>Worker</li>
</defaultOutfitTags>
</apparel>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
<!-- NCR Ambassador Suit -->
@@ -197,6 +203,9 @@
<li>Worker</li>
</defaultOutfitTags>
</apparel>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
<!-- NCR Presidents Suit -->
@@ -260,6 +269,9 @@
<li>Worker</li>
</defaultOutfitTags>
</apparel>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
<!--___ NCR Army ___-->
@@ -320,6 +332,9 @@
<li>Soldier</li>
</defaultOutfitTags>
</apparel>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
<!-- Trooper MP -->
@@ -378,6 +393,9 @@
<li>FCP_NCR_Trooper</li>
</defaultOutfitTags>
</apparel>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
<!-- NCR General Uniform-->
@@ -437,6 +455,9 @@
<li>Worker</li>
</defaultOutfitTags>
</apparel>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
<!--___ NCR Rangers ___-->
@@ -491,6 +512,9 @@
<li>Worker</li>
</defaultOutfitTags>
</apparel>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
<!-- NCR Ranger Casual Outfit -->
@@ -592,6 +616,9 @@
<li>Soldier</li>
</defaultOutfitTags>
</apparel>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
<!-- Veteran Ranger Duster -->
@@ -649,6 +676,9 @@
<li>Soldier</li>
</defaultOutfitTags>
</apparel>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
<!--___ NCRCF ___-->
@@ -713,6 +743,9 @@
<li>Worker</li>
</defaultOutfitTags>
</apparel>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
<!-- NCRCF Jacket -->
@@ -773,6 +806,9 @@
<li>Worker</li>
</defaultOutfitTags>
</apparel>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
<!--_____ NCR Armors _____-->
@@ -837,6 +873,9 @@
<li>Soldier</li>
</defaultOutfitTags>
</apparel>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
<!-- Trooper Bandoleer Armor -->
@@ -900,6 +939,9 @@
<li>Soldier</li>
</defaultOutfitTags>
</apparel>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
<!-- Trooper Vest -->
@@ -955,6 +997,9 @@
<li>Soldier</li>
</defaultOutfitTags>
</apparel>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
<!-- Trooper Mantle Armor -->
@@ -1015,6 +1060,9 @@
<li>Soldier</li>
</defaultOutfitTags>
</apparel>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
<!-- Scout Recon -->
@@ -1075,6 +1123,9 @@
<li>Soldier</li>
</defaultOutfitTags>
</apparel>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
<!-- Power Armor -->
@@ -1137,12 +1188,15 @@
<li>Soldier</li>
</defaultOutfitTags>
</apparel>
<modExtensions>
<li Class="FalloutCore.ApparelExtension">
<shouldHideBody>True</shouldHideBody>
<displayBodyType>Hulk</displayBodyType>
</li>
</modExtensions>
<modExtensions>
<li Class="FalloutCore.ApparelExtension">
<shouldHideBody>True</shouldHideBody>
<displayBodyType>Hulk</displayBodyType>
</li>
</modExtensions>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
<!--___ NCR Rangers ___-->
@@ -1205,6 +1259,9 @@
<li>Soldier</li>
</defaultOutfitTags>
</apparel>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
<!-- Veteran Ranger Armor -->
@@ -1259,6 +1316,9 @@
<li>Soldier</li>
</defaultOutfitTags>
</apparel>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
<!--___ NCRCF ___-->
@@ -1320,6 +1380,9 @@
<li>Soldier</li>
</defaultOutfitTags>
</apparel>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
</Defs>
1.5/Defs/ThingDefs_Apparel/ThingDefs_Headgear.xml
+20
View File
@@ -53,6 +53,9 @@
<li>Soldier</li>
</defaultOutfitTags>
</apparel>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
<!--___ Troopers ___-->
@@ -103,6 +106,9 @@
<li>Soldier</li>
</defaultOutfitTags>
</apparel>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
<!-- NCR Goggles Trooper Helmet -->
@@ -239,6 +245,7 @@
<Cloth>25</Cloth>
</costList>
<apparel>
<canBeDesiredForIdeo>true</canBeDesiredForIdeo>
<bodyPartGroups>
<li>UpperHead</li>
</bodyPartGroups>
@@ -253,6 +260,9 @@
<li>Soldier</li>
</defaultOutfitTags>
</apparel>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
<!-- NCR 1st Recon Beret -->
@@ -327,6 +337,9 @@
<li>Soldier</li>
</defaultOutfitTags>
</apparel>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
<!--___ Misc -->
@@ -404,6 +417,9 @@
<li>Worker</li>
</defaultOutfitTags>
</apparel>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
<!-- Ranger Hat Brown -->
@@ -490,6 +506,7 @@
</statBases>
<equippedStatOffsets>
<ToxicEnvironmentResistance MayRequire="Ludeon.RimWorld.Biotech">0.90</ToxicEnvironmentResistance>
<ShootingAccuracyPawn>0.50</ShootingAccuracyPawn> <!-- +1 Perception -->
</equippedStatOffsets>
<costList>
<Steel>50</Steel>
@@ -509,6 +526,9 @@
<li>Soldier</li>
</defaultOutfitTags>
</apparel>
<tradeTags>
<li>FCP_Trade_Tag_NCR_Apparel</li>
</tradeTags>
</ThingDef>
</Defs>
1.5/Defs/TraderKindDefs/TraderKindDefs_NCR.xml
+23 -16
View File
@@ -29,9 +29,9 @@
</li>
<!--__ Currency __-->
<!-- NCR Dollars -->
<li Class="StockGenerator_SingleDef">
<thingDef>FCP_Currency_NCR_Dollar</thingDef>
<countRange>750~1200</countRange>
@@ -49,16 +49,17 @@
<!--__ Slaves __-->
<li Class="StockGenerator_Slaves">
<respectPopulationIntent>true</respectPopulationIntent>
<li Class="FCP.Core.StockGenerator_PawnsWithXenotype">
<ignoreIdeoRequirements>true</ignoreIdeoRequirements>
<respectPopulationIntent>false</respectPopulationIntent>
<countRange>2~5</countRange>
<slaveKindDef>FCP_NCR_NCRCF_Inmate</slaveKindDef>
</li>
<!--__ Currency __-->
<!-- NCR Dollars -->
<li Class="StockGenerator_SingleDef">
<thingDef>FCP_Currency_NCR_Dollar</thingDef>
<countRange>750~1200</countRange>
@@ -73,7 +74,9 @@
<label>NCR Quartermaster</label>
<stockGenerators>
<!--__ Apparel __-->
<!--__ Selling __-->
<!--_ Apparel _-->
<!-- Clothing -->
@@ -101,7 +104,7 @@
<thingDef>FCP_Apparel_NCR_Beret_1st_Recon</thingDef>
<countRange>0~1</countRange>
</li>
<!-- Armor -->
<li Class="StockGenerator_SingleDef">
@@ -156,18 +159,22 @@
<thingDef>FCP_Accessories_NCR_Mantle</thingDef>
<countRange>2~6</countRange>
</li>
<!--__ Buying __-->
<li Class="StockGenerator_BuyTradeTag"><tag>Art</tag></li>
<!--__ Currency __-->
<!-- NCR Dollars -->
<li Class="StockGenerator_SingleDef">
<thingDef>FCP_Currency_NCR_Dollar</thingDef>
<countRange>300~1250</countRange>
</li>
</stockGenerators>
</TraderKindDef>
<!--___ Pre-War Goods Trader ___-->
<TraderKindDef>
@@ -263,11 +270,11 @@
<thingDef>FCP_Food_Yum_Yum_Deviled_Eggs_Sour_Cream_Flavor</thingDef>
<countRange>2~10</countRange>
</li>
<!--__ Currency __-->
<!-- NCR Dollars -->
<li Class="StockGenerator_SingleDef">
<thingDef>FCP_Currency_NCR_Dollar</thingDef>
<countRange>150~750</countRange>