Core/Spells: Named and implemented most of SpellAttr8

Port From (https://github.com/TrinityCore/TrinityCore/commit/dc9361fcc2eb16a59b52dfd8b0d47dfc1bf639be)
This commit is contained in:
hondacrx
2024-02-01 18:59:34 -05:00
parent e37c9558ad
commit 5869fbaee0
10 changed files with 232 additions and 87 deletions
+4 -4
View File
@@ -274,7 +274,7 @@ namespace Game.Entities
return false;
}
public override SpellInfo GetCastSpellInfo(SpellInfo spellInfo)
public override SpellInfo GetCastSpellInfo(SpellInfo spellInfo, TriggerCastFlags triggerFlag)
{
var overrides = m_overrideSpells.LookupByKey(spellInfo.Id);
if (!overrides.Empty())
@@ -283,11 +283,11 @@ namespace Game.Entities
{
SpellInfo newInfo = Global.SpellMgr.GetSpellInfo(spellId, GetMap().GetDifficultyID());
if (newInfo != null)
return GetCastSpellInfo(newInfo);
return GetCastSpellInfo(newInfo, triggerFlag);
}
}
return base.GetCastSpellInfo(spellInfo);
return base.GetCastSpellInfo(spellInfo, triggerFlag);
}
public void SetOverrideSpellsId(uint overrideSpellsId) { SetUpdateFieldValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.OverrideSpellsID), overrideSpellsId); }
@@ -1778,7 +1778,7 @@ namespace Game.Entities
}
case ItemClass.Armor:
{
if (!spellInfo.HasAttribute(SpellAttr8.ArmorSpecialization))
if (!spellInfo.HasAttribute(SpellAttr8.RequiresEquippedInvTypes))
{
// most used check: shield only
if ((spellInfo.EquippedItemSubClassMask & (1 << (int)ItemSubClassArmor.Shield)) != 0)