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

Core/Spell: unified handling of SPELL_ATTR5_USABLE_WHILE_* attributes

Browse Source 
Port TrinityCore Commit: https://github.com/TrinityCore/TrinityCore/commit/2b0c73960b431acb25ddfba916017fbfe84f065b
This commit is contained in:
hondacrx
2019-08-14 12:05:26 -04:00
parent e35ba6d97f
commit ed3a310756
2 changed files with 113 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Spells/SpellInfo.cs
+33
View File
@@ -2371,6 +2371,8 @@ namespace Game.Spells
immuneInfo.MechanicImmuneMask = mechanicImmunityMask;
immuneInfo.DispelImmune = dispelImmunity;
immuneInfo.DamageSchoolMask = damageImmunityMask;
_allowedMechanicMask |= immuneInfo.MechanicImmuneMask;
});
foreach (var effects in _effects)
@@ -2383,6 +2385,31 @@ namespace Game.Spells
loadImmunityInfoFn(effect);
}
}
if (HasAttribute(SpellAttr5.UsableWhileStunned))
{
switch (Id)
{
case 22812: // Barkskin
_allowedMechanicMask |=
(1 << (int)Mechanics.Stun) |
(1 << (int)Mechanics.Freeze) |
(1 << (int)Mechanics.Knockout) |
(1 << (int)Mechanics.Sleep);
break;
case 49039: // Lichborne, don't allow normal stuns
break;
default:
_allowedMechanicMask |= (1 << (int)Mechanics.Stun);
break;
}
}
if (HasAttribute(SpellAttr5.UsableWhileConfused))
_allowedMechanicMask |= (1 << (int)Mechanics.Disoriented);
if (HasAttribute(SpellAttr5.UsableWhileFeared))
_allowedMechanicMask |= (1 << (int)Mechanics.Fear);
}
public void ApplyAllSpellImmunitiesTo(Unit target, SpellEffectInfo effect, bool apply)
@@ -2590,6 +2617,11 @@ namespace Game.Spells
return false;
}
public uint GetAllowedMechanicMask()
{
return _allowedMechanicMask;
}
public float GetMinRange(bool positive = false)
{
if (RangeEntry == null)
@@ -3733,6 +3765,7 @@ namespace Game.Spells
AuraStateType _auraState;
SpellDiminishInfo _diminishInfo;
uint _allowedMechanicMask;
#endregion
public struct ScalingInfo