Core/Auras: Update AuraState enum and implement missing new ones

Port From (https://github.com/TrinityCore/TrinityCore/commit/69e0b9a98516a0cac14bc3f985a2deb2fe79205f)
This commit is contained in:
hondacrx
2021-03-17 21:51:55 -04:00
parent 97a89d0c8c
commit 76d79ff2e6
8 changed files with 98 additions and 105 deletions
+9 -15
View File
@@ -1729,16 +1729,12 @@ namespace Game.Entities
switch (reactive)
{
case ReactiveType.Defense:
if (HasAuraState(AuraStateType.Defense))
ModifyAuraState(AuraStateType.Defense, false);
if (HasAuraState(AuraStateType.Defensive))
ModifyAuraState(AuraStateType.Defensive, false);
break;
case ReactiveType.HunterParry:
if (GetClass() == Class.Hunter && HasAuraState(AuraStateType.HunterParry))
ModifyAuraState(AuraStateType.HunterParry, false);
break;
case ReactiveType.OverPower:
if (GetClass() == Class.Warrior && IsTypeId(TypeId.Player))
ToPlayer().ClearComboPoints();
case ReactiveType.Defense2:
if (HasAuraState(AuraStateType.Defensive2))
ModifyAuraState(AuraStateType.Defensive2, false);
break;
}
}
@@ -1836,12 +1832,10 @@ namespace Game.Entities
for (ReactiveType i = 0; i < ReactiveType.Max; ++i)
m_reactiveTimer[i] = 0;
if (HasAuraState(AuraStateType.Defense))
ModifyAuraState(AuraStateType.Defense, false);
if (GetClass() == Class.Hunter && HasAuraState(AuraStateType.HunterParry))
ModifyAuraState(AuraStateType.HunterParry, false);
if (GetClass() == Class.Warrior && IsTypeId(TypeId.Player))
ToPlayer().ClearComboPoints();
if (HasAuraState(AuraStateType.Defensive))
ModifyAuraState(AuraStateType.Defensive, false);
if (HasAuraState(AuraStateType.Defensive2))
ModifyAuraState(AuraStateType.Defensive2, false);
}
public virtual bool CanUseAttackType(WeaponAttackType attacktype)