fix(Scripts/DTK): Fix a couple of Prophet Tharon'ja issues (#23568)

This commit is contained in:
Andrew
2025-11-08 16:01:55 -03:00
committed by GitHub
parent c9aedce67f
commit fca2e12056

View File

@@ -33,7 +33,6 @@ enum Yells
enum Spells enum Spells
{ {
SPELL_CURSE_OF_LIFE = 49527, SPELL_CURSE_OF_LIFE = 49527,
SPELL_RAIN_OF_FIRE = 49518,
SPELL_SHADOW_VOLLEY = 49528, SPELL_SHADOW_VOLLEY = 49528,
// flesh spells // flesh spells
@@ -56,7 +55,6 @@ enum Misc
ACTION_TURN_BONES = 1, ACTION_TURN_BONES = 1,
EVENT_SPELL_CURSE_OF_LIFE = 1, EVENT_SPELL_CURSE_OF_LIFE = 1,
EVENT_SPELL_RAIN_OF_FIRE = 2,
EVENT_SPELL_SHADOW_VOLLEY = 3, EVENT_SPELL_SHADOW_VOLLEY = 3,
EVENT_SPELL_EYE_BEAM = 4, EVENT_SPELL_EYE_BEAM = 4,
EVENT_SPELL_LIGHTNING_BREATH = 5, EVENT_SPELL_LIGHTNING_BREATH = 5,
@@ -97,7 +95,6 @@ public:
Talk(SAY_AGGRO); Talk(SAY_AGGRO);
BossAI::JustEngagedWith(who); BossAI::JustEngagedWith(who);
events.ScheduleEvent(EVENT_SPELL_CURSE_OF_LIFE, 5s); events.ScheduleEvent(EVENT_SPELL_CURSE_OF_LIFE, 5s);
events.ScheduleEvent(EVENT_SPELL_RAIN_OF_FIRE, 14s, 18s);
events.ScheduleEvent(EVENT_SPELL_SHADOW_VOLLEY, 8s, 10s); events.ScheduleEvent(EVENT_SPELL_SHADOW_VOLLEY, 8s, 10s);
events.ScheduleEvent(EVENT_SPELL_TURN_FLESH, 1s); events.ScheduleEvent(EVENT_SPELL_TURN_FLESH, 1s);
} }
@@ -146,17 +143,11 @@ public:
switch (events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case EVENT_SPELL_CURSE_OF_LIFE: case EVENT_SPELL_CURSE_OF_LIFE:
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true)) DoCastRandomTarget(SPELL_CURSE_OF_LIFE, 0, 30.0f, false);
me->CastSpell(target, SPELL_CURSE_OF_LIFE, false);
events.ScheduleEvent(EVENT_SPELL_CURSE_OF_LIFE, 13s); events.ScheduleEvent(EVENT_SPELL_CURSE_OF_LIFE, 13s);
break; break;
case EVENT_SPELL_RAIN_OF_FIRE:
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true))
me->CastSpell(target, SPELL_RAIN_OF_FIRE, false);
events.ScheduleEvent(EVENT_SPELL_RAIN_OF_FIRE, 16s);
break;
case EVENT_SPELL_SHADOW_VOLLEY: case EVENT_SPELL_SHADOW_VOLLEY:
me->CastSpell(me, SPELL_SHADOW_VOLLEY, false); DoCastAOE(SPELL_SHADOW_VOLLEY);
events.ScheduleEvent(EVENT_SPELL_SHADOW_VOLLEY, 9s); events.ScheduleEvent(EVENT_SPELL_SHADOW_VOLLEY, 9s);
break; break;
case EVENT_SPELL_TURN_FLESH: case EVENT_SPELL_TURN_FLESH:
@@ -173,9 +164,8 @@ public:
events.ScheduleEvent(EVENT_SPELL_TURN_FLESH, 1s); events.ScheduleEvent(EVENT_SPELL_TURN_FLESH, 1s);
break; break;
case EVENT_TURN_FLESH_REAL: case EVENT_TURN_FLESH_REAL:
me->CastSpell(me, SPELL_DUMMY, true); DoCastSelf(SPELL_DUMMY, true);
me->ResumeChasingVictim();
me->GetMotionMaster()->MoveChase(me->GetVictim());
events.ScheduleEvent(EVENT_SPELL_EYE_BEAM, 11s); events.ScheduleEvent(EVENT_SPELL_EYE_BEAM, 11s);
events.ScheduleEvent(EVENT_SPELL_LIGHTNING_BREATH, 3s); events.ScheduleEvent(EVENT_SPELL_LIGHTNING_BREATH, 3s);
events.ScheduleEvent(EVENT_SPELL_POISON_CLOUD, 6s); events.ScheduleEvent(EVENT_SPELL_POISON_CLOUD, 6s);
@@ -199,7 +189,6 @@ public:
me->CastSpell(me, SPELL_CLEAR_GIFT, true); me->CastSpell(me, SPELL_CLEAR_GIFT, true);
events.Reset(); events.Reset();
events.ScheduleEvent(EVENT_SPELL_CURSE_OF_LIFE, 1s); events.ScheduleEvent(EVENT_SPELL_CURSE_OF_LIFE, 1s);
events.ScheduleEvent(EVENT_SPELL_RAIN_OF_FIRE, 12s, 14s);
events.ScheduleEvent(EVENT_SPELL_SHADOW_VOLLEY, 8s, 10s); events.ScheduleEvent(EVENT_SPELL_SHADOW_VOLLEY, 8s, 10s);
break; break;
} }
@@ -249,7 +238,6 @@ class spell_tharon_ja_dummy_aura : public AuraScript
{ {
PreventDefaultAction(); PreventDefaultAction();
GetUnitOwner()->GetThreatMgr().ResetAllThreat(); GetUnitOwner()->GetThreatMgr().ResetAllThreat();
GetUnitOwner()->GetMotionMaster()->Clear();
GetUnitOwner()->CastSpell((Unit*)nullptr, SPELL_TURN_BONES, false); GetUnitOwner()->CastSpell((Unit*)nullptr, SPELL_TURN_BONES, false);
GetUnitOwner()->GetAI()->DoAction(ACTION_TURN_BONES); GetUnitOwner()->GetAI()->DoAction(ACTION_TURN_BONES);
} }