Merge pull request #3225 from CombatExtended-Continued/Ammo-Misc

Ammo Housekeeping
CombatExtended-Continued · Jun 30, 2024 · c878437 · c878437
2 parents 033d86e + 06d7a31
commit c878437
Show file tree

Hide file tree

Showing 30 changed files with 88 additions and 77 deletions.
diff --git a/Defs/Ammo/Generic/AntiMateriel.xml b/Defs/Ammo/Generic/AntiMateriel.xml
@@ -78,21 +78,21 @@
 			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>0.66</MarketValue>
+			<MarketValue>0.82</MarketValue>
 		</statBases>
 		<ammoClass>IncendiaryAP</ammoClass>
 		<cookOffProjectile>Bullet_50BMG_Incendiary</cookOffProjectile>
 	</ThingDef>
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoAntiMaterielBase">
 		<defName>Ammo_AntiMateriel_HE</defName>
-		<label>anti-materiel cartridge (HE)</label>
+		<label>anti-materiel cartridge (AP-HE)</label>
 		<graphicData>
 			<texPath>Things/Ammo/STACK_RANGED/HighCaliber/HE</texPath>
 			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>0.89</MarketValue>
+			<MarketValue>1.36</MarketValue>
 		</statBases>
 		<ammoClass>ExplosiveAP</ammoClass>
 		<cookOffProjectile>Bullet_50BMG_HE</cookOffProjectile>

diff --git a/Defs/Ammo/Generic/Autocannon.xml b/Defs/Ammo/Generic/Autocannon.xml
@@ -63,21 +63,21 @@
 			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>1.35</MarketValue>
+			<MarketValue>1.67</MarketValue>
 		</statBases>
 		<ammoClass>IncendiaryAP</ammoClass>
 		<cookOffProjectile>Bullet_20x102mmNATO_Incendiary</cookOffProjectile>
 	</ThingDef>
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoAutocannonShellBase">
 		<defName>Ammo_Autocannon_HE</defName>
-		<label>autocannon shell (HE)</label>
+		<label>autocannon shell (AP-HE)</label>
 		<graphicData>
 			<texPath>Things/Ammo/STACK_RANGED/HighCaliber/HE</texPath>
 			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>1.78</MarketValue>
+			<MarketValue>2.84</MarketValue>
 		</statBases>
 		<ammoClass>ExplosiveAP</ammoClass>
 		<cookOffProjectile>Bullet_20x102mmNATO_HE</cookOffProjectile>

diff --git a/Defs/Ammo/Generic/LauncherGrenade.xml b/Defs/Ammo/Generic/LauncherGrenade.xml
@@ -17,6 +17,7 @@
 		<label>launcher grenade</label>
 		<ammoTypes>
 			<Ammo_LauncherGrenade_HE>Bullet_40x46mmGrenade_HE</Ammo_LauncherGrenade_HE>
+			<Ammo_LauncherGrenade_HE_TFuzed>Bullet_40x46mmGrenade_HE_TFuzed</Ammo_LauncherGrenade_HE_TFuzed>
 			<Ammo_LauncherGrenade_HEDP>Bullet_40x46mmGrenade_HEDP</Ammo_LauncherGrenade_HEDP>
 			<Ammo_LauncherGrenade_EMP>Bullet_40x46mmGrenade_EMP</Ammo_LauncherGrenade_EMP>
 			<Ammo_LauncherGrenade_Smoke>Bullet_40x46mmGrenade_Smoke</Ammo_LauncherGrenade_Smoke>
@@ -50,12 +51,26 @@
 			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>2.19</MarketValue>
+			<MarketValue>2.27</MarketValue>
 		</statBases>
 		<ammoClass>GrenadeHE</ammoClass>
 		<detonateProjectile>Bullet_40x46mmGrenade_HE</detonateProjectile>
 	</ThingDef>
 
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoLauncherGrenadeBase">
+		<defName>Ammo_LauncherGrenade_HE_TFuzed</defName>
+		<label>launcher grenade (HE Time-Fuzed)</label>
+		<graphicData>
+			<texPath>Things/Ammo/GrenadeLauncher/AIR</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>3.25</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeHETF</ammoClass>
+		<detonateProjectile>Bullet_40x46mmGrenade_HE</detonateProjectile>
+	</ThingDef>
+
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoLauncherGrenadeBase">
 		<defName>Ammo_LauncherGrenade_HEDP</defName>
 		<label>launcher grenade (HEDP)</label>
@@ -64,7 +79,7 @@
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>2.19</MarketValue>
+			<MarketValue>2.12</MarketValue>
 		</statBases>
 		<ammoClass>GrenadeHEDP</ammoClass>
 		<detonateProjectile>Bullet_40x46mmGrenade_HE</detonateProjectile>
@@ -78,7 +93,7 @@
 			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>4.25</MarketValue>
+			<MarketValue>4.57</MarketValue>
 		</statBases>
 		<ammoClass>GrenadeEMP</ammoClass>
 		<detonateProjectile>Bullet_40x46mmGrenade_EMP</detonateProjectile>

diff --git a/Defs/Ammo/Generic/Rifle.xml b/Defs/Ammo/Generic/Rifle.xml
@@ -92,21 +92,21 @@
 			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>0.15</MarketValue>
+			<MarketValue>0.17</MarketValue>
 		</statBases>
 		<ammoClass>IncendiaryAP</ammoClass>
 		<cookOffProjectile>Bullet_762x51mmNATO_Incendiary</cookOffProjectile>
 	</ThingDef>
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoRifleBase">
 		<defName>Ammo_Rifle_HE</defName>
-		<label>rifle cartridge (HE)</label>
+		<label>rifle cartridge (AP-HE)</label>
 		<graphicData>
 			<texPath>Things/Ammo/STACK_RANGED/Rifle/HE</texPath>
 			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>0.19</MarketValue>
+			<MarketValue>0.31</MarketValue>
 		</statBases>
 		<ammoClass>ExplosiveAP</ammoClass>
 		<cookOffProjectile>Bullet_762x51mmNATO_HE</cookOffProjectile>

diff --git a/Defs/Ammo/Generic/RifleIntermediate.xml b/Defs/Ammo/Generic/RifleIntermediate.xml
@@ -92,21 +92,21 @@
 			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>0.09</MarketValue>
+			<MarketValue>0.1</MarketValue>
 		</statBases>
 		<ammoClass>IncendiaryAP</ammoClass>
 		<cookOffProjectile>Bullet_556x45mmNATO_Incendiary</cookOffProjectile>
 	</ThingDef>
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoRifleIntermediateBase">
 		<defName>Ammo_RifleIntermediate_HE</defName>
-		<label>intermediate rifle cartridge (HE)</label>
+		<label>intermediate rifle cartridge (AP-HE)</label>
 		<graphicData>
 			<texPath>Things/Ammo/STACK_RANGED/Rifle/HE</texPath>
 			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>0.12</MarketValue>
+			<MarketValue>0.17</MarketValue>
 		</statBases>
 		<ammoClass>ExplosiveAP</ammoClass>
 		<cookOffProjectile>Bullet_556x45mmNATO_HE</cookOffProjectile>

diff --git a/Defs/Ammo/Generic/RifleMagnum.xml b/Defs/Ammo/Generic/RifleMagnum.xml
@@ -78,21 +78,21 @@
 			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>0.27</MarketValue>
+			<MarketValue>0.33</MarketValue>
 		</statBases>
 		<ammoClass>IncendiaryAP</ammoClass>
 		<cookOffProjectile>Bullet_338Lapua_Incendiary</cookOffProjectile>
 	</ThingDef>
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoRifleMagnumBase">
 		<defName>Ammo_RifleMagnum_HE</defName>
-		<label>magnum rifle cartridge (HE)</label>
+		<label>magnum rifle cartridge (AP-HE)</label>
 		<graphicData>
 			<texPath>Things/Ammo/STACK_RANGED/HighCaliber/HE</texPath>
 			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>0.36</MarketValue>
+			<MarketValue>0.52</MarketValue>
 		</statBases>
 		<ammoClass>ExplosiveAP</ammoClass>
 		<cookOffProjectile>Bullet_338Lapua_HE</cookOffProjectile>

diff --git a/Defs/Ammo/Grenade/20x42mmGrenade.xml b/Defs/Ammo/Grenade/20x42mmGrenade.xml
@@ -251,8 +251,8 @@
 		<defName>Bullet_20x42mmGrenade_Smoke</defName>
 		<label>20mm grenade (Smoke)</label>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<explosionRadius>2</explosionRadius>
 			<damageDef>Smoke</damageDef>
+			<explosionRadius>2</explosionRadius>
 			<suppressionFactor>0.0</suppressionFactor>
 			<dangerFactor>0.0</dangerFactor>
 			<postExplosionGasType>BlindSmoke</postExplosionGasType>

diff --git a/Defs/Ammo/Grenade/25x40mmGrenade.xml b/Defs/Ammo/Grenade/25x40mmGrenade.xml
@@ -168,8 +168,8 @@
 		<defName>Bullet_25x40mmGrenade_Smoke</defName>
 		<label>25mm grenade (Smoke)</label>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<explosionRadius>2</explosionRadius>
 			<damageDef>Smoke</damageDef>
+			<explosionRadius>2</explosionRadius>
 			<suppressionFactor>0.0</suppressionFactor>
 			<dangerFactor>0.0</dangerFactor>
 			<postExplosionGasType>BlindSmoke</postExplosionGasType>

diff --git a/Defs/Ammo/Grenade/25x59mmGrenade.xml b/Defs/Ammo/Grenade/25x59mmGrenade.xml
@@ -209,8 +209,8 @@
 		<defName>Bullet_25x59mmGrenade_Smoke</defName>
 		<label>25x59mm grenade (Smoke)</label>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<explosionRadius>2</explosionRadius>
 			<damageDef>Smoke</damageDef>
+			<explosionRadius>2</explosionRadius>
 			<suppressionFactor>0.0</suppressionFactor>
 			<dangerFactor>0.0</dangerFactor>
 			<postExplosionGasType>BlindSmoke</postExplosionGasType>

diff --git a/Defs/Ammo/Grenade/30x29mmGrenade.xml b/Defs/Ammo/Grenade/30x29mmGrenade.xml
@@ -133,9 +133,9 @@
 		<defName>Bullet_30x29mmGrenade_HE</defName>
 		<label>30x29mm grenade (HE)</label>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<explosionRadius>1</explosionRadius>
 			<damageDef>Bomb</damageDef>
 			<damageAmountBase>22</damageAmountBase>
+			<explosionRadius>1</explosionRadius>
 			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
 		</projectile>
 		<comps>
@@ -152,9 +152,9 @@
 		<label>30x29mm grenade (HE Time-Fuzed)</label>
 		<thingClass>CombatExtended.ProjectileCE_Bursting</thingClass>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<explosionRadius>1</explosionRadius>
 			<damageDef>Bomb</damageDef>
 			<damageAmountBase>22</damageAmountBase>
+			<explosionRadius>1</explosionRadius>
 			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
 			<aimHeightOffset>1.4</aimHeightOffset>
 			<armingDelay>2</armingDelay>
@@ -198,18 +198,18 @@
 		<defName>Bullet_30x29mmGrenade_EMP</defName>
 		<label>30x29mm grenade (EMP)</label>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<explosionRadius>2</explosionRadius>
 			<damageDef>EMP</damageDef>
 			<damageAmountBase>22</damageAmountBase>
+			<explosionRadius>2</explosionRadius>
 		</projectile>
 	</ThingDef>
 
 	<ThingDef ParentName="Base30x29mmGrenadeBullet">
 		<defName>Bullet_30x29mmGrenade_Smoke</defName>
 		<label>30x29mm grenade (Smoke)</label>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<explosionRadius>2</explosionRadius>
 			<damageDef>Smoke</damageDef>
+			<explosionRadius>2</explosionRadius>
 			<suppressionFactor>0.0</suppressionFactor>
 			<dangerFactor>0.0</dangerFactor>
 			<postExplosionGasType>BlindSmoke</postExplosionGasType>

diff --git a/Defs/Ammo/Grenade/35x32mmSRGrenade.xml b/Defs/Ammo/Grenade/35x32mmSRGrenade.xml
@@ -117,9 +117,9 @@
 		<label>35x32mmSR grenade (HE)</label>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<explosionRadius>1</explosionRadius>
 			<damageDef>Bomb</damageDef>
 			<damageAmountBase>20</damageAmountBase>
+			<explosionRadius>1</explosionRadius>
 			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
 		</projectile>
 		<comps>
@@ -161,18 +161,18 @@
 		<label>35x32mmSR grenade (EMP)</label>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<explosionRadius>1.5</explosionRadius>
 			<damageDef>EMP</damageDef>
 			<damageAmountBase>20</damageAmountBase>
+			<explosionRadius>1.5</explosionRadius>
 		</projectile>
 	</ThingDef>
 
 	<ThingDef ParentName="Base35x32mmSRGrenadeBullet">
 		<defName>Bullet_35x32mmSRGrenade_Smoke</defName>
 		<label>35x32mmSR grenade (Smoke)</label>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<explosionRadius>2</explosionRadius>
 			<damageDef>Smoke</damageDef>
+			<explosionRadius>2</explosionRadius>
 			<suppressionFactor>0.0</suppressionFactor>
 			<dangerFactor>0.0</dangerFactor>
 			<postExplosionGasType>BlindSmoke</postExplosionGasType>

diff --git a/Defs/Ammo/Grenade/40x46mmGrenade.xml b/Defs/Ammo/Grenade/40x46mmGrenade.xml
@@ -150,9 +150,9 @@
 		<defName>Bullet_40x46mmGrenade_HE</defName>
 		<label>40x46mm grenade (HE)</label>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<explosionRadius>1.0</explosionRadius>
 			<damageDef>Bomb</damageDef>
 			<damageAmountBase>22</damageAmountBase>
+			<explosionRadius>1.0</explosionRadius>
 			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
 		</projectile>
 		<comps>
@@ -169,9 +169,9 @@
 		<label>40x46mm grenade (HE Time-Fuzed)</label>
 		<thingClass>CombatExtended.ProjectileCE_Bursting</thingClass>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<explosionRadius>1.0</explosionRadius>
 			<damageDef>Bomb</damageDef>
 			<damageAmountBase>22</damageAmountBase>
+			<explosionRadius>1.0</explosionRadius>
 			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
 			<aimHeightOffset>1.4</aimHeightOffset>
 			<armingDelay>2</armingDelay>
@@ -215,18 +215,18 @@
 		<defName>Bullet_40x46mmGrenade_EMP</defName>
 		<label>40x46mm grenade (EMP)</label>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<explosionRadius>1.5</explosionRadius>
 			<damageDef>EMP</damageDef>
 			<damageAmountBase>22</damageAmountBase>
+			<explosionRadius>1.5</explosionRadius>
 		</projectile>
 	</ThingDef>
 
 	<ThingDef ParentName="Base40x46mmGrenadeBullet">
 		<defName>Bullet_40x46mmGrenade_Smoke</defName>
 		<label>40x46mm grenade (Smoke)</label>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<explosionRadius>2</explosionRadius>
 			<damageDef>Smoke</damageDef>
+			<explosionRadius>2</explosionRadius>
 			<suppressionFactor>0.0</suppressionFactor>
 			<dangerFactor>0.0</dangerFactor>
 			<postExplosionGasType>BlindSmoke</postExplosionGasType>
@@ -238,8 +238,8 @@
 		<defName>Bullet_40x46mmGrenade_Tox</defName>
 		<label>40x46mm grenade (Tox)</label>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<explosionRadius>2</explosionRadius>
 			<damageDef>ToxGas</damageDef>
+			<explosionRadius>2</explosionRadius>
 			<postExplosionGasType>ToxGas</postExplosionGasType>
 			<preExplosionSpawnChance>1</preExplosionSpawnChance>
 		</projectile>

diff --git a/Defs/Ammo/Grenade/40x47mmGrenade.xml b/Defs/Ammo/Grenade/40x47mmGrenade.xml
@@ -105,9 +105,9 @@
 		<defName>Bullet_40x47mmGrenade_HE</defName>
 		<label>40x47mm grenade (HE)</label>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<explosionRadius>1</explosionRadius>
 			<damageDef>Bomb</damageDef>
 			<damageAmountBase>22</damageAmountBase>
+			<explosionRadius>1</explosionRadius>
 			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
 		</projectile>
 		<comps>
@@ -123,18 +123,18 @@
 		<defName>Bullet_40x47mmGrenade_EMP</defName>
 		<label>40x47mm grenade (EMP)</label>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<explosionRadius>2.0</explosionRadius>
 			<damageDef>EMP</damageDef>
 			<damageAmountBase>22</damageAmountBase>
+			<explosionRadius>2.0</explosionRadius>
 		</projectile>
 	</ThingDef>
 
 	<ThingDef ParentName="Base40x47mmGrenadeBullet">
 		<defName>Bullet_40x47mmGrenade_Smoke</defName>
 		<label>40x47mm grenade (Smoke)</label>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<explosionRadius>2</explosionRadius>
 			<damageDef>Smoke</damageDef>
+			<explosionRadius>2</explosionRadius>
 			<suppressionFactor>0.0</suppressionFactor>
 			<dangerFactor>0.0</dangerFactor>
 			<postExplosionGasType>BlindSmoke</postExplosionGasType>