diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Miscellaneous/SharedDefines.h | 4 | ||||
| -rw-r--r-- | src/server/game/Miscellaneous/enuminfo_SharedDefines.cpp | 12 | ||||
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellInfo.cpp | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 2a3e93fa46b..9e43cbfbb48 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -767,8 +767,8 @@ enum SpellAttr9 : uint32 SPELL_ATTR9_IGNORE_TOTEM_REQUIREMENTS_FOR_CASTING = 0x00000020, // TITLE Ignore Totem Requirements for Casting SPELL_ATTR9_ITEM_CAST_GRANTS_SKILL_GAIN = 0x00000040, // TITLE Item Cast Grants Skill Gain SPELL_ATTR9_DO_NOT_ADD_TO_UNLEARN_LIST = 0x00000080, /* NYI - unlearn list not maintained SMSG_SEND_UNLEARN_SPELLS always empty */ // TITLE Do Not Add to Unlearn List - SPELL_ATTR9_AIMED_SHOT = 0x00000100, // TITLE Cooldown Ignores Ranged Weapon - SPELL_ATTR9_NOT_USABLE_IN_ARENA = 0x00000200, // TITLE Not In Arena + SPELL_ATTR9_COOLDOWN_IGNORES_RANGED_WEAPON = 0x00000100, // TITLE Cooldown Ignores Ranged Weapon + SPELL_ATTR9_NOT_IN_ARENA = 0x00000200, // TITLE Not In Arena SPELL_ATTR9_UNK10 = 0x00000400, // TITLE Unknown attribute 10@Attr9 SPELL_ATTR9_UNK11 = 0x00000800, // TITLE Unknown attribute 11@Attr9 SPELL_ATTR9_UNK12 = 0x00001000, // TITLE Unknown attribute 12@Attr9 diff --git a/src/server/game/Miscellaneous/enuminfo_SharedDefines.cpp b/src/server/game/Miscellaneous/enuminfo_SharedDefines.cpp index 67afbea982c..6656ef26628 100644 --- a/src/server/game/Miscellaneous/enuminfo_SharedDefines.cpp +++ b/src/server/game/Miscellaneous/enuminfo_SharedDefines.cpp @@ -1443,8 +1443,8 @@ TC_API_EXPORT EnumText EnumUtils<SpellAttr9>::ToString(SpellAttr9 value) case SPELL_ATTR9_IGNORE_TOTEM_REQUIREMENTS_FOR_CASTING: return { "SPELL_ATTR9_IGNORE_TOTEM_REQUIREMENTS_FOR_CASTING", "Ignore Totem Requirements for Casting", "" }; case SPELL_ATTR9_ITEM_CAST_GRANTS_SKILL_GAIN: return { "SPELL_ATTR9_ITEM_CAST_GRANTS_SKILL_GAIN", "Item Cast Grants Skill Gain", "" }; case SPELL_ATTR9_DO_NOT_ADD_TO_UNLEARN_LIST: return { "SPELL_ATTR9_DO_NOT_ADD_TO_UNLEARN_LIST", "Do Not Add to Unlearn List", "" }; - case SPELL_ATTR9_AIMED_SHOT: return { "SPELL_ATTR9_AIMED_SHOT", "Cooldown Ignores Ranged Weapon", "" }; - case SPELL_ATTR9_NOT_USABLE_IN_ARENA: return { "SPELL_ATTR9_NOT_USABLE_IN_ARENA", "Not In Arena", "" }; + case SPELL_ATTR9_COOLDOWN_IGNORES_RANGED_WEAPON: return { "SPELL_ATTR9_COOLDOWN_IGNORES_RANGED_WEAPON", "Cooldown Ignores Ranged Weapon", "" }; + case SPELL_ATTR9_NOT_IN_ARENA: return { "SPELL_ATTR9_NOT_IN_ARENA", "Not In Arena", "" }; case SPELL_ATTR9_UNK10: return { "SPELL_ATTR9_UNK10", "Unknown attribute 10@Attr9", "" }; case SPELL_ATTR9_UNK11: return { "SPELL_ATTR9_UNK11", "Unknown attribute 11@Attr9", "" }; case SPELL_ATTR9_UNK12: return { "SPELL_ATTR9_UNK12", "Unknown attribute 12@Attr9", "" }; @@ -1487,8 +1487,8 @@ TC_API_EXPORT SpellAttr9 EnumUtils<SpellAttr9>::FromIndex(size_t index) case 5: return SPELL_ATTR9_IGNORE_TOTEM_REQUIREMENTS_FOR_CASTING; case 6: return SPELL_ATTR9_ITEM_CAST_GRANTS_SKILL_GAIN; case 7: return SPELL_ATTR9_DO_NOT_ADD_TO_UNLEARN_LIST; - case 8: return SPELL_ATTR9_AIMED_SHOT; - case 9: return SPELL_ATTR9_NOT_USABLE_IN_ARENA; + case 8: return SPELL_ATTR9_COOLDOWN_IGNORES_RANGED_WEAPON; + case 9: return SPELL_ATTR9_NOT_IN_ARENA; case 10: return SPELL_ATTR9_UNK10; case 11: return SPELL_ATTR9_UNK11; case 12: return SPELL_ATTR9_UNK12; @@ -1528,8 +1528,8 @@ TC_API_EXPORT size_t EnumUtils<SpellAttr9>::ToIndex(SpellAttr9 value) case SPELL_ATTR9_IGNORE_TOTEM_REQUIREMENTS_FOR_CASTING: return 5; case SPELL_ATTR9_ITEM_CAST_GRANTS_SKILL_GAIN: return 6; case SPELL_ATTR9_DO_NOT_ADD_TO_UNLEARN_LIST: return 7; - case SPELL_ATTR9_AIMED_SHOT: return 8; - case SPELL_ATTR9_NOT_USABLE_IN_ARENA: return 9; + case SPELL_ATTR9_COOLDOWN_IGNORES_RANGED_WEAPON: return 8; + case SPELL_ATTR9_NOT_IN_ARENA: return 9; case SPELL_ATTR9_UNK10: return 10; case SPELL_ATTR9_UNK11: return 11; case SPELL_ATTR9_UNK12: return 12; diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 923ac1e7f5f..f84066f77c4 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -7247,7 +7247,7 @@ SpellCastResult Spell::CheckArenaAndRatedBattlegroundCastRules() if (m_spellInfo->HasAttribute(SPELL_ATTR4_NOT_IN_ARENA_OR_RATED_BATTLEGROUND)) return isArena ? SPELL_FAILED_NOT_IN_ARENA : SPELL_FAILED_NOT_IN_RATED_BATTLEGROUND; - if (isArena && m_spellInfo->HasAttribute(SPELL_ATTR9_NOT_USABLE_IN_ARENA)) + if (isArena && m_spellInfo->HasAttribute(SPELL_ATTR9_NOT_IN_ARENA)) return SPELL_FAILED_NOT_IN_ARENA; // check cooldowns diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 6d1e8e6ba6f..5adbd2bd01f 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -3811,7 +3811,7 @@ uint32 SpellInfo::CalcCastTime(Spell* spell /*= nullptr*/) const if (spell) spell->GetCaster()->ModSpellCastTime(this, castTime, spell); - if (HasAttribute(SPELL_ATTR0_USES_RANGED_SLOT) && !IsAutoRepeatRangedSpell() && !HasAttribute(SPELL_ATTR9_AIMED_SHOT)) + if (HasAttribute(SPELL_ATTR0_USES_RANGED_SLOT) && !IsAutoRepeatRangedSpell() && !HasAttribute(SPELL_ATTR9_COOLDOWN_IGNORES_RANGED_WEAPON)) castTime += 500; return (castTime > 0) ? uint32(castTime) : 0; |