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

fix(Scripts/TempleOfAhnQiraj): Replace Sartura's Gaze mechanic with a threat wipe (#13691)

Browse Source 
Update boss_sartura.cpp
This commit is contained in:
Gultask
2022-11-04 17:23:18 -03:00
committed by GitHub
parent 2420d19e54
commit a7cd116880
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
+12 -6
View File
@@ -105,7 +105,7 @@ struct boss_sartura : public BossAI
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
if (!UpdateVictimWithGaze()) if (!UpdateVictim())
return; return;
events.Update(diff); events.Update(diff);
@@ -117,7 +117,8 @@ struct boss_sartura : public BossAI
case EVENT_SARTURA_WHIRLWIND: case EVENT_SARTURA_WHIRLWIND:
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100.0f, true)) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100.0f, true))
{ {
SetGazeOn(target); me->GetThreatMgr().ResetAllThreat();
me->AddThreat(target, 1000.0f);
} }
DoCastSelf(SPELL_WHIRLWIND); DoCastSelf(SPELL_WHIRLWIND);
events.ScheduleEvent(EVENT_SARTURA_WHIRLWIND_RANDOM, 2s, 7s); events.ScheduleEvent(EVENT_SARTURA_WHIRLWIND_RANDOM, 2s, 7s);
@@ -126,11 +127,13 @@ struct boss_sartura : public BossAI
case EVENT_SARTURA_WHIRLWIND_RANDOM: case EVENT_SARTURA_WHIRLWIND_RANDOM:
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true))
{ {
SetGazeOn(target); me->GetThreatMgr().ResetAllThreat();
me->AddThreat(target, 1000.0f);
} }
events.Repeat(2s, 7s); events.Repeat(2s, 7s);
break; break;
case EVENT_SARTURA_WHIRLWIND_END: case EVENT_SARTURA_WHIRLWIND_END:
me->GetThreatMgr().ResetAllThreat();
me->SetReactState(REACT_AGGRESSIVE); me->SetReactState(REACT_AGGRESSIVE);
events.CancelEvent(EVENT_SARTURA_WHIRLWIND_RANDOM); events.CancelEvent(EVENT_SARTURA_WHIRLWIND_RANDOM);
events.ScheduleEvent(EVENT_SARTURA_WHIRLWIND, 5s, 11s); events.ScheduleEvent(EVENT_SARTURA_WHIRLWIND, 5s, 11s);
@@ -186,7 +189,7 @@ struct npc_sartura_royal_guard : public ScriptedAI
void UpdateAI(uint32 diff) override void UpdateAI(uint32 diff) override
{ {
if (!UpdateVictimWithGaze()) if (!UpdateVictim())
return; return;
events.Update(diff); events.Update(diff);
@@ -198,7 +201,8 @@ struct npc_sartura_royal_guard : public ScriptedAI
case EVENT_GUARD_WHIRLWIND: case EVENT_GUARD_WHIRLWIND:
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100.0f, true)) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100.0f, true))
{ {
SetGazeOn(target); me->GetThreatMgr().ResetAllThreat();
me->AddThreat(target, 1000.0f);
} }
DoCastSelf(SPELL_GUARD_WHIRLWIND); DoCastSelf(SPELL_GUARD_WHIRLWIND);
events.ScheduleEvent(EVENT_GUARD_WHIRLWIND_RANDOM, 2s, 7s); events.ScheduleEvent(EVENT_GUARD_WHIRLWIND_RANDOM, 2s, 7s);
@@ -207,11 +211,13 @@ struct npc_sartura_royal_guard : public ScriptedAI
case EVENT_GUARD_WHIRLWIND_RANDOM: case EVENT_GUARD_WHIRLWIND_RANDOM:
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true))
{ {
SetGazeOn(target); me->GetThreatMgr().ResetAllThreat();
me->AddThreat(target, 1000.0f);
} }
events.Repeat(2s, 7s); events.Repeat(2s, 7s);
break; break;
case EVENT_GUARD_WHIRLWIND_END: case EVENT_GUARD_WHIRLWIND_END:
me->GetThreatMgr().ResetAllThreat();
me->SetReactState(REACT_AGGRESSIVE); me->SetReactState(REACT_AGGRESSIVE);
events.CancelEvent(EVENT_GUARD_WHIRLWIND_RANDOM); events.CancelEvent(EVENT_GUARD_WHIRLWIND_RANDOM);
events.ScheduleEvent(EVENT_GUARD_WHIRLWIND, 500ms, 9s); events.ScheduleEvent(EVENT_GUARD_WHIRLWIND, 500ms, 9s);