From 32709d331b136c375be0655b5c9c677030a75af6 Mon Sep 17 00:00:00 2001
From: nl <nldev00@pm.me>
Date: Mon, 4 Jul 2022 22:03:48 -0500
Subject: [PATCH 1/2] livescripts: add crushing/glancing chance to
 OnCalcMeleeOutcome

---
 src/server/game/Entities/Unit/Unit.cpp | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 6ea027c315869..091b2382caf40 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -2236,6 +2236,8 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(Unit const* victim, WeaponAttackTy
     float dodge_chance_f = GetUnitDodgeChance(attType, victim);
     float block_chance_f = GetUnitBlockChance(attType, victim);
     float parry_chance_f = GetUnitParryChance(attType, victim);
+    float glancing_chance_f = 0;
+    float crushing_chance_f = 0;
 
     FIRE(Unit,OnCalcMeleeOutcome
         , TSUnit(const_cast<Unit*>(this))
@@ -2245,6 +2247,8 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(Unit const* victim, WeaponAttackTy
         , TSMutable<float>(&dodge_chance_f)
         , TSMutable<float>(&block_chance_f)
         , TSMutable<float>(&parry_chance_f)
+        , TSMutable<float>(&glancing_chance_f)
+        , TSMutable<float>(&crushing_chance_f)
         , attType
         );
 
@@ -2253,6 +2257,8 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(Unit const* victim, WeaponAttackTy
     int32 dodge_chance = int32(dodge_chance_f*100.0f);
     int32 block_chance = int32(block_chance_f*100.0f);
     int32 parry_chance = int32(parry_chance_f*100.0f);
+    int32 glancing_chance = int32(glancing_chance_f*100.0f);
+    int32 crushing_chance = int32(crushing_chance_f*100.0f);
     // @tswow-end
 
     // melee attack table implementation
@@ -2321,6 +2327,15 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(Unit const* victim, WeaponAttackTy
         if (tmp > 0 && roll < (sum += tmp))
             return MELEE_HIT_GLANCING;
     }
+    // @tswow-begin
+    if (glancing_chance)
+    {
+        tmp = glancing_chance;
+        if (tmp > 0
+            && roll < (sum += tmp))
+        return MELEE_HIT_GLANCING;
+    }
+    // @tswow-end
 
     // 5. BLOCK
     if (canParryOrBlock)
@@ -2357,6 +2372,15 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(Unit const* victim, WeaponAttackTy
         if (tmp > 0 && roll < (sum += tmp))
             return MELEE_HIT_CRUSHING;
     }
+    // @tswow-begin
+    if (crushing_chance)
+    {
+        tmp = crushing_chance;
+        if (tmp > 0
+            && roll < (sum += tmp))
+            return MELEE_HIT_CRUSHING;
+    }
+    // @tswow-end
 
     // 8. HIT
     return MELEE_HIT_NORMAL;

From a231d17bafce408d59ad26eeec1935bb12c91b9c Mon Sep 17 00:00:00 2001
From: nl <nldev00@pm.me>
Date: Fri, 8 Jul 2022 19:03:09 -0500
Subject: [PATCH 2/2] livescripts: OnCalcMeleeOutcome code style change

---
 src/server/game/Entities/Unit/Unit.cpp | 34 ++++++++++++--------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 79d9bb8657345..cfd13c12f2ec1 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -2309,6 +2309,14 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(Unit const* victim, WeaponAttackTy
     }
 
     // 4. GLANCING
+    // @tswow-begin
+    if (glancing_chance)
+    {
+        tmp = glancing_chance;
+        if (tmp > 0 && roll < (sum += tmp))
+            return MELEE_HIT_GLANCING;
+    }
+    // @tswow-end
     // Max 40% chance to score a glancing blow against mobs of the same or higher level (only players and pets, not for ranged weapons).
     if ((GetTypeId() == TYPEID_PLAYER || IsPet()) &&
         victim->GetTypeId() != TYPEID_PLAYER && !victim->IsPet() &&
@@ -2326,15 +2334,6 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(Unit const* victim, WeaponAttackTy
         if (tmp > 0 && roll < (sum += tmp))
             return MELEE_HIT_GLANCING;
     }
-    // @tswow-begin
-    if (glancing_chance)
-    {
-        tmp = glancing_chance;
-        if (tmp > 0
-            && roll < (sum += tmp))
-        return MELEE_HIT_GLANCING;
-    }
-    // @tswow-end
 
     // 5. BLOCK
     if (canParryOrBlock)
@@ -2351,6 +2350,14 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(Unit const* victim, WeaponAttackTy
         return MELEE_HIT_CRIT;
 
     // 7. CRUSHING
+    // @tswow-begin
+    if (crushing_chance)
+    {
+        tmp = crushing_chance;
+        if (tmp > 0 && roll < (sum += tmp))
+            return MELEE_HIT_CRUSHING;
+    }
+    // @tswow-end
     // mobs can score crushing blows if they're 4 or more levels above victim
     if (GetLevelForTarget(victim) >= victim->GetLevelForTarget(this) + 4 &&
         // can be from by creature (if can) or from controlled player that considered as creature
@@ -2371,15 +2378,6 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(Unit const* victim, WeaponAttackTy
         if (tmp > 0 && roll < (sum += tmp))
             return MELEE_HIT_CRUSHING;
     }
-    // @tswow-begin
-    if (crushing_chance)
-    {
-        tmp = crushing_chance;
-        if (tmp > 0
-            && roll < (sum += tmp))
-            return MELEE_HIT_CRUSHING;
-    }
-    // @tswow-end
 
     // 8. HIT
     return MELEE_HIT_NORMAL;