Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ammo Housekeeping #3225

Merged
merged 11 commits into from
Jun 30, 2024
Merged

Ammo Housekeeping #3225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5f9799a
Explosives Rework
SamaelGray Jun 4, 2024
9850ae8
Merge branch 'CombatExtended-Continued:Development' into SamaelGray-E…
SamaelGray Jun 4, 2024
03a1289
.338 Lapua tweaks
SamaelGray Jun 9, 2024
b677b17
generic airburst launcher grenade textures
SamaelGray Jun 19, 2024
78cd6ec
Revert ".338 Lapua tweaks"
SamaelGray Jun 20, 2024
d6f9741
Tweaks and reversions
SamaelGray Jun 20, 2024
a865005
Merge pull request #3170 from SamaelGray/SamaelGray-EverythingExplosi…
N7Huntsman Jun 30, 2024
2bce542
Back-out balance changes
N7Huntsman Jun 30, 2024
9dd02ea
A couple more to back out
N7Huntsman Jun 30, 2024
7eb218f
Remove duplicate airburst textures
N7Huntsman Jun 30, 2024
06d7a31
Back out
N7Huntsman Jun 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Defs/Ammo/Generic/AntiMateriel.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions Defs/Ammo/Generic/Autocannon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
21 changes: 18 additions & 3 deletions Defs/Ammo/Generic/LauncherGrenade.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions Defs/Ammo/Generic/Rifle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions Defs/Ammo/Generic/RifleIntermediate.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions Defs/Ammo/Generic/RifleMagnum.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion Defs/Ammo/Grenade/20x42mmGrenade.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion Defs/Ammo/Grenade/25x40mmGrenade.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion Defs/Ammo/Grenade/25x59mmGrenade.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions Defs/Ammo/Grenade/30x29mmGrenade.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions Defs/Ammo/Grenade/35x32mmSRGrenade.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions Defs/Ammo/Grenade/40x46mmGrenade.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions Defs/Ammo/Grenade/40x47mmGrenade.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
Loading
Loading