nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-13 09:17:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Spells): Script Void Star Talisman resistances. (#17427)

Browse Source 
* fix(Core/Spells): Script Void Star Talisman resistances.

* add check for armor

* change comment loc

* .

* fix(Core/Spells): Script Lord Valthalak's Amulet

* Revert "fix(Core/Spells): Script Lord Valthalak's Amulet"

This reverts commit 5a6a0a8e1fd596e0ffae906cfdac2f68fb1bc78d.

* Use spellInfo instead of hardcode
This commit is contained in:
avarishd
2023-10-10 19:12:11 +03:00
committed by GitHub
parent 90071f8fcd
commit e8b81430af
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/server/scripts/Spells/spell_warlock.cpp
View File

@@ -63,7 +63,8 @@ enum WarlockSpells
SPELL_WARLOCK_UNSTABLE_AFFLICTION_DISPEL = 31117,
SPELL_WARLOCK_IMPROVED_DRAIN_SOUL_R1 = 18213,
SPELL_WARLOCK_IMPROVED_DRAIN_SOUL_PROC = 18371,
SPELL_WARLOCK_EYE_OF_KILROGG_FLY = 58083
SPELL_WARLOCK_EYE_OF_KILROGG_FLY = 58083,
SPELL_WARLOCK_PET_VOID_STAR_TALISMAN = 37386, // Void Star Talisman
};
enum WarlockSpellIcons
@@ -284,6 +285,11 @@ class spell_warl_generic_scaling : public AuraScript
SpellSchoolMask schoolMask = SpellSchoolMask(aurEff->GetSpellInfo()->Effects[aurEff->GetEffIndex()].MiscValue);
int32 modifier = schoolMask == SPELL_SCHOOL_MASK_NORMAL ? 35 : 40;
amount = CalculatePct(std::max<int32>(0, owner->GetResistance(schoolMask)), modifier);
if (owner->HasAura(SPELL_WARLOCK_PET_VOID_STAR_TALISMAN) && schoolMask != SPELL_SCHOOL_MASK_NORMAL)
{
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(SPELL_WARLOCK_PET_VOID_STAR_TALISMAN);
amount += spellInfo->Effects[EFFECT_0].CalcValue(); // 130
}
}
}
@@ -390,6 +396,11 @@ class spell_warl_infernal_scaling : public AuraScript
SpellSchoolMask schoolMask = SpellSchoolMask(aurEff->GetSpellInfo()->Effects[aurEff->GetEffIndex()].MiscValue);
int32 modifier = schoolMask == SPELL_SCHOOL_MASK_NORMAL ? 35 : 40;
amount = CalculatePct(std::max<int32>(0, owner->GetResistance(schoolMask)), modifier);
if (owner->HasAura(SPELL_WARLOCK_PET_VOID_STAR_TALISMAN) && schoolMask != SPELL_SCHOOL_MASK_NORMAL)
{
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(SPELL_WARLOCK_PET_VOID_STAR_TALISMAN);
amount += spellInfo->Effects[EFFECT_0].CalcValue(); // 130
}
}
}