araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-18 14:10:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: Rename more SpellAttr9 to official names

Browse Source 
(cherry picked from commit 9d4047a3be)
This commit is contained in:
Shauren
2024-06-14 13:37:35 +02:00
committed by Ovahlord
parent cc5c68df1e
commit 2cfccad14f
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Miscellaneous/SharedDefines.h
+2 -2
View File
@@ -770,8 +770,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
src/server/game/Miscellaneous/enuminfo_SharedDefines.cpp
+6 -6
View File
@@ -1446,8 +1446,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", "" };
@@ -1490,8 +1490,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;
@@ -1531,8 +1531,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;
src/server/game/Spells/Spell.cpp
+1 -1
View File
@@ -7030,7 +7030,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
src/server/game/Spells/SpellInfo.cpp
+1 -1
View File
@@ -3799,7 +3799,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;