diff options
author | Shauren <shauren.trinity@gmail.com> | 2024-06-11 11:05:40 +0200 |
---|---|---|
committer | Ovahlord <dreadkiller@gmx.de> | 2024-06-20 01:19:46 +0200 |
commit | f7992964c3d60e6a8e159b1c151a2ac3367b861f (patch) | |
tree | 8e84ff27e3e770017abdb195291df786b325ce06 /src | |
parent | e732af829701270311322b2af54e95901d4e936f (diff) |
Core/Spells: Rename more SpellAttr9
(cherry picked from commit 56a027131a130bc778ee34ddfa379c42580b510b)
Diffstat (limited to 'src')
-rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 2 | ||||
-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 | 8 | ||||
-rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 4 | ||||
-rw-r--r-- | src/server/game/Spells/SpellMgr.cpp | 2 |
6 files changed, 16 insertions, 16 deletions
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index cacf3f1f420..6d6452014b6 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -3316,7 +3316,7 @@ Unit* WorldObject::GetMagicHitRedirectTarget(Unit* victim, SpellInfo const* spel { // Set up missile speed based delay float hitDelay = spellInfo->LaunchDelay; - if (spellInfo->HasAttribute(SPELL_ATTR9_SPECIAL_DELAY_CALCULATION)) + if (spellInfo->HasAttribute(SPELL_ATTR9_MISSILE_SPEED_IS_DELAY_IN_SEC)) hitDelay += spellInfo->Speed; else if (spellInfo->Speed > 0.0f) hitDelay += std::max(victim->GetDistance(this), 5.0f) / spellInfo->Speed; diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index f62d4426dd2..9941f4fce6b 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -765,8 +765,8 @@ enum SpellAttr9 : uint32 SPELL_ATTR9_FORCE_DEST_LOCATION = 0x00000001, // TITLE Force Dest Location DESCRIPTION Ignores collision with terrain (unsure if it also ignores terrain height and can go under map) SPELL_ATTR9_MOD_INVIS_INCLUDES_PARTY = 0x00000002, // TITLE Mod Invis Includes Party 1@Attr9 DESCRIPTION Causes invisibility auras to ignore "can always see party member invis" rule SPELL_ATTR9_ONLY_WHEN_ILLEGALLY_MOUNTED = 0x00000004, // TITLE Only When Illegally Mounted - SPELL_ATTR9_UNK3 = 0x00000008, // TITLE Unknown attribute 3@Attr9 - SPELL_ATTR9_SPECIAL_DELAY_CALCULATION = 0x00000010, // TITLE Missile Speed is Delay (in sec) + SPELL_ATTR9_DO_NOT_LOG_AURA_REFRESH = 0x00000008, // TITLE Do Not Log Aura Refresh (client only) + SPELL_ATTR9_MISSILE_SPEED_IS_DELAY_IN_SEC = 0x00000010, // TITLE Missile Speed is Delay (in sec) SPELL_ATTR9_SUMMON_PLAYER_TOTEM = 0x00000020, // TITLE Ignore Totem Requirements for Casting SPELL_ATTR9_UNK6 = 0x00000040, // TITLE Unknown attribute 6@Attr9 SPELL_ATTR9_UNK7 = 0x00000080, // TITLE Unknown attribute 7@Attr9 diff --git a/src/server/game/Miscellaneous/enuminfo_SharedDefines.cpp b/src/server/game/Miscellaneous/enuminfo_SharedDefines.cpp index 3531eb60238..c5593f07b4d 100644 --- a/src/server/game/Miscellaneous/enuminfo_SharedDefines.cpp +++ b/src/server/game/Miscellaneous/enuminfo_SharedDefines.cpp @@ -1441,8 +1441,8 @@ TC_API_EXPORT EnumText EnumUtils<SpellAttr9>::ToString(SpellAttr9 value) case SPELL_ATTR9_FORCE_DEST_LOCATION: return { "SPELL_ATTR9_FORCE_DEST_LOCATION", "Force Dest Location", "Ignores collision with terrain (unsure if it also ignores terrain height and can go under map)" }; case SPELL_ATTR9_MOD_INVIS_INCLUDES_PARTY: return { "SPELL_ATTR9_MOD_INVIS_INCLUDES_PARTY", "Mod Invis Includes Party 1@Attr9", "Causes invisibility auras to ignore \042can always see party member invis\042 rule" }; case SPELL_ATTR9_ONLY_WHEN_ILLEGALLY_MOUNTED: return { "SPELL_ATTR9_ONLY_WHEN_ILLEGALLY_MOUNTED", "Only When Illegally Mounted", "" }; - case SPELL_ATTR9_UNK3: return { "SPELL_ATTR9_UNK3", "Unknown attribute 3@Attr9", "" }; - case SPELL_ATTR9_SPECIAL_DELAY_CALCULATION: return { "SPELL_ATTR9_SPECIAL_DELAY_CALCULATION", "Missile Speed is Delay (in sec)", "" }; + case SPELL_ATTR9_DO_NOT_LOG_AURA_REFRESH: return { "SPELL_ATTR9_DO_NOT_LOG_AURA_REFRESH", "Do Not Log Aura Refresh (client only)", "" }; + case SPELL_ATTR9_MISSILE_SPEED_IS_DELAY_IN_SEC: return { "SPELL_ATTR9_MISSILE_SPEED_IS_DELAY_IN_SEC", "Missile Speed is Delay (in sec)", "" }; case SPELL_ATTR9_SUMMON_PLAYER_TOTEM: return { "SPELL_ATTR9_SUMMON_PLAYER_TOTEM", "Ignore Totem Requirements for Casting", "" }; case SPELL_ATTR9_UNK6: return { "SPELL_ATTR9_UNK6", "Unknown attribute 6@Attr9", "" }; case SPELL_ATTR9_UNK7: return { "SPELL_ATTR9_UNK7", "Unknown attribute 7@Attr9", "" }; @@ -1485,8 +1485,8 @@ TC_API_EXPORT SpellAttr9 EnumUtils<SpellAttr9>::FromIndex(size_t index) case 0: return SPELL_ATTR9_FORCE_DEST_LOCATION; case 1: return SPELL_ATTR9_MOD_INVIS_INCLUDES_PARTY; case 2: return SPELL_ATTR9_ONLY_WHEN_ILLEGALLY_MOUNTED; - case 3: return SPELL_ATTR9_UNK3; - case 4: return SPELL_ATTR9_SPECIAL_DELAY_CALCULATION; + case 3: return SPELL_ATTR9_DO_NOT_LOG_AURA_REFRESH; + case 4: return SPELL_ATTR9_MISSILE_SPEED_IS_DELAY_IN_SEC; case 5: return SPELL_ATTR9_SUMMON_PLAYER_TOTEM; case 6: return SPELL_ATTR9_UNK6; case 7: return SPELL_ATTR9_UNK7; @@ -1526,8 +1526,8 @@ TC_API_EXPORT size_t EnumUtils<SpellAttr9>::ToIndex(SpellAttr9 value) case SPELL_ATTR9_FORCE_DEST_LOCATION: return 0; case SPELL_ATTR9_MOD_INVIS_INCLUDES_PARTY: return 1; case SPELL_ATTR9_ONLY_WHEN_ILLEGALLY_MOUNTED: return 2; - case SPELL_ATTR9_UNK3: return 3; - case SPELL_ATTR9_SPECIAL_DELAY_CALCULATION: return 4; + case SPELL_ATTR9_DO_NOT_LOG_AURA_REFRESH: return 3; + case SPELL_ATTR9_MISSILE_SPEED_IS_DELAY_IN_SEC: return 4; case SPELL_ATTR9_SUMMON_PLAYER_TOTEM: return 5; case SPELL_ATTR9_UNK6: return 6; case SPELL_ATTR9_UNK7: return 7; diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index ce064dcc5f1..32693cef662 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -856,7 +856,7 @@ uint64 Spell::CalculateDelayMomentForDst(float launchDelay) const if (speed > 0.0f) return uint64(std::floor((m_targets.GetDist2d() / speed + launchDelay) * 1000.0f)); } - else if (m_spellInfo->HasAttribute(SPELL_ATTR9_SPECIAL_DELAY_CALCULATION)) + else if (m_spellInfo->HasAttribute(SPELL_ATTR9_MISSILE_SPEED_IS_DELAY_IN_SEC)) return uint64(std::floor((m_spellInfo->Speed + launchDelay) * 1000.0f)); else if (m_spellInfo->Speed > 0.0f) { @@ -2484,7 +2484,7 @@ void Spell::AddUnitTarget(Unit* target, uint32 effectMask, bool checkIfValid /*= } } - if (m_spellInfo->HasAttribute(SPELL_ATTR9_SPECIAL_DELAY_CALCULATION)) + if (m_spellInfo->HasAttribute(SPELL_ATTR9_MISSILE_SPEED_IS_DELAY_IN_SEC)) hitDelay += m_spellInfo->Speed; else if (m_spellInfo->Speed > 0.0f) { @@ -2554,7 +2554,7 @@ void Spell::AddGOTarget(GameObject* go, uint32 effectMask) if (static_cast<WorldObject*>(m_caster) != go) { float hitDelay = m_spellInfo->LaunchDelay; - if (m_spellInfo->HasAttribute(SPELL_ATTR9_SPECIAL_DELAY_CALCULATION)) + if (m_spellInfo->HasAttribute(SPELL_ATTR9_MISSILE_SPEED_IS_DELAY_IN_SEC)) hitDelay += m_spellInfo->Speed; else if (m_spellInfo->Speed > 0.0f) { @@ -2634,7 +2634,7 @@ void Spell::AddCorpseTarget(Corpse* corpse, uint32 effectMask) if (m_caster != corpse) { float hitDelay = m_spellInfo->LaunchDelay; - if (m_spellInfo->HasAttribute(SPELL_ATTR9_SPECIAL_DELAY_CALCULATION)) + if (m_spellInfo->HasAttribute(SPELL_ATTR9_MISSILE_SPEED_IS_DELAY_IN_SEC)) hitDelay += m_spellInfo->Speed; else if (m_spellInfo->Speed > 0.0f) { diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index e7474d63580..f255b272120 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -3848,7 +3848,7 @@ void Spell::EffectCharge() m_preGeneratedPath->CalculatePath(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), false); } - if (G3D::fuzzyGt(m_spellInfo->Speed, 0.0f) && m_spellInfo->HasAttribute(SPELL_ATTR9_SPECIAL_DELAY_CALCULATION)) + if (G3D::fuzzyGt(m_spellInfo->Speed, 0.0f) && m_spellInfo->HasAttribute(SPELL_ATTR9_MISSILE_SPEED_IS_DELAY_IN_SEC)) speed = m_preGeneratedPath->GetPathLength() / speed; unitCaster->GetMotionMaster()->MoveCharge(*m_preGeneratedPath, speed, unitTarget, spellEffectExtraData ? &*spellEffectExtraData : nullptr); @@ -3895,7 +3895,7 @@ void Spell::EffectChargeDest() float speed = G3D::fuzzyGt(m_spellInfo->Speed, 0.0f) ? m_spellInfo->Speed : SPEED_CHARGE; - if (G3D::fuzzyGt(m_spellInfo->Speed, 0.0f) && m_spellInfo->HasAttribute(SPELL_ATTR9_SPECIAL_DELAY_CALCULATION)) + if (G3D::fuzzyGt(m_spellInfo->Speed, 0.0f) && m_spellInfo->HasAttribute(SPELL_ATTR9_MISSILE_SPEED_IS_DELAY_IN_SEC)) speed = path.GetPathLength() / speed; unitCaster->GetMotionMaster()->MoveCharge(path, speed); diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index e3c4ba51132..ac2568f00f3 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -4862,7 +4862,7 @@ void SpellMgr::LoadSpellInfoCorrections() case SPELL_EFFECT_JUMP: case SPELL_EFFECT_JUMP_DEST: case SPELL_EFFECT_LEAP_BACK: - if (!spellInfo->Speed && !spellInfo->SpellFamilyName && !spellInfo->HasAttribute(SPELL_ATTR9_SPECIAL_DELAY_CALCULATION)) + if (!spellInfo->Speed && !spellInfo->SpellFamilyName && !spellInfo->HasAttribute(SPELL_ATTR9_MISSILE_SPEED_IS_DELAY_IN_SEC)) spellInfo->Speed = SPEED_CHARGE; break; default: |