sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(Core/Unit): use spell_group functions for a few more cases (#24019)

Browse Source
This commit is contained in:
Tereneckla
2026-02-15 16:32:41 +00:00
committed by GitHub
parent 4289b2641f
commit d9807742e5
1 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Unit/Unit.cpp
+30 -33
View File
@@ -2226,15 +2226,19 @@ void Unit::CalcAbsorbResist(DamageInfo& dmgInfo, bool Splited)
{ {
if (attacker) if (attacker)
{ {
AuraEffectList const& ResIgnoreAurasAb = attacker->GetAuraEffectsByType(SPELL_AURA_MOD_ABILITY_IGNORE_TARGET_RESIST); float mult = attacker->GetTotalAuraMultiplier(SPELL_AURA_MOD_ABILITY_IGNORE_TARGET_RESIST, [schoolMask, spellInfo](AuraEffect const* aurEff)
for (AuraEffectList::const_iterator j = ResIgnoreAurasAb.begin(); j != ResIgnoreAurasAb.end(); ++j) {
if (((*j)->GetMiscValue() & schoolMask) && (*j)->IsAffectedOnSpell(spellInfo)) if (!(aurEff->GetMiscValue() & schoolMask))
AddPct(damageResisted, -(*j)->GetAmount()); return false;
AuraEffectList const& ResIgnoreAuras = attacker->GetAuraEffectsByType(SPELL_AURA_MOD_IGNORE_TARGET_RESIST); if (!aurEff->IsAffectedOnSpell(spellInfo))
for (AuraEffectList::const_iterator j = ResIgnoreAuras.begin(); j != ResIgnoreAuras.end(); ++j) return false;
if ((*j)->GetMiscValue() & schoolMask)
AddPct(damageResisted, -(*j)->GetAmount()); return true;
});
damageResisted -= damageResisted * (mult - 1.0f);
mult = attacker->GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_IGNORE_TARGET_RESIST, schoolMask);
damageResisted -= damageResisted * (mult - 1.0f);
} }
// pussywizard: // pussywizard:
@@ -2254,25 +2258,17 @@ void Unit::CalcAbsorbResist(DamageInfo& dmgInfo, bool Splited)
float auraAbsorbMod = 0; float auraAbsorbMod = 0;
if (attacker) if (attacker)
{ {
AuraEffectList const& AbsIgnoreAurasA = attacker->GetAuraEffectsByType(SPELL_AURA_MOD_TARGET_ABSORB_SCHOOL); auraAbsorbMod = attacker->GetMaxPositiveAuraModifierByMiscMask(SPELL_AURA_MOD_TARGET_ABSORB_SCHOOL, schoolMask);
for (AuraEffectList::const_iterator itr = AbsIgnoreAurasA.begin(); itr != AbsIgnoreAurasA.end(); ++itr) auraAbsorbMod = std::max(auraAbsorbMod, float(attacker->GetMaxPositiveAuraModifier(SPELL_AURA_MOD_TARGET_ABILITY_ABSORB_SCHOOL, [spellInfo, schoolMask](AuraEffect const* aurEff)
{ {
if (!((*itr)->GetMiscValue() & schoolMask)) if (!(aurEff->GetMiscValue() & schoolMask))
continue; return false;
if ((*itr)->GetAmount() > auraAbsorbMod) if (!aurEff->IsAffectedOnSpell(spellInfo))
auraAbsorbMod = float((*itr)->GetAmount()); return false;
}
AuraEffectList const& AbsIgnoreAurasB = attacker->GetAuraEffectsByType(SPELL_AURA_MOD_TARGET_ABILITY_ABSORB_SCHOOL); return true;
for (AuraEffectList::const_iterator itr = AbsIgnoreAurasB.begin(); itr != AbsIgnoreAurasB.end(); ++itr) })));
{
if (!((*itr)->GetMiscValue() & schoolMask))
continue;
if (((*itr)->GetAmount() > auraAbsorbMod) && (*itr)->IsAffectedOnSpell(spellInfo))
auraAbsorbMod = float((*itr)->GetAmount());
}
RoundToInterval(auraAbsorbMod, 0.0f, 100.0f); RoundToInterval(auraAbsorbMod, 0.0f, 100.0f);
} }
@@ -11871,13 +11867,12 @@ uint32 Unit::SpellDamageBonusDone(Unit* victim, SpellInfo const* spellProto, uin
// done scripted mod (take it from owner) // done scripted mod (take it from owner)
Unit* owner = GetOwner() ? GetOwner() : this; Unit* owner = GetOwner() ? GetOwner() : this;
int32 DoneAdvertisedBenefit = 0; int32 DoneAdvertisedBenefit = 0;
AuraEffectList const& mOverrideClassScript = owner->GetAuraEffectsByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS); DoneAdvertisedBenefit += owner->GetTotalAuraModifier(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS, [spellProto](AuraEffect const* aurEff)
for (AuraEffectList::const_iterator i = mOverrideClassScript.begin(); i != mOverrideClassScript.end(); ++i)
{ {
if (!(*i)->IsAffectedOnSpell(spellProto)) if (!aurEff->IsAffectedOnSpell(spellProto))
continue; return false;
switch ((*i)->GetMiscValue()) switch (aurEff->GetMiscValue())
{ {
case 4418: // Increased Shock Damage case 4418: // Increased Shock Damage
case 4554: // Increased Lightning Damage case 4554: // Increased Lightning Damage
@@ -11887,12 +11882,14 @@ uint32 Unit::SpellDamageBonusDone(Unit* victim, SpellInfo const* spellProto, uin
case 5148: // Idol of the Shooting Star case 5148: // Idol of the Shooting Star
case 6008: // Increased Lightning Damage case 6008: // Increased Lightning Damage
case 8627: // Totem of Hex case 8627: // Totem of Hex
{ return true;
DoneAdvertisedBenefit += (*i)->GetAmount(); break;
default:
break; break;
} }
}
} return false;
});
// Custom scripted damage // Custom scripted damage
switch (spellProto->SpellFamilyName) switch (spellProto->SpellFamilyName)