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

Minor explosives rework #3170

Merged
merged 6 commits into from
Jun 30, 2024
Merged

Minor explosives rework #3170

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 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
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
4 changes: 2 additions & 2 deletions Defs/Ammo/Advanced/30x64mmFuelCell.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
<label>incendiary bolt</label>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>PrometheumFlame</damageDef>
<damageAmountBase>6</damageAmountBase>
<damageAmountBase>7</damageAmountBase>
<explosionRadius>4.5</explosionRadius>
<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
<preExplosionSpawnChance>0.2</preExplosionSpawnChance>
Expand All @@ -113,7 +113,7 @@
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<explosionRadius>2.0</explosionRadius>
<damageDef>Thermobaric</damageDef>
<damageAmountBase>48</damageAmountBase>
<damageAmountBase>60</damageAmountBase>
<soundExplode>MortarBomb_Explode</soundExplode>
<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
<ai_IsIncendiary>true</ai_IsIncendiary>
Expand Down
2 changes: 1 addition & 1 deletion Defs/Ammo/Advanced/60x225mmGammaShell.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Burn</damageDef>
<damageAmountBase>33</damageAmountBase>
<damageAmountBase>39</damageAmountBase>
<speed>73</speed>
<flyOverhead>false</flyOverhead>
<explosionRadius>7.5</explosionRadius>
Expand Down
2 changes: 1 addition & 1 deletion Defs/Ammo/Advanced/66mmThermalBolt.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>PrometheumFlame</damageDef>
<damageAmountBase>6</damageAmountBase>
<damageAmountBase>8</damageAmountBase>
<explosionRadius>4.9</explosionRadius>
<flyOverhead>true</flyOverhead>
<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
Expand Down
4 changes: 2 additions & 2 deletions Defs/Ammo/Advanced/70mmMechanoidGrenade.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
<label>70mm mechanoid grenade (HE)</label>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Bomb</damageDef>
<damageAmountBase>132</damageAmountBase>
<damageAmountBase>154</damageAmountBase>
<explosionRadius>2.5</explosionRadius>
<soundExplode>MortarBomb_Explode</soundExplode>
<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
Expand All @@ -104,7 +104,7 @@
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<explosionRadius>5</explosionRadius>
<damageDef>EMP</damageDef>
<damageAmountBase>132</damageAmountBase>
<damageAmountBase>154</damageAmountBase>
</projectile>
</ThingDef>

Expand Down
2 changes: 1 addition & 1 deletion Defs/Ammo/Advanced/80x256mmFuelCell.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>PrometheumFlame</damageDef>
<damageAmountBase>11</damageAmountBase>
<damageAmountBase>13</damageAmountBase>
<speed>73</speed>
<flyOverhead>false</flyOverhead>
<explosionRadius>6.5</explosionRadius>
Expand Down
2 changes: 1 addition & 1 deletion Defs/Ammo/Advanced/PlasmaCellHeavy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<speed>165</speed>
<damageDef>Bomb</damageDef>
<damageAmountBase>18</damageAmountBase>
<damageAmountBase>25</damageAmountBase>
<explosionRadius>1</explosionRadius>
<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
<secondaryDamage>
Expand Down
2 changes: 1 addition & 1 deletion Defs/Ammo/Advanced/PlasmaCellPistol.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<speed>137</speed>
<damageDef>Bomb</damageDef>
<damageAmountBase>2</damageAmountBase>
<damageAmountBase>3</damageAmountBase>
<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
<secondaryDamage>
<li>
Expand Down
2 changes: 1 addition & 1 deletion Defs/Ammo/Advanced/PlasmaCellRifle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<speed>178</speed>
<damageDef>Bomb</damageDef>
<damageAmountBase>2</damageAmountBase>
<damageAmountBase>4</damageAmountBase>
<explosionRadius>0.5</explosionRadius>
<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
<secondaryDamage>
Expand Down
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/STACK_RANGED/GrenadeLauncher/AIR</texPath>
SamaelGray marked this conversation as resolved.
Show resolved Hide resolved
<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
8 changes: 4 additions & 4 deletions Defs/Ammo/Grenade/20x42mmGrenade.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@
<secondaryDamage>
<li>
<def>Flame_Secondary</def>
<amount>12</amount>
<amount>27</amount>
</li>
</secondaryDamage>
</projectile>
Expand All @@ -211,7 +211,7 @@
<secondaryDamage>
<li>
<def>Bomb_Secondary</def>
<amount>19</amount>
<amount>40</amount>
</li>
</secondaryDamage>
</projectile>
Expand All @@ -223,7 +223,7 @@
<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Bomb</damageDef>
<damageAmountBase>18</damageAmountBase>
<damageAmountBase>25</damageAmountBase>
<explosionRadius>1.0</explosionRadius>
<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
</projectile>
Expand All @@ -242,7 +242,7 @@
<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>EMP</damageDef>
<damageAmountBase>18</damageAmountBase>
<damageAmountBase>25</damageAmountBase>
<explosionRadius>1.5</explosionRadius>
</projectile>
</ThingDef>
Expand Down
6 changes: 3 additions & 3 deletions Defs/Ammo/Grenade/25x40mmGrenade.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Bomb</damageDef>
<damageAmountBase>18</damageAmountBase>
<damageAmountBase>24</damageAmountBase>
<explosionRadius>1</explosionRadius>
<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
</projectile>
Expand All @@ -138,7 +138,7 @@
<thingClass>CombatExtended.ProjectileCE_Bursting</thingClass>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Bomb</damageDef>
<damageAmountBase>18</damageAmountBase>
<damageAmountBase>24</damageAmountBase>
<explosionRadius>1</explosionRadius>
<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
<aimHeightOffset>0.5</aimHeightOffset>
Expand All @@ -159,7 +159,7 @@
<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>EMP</damageDef>
<damageAmountBase>17</damageAmountBase>
<damageAmountBase>24</damageAmountBase>
<explosionRadius>1.5</explosionRadius>
</projectile>
</ThingDef>
Expand Down
12 changes: 6 additions & 6 deletions Defs/Ammo/Grenade/25x59mmGrenade.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Bomb</damageDef>
<damageAmountBase>19</damageAmountBase>
<damageAmountBase>26</damageAmountBase>
<explosionRadius>1</explosionRadius>
<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
</projectile>
Expand All @@ -153,7 +153,7 @@
<thingClass>CombatExtended.ProjectileCE_Bursting</thingClass>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Bomb</damageDef>
<damageAmountBase>19</damageAmountBase>
<damageAmountBase>26</damageAmountBase>
<explosionRadius>1</explosionRadius>
<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
<aimHeightOffset>1.4</aimHeightOffset>
Expand All @@ -175,13 +175,13 @@
<thingClass>CombatExtended.BulletCE</thingClass>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Bullet</damageDef>
<damageAmountBase>30</damageAmountBase>
<damageAmountBase>29</damageAmountBase>
<armorPenetrationSharp>50</armorPenetrationSharp>
<armorPenetrationBlunt>4.818</armorPenetrationBlunt>
<armorPenetrationBlunt>3.613</armorPenetrationBlunt>
</projectile>
<comps>
<li Class="CombatExtended.CompProperties_ExplosiveCE">
<damageAmountBase>16</damageAmountBase>
<damageAmountBase>17</damageAmountBase>
<explosiveDamageType>Bomb</explosiveDamageType>
<explosiveRadius>0.5</explosiveRadius>
<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
Expand All @@ -200,7 +200,7 @@
<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>EMP</damageDef>
<damageAmountBase>19</damageAmountBase>
<damageAmountBase>26</damageAmountBase>
<explosionRadius>1.5</explosionRadius>
</projectile>
</ThingDef>
Expand Down
Loading
Loading