sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Scripts/ZulAman): Hex Lord Malacrass shouldn't use previous class… (#20784)

Browse Source 
fix(Scripts/ZulAman): Hex Lord Malacrass shouldn't use previous class abilities after siphon
This commit is contained in:
Andrew
2024-11-30 16:52:10 -03:00
committed by GitHub
parent e9137d4d4d
commit 4a8247824e
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
+14 -5
View File
@@ -134,7 +134,8 @@ enum Misc
{ {
MAX_ADD_COUNT = 4, MAX_ADD_COUNT = 4,
ADDITIONAL_CLASS_SPRIEST = 11, ADDITIONAL_CLASS_SPRIEST = 11,
AURA_SHADOW_FORM = 15473 AURA_SHADOW_FORM = 15473,
GROUP_CLASS_ABILITY = 1
}; };
enum AbilityTarget enum AbilityTarget
@@ -264,6 +265,7 @@ struct boss_hexlord_malacrass : public BossAI
}); });
ScheduleTimedEvent(30s, [&]{ ScheduleTimedEvent(30s, [&]{
scheduler.CancelGroup(GROUP_CLASS_ABILITY);
DoCastSelf(SPELL_SPIRIT_BOLTS); DoCastSelf(SPELL_SPIRIT_BOLTS);
scheduler.Schedule(10s, [this](TaskContext) scheduler.Schedule(10s, [this](TaskContext)
{ {
@@ -277,14 +279,12 @@ struct boss_hexlord_malacrass : public BossAI
siphonTrigger->GetMotionMaster()->MoveFollow(me, 0.0f, 0.0f); siphonTrigger->GetMotionMaster()->MoveFollow(me, 0.0f, 0.0f);
if (Player* player = target->ToPlayer()) if (Player* player = target->ToPlayer())
_currentClass = player->HasAura(AURA_SHADOW_FORM) ? uint8(ADDITIONAL_CLASS_SPRIEST) : player->getClass(); _currentClass = player->HasAura(AURA_SHADOW_FORM) ? uint8(ADDITIONAL_CLASS_SPRIEST) : player->getClass();
ScheduleClassAbility();
} }
} }
}); });
}, 40s); }, 40s);
ScheduleTimedEvent(_classAbilityTimer, [&]{
if (_currentClass)
UseAbility();
}, _classAbilityTimer);
} }
void UseAbility() void UseAbility()
@@ -319,6 +319,15 @@ struct boss_hexlord_malacrass : public BossAI
_classAbilityTimer = PlayerAbility[_currentClass][random].cooldown; _classAbilityTimer = PlayerAbility[_currentClass][random].cooldown;
} }
void ScheduleClassAbility()
{
scheduler.Schedule(_classAbilityTimer, GROUP_CLASS_ABILITY, [this](TaskContext context)
{
UseAbility();
context.Repeat(_classAbilityTimer);
});
}
void KilledUnit(Unit* victim) override void KilledUnit(Unit* victim) override
{ {
BossAI::KilledUnit(victim); BossAI::KilledUnit(victim);