chore(Script/Misc): Cleanup some JustDied hooks (#9669)
This commit is contained in:
@@ -196,9 +196,9 @@ public:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void JustDied(Unit* who) override
|
void JustDied(Unit* killer) override
|
||||||
{
|
{
|
||||||
BossAI::JustDied(who);
|
BossAI::JustDied(killer);
|
||||||
}
|
}
|
||||||
|
|
||||||
void EnterCombat(Unit* who) override
|
void EnterCombat(Unit* who) override
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ struct boss_amanitar : public BossAI
|
|||||||
events.ScheduleEvent(EVENT_RESPAWN, 40000, 60000);
|
events.ScheduleEvent(EVENT_RESPAWN, 40000, 60000);
|
||||||
}
|
}
|
||||||
|
|
||||||
void JustDied(Unit* /*Killer*/) override
|
void JustDied(Unit* /*killer*/) override
|
||||||
{
|
{
|
||||||
_JustDied();
|
_JustDied();
|
||||||
instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_MINI);
|
instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_MINI);
|
||||||
|
|||||||
@@ -336,7 +336,7 @@ struct boss_jedoga_shadowseeker : public BossAI
|
|||||||
Talk(SAY_SLAY);
|
Talk(SAY_SLAY);
|
||||||
}
|
}
|
||||||
|
|
||||||
void JustDied(Unit* /*Killer*/) override
|
void JustDied(Unit* /*killer*/) override
|
||||||
{
|
{
|
||||||
_JustDied();
|
_JustDied();
|
||||||
DespawnOOCSummons();
|
DespawnOOCSummons();
|
||||||
|
|||||||
@@ -208,7 +208,7 @@ public:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void JustDied(Unit* /*victim*/) override
|
void JustDied(Unit* /*killer*/) override
|
||||||
{
|
{
|
||||||
if (m_pInstance)
|
if (m_pInstance)
|
||||||
m_pInstance->SetData(TYPE_AURIAYA, DONE);
|
m_pInstance->SetData(TYPE_AURIAYA, DONE);
|
||||||
|
|||||||
@@ -804,10 +804,10 @@ public:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void JustDied(Unit* who) override
|
void JustDied(Unit* killer) override
|
||||||
{
|
{
|
||||||
if (Player* killer = who->ToPlayer())
|
if (Player* player = killer->ToPlayer())
|
||||||
killer->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GET_KILLING_BLOWS, 1, 0, me);
|
player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GET_KILLING_BLOWS, 1, 0, me);
|
||||||
|
|
||||||
if (Vehicle* vehicle = me->GetVehicle())
|
if (Vehicle* vehicle = me->GetVehicle())
|
||||||
if (Unit* device = vehicle->GetPassenger(SEAT_DEVICE))
|
if (Unit* device = vehicle->GetPassenger(SEAT_DEVICE))
|
||||||
|
|||||||
@@ -309,7 +309,7 @@ public:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void JustDied(Unit* /*victim*/) override
|
void JustDied(Unit* /*killer*/) override
|
||||||
{
|
{
|
||||||
me->Yell(TEXT_DEATH, LANG_UNIVERSAL);
|
me->Yell(TEXT_DEATH, LANG_UNIVERSAL);
|
||||||
me->PlayDirectSound(SOUND_DEATH);
|
me->PlayDirectSound(SOUND_DEATH);
|
||||||
|
|||||||
@@ -236,7 +236,7 @@ public:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void JustDied(Unit* /*victim*/) override
|
void JustDied(Unit* /*killer*/) override
|
||||||
{
|
{
|
||||||
me->Yell("You are bad... Toys... Very... Baaaaad!", LANG_UNIVERSAL);
|
me->Yell("You are bad... Toys... Very... Baaaaad!", LANG_UNIVERSAL);
|
||||||
me->PlayDirectSound(XT_SOUND_DEATH);
|
me->PlayDirectSound(XT_SOUND_DEATH);
|
||||||
@@ -533,7 +533,7 @@ public:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void JustDied(Unit* /*victim*/) override
|
void JustDied(Unit* /*killer*/) override
|
||||||
{
|
{
|
||||||
me->SetVisible(false);
|
me->SetVisible(false);
|
||||||
if (me->GetInstanceScript())
|
if (me->GetInstanceScript())
|
||||||
@@ -591,7 +591,7 @@ public:
|
|||||||
void JustDied(Unit* killer) override
|
void JustDied(Unit* killer) override
|
||||||
{
|
{
|
||||||
// Nerf Scrapbots achievement
|
// Nerf Scrapbots achievement
|
||||||
if (killer->GetEntry() == NPC_XE321_BOOMBOT)
|
if (killer && killer->GetEntry() == NPC_XE321_BOOMBOT)
|
||||||
if (me->GetInstanceScript())
|
if (me->GetInstanceScript())
|
||||||
{
|
{
|
||||||
me->GetInstanceScript()->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_SPELL_TARGET, 65037);
|
me->GetInstanceScript()->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_SPELL_TARGET, 65037);
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ public:
|
|||||||
Talk(YELL_KILL);
|
Talk(YELL_KILL);
|
||||||
}
|
}
|
||||||
|
|
||||||
void JustDied(Unit* /*victim*/) override
|
void JustDied(Unit* /*killer*/) override
|
||||||
{
|
{
|
||||||
_JustDied();
|
_JustDied();
|
||||||
Talk(YELL_DEATH);
|
Talk(YELL_DEATH);
|
||||||
|
|||||||
Reference in New Issue
Block a user