From cb4ca67612fc2944c1d143ba81affb8d7da6305e Mon Sep 17 00:00:00 2001
From: gromchek <gromchek@protonmail.com>
Date: Sat, 31 Aug 2024 14:07:47 +0300
Subject: [PATCH] Fix damage calculation

---
 .../custom/unsorted/DeadlyBulletsEffect.cpp   | 44 ++++++++-----------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/gtasa/effects/custom/unsorted/DeadlyBulletsEffect.cpp b/src/gtasa/effects/custom/unsorted/DeadlyBulletsEffect.cpp
index 45177e05..1c811fdc 100644
--- a/src/gtasa/effects/custom/unsorted/DeadlyBulletsEffect.cpp
+++ b/src/gtasa/effects/custom/unsorted/DeadlyBulletsEffect.cpp
@@ -14,27 +14,27 @@ template <float dmgMult> class DeadlyBulletsEffect : public EffectBase
     {
         if (!isPlayerOnly)
         {
-            HOOK_METHOD_ARGS (inst, Hooked_ComputeWillKillPed_everyone,
-                              void (CPedDamageResponseCalculator *, CPed *,
-                                    uint8_t *, char),
-                              0x4B5B27);
-
             HOOK_METHOD_ARGS (inst, Hooked_VehicleInflictDamage_everyone,
                               void (CVehicle *, CEntity *, eWeaponType, float,
                                     CVector),
                               0x6D7C90);
+
+            HOOK_METHOD_ARGS (inst, Hooked_AccountForPedArmour_everyone,
+                              void (CPedDamageResponseCalculator *, CPed *,
+                                    uint8_t *),
+                              0x4B5B19);
         }
         else
         {
-            HOOK_METHOD_ARGS (inst, Hooked_ComputeWillKillPed_player,
-                              void (CPedDamageResponseCalculator *, CPed *,
-                                    uint8_t *, char),
-                              0x4B5B27);
-
             HOOK_METHOD_ARGS (inst, Hooked_VehicleInflictDamage_player,
                               void (CVehicle *, CEntity *, eWeaponType, float,
                                     CVector),
                               0x6D7C90);
+
+            HOOK_METHOD_ARGS (inst, Hooked_AccountForPedArmour_player,
+                              void (CPedDamageResponseCalculator *, CPed *,
+                                    uint8_t *),
+                              0x4B5B19);
         }
     }
 
@@ -73,14 +73,11 @@ template <float dmgMult> class DeadlyBulletsEffect : public EffectBase
     }
 
     static void
-    Hooked_ComputeWillKillPed_player (auto                        &&cb,
-                                      CPedDamageResponseCalculator *thisCalc,
-                                      CPed *ped, uint8_t *cDamageResponseInfo,
-                                      char a4)
+    Hooked_AccountForPedArmour_player (auto                        &&cb,
+                                       CPedDamageResponseCalculator *thisCalc,
+                                       CPed *ped, uint8_t *data)
     {
-        if (thisCalc->m_pDamager != FindPlayerPed ()) return;
-
-        if (thisCalc->m_weaponType >= WEAPON_PISTOL
+        if (ped != FindPlayerPed () && thisCalc->m_weaponType >= WEAPON_PISTOL
             && thisCalc->m_weaponType <= WEAPON_SNIPERRIFLE)
         {
             thisCalc->m_fDamageFactor *= dmgMult;
@@ -90,10 +87,9 @@ template <float dmgMult> class DeadlyBulletsEffect : public EffectBase
     }
 
     static void
-    Hooked_ComputeWillKillPed_everyone (auto                        &&cb,
-                                        CPedDamageResponseCalculator *thisCalc,
-                                        CPed *ped, uint8_t *cDamageResponseInfo,
-                                        char a4)
+    Hooked_AccountForPedArmour_everyone (auto                        &&cb,
+                                         CPedDamageResponseCalculator *thisCalc,
+                                         CPed *ped, uint8_t *data)
     {
         if (thisCalc->m_weaponType >= WEAPON_PISTOL
             && thisCalc->m_weaponType <= WEAPON_SNIPERRIFLE)
@@ -108,8 +104,6 @@ template <float dmgMult> class DeadlyBulletsEffect : public EffectBase
 using DeadlyBulletsEffectQuad = DeadlyBulletsEffect<4.0f>;
 
 /* clang-format off */
-DEFINE_EFFECT (DeadlyBulletsEffectQuad, "effect_deadly_bullets_quad_dmg_everyone",
-               GROUP_WEAPONS, false);
-DEFINE_EFFECT (DeadlyBulletsEffectQuad, "effect_deadly_bullets_quad_dmg_player",
-               GROUP_WEAPONS, true);
+DEFINE_EFFECT (DeadlyBulletsEffectQuad, "effect_deadly_bullets_quad_dmg_everyone", GROUP_WEAPONS, false);
+DEFINE_EFFECT (DeadlyBulletsEffectQuad, "effect_deadly_bullets_quad_dmg_player", GROUP_WEAPONS, true);
 /* clang-format on */
\ No newline at end of file