Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Spells: Rename more SpellAttr9

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/56a027131a130bc778ee34ddfa379c42580b510b)
This commit is contained in:
Hondacrx
2024-08-25 21:45:49 -04:00
parent 269f427e9a
commit bb26b47824
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Constants/Spells/SpellConst.cs
+2 -2
View File
@@ -1969,8 +1969,8 @@ namespace Framework.Constants
ForceDestLocation = 0x01, // Force Dest Location DESCRIPTION Ignores collision with terrain (unsure if it also ignores terrain height and can go under map) ForceDestLocation = 0x01, // Force Dest Location DESCRIPTION Ignores collision with terrain (unsure if it also ignores terrain height and can go under map)
ModInvisIncludesParty = 0x02, // Mod Invis Includes Party 1@Attr9 DESCRIPTION Causes invisibility auras to ignore "can always see party member invis" rule ModInvisIncludesParty = 0x02, // Mod Invis Includes Party 1@Attr9 DESCRIPTION Causes invisibility auras to ignore "can always see party member invis" rule
OnlyWhenIllegallyMounted = 0x04, // Only When Illegally Mounted OnlyWhenIllegallyMounted = 0x04, // Only When Illegally Mounted
Unk3 = 0x08, // 3 DoNotLogAuraRefresh = 0x08, // Do Not Log Aura Refresh (client only)
SpecialDelayCalculation = 0x10, // 4 MissileSpeedIsDelayInSec = 0x10, // Missile Speed is Delay (in sec)
SummonPlayerTotem = 0x20, // 5 SummonPlayerTotem = 0x20, // 5
Unk6 = 0x40, // 6 Unk6 = 0x40, // 6
Unk7 = 0x80, // 7 Unk7 = 0x80, // 7
Source/Game/Entities/Object/WorldObject.cs
+1 -1
View File
@@ -2864,7 +2864,7 @@ namespace Game.Entities
{ {
// Set up missile speed based delay // Set up missile speed based delay
float hitDelay = spellInfo.LaunchDelay; float hitDelay = spellInfo.LaunchDelay;
if (spellInfo.HasAttribute(SpellAttr9.SpecialDelayCalculation)) if (spellInfo.HasAttribute(SpellAttr9.MissileSpeedIsDelayInSec))
hitDelay += spellInfo.Speed; hitDelay += spellInfo.Speed;
else if (spellInfo.Speed > 0.0f) else if (spellInfo.Speed > 0.0f)
hitDelay += Math.Max(victim.GetDistance(this), 5.0f) / spellInfo.Speed; hitDelay += Math.Max(victim.GetDistance(this), 5.0f) / spellInfo.Speed;
Source/Game/Spells/Spell.cs
+4 -4
View File
@@ -339,7 +339,7 @@ namespace Game.Spells
if (speed > 0.0f) if (speed > 0.0f)
return (ulong)(Math.Floor((m_targets.GetDist2d() / speed + launchDelay) * 1000.0f)); return (ulong)(Math.Floor((m_targets.GetDist2d() / speed + launchDelay) * 1000.0f));
} }
else if (m_spellInfo.HasAttribute(SpellAttr9.SpecialDelayCalculation)) else if (m_spellInfo.HasAttribute(SpellAttr9.MissileSpeedIsDelayInSec))
return (ulong)(Math.Floor((m_spellInfo.Speed + launchDelay) * 1000.0f)); return (ulong)(Math.Floor((m_spellInfo.Speed + launchDelay) * 1000.0f));
else if (m_spellInfo.Speed > 0.0f) else if (m_spellInfo.Speed > 0.0f)
{ {
@@ -1988,7 +1988,7 @@ namespace Game.Spells
} }
} }
if (m_spellInfo.HasAttribute(SpellAttr9.SpecialDelayCalculation)) if (m_spellInfo.HasAttribute(SpellAttr9.MissileSpeedIsDelayInSec))
hitDelay += m_spellInfo.Speed; hitDelay += m_spellInfo.Speed;
else if (m_spellInfo.Speed > 0.0f) else if (m_spellInfo.Speed > 0.0f)
{ {
@@ -2057,7 +2057,7 @@ namespace Game.Spells
if (m_caster != go) if (m_caster != go)
{ {
float hitDelay = m_spellInfo.LaunchDelay; float hitDelay = m_spellInfo.LaunchDelay;
if (m_spellInfo.HasAttribute(SpellAttr9.SpecialDelayCalculation)) if (m_spellInfo.HasAttribute(SpellAttr9.MissileSpeedIsDelayInSec))
hitDelay += m_spellInfo.Speed; hitDelay += m_spellInfo.Speed;
else if (m_spellInfo.Speed > 0.0f) else if (m_spellInfo.Speed > 0.0f)
{ {
@@ -2137,7 +2137,7 @@ namespace Game.Spells
if (m_caster != corpse) if (m_caster != corpse)
{ {
float hitDelay = m_spellInfo.LaunchDelay; float hitDelay = m_spellInfo.LaunchDelay;
if (m_spellInfo.HasAttribute(SpellAttr9.SpecialDelayCalculation)) if (m_spellInfo.HasAttribute(SpellAttr9.MissileSpeedIsDelayInSec))
hitDelay += m_spellInfo.Speed; hitDelay += m_spellInfo.Speed;
else if (m_spellInfo.Speed > 0.0f) else if (m_spellInfo.Speed > 0.0f)
{ {
Source/Game/Spells/SpellEffects.cs
+2 -2
View File
@@ -3545,7 +3545,7 @@ namespace Game.Spells
m_preGeneratedPath.CalculatePath(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), false); m_preGeneratedPath.CalculatePath(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), false);
} }
if (MathFunctions.fuzzyGt(m_spellInfo.Speed, 0.0f) && m_spellInfo.HasAttribute(SpellAttr9.SpecialDelayCalculation)) if (MathFunctions.fuzzyGt(m_spellInfo.Speed, 0.0f) && m_spellInfo.HasAttribute(SpellAttr9.MissileSpeedIsDelayInSec))
speed = m_preGeneratedPath.GetPathLength() / speed; speed = m_preGeneratedPath.GetPathLength() / speed;
unitCaster.GetMotionMaster().MoveCharge(m_preGeneratedPath, speed, unitTarget, spellEffectExtraData); unitCaster.GetMotionMaster().MoveCharge(m_preGeneratedPath, speed, unitTarget, spellEffectExtraData);
@@ -3592,7 +3592,7 @@ namespace Game.Spells
float speed = MathFunctions.fuzzyGt(m_spellInfo.Speed, 0.0f) ? m_spellInfo.Speed : MotionMaster.SPEED_CHARGE; float speed = MathFunctions.fuzzyGt(m_spellInfo.Speed, 0.0f) ? m_spellInfo.Speed : MotionMaster.SPEED_CHARGE;
if (MathFunctions.fuzzyGt(m_spellInfo.Speed, 0.0f) && m_spellInfo.HasAttribute(SpellAttr9.SpecialDelayCalculation)) if (MathFunctions.fuzzyGt(m_spellInfo.Speed, 0.0f) && m_spellInfo.HasAttribute(SpellAttr9.MissileSpeedIsDelayInSec))
speed = path.GetPathLength() / speed; speed = path.GetPathLength() / speed;
unitCaster.GetMotionMaster().MoveCharge(path, speed); unitCaster.GetMotionMaster().MoveCharge(path, speed);
Source/Game/Spells/SpellManager.cs
+1 -1
View File
@@ -4455,7 +4455,7 @@ namespace Game.Entities
case SpellEffectName.Jump: case SpellEffectName.Jump:
case SpellEffectName.JumpDest: case SpellEffectName.JumpDest:
case SpellEffectName.LeapBack: case SpellEffectName.LeapBack:
if (spellInfo.Speed == 0 && spellInfo.SpellFamilyName == 0 && !spellInfo.HasAttribute(SpellAttr9.SpecialDelayCalculation)) if (spellInfo.Speed == 0 && spellInfo.SpellFamilyName == 0 && !spellInfo.HasAttribute(SpellAttr9.MissileSpeedIsDelayInSec))
spellInfo.Speed = MotionMaster.SPEED_CHARGE; spellInfo.Speed = MotionMaster.SPEED_CHARGE;
break; break;
} }