Merge branch 'master' into Playerbot

This commit is contained in:
Yunfan Li
2024-06-28 18:36:45 +08:00
57 changed files with 1524 additions and 1417 deletions
@@ -31,6 +31,7 @@ enum Spells
SPELL_EMERGE = 53500,
SPELL_SUBMERGE = 53421,
SPELL_SELF_ROOT = 42716,
SPELL_CLEAR_ALL_DEBUFFS = 34098,
SPELL_SUMMON_DARTER = 53599,
SPELL_SUMMON_ASSASSIN = 53610,
@@ -193,6 +194,7 @@ class boss_anub_arak : public CreatureScript
if (me->HealthBelowPct(eventId*25))
{
Talk(SAY_SUBMERGE);
DoCastSelf(SPELL_CLEAR_ALL_DEBUFFS, true);
me->CastSpell(me, SPELL_IMPALE_PERIODIC, true);
me->CastSpell(me, SPELL_SUBMERGE, false);
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE);
@@ -88,6 +88,7 @@ enum AnubSpells
SPELL_SUBMERGE = 65981,
SPELL_EMERGE = 65982,
SPELL_BERSERK = 26662,
SPELL_CLEAR_ALL_DEBUFFS = 34098,
SPELL_FREEZING_SLASH = 66012,
SPELL_PENETRATING_COLD = 66013,
@@ -313,7 +314,7 @@ public:
{
me->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
bool berserk = me->HasAura(SPELL_BERSERK);
me->RemoveAllAuras();
DoCastSelf(SPELL_CLEAR_ALL_DEBUFFS, true);
if (berserk)
me->CastSpell(me, SPELL_BERSERK, true);
Talk(EMOTE_SUBMERGE);
@@ -681,7 +682,7 @@ public:
{
me->GetMotionMaster()->MoveIdle();
me->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
me->RemoveAllAuras();
DoCastSelf(SPELL_CLEAR_ALL_DEBUFFS, true);
me->CastSpell(me, SPELL_EXPOSE_WEAKNESS, true);
me->CastSpell(me, SPELL_SPIDER_FRENZY, true);
me->CastSpell(me, SPELL_SUBMERGE, false);