Core/Spells Implement SPELL_ATTR8_COMBAT_RESURECTION_LIMIT

- fix an issue where some battle resurrection spells were using the wrong effect basepoints for health and mana calculations
ProjectSkyfire · Aug 3, 2021 · e02ee0a · e02ee0a
1 parent 8a7d57c
commit e02ee0a
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 11 deletions.
diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h
@@ -650,7 +650,7 @@ enum SpellAttr8
     SPELL_ATTR8_ARMOR_SPECIALIZATION             = 0x00100000, // 20
     SPELL_ATTR8_UNK21                            = 0x00200000, // 21
     SPELL_ATTR8_UNK22                            = 0x00400000, // 22
-    SPELL_ATTR8_UNK23                            = 0x00800000, // 23
+    SPELL_ATTR8_COMBAT_RESURECTION_LIMIT         = 0x00800000, // 23
     SPELL_ATTR8_HEALING_SPELL                    = 0x01000000, // 24
     SPELL_ATTR8_UNK25                            = 0x02000000, // 25
     SPELL_ATTR8_RAID_MARKER                      = 0x04000000, // 26 probably spell no need learn to cast

diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
@@ -4386,8 +4386,20 @@ void Spell::EffectResurrect(SpellEffIndex effIndex)
     if (target->IsRessurectRequested())       // already have one active request
         return;
 
-    uint32 health = target->CountPctFromMaxHealth(damage);
-    uint32 mana   = CalculatePct(target->GetMaxPower(POWER_MANA), damage);
+    uint32 health = 0;
+    uint32 mana = 0;
+
+    // check for spells that use different health and mana % on some resurrection
+    if (m_spellInfo->AttributesEx8 & SPELL_ATTR8_COMBAT_RESURECTION_LIMIT)
+    {
+        health = target->CountPctFromMaxHealth(m_spellInfo->Effects[EFFECT_1].BasePoints);
+        mana = CalculatePct(target->GetMaxPower(POWER_MANA), m_spellInfo->Effects[EFFECT_0].BasePoints);       
+    }
+    else 
+    {
+        health = target->CountPctFromMaxHealth(damage);
+        mana = CalculatePct(target->GetMaxPower(POWER_MANA), damage);
+    }
 
     ExecuteLogEffectResurrect(effIndex, target);
 
@@ -4528,18 +4540,27 @@ void Spell::EffectSelfResurrect(SpellEffIndex effIndex)
     uint32 health = 0;
     uint32 mana = 0;
 
-    // flat case
-    if (damage < 0)
+    // check for spells that use different health and mana % on some battle resurrection
+    if (m_spellInfo->AttributesEx8 & SPELL_ATTR8_COMBAT_RESURECTION_LIMIT)
     {
-        health = uint32(-damage);
-        mana = m_spellInfo->Effects[effIndex].MiscValue;
+        health = m_caster->CountPctFromMaxHealth(m_spellInfo->Effects[EFFECT_1].BasePoints);
+        mana = CalculatePct(m_caster->GetMaxPower(POWER_MANA), m_spellInfo->Effects[EFFECT_0].BasePoints);
     }
-    // percent case
     else
     {
-        health = m_caster->CountPctFromMaxHealth(damage);
-        if (m_caster->GetMaxPower(POWER_MANA) > 0)
-            mana = CalculatePct(m_caster->GetMaxPower(POWER_MANA), damage);
+        // flat case
+        if (damage < 0)
+        {
+            health = uint32(-damage);
+            mana = m_spellInfo->Effects[effIndex].MiscValue;
+        }
+        // percent case
+        else
+        {
+            health = m_caster->CountPctFromMaxHealth(damage);
+            if (m_caster->GetMaxPower(POWER_MANA) > 0)
+                mana = CalculatePct(m_caster->GetMaxPower(POWER_MANA), damage);
+        }
     }
 
     Player* player = m_caster->ToPlayer();