Core/Spells: Rename more SpellAttr9 to official names
Port From (https://github.com/TrinityCore/TrinityCore/commit/9d4047a3be5f3de8ca7c4818c265127578dbcc81)
This commit is contained in:
@@ -1974,8 +1974,8 @@ namespace Framework.Constants
|
|||||||
IgnoreTotemRequirementsForCasting = 0x20, // Ignore Totem Requirements for Casting
|
IgnoreTotemRequirementsForCasting = 0x20, // Ignore Totem Requirements for Casting
|
||||||
ItemCastGrantsSkillGain = 0x40, // Item Cast Grants Skill Gain
|
ItemCastGrantsSkillGain = 0x40, // Item Cast Grants Skill Gain
|
||||||
DoNotAddToUnlearnList = 0x80, // NYI - unlearn list not maintained SMSG_SEND_UNLEARN_SPELLS always empty // Do Not Add to Unlearn List
|
DoNotAddToUnlearnList = 0x80, // NYI - unlearn list not maintained SMSG_SEND_UNLEARN_SPELLS always empty // Do Not Add to Unlearn List
|
||||||
AimedShot = 0x100, // 8
|
CooldownIgnoresRangedWeapon = 0x100, // Cooldown Ignores Ranged Weapon
|
||||||
NotUsableInArena = 0x200, // 9 Cannot Be Used In Arenas
|
NotInArena = 0x200, // 9 Not In Arena
|
||||||
Unk10 = 0x400, // 10
|
Unk10 = 0x400, // 10
|
||||||
Unk11 = 0x800, // 11
|
Unk11 = 0x800, // 11
|
||||||
Unk12 = 0x1000, // 12
|
Unk12 = 0x1000, // 12
|
||||||
|
|||||||
@@ -6437,7 +6437,7 @@ namespace Game.Spells
|
|||||||
if (m_spellInfo.HasAttribute(SpellAttr4.NotInArenaOrRatedBattleground))
|
if (m_spellInfo.HasAttribute(SpellAttr4.NotInArenaOrRatedBattleground))
|
||||||
return isArena ? SpellCastResult.NotInArena : SpellCastResult.NotInBattleground;
|
return isArena ? SpellCastResult.NotInArena : SpellCastResult.NotInBattleground;
|
||||||
|
|
||||||
if (isArena && m_spellInfo.HasAttribute(SpellAttr9.NotUsableInArena))
|
if (isArena && m_spellInfo.HasAttribute(SpellAttr9.NotInArena))
|
||||||
return SpellCastResult.NotInArena;
|
return SpellCastResult.NotInArena;
|
||||||
|
|
||||||
// check cooldowns
|
// check cooldowns
|
||||||
|
|||||||
@@ -2635,7 +2635,7 @@ namespace Game.Spells
|
|||||||
if (spell != null)
|
if (spell != null)
|
||||||
spell.GetCaster().ModSpellCastTime(this, ref castTime, spell);
|
spell.GetCaster().ModSpellCastTime(this, ref castTime, spell);
|
||||||
|
|
||||||
if (HasAttribute(SpellAttr0.UsesRangedSlot) && (!IsAutoRepeatRangedSpell()) && !HasAttribute(SpellAttr9.AimedShot))
|
if (HasAttribute(SpellAttr0.UsesRangedSlot) && (!IsAutoRepeatRangedSpell()) && !HasAttribute(SpellAttr9.CooldownIgnoresRangedWeapon))
|
||||||
castTime += 500;
|
castTime += 500;
|
||||||
|
|
||||||
return (castTime > 0) ? castTime : 0;
|
return (castTime > 0) ? castTime : 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user