From 836ef856c6a1375cffca0d843c31bfc38de666e0 Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Wed, 17 Apr 2024 16:22:09 +0330 Subject: [PATCH 01/11] Explosion blunt AP ratio tweak --- Source/CombatExtended/CombatExtended/AmmoUtility.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/CombatExtended/CombatExtended/AmmoUtility.cs b/Source/CombatExtended/CombatExtended/AmmoUtility.cs index e000cfdb45..5b61a16ded 100644 --- a/Source/CombatExtended/CombatExtended/AmmoUtility.cs +++ b/Source/CombatExtended/CombatExtended/AmmoUtility.cs @@ -9,7 +9,7 @@ public static class AmmoUtility /// /// Multiplier used to scale the armor penetration of a given projectile's explosion /// - private const float ExplosiveArmorPenetrationMultiplier = 0.33f; + private const float ExplosiveArmorPenetrationMultiplier = 1.0f; /// /// Generates a readout text for a projectile with the damage amount, type, secondary explosion and other CE stats for From 1b0ba86e65f68e50f1f9cc67ec68fd8f1d8c794d Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Mon, 13 May 2024 23:43:53 +0330 Subject: [PATCH 02/11] default damage and AP tweaks --- Defs/Ammo/Shell/81mmMortar.xml | 1462 +++++++++-------- .../Core/DamageDefs/Damages_LocalInjury.xml | 4 +- 2 files changed, 734 insertions(+), 732 deletions(-) diff --git a/Defs/Ammo/Shell/81mmMortar.xml b/Defs/Ammo/Shell/81mmMortar.xml index ad2b6bc1bd..2e8b890df4 100644 --- a/Defs/Ammo/Shell/81mmMortar.xml +++ b/Defs/Ammo/Shell/81mmMortar.xml @@ -1,738 +1,740 @@  - - Ammo81mmMortarShells - - AmmoShells - UI/Icons/ThingCategories/CaliberMortar - - - - - - AmmoSet_81mmMortarShell - - - - Bullet_81mmMortarShell_HE - Bullet_81mmMortarShell_HE_HFuzed - Bullet_81mmMortarShell_Incendiary - Bullet_81mmMortarShell_EMP - Bullet_81mmMortarShell_Firefoam - Bullet_81mmMortarShell_Smoke - Bullet_81mmMortarShell_Antigrain - Bullet_81mmMortarShell_Tox - - true - - - - - - Low-velocity shell designed to be fired from a mortar. - - 200 - - -
  • Ammo81mmMortarShells
    • -     - 25 - 30 - MortarBomb_Explode - true -     - - - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting_TableMachining
    • -     -     - - - - Shell_HighExplosive - - - Things/Ammo/Mortar/HE - Graphic_StackCount - - - 50.09 - 5.27 - 8.17 - - GrenadeHE - Bullet_81mmMortarShell_HE - - - - Shell_HighExplosive_HFuzed - - - Things/Ammo/Mortar/Airburst - Graphic_StackCount - - - 63.09 - 5.27 - 8.17 - - GrenadeHETF - Bullet_81mmMortarShell_HE - - - - Shell_Incendiary - - - Things/Ammo/Mortar/Incendiary - Graphic_StackCount - - - 42.34 - 5.65 - 9.0 - - GrenadeIncendiary - Bullet_81mmMortarShell_Incendiary - - - - Shell_EMP - - - Things/Ammo/Mortar/EMP - Graphic_StackCount - - - 112.42 - 5.27 - 8.17 - - GrenadeEMP - Bullet_81mmMortarShell_EMP - - - - Shell_Firefoam - - - Things/Ammo/Mortar/Firefoam - Graphic_StackCount - - - 37.03 - 4.1 - 10.01 - - FoamFuel - Bullet_81mmMortarShell_Firefoam - - - - Shell_Smoke - - - Things/Ammo/Mortar/Smoke - Graphic_StackCount - - - 37.03 - 4.1 - 10.01 - - Smoke - Bullet_81mmMortarShell_Smoke - - - - Shell_AntigrainWarhead - - - Things/Ammo/Mortar/Antigrain - Graphic_StackCount - - - 1500 - 6.5 - 6 - - -
  • RewardStandardCore
    • -     - -
  • CE_AutoEnableTrade_Sellable
    • -     - Antigrain - - -
  • - 14.9 - BombSuper - 0.7 - 0.22 - true - GiantExplosion - Explosion_GiantBomb - 60~120 - True - true -
    • -     -     - - - Shell_Toxic - - - Things/Ammo/Mortar/Toxic - Graphic_StackCount - - - 37.03 - 4.1 - 10.01 - - Toxic - Bullet_81mmMortarShell_Tox - - - - - - CombatExtended.ProjectileCE_Explosive - - TransparentPostLight - - - 0 - Artillery_HitThickRoof - MortarRound_PreImpact - MortarRound_Ambient - true - false - 5 - - Things/WorldObjects/Munitions/Mortar - 0.06 - 10 - - - - - - Bullet_81mmMortarShell_HE - - - Things/Projectile/Mortar/HE - Graphic_Single - - - Bomb - 156 - 2.5 - true - MortarBomb_Explode - true - true - - -
  • - - 16 - 25 - -
    • -     -     - - - Bullet_81mmMortarShell_HE_HFuzed - - CombatExtended.ProjectileCE_HeightFuse - - Things/Projectile/Mortar/Airburst - Graphic_Single - - - Smoke - 0 - 1 - true - MortarBomb_Explode - true - true - 8 + + Ammo81mmMortarShells + + AmmoShells + UI/Icons/ThingCategories/CaliberMortar + + + + + + AmmoSet_81mmMortarShell + + + + Bullet_81mmMortarShell_HE + Bullet_81mmMortarShell_HE_HFuzed + Bullet_81mmMortarShell_Incendiary + Bullet_81mmMortarShell_EMP + Bullet_81mmMortarShell_Firefoam + Bullet_81mmMortarShell_Smoke + Bullet_81mmMortarShell_Antigrain + Bullet_81mmMortarShell_Tox + + true + + + + + + Low-velocity shell designed to be fired from a mortar. + + 200 + + +
  • Ammo81mmMortarShells
    • +     + 25 + 30 + MortarBomb_Explode + true +     + + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     +     + + + + Shell_HighExplosive + + + Things/Ammo/Mortar/HE + Graphic_StackCount + + + 50.09 + 5.27 + 8.17 + + GrenadeHE + Bullet_81mmMortarShell_HE + + + + Shell_HighExplosive_HFuzed + + + Things/Ammo/Mortar/Airburst + Graphic_StackCount + + + 63.09 + 5.27 + 8.17 + + GrenadeHETF + Bullet_81mmMortarShell_HE + + + + Shell_Incendiary + + + Things/Ammo/Mortar/Incendiary + Graphic_StackCount + + + 42.34 + 5.65 + 9.0 + + GrenadeIncendiary + Bullet_81mmMortarShell_Incendiary + + + + Shell_EMP + + + Things/Ammo/Mortar/EMP + Graphic_StackCount + + + 112.42 + 5.27 + 8.17 + + GrenadeEMP + Bullet_81mmMortarShell_EMP + + + + Shell_Firefoam + + + Things/Ammo/Mortar/Firefoam + Graphic_StackCount + + + 37.03 + 4.1 + 10.01 + + FoamFuel + Bullet_81mmMortarShell_Firefoam + + + + Shell_Smoke + + + Things/Ammo/Mortar/Smoke + Graphic_StackCount + + + 37.03 + 4.1 + 10.01 + + Smoke + Bullet_81mmMortarShell_Smoke + + + + Shell_AntigrainWarhead + + + Things/Ammo/Mortar/Antigrain + Graphic_StackCount + + + 1500 + 6.5 + 6 + + +
  • RewardStandardCore
    • +     + +
  • CE_AutoEnableTrade_Sellable
    • +     + Antigrain + + +
  • + 14.9 + 300 + BombSuper + 0.7 + 0.22 + true + GiantExplosion + Explosion_GiantBomb + 60~120 + True + true +
    • +     +     + + + Shell_Toxic + + + Things/Ammo/Mortar/Toxic + Graphic_StackCount + + + 37.03 + 4.1 + 10.01 + + Toxic + Bullet_81mmMortarShell_Tox + + + + + + CombatExtended.ProjectileCE_Explosive + + TransparentPostLight + + + 0 + Artillery_HitThickRoof + MortarRound_PreImpact + MortarRound_Ambient + true + false + 5 + + Things/WorldObjects/Munitions/Mortar + 0.06 + 10 + + + + + + Bullet_81mmMortarShell_HE + + + Things/Projectile/Mortar/HE + Graphic_Single + + + Bomb + 156 + 2.5 + true + MortarBomb_Explode + true + true + + +
  • + + 16 + 25 + +
    • +     +     + + + Bullet_81mmMortarShell_HE_HFuzed + + CombatExtended.ProjectileCE_HeightFuse + + Things/Projectile/Mortar/Airburst + Graphic_Single + + + Smoke + 0 + 1 + true + MortarBomb_Explode + true + true + 8 0.013 - - -
  • - - 12 - 24 - - -90~-48 -
    • -     -     - - - Bullet_81mmMortarShell_Incendiary - - - Things/Projectile/Mortar/Incendiary - Graphic_Single - - - PrometheumFlame - 11 - 6.5 - true - FilthPrometheum - 0.15 - MortarIncendiary_Explode - - - - - Bullet_81mmMortarShell_EMP - - - Things/Projectile/Mortar/EMP - Graphic_Single - - - EMP - 156 - true - 5.5 - - - - - Bullet_81mmMortarShell_Firefoam - - - Things/Projectile/Mortar/Firefoam - Graphic_Single - - - Extinguish - 0.0 - 0.0 - 5 - true - Artillery_HitThickRoof - Explosion_EMP - MortarRound_PreImpact - MortarRound_Ambient - Filth_FireFoam - 1 - 3 - true - ExtinguisherExplosion - - - - - Bullet_81mmMortarShell_Smoke - - - Things/Projectile/Mortar/Smoke - Graphic_Single - - - Smoke - 0.0 - 0.0 - 6 - true - Artillery_HitThickRoof - Explosion_EMP - MortarRound_PreImpact - MortarRound_Ambient - BlindSmoke - 1 - true - ExtinguisherExplosion - - - - - Bullet_81mmMortarShell_Antigrain - - - Things/Projectile/Mortar/Antigrain - Graphic_Single - - - BombSuper - 50 - 0.22 - true - true - GiantExplosion - Artillery_HitThickRoof - Explosion_GiantBomb - MortarRound_PreImpact - MortarRound_Ambient - - 0.85 - - - - - - Bullet_81mmMortarShell_Tox - - - Things/Projectile/Mortar/Toxic - Graphic_Single - - - ToxGas - 0 - 0 - 0.1 - true - Artillery_HitThickRoof - ToxicShellLanded - MortarRound_PreImpact - MortarRound_Ambient - Shell_Toxic_Releasing - Shell_Toxic_Releasing_Water - - - - - - - MakeShell_HighExplosive - - Craft 5 81mm HE mortar shells. - Making 81mm HE mortar shells. - -
  • - - -
  • Steel
    • - - - 54 - -
  • - - -
  • FSX
    • - - - 10 - -
  • - - -
  • ComponentIndustrial
    • - - - 2 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 5 - - - 4 - - 10600 -     - - - MakeShell_HighExplosive_HFuzed - - Craft 5 81mm airburst mortar shells. - Making 81mm airburst mortar shells. - -
  • - - -
  • Steel
    • - - - 54 - -
  • - - -
  • FSX
    • - - - 10 - -
  • - - -
  • ComponentIndustrial
    • - - - 4 - -     - - -
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
    • -     -     - - 5 - - - 5 - - 11800 -     - - - MakeShell_Incendiary - - Craft 5 81mm incendiary mortar shells. - Making 81mm incendiary mortar shells. - -
  • - - -
  • Steel
    • - - - 58 - -
  • - - -
  • Prometheum
    • - - - 5 - -
  • - - -
  • ComponentIndustrial
    • - - - 2 - -     - - -
  • Steel
    • -
  • Prometheum
    • -
  • ComponentIndustrial
    • -     -     - - 5 - - - 4 - - 9000 -     - - - MakeShell_EMP - - Craft 5 81mm EMP mortar shells. - Making 81mm EMP mortar shells. - MicroelectronicsBasics - -
  • - - -
  • Steel
    • - - - 54 - -
  • - - -
  • ComponentIndustrial
    • - - - 14 - -     - - -
  • Steel
    • -
  • ComponentIndustrial
    • -     -     - - 5 - - - 4 - - 13800 -     - - - MakeShell_Firefoam - - Craft 5 81mm firefoam mortar shells. - Making 81mm firefoam mortar shells. - Firefoam - -
  • - - -
  • Steel
    • - - - 42 - -
  • - - -
  • ComponentIndustrial
    • - - - 2 - -
  • - - -
  • MeatRaw
    • - - - 17 - -     - - -
  • Steel
    • -
  • ComponentIndustrial
    • -     - -
  • MeatRaw
    • -     -     - - 5 - - - 4 - - 8800 -     - - - MakeShell_Smoke - - Craft 5 81mm smoke mortar shells. - Making 81mm smoke mortar shells. - -
  • - - -
  • Steel
    • - - - 42 - -
  • - - -
  • ComponentIndustrial
    • - - - 2 - -
  • - - -
  • Prometheum
    • - - - 2 - -     - - -
  • Steel
    • -
  • Prometheum
    • -
  • ComponentIndustrial
    • -     -     - - 5 - - - 4 - - 6600 -     - - - MakeShell_Toxic - - Craft 5 81mm tox mortar shells. - Making 81mm tox mortar shells. - ToxGas - -
  • - - -
  • Steel
    • - - - 42 - -
  • - - -
  • ComponentIndustrial
    • - - - 2 - -
  • - - -
  • Prometheum
    • - - - 2 - -     - - -
  • Steel
    • -
  • Prometheum
    • -
  • ComponentIndustrial
    • -     -     - - 5 - - - 4 - - 6600 -     +     + +
  • + + 12 + 24 + + -90~-48 +
    • +     +     + + + Bullet_81mmMortarShell_Incendiary + + + Things/Projectile/Mortar/Incendiary + Graphic_Single + + + PrometheumFlame + 11 + 6.5 + true + FilthPrometheum + 0.15 + MortarIncendiary_Explode + + + + + Bullet_81mmMortarShell_EMP + + + Things/Projectile/Mortar/EMP + Graphic_Single + + + EMP + 156 + true + 5.5 + + + + + Bullet_81mmMortarShell_Firefoam + + + Things/Projectile/Mortar/Firefoam + Graphic_Single + + + Extinguish + 0.0 + 0.0 + 5 + true + Artillery_HitThickRoof + Explosion_EMP + MortarRound_PreImpact + MortarRound_Ambient + Filth_FireFoam + 1 + 3 + true + ExtinguisherExplosion + + + + + Bullet_81mmMortarShell_Smoke + + + Things/Projectile/Mortar/Smoke + Graphic_Single + + + Smoke + 0.0 + 0.0 + 6 + true + Artillery_HitThickRoof + Explosion_EMP + MortarRound_PreImpact + MortarRound_Ambient + BlindSmoke + 1 + true + ExtinguisherExplosion + + + + + Bullet_81mmMortarShell_Antigrain + + + Things/Projectile/Mortar/Antigrain + Graphic_Single + + + BombSuper + 800 + 50 + 0.22 + true + true + GiantExplosion + Artillery_HitThickRoof + Explosion_GiantBomb + MortarRound_PreImpact + MortarRound_Ambient + + 0.85 + + + + + + Bullet_81mmMortarShell_Tox + + + Things/Projectile/Mortar/Toxic + Graphic_Single + + + ToxGas + 0 + 0 + 0.1 + true + Artillery_HitThickRoof + ToxicShellLanded + MortarRound_PreImpact + MortarRound_Ambient + Shell_Toxic_Releasing + Shell_Toxic_Releasing_Water + + + + + + + MakeShell_HighExplosive + + Craft 5 81mm HE mortar shells. + Making 81mm HE mortar shells. + +
  • + + +
  • Steel
    • + + + 54 + +
  • + + +
  • FSX
    • + + + 10 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + + + 4 + + 10600 +     + + + MakeShell_HighExplosive_HFuzed + + Craft 5 81mm airburst mortar shells. + Making 81mm airburst mortar shells. + +
  • + + +
  • Steel
    • + + + 54 + +
  • + + +
  • FSX
    • + + + 10 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + + + 5 + + 11800 +     + + + MakeShell_Incendiary + + Craft 5 81mm incendiary mortar shells. + Making 81mm incendiary mortar shells. + +
  • + + +
  • Steel
    • + + + 58 + +
  • + + +
  • Prometheum
    • + + + 5 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +     + + +
  • Steel
    • +
  • Prometheum
    • +
  • ComponentIndustrial
    • +     +     + + 5 + + + 4 + + 9000 +     + + + MakeShell_EMP + + Craft 5 81mm EMP mortar shells. + Making 81mm EMP mortar shells. + MicroelectronicsBasics + +
  • + + +
  • Steel
    • + + + 54 + +
  • + + +
  • ComponentIndustrial
    • + + + 14 + +     + + +
  • Steel
    • +
  • ComponentIndustrial
    • +     +     + + 5 + + + 4 + + 13800 +     + + + MakeShell_Firefoam + + Craft 5 81mm firefoam mortar shells. + Making 81mm firefoam mortar shells. + Firefoam + +
  • + + +
  • Steel
    • + + + 42 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +
  • + + +
  • MeatRaw
    • + + + 17 + +     + + +
  • Steel
    • +
  • ComponentIndustrial
    • +     + +
  • MeatRaw
    • +     +     + + 5 + + + 4 + + 8800 +     + + + MakeShell_Smoke + + Craft 5 81mm smoke mortar shells. + Making 81mm smoke mortar shells. + +
  • + + +
  • Steel
    • + + + 42 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +
  • + + +
  • Prometheum
    • + + + 2 + +     + + +
  • Steel
    • +
  • Prometheum
    • +
  • ComponentIndustrial
    • +     +     + + 5 + + + 4 + + 6600 +     + + + MakeShell_Toxic + + Craft 5 81mm tox mortar shells. + Making 81mm tox mortar shells. + ToxGas + +
  • + + +
  • Steel
    • + + + 42 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +
  • + + +
  • Prometheum
    • + + + 2 + +     + + +
  • Steel
    • +
  • Prometheum
    • +
  • ComponentIndustrial
    • +     +     + + 5 + + + 4 + + 6600 +     \ No newline at end of file diff --git a/Patches/Core/DamageDefs/Damages_LocalInjury.xml b/Patches/Core/DamageDefs/Damages_LocalInjury.xml index 7cfe7de905..311e605a52 100644 --- a/Patches/Core/DamageDefs/Damages_LocalInjury.xml +++ b/Patches/Core/DamageDefs/Damages_LocalInjury.xml @@ -79,7 +79,7 @@ Defs/DamageDef[defName="Bomb"]/defaultArmorPenetration - 52 + 156 @@ -93,7 +93,7 @@ Defs/DamageDef[defName="BombSuper"]/defaultArmorPenetration - 264 + 800 From 83e3e05ddd2609259719434be1598ec056d2c763 Mon Sep 17 00:00:00 2001 From: SamGray <56392968+SamaelGray@users.noreply.github.com> Date: Tue, 21 May 2024 18:03:07 +0330 Subject: [PATCH 03/11] Reverting secondary bomb damage's AP factor --- Source/CombatExtended/CombatExtended/SecondaryDamage.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/CombatExtended/CombatExtended/SecondaryDamage.cs b/Source/CombatExtended/CombatExtended/SecondaryDamage.cs index 93b084137e..c55b0587f7 100644 --- 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 = 2; public DamageDef def; public int amount; From 781e4025af352f7f5547ad1ca6b360369c98a8b0 Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Thu, 23 May 2024 12:16:51 +0330 Subject: [PATCH 04/11] Explosion damage and AP falloff tweak --- Source/CombatExtended/CombatExtended/ExplosionCE.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/CombatExtended/CombatExtended/ExplosionCE.cs b/Source/CombatExtended/CombatExtended/ExplosionCE.cs index 31cdd26d1b..b3290c16c1 100644 --- a/Source/CombatExtended/CombatExtended/ExplosionCE.cs +++ b/Source/CombatExtended/CombatExtended/ExplosionCE.cs @@ -16,8 +16,8 @@ public class ExplosionCE : Verse.Explosion public bool radiusChange = false; public bool toBeMerged = false; private const int DamageAtEdge = 2; // Synch these with spreadsheet - private const float PenAtEdge = 0.6f; - private const float PressurePerDamage = 0.3f; + private const float PenAtEdge = 2; + private const float PressurePerDamage = 1.0f; private const float MaxMergeTicks = 3f; public const float MaxMergeRange = 3f; //merge within 3 tiles public const bool MergeExplosions = false; @@ -402,18 +402,18 @@ public override void ExposeData() } //New methods - public int GetDamageAmountAtCE(IntVec3 c) //t => t^(0.333f) + public int GetDamageAmountAtCE(IntVec3 c) //t => t^(2.0f) { if (!damageFalloff) { return damAmount; } var t = c.DistanceTo(Position) / radius; - t = Mathf.Pow(t, 0.333f); + t = Mathf.Pow(t, 2.0f); return Mathf.Max(GenMath.RoundRandom(Mathf.Lerp((float)damAmount, DamageAtEdge, t)), 1); } - public float GetArmorPenetrationAtCE(IntVec3 c) //t => t^(0.55f), penetrationAmount => damAmount * PressurePerDamage + public float GetArmorPenetrationAtCE(IntVec3 c) //t => t^(2.0f), penetrationAmount => damAmount * PressurePerDamage { var basePen = Mathf.Max(damAmount * PressurePerDamage, armorPenetration); if (!damageFalloff) @@ -421,7 +421,7 @@ public float GetArmorPenetrationAtCE(IntVec3 c) //t => t^(0.55f), penetrationAmo return basePen; } var t = c.DistanceTo(Position) / radius; - t = Mathf.Pow(t, 0.55f); + t = Mathf.Pow(t, 2.0f); return Mathf.Lerp(basePen, PenAtEdge, t); } } From 9ad866100cb5ce8c87aa27d1675583f3e0ac6e49 Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Wed, 5 Jun 2024 00:37:16 +0330 Subject: [PATCH 05/11] Bomb default damage update --- Patches/Core/DamageDefs/Damages_LocalInjury.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Patches/Core/DamageDefs/Damages_LocalInjury.xml b/Patches/Core/DamageDefs/Damages_LocalInjury.xml index 311e605a52..afee0fc1b6 100644 --- a/Patches/Core/DamageDefs/Damages_LocalInjury.xml +++ b/Patches/Core/DamageDefs/Damages_LocalInjury.xml @@ -72,14 +72,14 @@ Defs/DamageDef[defName="Bomb"]/defaultDamage - 156 + 181 Defs/DamageDef[defName="Bomb"]/defaultArmorPenetration - 156 + 181 From e5ca803bcb6ea83876bfed832ed8f5bddb1d5a5a Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Mon, 24 Jun 2024 01:49:46 -0400 Subject: [PATCH 06/11] Remove changes to the physics/geometry calcs --- Source/CombatExtended/CombatExtended/ExplosionCE.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/CombatExtended/CombatExtended/ExplosionCE.cs b/Source/CombatExtended/CombatExtended/ExplosionCE.cs index 4dad7efd79..2a4e22a9b6 100644 --- a/Source/CombatExtended/CombatExtended/ExplosionCE.cs +++ b/Source/CombatExtended/CombatExtended/ExplosionCE.cs @@ -16,8 +16,8 @@ public class ExplosionCE : Verse.Explosion public bool radiusChange = false; public bool toBeMerged = false; private const int DamageAtEdge = 2; // Synch these with spreadsheet - private const float PenAtEdge = 2; - private const float PressurePerDamage = 1.0f; + private const float PenAtEdge = 0.6f; + private const float PressurePerDamage = 0.3f; private const float MaxMergeTicks = 3f; public const float MaxMergeRange = 3f; //merge within 3 tiles public const bool MergeExplosions = false; @@ -403,18 +403,18 @@ public override void ExposeData() } //New methods - public int GetDamageAmountAtCE(IntVec3 c) //t => t^(2.0f) + public int GetDamageAmountAtCE(IntVec3 c) //t => t^(0.333f) { if (!damageFalloff) { return damAmount; } var t = c.DistanceTo(Position) / radius; - t = Mathf.Pow(t, 2.0f); + t = Mathf.Pow(t, 0.333f); return Mathf.Max(GenMath.RoundRandom(Mathf.Lerp((float)damAmount, DamageAtEdge, t)), 1); } - public float GetArmorPenetrationAtCE(IntVec3 c) //t => t^(2.0f), penetrationAmount => damAmount * PressurePerDamage + public float GetArmorPenetrationAtCE(IntVec3 c) //t => t^(0.55f), penetrationAmount => damAmount * PressurePerDamage { var basePen = Mathf.Max(damAmount * PressurePerDamage, armorPenetration); if (!damageFalloff) @@ -422,7 +422,7 @@ public float GetArmorPenetrationAtCE(IntVec3 c) //t => t^(2.0f), penetrationAmou return basePen; } var t = c.DistanceTo(Position) / radius; - t = Mathf.Pow(t, 2.0f); + t = Mathf.Pow(t, 0.55f); return Mathf.Lerp(basePen, PenAtEdge, t); } } From 77cdc5d8b6402f55db7a4824e60bf8173075f609 Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Mon, 24 Jun 2024 01:51:22 -0400 Subject: [PATCH 07/11] Set explosion armor pen mult to 0.4 --- Source/CombatExtended/CombatExtended/AmmoUtility.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/CombatExtended/CombatExtended/AmmoUtility.cs b/Source/CombatExtended/CombatExtended/AmmoUtility.cs index 5b61a16ded..29a74d9b3d 100644 --- a/Source/CombatExtended/CombatExtended/AmmoUtility.cs +++ b/Source/CombatExtended/CombatExtended/AmmoUtility.cs @@ -9,7 +9,7 @@ public static class AmmoUtility /// /// Multiplier used to scale the armor penetration of a given projectile's explosion /// - private const float ExplosiveArmorPenetrationMultiplier = 1.0f; + private const float ExplosiveArmorPenetrationMultiplier = 0.4f; /// /// Generates a readout text for a projectile with the damage amount, type, secondary explosion and other CE stats for From 8eec2fe854b552a8e1888ed0604ae197e1551a33 Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Mon, 24 Jun 2024 01:54:47 -0400 Subject: [PATCH 08/11] Readjust default pen to new multi --- Patches/Core/DamageDefs/Damages_LocalInjury.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Patches/Core/DamageDefs/Damages_LocalInjury.xml b/Patches/Core/DamageDefs/Damages_LocalInjury.xml index afee0fc1b6..b62b0023c8 100644 --- a/Patches/Core/DamageDefs/Damages_LocalInjury.xml +++ b/Patches/Core/DamageDefs/Damages_LocalInjury.xml @@ -79,7 +79,7 @@ Defs/DamageDef[defName="Bomb"]/defaultArmorPenetration - 181 + 73 @@ -93,7 +93,7 @@ Defs/DamageDef[defName="BombSuper"]/defaultArmorPenetration - 800 + 320 From 0b382717aee91ed49ee0e72a18d8f0bda9737cad Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Mon, 24 Jun 2024 10:18:36 +0330 Subject: [PATCH 09/11] minor reversion bombs did not get bigger --- Patches/Core/DamageDefs/Damages_LocalInjury.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Patches/Core/DamageDefs/Damages_LocalInjury.xml b/Patches/Core/DamageDefs/Damages_LocalInjury.xml index b62b0023c8..c7de68e9da 100644 --- a/Patches/Core/DamageDefs/Damages_LocalInjury.xml +++ b/Patches/Core/DamageDefs/Damages_LocalInjury.xml @@ -72,14 +72,14 @@ Defs/DamageDef[defName="Bomb"]/defaultDamage - 181 + 156 Defs/DamageDef[defName="Bomb"]/defaultArmorPenetration - 73 + 62 From 403ed966154b11dac7ffc1dcede09a188038ed38 Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Mon, 24 Jun 2024 05:09:36 -0400 Subject: [PATCH 10/11] Set SecondaryPen to 2x regular blast pen --- Source/CombatExtended/CombatExtended/SecondaryDamage.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/CombatExtended/CombatExtended/SecondaryDamage.cs b/Source/CombatExtended/CombatExtended/SecondaryDamage.cs index c55b0587f7..545b7f0b24 100644 --- 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; + private const float SecExplosionPenPerDmg = 0.8; // 2x ExplosiveArmorPenetrationMultiplier public DamageDef def; public int amount; From 67c4d65c170ae2c14eda67f37f4182b91c06663b Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Mon, 24 Jun 2024 13:09:20 +0330 Subject: [PATCH 11/11] float fix --- Source/CombatExtended/CombatExtended/SecondaryDamage.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/CombatExtended/CombatExtended/SecondaryDamage.cs b/Source/CombatExtended/CombatExtended/SecondaryDamage.cs index 545b7f0b24..244f70c403 100644 --- 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 = 0.8; // 2x ExplosiveArmorPenetrationMultiplier + private const float SecExplosionPenPerDmg = 0.8f; // 2x ExplosiveArmorPenetrationMultiplier public DamageDef def; public int amount;