From 0bb55fd94298981f5c9bcef058a0586c1b9d7559 Mon Sep 17 00:00:00 2001 From: Hondacrx Date: Sun, 25 Aug 2024 23:49:17 -0400 Subject: [PATCH] Core/Spells: Rename more SpellAttr9 to official names Port From (https://github.com/TrinityCore/TrinityCore/commit/9d4047a3be5f3de8ca7c4818c265127578dbcc81) --- Source/Framework/Constants/Spells/SpellConst.cs | 4 ++-- Source/Game/Spells/Spell.cs | 2 +- Source/Game/Spells/SpellInfo.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Framework/Constants/Spells/SpellConst.cs b/Source/Framework/Constants/Spells/SpellConst.cs index da23a9e7c..ff8c28e81 100644 --- a/Source/Framework/Constants/Spells/SpellConst.cs +++ b/Source/Framework/Constants/Spells/SpellConst.cs @@ -1974,8 +1974,8 @@ namespace Framework.Constants IgnoreTotemRequirementsForCasting = 0x20, // Ignore Totem Requirements for Casting 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 - AimedShot = 0x100, // 8 - NotUsableInArena = 0x200, // 9 Cannot Be Used In Arenas + CooldownIgnoresRangedWeapon = 0x100, // Cooldown Ignores Ranged Weapon + NotInArena = 0x200, // 9 Not In Arena Unk10 = 0x400, // 10 Unk11 = 0x800, // 11 Unk12 = 0x1000, // 12 diff --git a/Source/Game/Spells/Spell.cs b/Source/Game/Spells/Spell.cs index ad7c143ed..3a5f3a953 100644 --- a/Source/Game/Spells/Spell.cs +++ b/Source/Game/Spells/Spell.cs @@ -6437,7 +6437,7 @@ namespace Game.Spells if (m_spellInfo.HasAttribute(SpellAttr4.NotInArenaOrRatedBattleground)) return isArena ? SpellCastResult.NotInArena : SpellCastResult.NotInBattleground; - if (isArena && m_spellInfo.HasAttribute(SpellAttr9.NotUsableInArena)) + if (isArena && m_spellInfo.HasAttribute(SpellAttr9.NotInArena)) return SpellCastResult.NotInArena; // check cooldowns diff --git a/Source/Game/Spells/SpellInfo.cs b/Source/Game/Spells/SpellInfo.cs index f98f14a9d..37d47c8ad 100644 --- a/Source/Game/Spells/SpellInfo.cs +++ b/Source/Game/Spells/SpellInfo.cs @@ -2635,7 +2635,7 @@ namespace Game.Spells if (spell != null) 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; return (castTime > 0) ? castTime : 0;