Merge pull request #3093 from SamaelGray/SamaelGray-ExplosionAP

Explosion blunt AP ratio, damage and AP falloff tweaks
CombatExtended-Continued · Jun 26, 2024 · 92d035e · 92d035e
2 parents b8587de + 67c4d65
commit 92d035e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/Defs/Ammo/Shell/81mmMortar.xml b/Defs/Ammo/Shell/81mmMortar.xml
@@ -173,6 +173,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>
@@ -393,6 +394,7 @@
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageDef>BombSuper</damageDef>
+			<damageAmountBase>800</damageAmountBase>
 			<explosionRadius>50</explosionRadius>
 			<explosionChanceToStartFire>0.22</explosionChanceToStartFire>
 			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>

diff --git a/Patches/Core/DamageDefs/Damages_LocalInjury.xml b/Patches/Core/DamageDefs/Damages_LocalInjury.xml
@@ -79,7 +79,7 @@
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/DamageDef[defName="Bomb"]/defaultArmorPenetration</xpath>
 		<value>
-			<defaultArmorPenetration>52</defaultArmorPenetration>
+			<defaultArmorPenetration>62</defaultArmorPenetration>
 		</value>
 	</Operation>
 
@@ -93,7 +93,7 @@
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/DamageDef[defName="BombSuper"]/defaultArmorPenetration</xpath>
 		<value>
-			<defaultArmorPenetration>264</defaultArmorPenetration>
+			<defaultArmorPenetration>320</defaultArmorPenetration>
 		</value>
 	</Operation>
 

diff --git a/Source/CombatExtended/CombatExtended/AmmoUtility.cs b/Source/CombatExtended/CombatExtended/AmmoUtility.cs
@@ -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

diff --git a/Source/CombatExtended/CombatExtended/SecondaryDamage.cs b/Source/CombatExtended/CombatExtended/SecondaryDamage.cs
@@ -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;