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

refactor(Core/Spell): Change "Attribute &" to HasAttribute() (#5991)

Browse Source
This commit is contained in:
Kitzunu
2021-05-29 11:56:19 +02:00
committed by GitHub
parent bc380aaa2b
commit b846179986
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/SpellInfo.cpp
+12 -12
View File
@@ -1075,14 +1075,14 @@ bool SpellInfo::IsSelfCast() const
bool SpellInfo::IsPassive() const bool SpellInfo::IsPassive() const
{ {
return Attributes & SPELL_ATTR0_PASSIVE; return HasAttribute(SPELL_ATTR0_PASSIVE);
} }
bool SpellInfo::IsAutocastable() const bool SpellInfo::IsAutocastable() const
{ {
if (Attributes & SPELL_ATTR0_PASSIVE) if (HasAttribute(SPELL_ATTR0_PASSIVE))
return false; return false;
if (AttributesEx & SPELL_ATTR1_NO_AUTOCAST_AI) if (HasAttribute(SPELL_ATTR1_NO_AUTOCAST_AI))
return false; return false;
return true; return true;
} }
@@ -1189,7 +1189,7 @@ bool SpellInfo::IsMultiSlotAura() const
bool SpellInfo::IsCooldownStartedOnEvent() const bool SpellInfo::IsCooldownStartedOnEvent() const
{ {
return Attributes & SPELL_ATTR0_COOLDOWN_ON_EVENT || (CategoryEntry && CategoryEntry->Flags & SPELL_CATEGORY_FLAG_COOLDOWN_STARTS_ON_EVENT); return HasAttribute(SPELL_ATTR0_COOLDOWN_ON_EVENT) || (CategoryEntry && CategoryEntry->Flags & SPELL_CATEGORY_FLAG_COOLDOWN_STARTS_ON_EVENT);
} }
bool SpellInfo::IsDeathPersistent() const bool SpellInfo::IsDeathPersistent() const
@@ -1209,7 +1209,7 @@ bool SpellInfo::IsAllowingDeadTarget() const
bool SpellInfo::CanBeUsedInCombat() const bool SpellInfo::CanBeUsedInCombat() const
{ {
return !(Attributes & SPELL_ATTR0_NOT_IN_COMBAT_ONLY_PEACEFUL); return !(HasAttribute(SPELL_ATTR0_NOT_IN_COMBAT_ONLY_PEACEFUL));
} }
bool SpellInfo::IsPositive() const bool SpellInfo::IsPositive() const
@@ -1255,7 +1255,7 @@ bool SpellInfo::IsRangedWeaponSpell() const
{ {
return (SpellFamilyName == SPELLFAMILY_HUNTER && !(SpellFamilyFlags[1] & 0x10000000)) // for 53352, cannot find better way return (SpellFamilyName == SPELLFAMILY_HUNTER && !(SpellFamilyFlags[1] & 0x10000000)) // for 53352, cannot find better way
|| (EquippedItemSubClassMask & ITEM_SUBCLASS_MASK_WEAPON_RANGED) || (EquippedItemSubClassMask & ITEM_SUBCLASS_MASK_WEAPON_RANGED)
|| (Attributes & SPELL_ATTR0_USES_RANGED_SLOT); // Xinef: added || (HasAttribute(SPELL_ATTR0_USES_RANGED_SLOT)); // Xinef: added
} }
bool SpellInfo::IsAutoRepeatRangedSpell() const bool SpellInfo::IsAutoRepeatRangedSpell() const
@@ -1290,7 +1290,7 @@ bool SpellInfo::IsAffectedBySpellMod(SpellModifier const* mod) const
bool SpellInfo::CanPierceImmuneAura(SpellInfo const* aura) const bool SpellInfo::CanPierceImmuneAura(SpellInfo const* aura) const
{ {
// these spells pierce all avalible spells (Resurrection Sickness for example) // these spells pierce all avalible spells (Resurrection Sickness for example)
if (Attributes & SPELL_ATTR0_NO_IMMUNITIES) if (HasAttribute(SPELL_ATTR0_NO_IMMUNITIES))
return true; return true;
// these spells (Cyclone for example) can pierce all... // these spells (Cyclone for example) can pierce all...
@@ -1427,7 +1427,7 @@ SpellCastResult SpellInfo::CheckShapeshift(uint32 form) const
if (actAsShifted) if (actAsShifted)
{ {
if (Attributes & SPELL_ATTR0_NOT_SHAPESHIFTED) // not while shapeshifted if (HasAttribute(SPELL_ATTR0_NOT_SHAPESHIFTED)) // not while shapeshifted
return SPELL_FAILED_NOT_SHAPESHIFT; return SPELL_FAILED_NOT_SHAPESHIFT;
else if (Stances != 0) // needs other shapeshift else if (Stances != 0) // needs other shapeshift
return SPELL_FAILED_ONLY_SHAPESHIFT; return SPELL_FAILED_ONLY_SHAPESHIFT;
@@ -2292,7 +2292,7 @@ uint32 SpellInfo::CalcCastTime(Unit* caster, Spell* spell) const
return 0; return 0;
int32 castTime = CastTimeEntry->CastTime; int32 castTime = CastTimeEntry->CastTime;
if (Attributes & SPELL_ATTR0_USES_RANGED_SLOT && (!IsAutoRepeatRangedSpell())) if (HasAttribute(SPELL_ATTR0_USES_RANGED_SLOT) && (!IsAutoRepeatRangedSpell()))
castTime += 500; castTime += 500;
if (caster) if (caster)
@@ -2407,7 +2407,7 @@ int32 SpellInfo::CalcPowerCost(Unit const* caster, SpellSchoolMask schoolMask, S
if (!caster->IsControlledByPlayer()) if (!caster->IsControlledByPlayer())
{ {
if (Attributes & SPELL_ATTR0_SCALES_WITH_CREATURE_LEVEL) if (HasAttribute(SPELL_ATTR0_SCALES_WITH_CREATURE_LEVEL))
{ {
GtNPCManaCostScalerEntry const* spellScaler = sGtNPCManaCostScalerStore.LookupEntry(SpellLevel - 1); GtNPCManaCostScalerEntry const* spellScaler = sGtNPCManaCostScalerStore.LookupEntry(SpellLevel - 1);
GtNPCManaCostScalerEntry const* casterScaler = sGtNPCManaCostScalerStore.LookupEntry(caster->getLevel() - 1); GtNPCManaCostScalerEntry const* casterScaler = sGtNPCManaCostScalerStore.LookupEntry(caster->getLevel() - 1);
@@ -2557,7 +2557,7 @@ uint32 SpellInfo::_GetExplicitTargetMask() const
bool SpellInfo::_IsPositiveEffect(uint8 effIndex, bool deep) const bool SpellInfo::_IsPositiveEffect(uint8 effIndex, bool deep) const
{ {
// not found a single positive spell with this attribute // not found a single positive spell with this attribute
if (Attributes & SPELL_ATTR0_AURA_IS_DEBUFF) if (HasAttribute(SPELL_ATTR0_AURA_IS_DEBUFF))
return false; return false;
switch (Mechanic) switch (Mechanic)
@@ -2698,7 +2698,7 @@ bool SpellInfo::_IsPositiveEffect(uint8 effIndex, bool deep) const
if (Effects[effIndex].TargetA.GetTarget() != TARGET_UNIT_CASTER) if (Effects[effIndex].TargetA.GetTarget() != TARGET_UNIT_CASTER)
return false; return false;
// but not this if this first effect (didn't find better check) // but not this if this first effect (didn't find better check)
if (Attributes & SPELL_ATTR0_AURA_IS_DEBUFF && effIndex == 0) if (HasAttribute(SPELL_ATTR0_AURA_IS_DEBUFF) && effIndex == 0)
return false; return false;
break; break;
case SPELL_AURA_MECHANIC_IMMUNITY: case SPELL_AURA_MECHANIC_IMMUNITY: