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

Explosion blunt AP ratio, damage and AP falloff tweaks #3093

Merged
merged 13 commits into from
Jun 26, 2024
Merged

Explosion blunt AP ratio, damage and AP falloff tweaks #3093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
836ef85
Explosion blunt AP ratio tweak
SamaelGray Apr 17, 2024
85d64c2
Merge branch 'Development' into SamaelGray-ExplosionAP
SamaelGray May 13, 2024
1b0ba86
default damage and AP tweaks
SamaelGray May 13, 2024
83e3e05
Reverting secondary bomb damage's AP factor
SamaelGray May 21, 2024
781e402
Explosion damage and AP falloff tweak
SamaelGray May 23, 2024
5e37bdb
Merge branch 'Development' into SamaelGray-ExplosionAP
SamaelGray Jun 4, 2024
9ad8661
Bomb default damage update
SamaelGray Jun 4, 2024
e5ca803
Remove changes to the physics/geometry calcs
N7Huntsman Jun 24, 2024
77cdc5d
Set explosion armor pen mult to 0.4
N7Huntsman Jun 24, 2024
8eec2fe
Readjust default pen to new multi
N7Huntsman Jun 24, 2024
0b38271
minor reversion
SamaelGray Jun 24, 2024
403ed96
Set SecondaryPen to 2x regular blast pen
N7Huntsman Jun 24, 2024
67c4d65
float fix
SamaelGray Jun 24, 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
2 changes: 2 additions & 0 deletions Defs/Ammo/Shell/81mmMortar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@
<!-- Vanilla values -->
<li Class="CompProperties_Explosive">
<explosiveRadius>14.9</explosiveRadius>
<damageAmountBase>300</damageAmountBase>
<explosiveDamageType>BombSuper</explosiveDamageType>
<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
<chanceToStartFire>0.22</chanceToStartFire>
Expand Down Expand Up @@ -371,6 +372,7 @@
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>BombSuper</damageDef>
<damageAmountBase>800</damageAmountBase>
<explosionRadius>50</explosionRadius>
<explosionChanceToStartFire>0.22</explosionChanceToStartFire>
<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
Expand Down
4 changes: 2 additions & 2 deletions Patches/Core/DamageDefs/Damages_LocalInjury.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<Operation Class="PatchOperationReplace">
<xpath>Defs/DamageDef[defName="Bomb"]/defaultArmorPenetration</xpath>
<value>
<defaultArmorPenetration>52</defaultArmorPenetration>
<defaultArmorPenetration>62</defaultArmorPenetration>
</value>
</Operation>

Expand All @@ -93,7 +93,7 @@
<Operation Class="PatchOperationReplace">
<xpath>Defs/DamageDef[defName="BombSuper"]/defaultArmorPenetration</xpath>
<value>
<defaultArmorPenetration>264</defaultArmorPenetration>
<defaultArmorPenetration>320</defaultArmorPenetration>
</value>
</Operation>

Expand Down
2 changes: 1 addition & 1 deletion Source/CombatExtended/CombatExtended/AmmoUtility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public static class AmmoUtility
/// <summary>
/// Multiplier used to scale the armor penetration of a given projectile's explosion
/// </summary>
private const float ExplosiveArmorPenetrationMultiplier = 0.33f;
private const float ExplosiveArmorPenetrationMultiplier = 0.4f;

/// <summary>
/// Generates a readout text for a projectile with the damage amount, type, secondary explosion and other CE stats for
Expand Down
2 changes: 1 addition & 1 deletion Source/CombatExtended/CombatExtended/SecondaryDamage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace CombatExtended
{
public class SecondaryDamage
{
private const float SecExplosionPenPerDmg = 2.5f;
private const float SecExplosionPenPerDmg = 0.8f; // 2x ExplosiveArmorPenetrationMultiplier

public DamageDef def;
public int amount;
Expand Down
Loading