Merge pull request CombatExtended-Continued#3734 from aldent95/patch-grimworld-traders

N7Huntsman · web-flow · commit 2cb08948dc94 · 2025-03-30T02:57:02.000-04:00
Grimworld Multi-patch - Traders
diff --git a/Defs/Ammo/Advanced/12mmRailgun.xml b/Defs/Ammo/Advanced/12mmRailgun.xml
@@ -33,6 +33,7 @@
 			<li>CE_AutoEnableTrade</li>
 			<li>CE_AutoEnableCrafting_FabricationBench</li>
 			<li>CE_AutoEnableCrafting_TableMachining</li>
+    		<li>CE_40K_MediumAmmo</li>
 			<!-- Railgun ammo isn't handloaded because it contains no propellant, and the sabots must be precision-machined anyway -->
 		</tradeTags>
 		<thingCategories>
@@ -101,4 +102,4 @@
 		</products>
 	</RecipeDef>
 
-</Defs>
+</Defs>
diff --git a/Defs/Ammo/Grenade/40x46mmGrenade.xml b/Defs/Ammo/Grenade/40x46mmGrenade.xml
@@ -34,6 +34,7 @@
 		<tradeTags>
 			<li>CE_AutoEnableTrade</li>
 			<li>CE_AutoEnableCrafting_TableMachining</li>
+    		<li>CE_40K_HeavyAmmo</li>
 		</tradeTags>
 		<thingCategories>
 			<li>Ammo40x46mmGrenades</li>
@@ -511,4 +512,4 @@
 		<workAmount>7400</workAmount>
 	</RecipeDef>
 
-</Defs>
+</Defs>
diff --git a/Defs/Ammo/HighCaliber/20x102mmNATO.xml b/Defs/Ammo/HighCaliber/20x102mmNATO.xml
@@ -33,6 +33,7 @@
 		<tradeTags>
 			<li>CE_AutoEnableTrade</li>
 			<li>CE_AutoEnableCrafting</li>
+    		<li>CE_40K_HeavyAmmo</li>
 		</tradeTags>
 		<thingCategories>
 			<li>Ammo20x102mmNATO</li>
@@ -308,4 +309,4 @@
 		<workAmount>13600</workAmount>
 	</RecipeDef>
 
-</Defs>
+</Defs>
diff --git a/Defs/Ammo/Modded/Warhammer 40k/Autoguns.xml b/Defs/Ammo/Modded/Warhammer 40k/Autoguns.xml
@@ -35,6 +35,7 @@
 		<tradeTags>
 			<li>CE_AutoEnableTrade</li>
 			<li>CE_AutoEnableCrafting</li>
+      		<li>CE_40K_Ammo</li>
 		</tradeTags>
 		<thingCategories>
 			<li>Ammo825mmLong</li>
@@ -407,4 +408,4 @@
 		<workAmount>4000</workAmount>
 	</RecipeDef>
 
-</Defs>
+</Defs>
diff --git a/Defs/Ammo/Modded/Warhammer 40k/Bolter.xml b/Defs/Ammo/Modded/Warhammer 40k/Bolter.xml
@@ -47,6 +47,7 @@
 			<li>CE_AutoEnableTrade</li>
 			<li>CE_AutoEnableCrafting</li>
 			<li>CE_AutoEnableCrafting_GWAmmoBench</li>
+    		<li>CE_40K_MediumAmmo</li>
 		</tradeTags>
 		<thingCategories>
 			<li>AmmoBolter75</li>
@@ -109,7 +110,7 @@
 		<ammoClass>Kraken</ammoClass>
 		<cookOffProjectile>Bullet_Bolter75_Kraken</cookOffProjectile>
 	</ThingDef>
-	
+
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoBolter75Base">
 		<defName>Ammo_Bolter75_Tempest</defName>
 		<label>.75 cal bolter shell (Tempest)</label>
@@ -184,7 +185,7 @@
 			<damageAmountBase>49</damageAmountBase>
 			<armorPenetrationSharp>15</armorPenetrationSharp>
 			<armorPenetrationBlunt>39.494</armorPenetrationBlunt>
-			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>			
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
 		</projectile>
 		<comps>
 			<li Class="CombatExtended.CompProperties_Fragments">
@@ -211,7 +212,7 @@
 			</secondaryDamage>
 		</projectile>
 	</ThingDef>
-	
+
 	<ThingDef ParentName="BaseBolter75Bullet">
 		<defName>Bullet_Bolter75_Tempest</defName>
 		<label>.75 cal bolt (tempest)</label>
@@ -282,7 +283,7 @@
 			<damageAmountBase>49</damageAmountBase>
 			<armorPenetrationSharp>16.5</armorPenetrationSharp>
 			<armorPenetrationBlunt>43.44</armorPenetrationBlunt>
-			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>			
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
 		</projectile>
 		<comps>
 			<li Class="CombatExtended.CompProperties_Fragments">
@@ -309,7 +310,7 @@
 			</secondaryDamage>
 		</projectile>
 	</ThingDef>
-	
+
 	<ThingDef ParentName="BaseBolter75Bullet">
 		<defName>Bullet_Bolter75_Tempest_Relic</defName>
 		<label>.75 cal bolt (tempest)</label>
@@ -586,4 +587,4 @@
 		<workAmount>15840</workAmount>
 	</RecipeDef>
 
-</Defs>
+</Defs>
diff --git a/Defs/Ammo/Modded/Warhammer 40k/Bolter_Small.xml b/Defs/Ammo/Modded/Warhammer 40k/Bolter_Small.xml
@@ -33,6 +33,7 @@
 			<li>CE_AutoEnableTrade</li>
 			<li>CE_AutoEnableCrafting</li>
 			<li>CE_AutoEnableCrafting_GWAmmoBench</li>
+     		 <li>CE_40K_MediumAmmo</li>
 		</tradeTags>
 		<thingCategories>
 			<li>AmmoBolter50</li>
@@ -81,7 +82,7 @@
 		<ammoClass>Kraken</ammoClass>
 		<cookOffProjectile>Bullet_Bolter50_Kraken</cookOffProjectile>
 	</ThingDef>
-	
+
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoBolter50Base">
 		<defName>Ammo_Bolter50_Tempest</defName>
 		<label>.50 cal bolter shell (Tempest)</label>
@@ -163,7 +164,7 @@
 			</secondaryDamage>
 		</projectile>
 	</ThingDef>
-	
+
 	<ThingDef ParentName="BaseBolter50Bullet">
 		<defName>Bullet_Bolter50_Tempest</defName>
 		<label>.50 cal bolt (tempest)</label>
@@ -387,4 +388,4 @@
 		<workAmount>7920</workAmount>
 	</RecipeDef>
 
-</Defs>
+</Defs>
diff --git a/Defs/Ammo/Modded/Warhammer 40k/HeavyBolter.xml b/Defs/Ammo/Modded/Warhammer 40k/HeavyBolter.xml
@@ -33,7 +33,8 @@
 		<tradeTags>
 			<li>CE_AutoEnableTrade</li>
 			<li>CE_AutoEnableCrafting</li>
-			<li>CE_AutoEnableCrafting_GWAmmoBench</li>			
+			<li>CE_AutoEnableCrafting_GWAmmoBench</li>
+    		<li>CE_40K_HeavyAmmo</li>
 		</tradeTags>
 		<thingCategories>
 			<li>AmmoBolter998</li>
@@ -96,7 +97,7 @@
 		<ammoClass>Kraken</ammoClass>
 		<cookOffProjectile>Bullet_Bolter998_Kraken</cookOffProjectile>
 	</ThingDef>
-	
+
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoBolter998Base">
 		<defName>Ammo_Bolter998_Tempest</defName>
 		<label>.998 cal bolter shell (Tempest)</label>
@@ -171,7 +172,7 @@
 			<damageAmountBase>58</damageAmountBase>
 			<armorPenetrationSharp>17.5</armorPenetrationSharp>
 			<armorPenetrationBlunt>59.81</armorPenetrationBlunt>
-			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>			
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
 		</projectile>
 		<comps>
 			<li Class="CombatExtended.CompProperties_Fragments">
@@ -198,7 +199,7 @@
 			</secondaryDamage>
 		</projectile>
 	</ThingDef>
-	
+
 	<ThingDef ParentName="BaseBolter998Bullet">
 		<defName>Bullet_Bolter998_Tempest</defName>
 		<label>.998 cal bolt (Tempest)</label>
@@ -430,7 +431,7 @@
 		</products>
 		<workAmount>48000</workAmount>
 	</RecipeDef>
-	
+
 	<RecipeDef ParentName="AmmoRecipeBase">
 		<defName>MakeAmmo_Bolter998_Tempest</defName>
 		<label>make .998 Cal Bolter (tempest) shell x200</label>
@@ -475,4 +476,4 @@
 		<workAmount>30240</workAmount>
 	</RecipeDef>
 
-</Defs>
+</Defs>
diff --git a/Defs/Ammo/Modded/Warhammer 40k/LasGun.xml b/Defs/Ammo/Modded/Warhammer 40k/LasGun.xml
@@ -55,6 +55,7 @@
 			<li>CE_AutoEnableCrafting_FabricationBench</li>
 			<li>CE_AutoEnableCrafting_TableMachining</li>
 			<li>CE_AutoEnableCrafting_GWAmmoBench</li>
+    		<li>CE_40K_Ammo</li>
 		</tradeTags>
 		<thingCategories>
 			<li>AmmoLasgunPowerPack</li>
@@ -167,4 +168,4 @@
 		<workAmount>8400</workAmount>
 	</RecipeDef>
 
-</Defs>
+</Defs>
diff --git a/Defs/Ammo/Modded/Warhammer 40k/MeltaGun.xml b/Defs/Ammo/Modded/Warhammer 40k/MeltaGun.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Defs>
-	
+
 	<ThingCategoryDef>
 		<defName>AmmoMeltaGun</defName>
 		<label>melta canister</label>
@@ -20,7 +20,7 @@
 	<!-- ==================== Ammo ========================== -->
 		<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerMediumAmmoBase">
 		<defName>Ammo_MeltaGun</defName>
-		<label>Meltagun Ammo Canister</label> 
+		<label>Meltagun Ammo Canister</label>
 		<description>Canister of Pyrum-petrol fuel for Meltaguns</description>
 		<statBases>
 			<Mass>0.09</Mass>
@@ -31,6 +31,7 @@
 			<li>CE_AutoEnableTrade</li>
 			<li>CE_AutoEnableCrafting_FabricationBench</li>
 			<li>CE_AutoEnableCrafting_GWAmmoBench</li>
+    		<li>CE_40K_MediumAmmo</li>
 		</tradeTags>
 		<ammoClass>Melta</ammoClass>
 		<graphicData>
@@ -145,4 +146,4 @@
 		<workAmount>15200</workAmount>
 	</RecipeDef>
 
-</Defs>
+</Defs>
diff --git a/Defs/Ammo/Modded/Warhammer 40k/PlasmaCannon.xml b/Defs/Ammo/Modded/Warhammer 40k/PlasmaCannon.xml
@@ -73,7 +73,8 @@
 		<tradeTags>
 			<li>CE_AutoEnableTrade</li>
 			<li>CE_AutoEnableCrafting</li>
-			<li>CE_AutoEnableCrafting_GWAmmoBench</li>			
+			<li>CE_AutoEnableCrafting_GWAmmoBench</li>
+    		<li>CE_40K_MediumAmmo</li>
 		</tradeTags>
 		<thingCategories>
 			<li>AmmoPlasmaCannon</li>
@@ -290,7 +291,7 @@
 				<explosionSound>MortarBomb_Explode</explosionSound>
 				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
 			</li>
-		</comps>		
+		</comps>
 		<modExtensions>
 			<li Class="ProjectileImpactFX.EffectProjectileExtension">
 				<AutoAssign>false</AutoAssign>
@@ -349,4 +350,4 @@
 		</products>
 	</RecipeDef>
 
-</Defs>
+</Defs>
diff --git a/Defs/Ammo/Other/Flamethrower.xml b/Defs/Ammo/Other/Flamethrower.xml
@@ -33,6 +33,7 @@
 		<tradeTags>
 			<li>CE_AutoEnableTrade</li>
 			<li>CE_AutoEnableCrafting_DrugLab</li>
+    		<li>CE_40K_HeavyAmmo</li>
 		</tradeTags>
 		<thingCategories>
 			<li>AmmoFlamethrower</li>
@@ -88,7 +89,7 @@
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="FlamethrowerBase" MayRequire="Ludeon.Rimworld.Anomaly">
 		<defName>Ammo_Flamethrower_Bioferrite</defName>
 		<label>infused chemfuel</label>
-		<description>Fuel for a flamethrower that burns at incredibly high temperature, leaving behind no puddles of fuel.\n\nAn infusion of crystalline bioferrite attacks organic matter on a cellular level, disrupting regeneration and weakening tissue.</description>	
+		<description>Fuel for a flamethrower that burns at incredibly high temperature, leaving behind no puddles of fuel.\n\nAn infusion of crystalline bioferrite attacks organic matter on a cellular level, disrupting regeneration and weakening tissue.</description>
 		<graphicData>
 			<texPath>Things/Ammo/FuelTank/Bioferrite</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -275,12 +276,12 @@
 		<fixedIngredientFilter>
 			<thingDefs>
 				<li>Bioferrite</li>
-				<li>Chemfuel</li>				
+				<li>Chemfuel</li>
 			</thingDefs>
 		</fixedIngredientFilter>
 		<products>
 			<Ammo_Flamethrower_Bioferrite>100</Ammo_Flamethrower_Bioferrite>
 		</products>
 	</RecipeDef>
 
-</Defs>
+</Defs>
diff --git a/Defs/Ammo/Pistols/454Casull.xml b/Defs/Ammo/Pistols/454Casull.xml
@@ -53,6 +53,7 @@
 		<tradeTags>
 			<li>CE_AutoEnableTrade</li>
 			<li>CE_AutoEnableCrafting</li>
+    		<li>CE_40K_Ammo</li>
 		</tradeTags>
 		<thingCategories>
 			<li>Ammo454Casull</li>
@@ -227,4 +228,4 @@
 		<workAmount>3400</workAmount>
 	</RecipeDef>
 
-</Defs>
+</Defs>
diff --git a/Defs/Ammo/Pistols/45ACP.xml b/Defs/Ammo/Pistols/45ACP.xml
@@ -47,6 +47,7 @@
 		<tradeTags>
 			<li>CE_AutoEnableTrade</li>
 			<li>CE_AutoEnableCrafting</li>
+    		<li>CE_40K_Ammo</li>
 		</tradeTags>
 		<thingCategories>
 			<li>Ammo45ACP</li>
@@ -222,4 +223,4 @@
 		<workAmount>2200</workAmount>
 	</RecipeDef>
 
-</Defs>
+</Defs>
diff --git a/Defs/Ammo/Rifle/3006Springfield.xml b/Defs/Ammo/Rifle/3006Springfield.xml
@@ -35,6 +35,7 @@
 		<tradeTags>
 			<li>CE_AutoEnableTrade</li>
 			<li>CE_AutoEnableCrafting</li>
+      		<li>CE_40K_Ammo</li>
 		</tradeTags>
 		<thingCategories>
 			<li>Ammo3006Springfield</li>
@@ -407,4 +408,4 @@
 		<workAmount>3600</workAmount>
 	</RecipeDef>
 
-</Defs>
+</Defs>
diff --git a/Defs/Ammo/Rocket/84x246mmR.xml b/Defs/Ammo/Rocket/84x246mmR.xml
@@ -37,6 +37,7 @@
 		<tradeTags>
 			<li>CE_AutoEnableTrade</li>
 			<li>CE_AutoEnableCrafting_TableMachining</li>
+    		<li>CE_40K_HeavyAmmo</li>
 		</tradeTags>
 		<thingCategories>
 			<li>Ammo84x246mmR</li>
@@ -920,4 +921,4 @@
 		</products>
 	</RecipeDef>
 
-</Defs>
+</Defs>
diff --git a/Defs/Ammo/Shotgun/10Gauge.xml b/Defs/Ammo/Shotgun/10Gauge.xml
@@ -21,7 +21,7 @@
 		</ammoTypes>
 		<similarTo>AmmoSet_Shotgun</similarTo>
 	</CombatExtended.AmmoSetDef>
-	
+
 	<CombatExtended.AmmoSetDef>
 		<defName>AmmoSet_10Gauge_Slug</defName>
 		<label>10 Gauge</label>
@@ -44,6 +44,7 @@
 		<tradeTags>
 			<li>CE_AutoEnableTrade</li>
 			<li>CE_AutoEnableCrafting</li>
+    		<li>CE_40K_Ammo</li>
 		</tradeTags>
 		<thingCategories>
 			<li>Ammo10Gauge</li>
@@ -324,4 +325,4 @@
 		<workAmount>7800</workAmount>
 	</RecipeDef>
 
-</Defs>
+</Defs>
diff --git a/Defs/Ammo/Shotgun/23x75mmR.xml b/Defs/Ammo/Shotgun/23x75mmR.xml
diff --git a/ModPatches/GrimWorld Talons of the Emperor/Patches/GrimWorld Talons of the Emperor/CE_Patch_Traders.xml b/ModPatches/GrimWorld Talons of the Emperor/Patches/GrimWorld Talons of the Emperor/CE_Patch_Traders.xml
diff --git a/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Traders.xml b/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Traders.xml
diff --git a/ModPatches/Grimworld Core Imperialis/Defs/Grimworld Core Imperialis/Ammo/CE_Patch_GravGunAmmo.xml b/ModPatches/Grimworld Core Imperialis/Defs/Grimworld Core Imperialis/Ammo/CE_Patch_GravGunAmmo.xml
diff --git a/ModPatches/Grimworld Core Imperialis/Patches/CE_Patch_Traders.xml b/ModPatches/Grimworld Core Imperialis/Patches/CE_Patch_Traders.xml
diff --git a/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Traders.xml b/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Traders.xml
