Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 10 Packages Projects Releases Wiki Activity

Core/Spells: greatly simplified Combustion's calculation and properly use its provided spellInfo data to determine eligible spells

Browse Source
This commit is contained in:
Ovahlord committed 2022-11-11 21:09:55 +01:00
1 parent f3fb5c5fd1
commit 86e5c189a4
1 file changed
+17 -32
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Spells/spell_mage.cpp
+17 -32
View File
@@ -2078,14 +2078,10 @@ class spell_mage_combustion : public SpellScript
{
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
{
SPELL_MAGE_COMBUSTION_DAMAGE,
SPELL_MAGE_LIVING_BOMB
});
return ValidateSpellInfo({ SPELL_MAGE_COMBUSTION_DAMAGE });
}
void HandleDotEffect(SpellEffIndex /*effIndex*/)
void HandleScriptEffect(SpellEffIndex effIndex)
{
Unit* caster = GetCaster();
if (!caster)
@@ -2093,41 +2089,30 @@ class spell_mage_combustion : public SpellScript
Unit* target = GetHitUnit();
int32 totalAmount = 0;
int32 basePoints = 0;
float scalingFactor = static_cast<float>(GetEffectValue());
for (AuraEffect const* aurEff : target->GetAuraEffectsByType(SPELL_AURA_PERIODIC_DAMAGE))
{
if (aurEff->GetCasterGUID() == caster->GetGUID() && aurEff->GetSpellInfo()->SpellFamilyFlags[2] & 0x00000008)
{
if (aurEff->GetSpellInfo()->Id == SPELL_MAGE_COMBUSTION_DAMAGE)
continue;
if (aurEff->GetCasterGUID() != caster->GetGUID()
|| !(aurEff->GetSpellInfo()->GetSchoolMask() & SPELL_SCHOOL_MASK_FIRE)
|| aurEff->GetSpellInfo()->SpellFamilyName != SPELLFAMILY_MAGE)
continue;
switch (aurEff->GetSpellInfo()->Id)
{
case SPELL_MAGE_IGNITE:
totalAmount += aurEff->GetAmount() / 2;
break;
case SPELL_MAGE_LIVING_BOMB:
case SPELL_MAGE_PYROBLAST:
case SPELL_MAGE_PYROBLAST_HOT_STREAK:
totalAmount += aurEff->GetAmount() / 3;
break;
default:
break;
}
}
// Only combine auras specified in the script effect's class mask
if (!aurEff->GetSpellInfo()->IsAffected(SPELLFAMILY_MAGE, GetSpellInfo()->Effects[effIndex].SpellClassMask))
continue;
basePoints = CalculatePct(aurEff->GetAmount(), scalingFactor);
if (basePoints > 0)
caster->CastSpell(target, SPELL_MAGE_COMBUSTION_DAMAGE, CastSpellExtraArgs(true).AddSpellBP0(basePoints));
}
if (totalAmount)
caster->CastSpell(target, SPELL_MAGE_COMBUSTION_DAMAGE, CastSpellExtraArgs(true).AddSpellBP0(totalAmount));
}
void Register() override
{
OnEffectHitTarget.Register(&spell_mage_combustion::HandleDotEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_mage_combustion::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
private:
std::vector<Aura*> _fireDotEffects;
};
// 44614 - Frostfire Bolt