Core/Script: Code style and some rewriting.

JustDied(Unit* Killer) -> JustDied(Unit* killer)
JustDied(Unit* /*Killer*/) -> JustDied(Unit* /*killer*/)
JustDied(Unit* /*unit*/) -> JustDied(Unit* /*killer*/)
JustDied(Unit* /*slayer*/)) -> JustDied(Unit* /*killer*/)
JustDied(Unit* /*victim*/) -> JustDied(Unit* /*killer*/)
JustDied(Unit* victim) -> JustDied(Unit* killer)
JustDied(Unit* /*who*/) -> JustDied(Unit* /*killer*/)
JustDied(Unit* who) -> JustDied(Unit* killer)
JustDied(Unit*) -> JustDied(Unit* /*killer*/)

Signed-off-by: Gyx <[email protected]>
This commit is contained in:
Gyx
2012-03-31 18:56:37 +08:00
parent 7efb637258
commit d9088c083c
162 changed files with 316 additions and 307 deletions
@@ -139,7 +139,7 @@ public:
summons.Summon(summoned); summons.Summon(summoned);
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
summons.DespawnAll(); summons.DespawnAll();
} }
@@ -71,7 +71,7 @@ public:
DoScriptText(SAY_SLAY, me); DoScriptText(SAY_SLAY, me);
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
if (Creature* Moira = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(DATA_MOIRA) : 0)) if (Creature* Moira = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(DATA_MOIRA) : 0))
{ {
@@ -80,9 +80,9 @@ public:
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
// When he die open door to last chamber // When he die open door to last chamber
void JustDied(Unit* who) void JustDied(Unit* killer)
{ {
if (InstanceScript* instance = who->GetInstanceScript()) if (InstanceScript* instance = killer->GetInstanceScript())
instance->HandleGameObject(instance->GetData64(DATA_THRONE_DOOR), true); instance->HandleGameObject(instance->GetData64(DATA_THRONE_DOOR), true);
} }
}; };
@@ -193,7 +193,7 @@ public:
instance->SetData64(DATA_EVENSTARTER, 0); instance->SetData64(DATA_EVENSTARTER, 0);
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
if (instance) if (instance)
instance->SetData(DATA_GHOSTKILL, 1); instance->SetData(DATA_GHOSTKILL, 1);
@@ -64,7 +64,7 @@ public:
events.ScheduleEvent(EVENT_THUNDERCLAP, 17 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_THUNDERCLAP, 17 * IN_MILLISECONDS);
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
_JustDied(); _JustDied();
} }
@@ -79,7 +79,7 @@ public:
events.ScheduleEvent(EVENT_AGGRO, 60 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_AGGRO, 60 * IN_MILLISECONDS);
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
_JustDied(); _JustDied();
} }
@@ -63,7 +63,7 @@ public:
events.ScheduleEvent(EVENT_MIGHTY_BLOW, 14 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_MIGHTY_BLOW, 14 * IN_MILLISECONDS);
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
_JustDied(); _JustDied();
} }
@@ -73,7 +73,7 @@ public:
events.ScheduleEvent(EVENT_SLOW, 24 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_SLOW, 24 * IN_MILLISECONDS);
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
_JustDied(); _JustDied();
} }
@@ -59,7 +59,7 @@ public:
events.ScheduleEvent(EVENT_MOTHERS_MILK, 10 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_MOTHERS_MILK, 10 * IN_MILLISECONDS);
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
_JustDied(); _JustDied();
} }
@@ -77,7 +77,7 @@ public:
events.ScheduleEvent(EVENT_KNOCK_AWAY, 12 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_KNOCK_AWAY, 12 * IN_MILLISECONDS);
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
_JustDied(); _JustDied();
} }
@@ -62,7 +62,7 @@ public:
events.ScheduleEvent(EVENT_PYROBLAST, 14 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_PYROBLAST, 14 * IN_MILLISECONDS);
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
_JustDied(); _JustDied();
} }
@@ -60,7 +60,7 @@ public:
events.ScheduleEvent(EVENT_STUN_BOMB, 16 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_STUN_BOMB, 16 * IN_MILLISECONDS);
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
_JustDied(); _JustDied();
} }
@@ -61,7 +61,7 @@ public:
events.ScheduleEvent(EVENT_THUNDERCLAP, 9 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_THUNDERCLAP, 9 * IN_MILLISECONDS);
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
_JustDied(); _JustDied();
} }
@@ -62,7 +62,7 @@ public:
events.ScheduleEvent(EVENT_CLEAVE, 14 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_CLEAVE, 14 * IN_MILLISECONDS);
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
_JustDied(); _JustDied();
} }
@@ -61,7 +61,7 @@ public:
events.ScheduleEvent(EVENT_TERRIFYING_ROAR, 23 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_TERRIFYING_ROAR, 23 * IN_MILLISECONDS);
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
_JustDied(); _JustDied();
} }
@@ -70,7 +70,7 @@ public:
events.ScheduleEvent(EVENT_THROW_AXE, 1 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_THROW_AXE, 1 * IN_MILLISECONDS);
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
_JustDied(); _JustDied();
} }
@@ -111,7 +111,7 @@ public:
DoScriptText(SAY_SLAY, me, Victim); DoScriptText(SAY_SLAY, me, Victim);
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
} }
@@ -75,7 +75,7 @@ public:
DoZoneInCombat(); DoZoneInCombat();
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
} }
@@ -80,7 +80,7 @@ public:
DoScriptText(RAND(SAY_KILL1, SAY_KILL2), me); DoScriptText(RAND(SAY_KILL1, SAY_KILL2), me);
} }
void JustDied(Unit* /*victim*/) void JustDied(Unit* /*killer*/)
{ {
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
} }
@@ -78,7 +78,7 @@ public:
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me);
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
} }
@@ -89,7 +89,7 @@ public:
DoScriptText(RAND(SAY_KILL1, SAY_KILL2), me); DoScriptText(RAND(SAY_KILL1, SAY_KILL2), me);
} }
void JustDied(Unit* /*victim*/) void JustDied(Unit* /*killer*/)
{ {
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
if (Unit* pMidnight = Unit::GetUnit(*me, Midnight)) if (Unit* pMidnight = Unit::GetUnit(*me, Midnight))
@@ -135,7 +135,7 @@ public:
DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2, SAY_KILL_3), me); DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2, SAY_KILL_3), me);
} }
void JustDied(Unit* /*victim*/) void JustDied(Unit* /*killer*/)
{ {
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
@@ -243,7 +243,7 @@ public:
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me);
} }
void JustDied(Unit* /*victim*/) void JustDied(Unit* /*killer*/)
{ {
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
@@ -161,7 +161,7 @@ public:
DoScriptText(RAND(SAY_KILL1, SAY_KILL2), me); DoScriptText(RAND(SAY_KILL1, SAY_KILL2), me);
} }
void JustDied(Unit* /*victim*/) void JustDied(Unit* /*killer*/)
{ {
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
@@ -94,7 +94,7 @@ public:
} }
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
if (instance) if (instance)
{ {
@@ -548,7 +548,7 @@ public:
} }
void JustDied(Unit* /*slayer*/) void JustDied(Unit* /*killer*/)
{ {
me->SummonCreature(CREATURE_PHOENIX_EGG, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 45000); me->SummonCreature(CREATURE_PHOENIX_EGG, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 45000);
} }
@@ -101,7 +101,7 @@ public:
DoScriptText(SAY_KILL, me); DoScriptText(SAY_KILL, me);
} }
void JustDied(Unit* /*victim*/) void JustDied(Unit* /*killer*/)
{ {
if (instance) if (instance)
instance->SetData(DATA_VEXALLUS_EVENT, DONE); instance->SetData(DATA_VEXALLUS_EVENT, DONE);
@@ -321,7 +321,7 @@ class mob_son_of_flame : public CreatureScript
instance = me->GetInstanceScript(); instance = me->GetInstanceScript();
} }
void JustDied(Unit* /*victim*/) void JustDied(Unit* /*killer*/)
{ {
if (instance) if (instance)
instance->SetData(DATA_RAGNAROS_ADDS, 1); instance->SetData(DATA_RAGNAROS_ADDS, 1);
@@ -829,13 +829,9 @@ public:
if (owner->GetTypeId() == TYPEID_PLAYER && CAST_PLR(owner)->isInCombat()) if (owner->GetTypeId() == TYPEID_PLAYER && CAST_PLR(owner)->isInCombat())
{ {
if (CAST_PLR(owner)->getAttackerForHelper() && CAST_PLR(owner)->getAttackerForHelper()->GetEntry() == GHOSTS) if (CAST_PLR(owner)->getAttackerForHelper() && CAST_PLR(owner)->getAttackerForHelper()->GetEntry() == GHOSTS)
{
AttackStart(CAST_PLR(owner)->getAttackerForHelper()); AttackStart(CAST_PLR(owner)->getAttackerForHelper());
}
else else
{
FindMinions(owner); FindMinions(owner);
}
} }
} }
} }
@@ -78,7 +78,7 @@ public:
DoScriptText(SAY_KILL, me); DoScriptText(SAY_KILL, me);
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
if (!instance) if (!instance)
return; return;
@@ -126,7 +126,7 @@ public:
summoned->AI()->AttackStart(target); summoned->AI()->AttackStart(target);
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
if (instance) if (instance)
instance->SetData(TYPE_BARON, DONE); instance->SetData(TYPE_BARON, DONE);
@@ -67,7 +67,7 @@ public:
{ {
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
if (instance) if (instance)
instance->SetData(TYPE_BARONESS, IN_PROGRESS); instance->SetData(TYPE_BARONESS, IN_PROGRESS);
@@ -103,7 +103,7 @@ public:
SummonRifleman_Timer = 15000; SummonRifleman_Timer = 15000;
} }
void JustDied(Unit* /*Victim*/) void JustDied(Unit* /*killer*/)
{ {
me->SummonCreature(11054, ADD_1X, ADD_1Y, ADD_1Z, ADD_1O, TEMPSUMMON_TIMED_DESPAWN, 240000); me->SummonCreature(11054, ADD_1X, ADD_1Y, ADD_1Z, ADD_1O, TEMPSUMMON_TIMED_DESPAWN, 240000);
me->SummonCreature(11054, ADD_2X, ADD_2Y, ADD_2Z, ADD_2O, TEMPSUMMON_TIMED_DESPAWN, 240000); me->SummonCreature(11054, ADD_2X, ADD_2Y, ADD_2Z, ADD_2O, TEMPSUMMON_TIMED_DESPAWN, 240000);
@@ -105,7 +105,7 @@ public:
me->UpdateEntry(NPC_DATHROHAN); me->UpdateEntry(NPC_DATHROHAN);
} }
void JustDied(Unit* /*Victim*/) void JustDied(Unit* /*killer*/)
{ {
static uint32 uiCount = sizeof(m_aSummonPoint)/sizeof(SummonDef); static uint32 uiCount = sizeof(m_aSummonPoint)/sizeof(SummonDef);
@@ -75,7 +75,7 @@ public:
ScriptedAI::MoveInLineOfSight(who); ScriptedAI::MoveInLineOfSight(who);
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
me->SetDisplayId(MODEL_HUMAN); me->SetDisplayId(MODEL_HUMAN);
} }
@@ -65,7 +65,7 @@ public:
{ {
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
if (instance) if (instance)
instance->SetData(TYPE_PALLID, IN_PROGRESS); instance->SetData(TYPE_PALLID, IN_PROGRESS);
@@ -67,7 +67,7 @@ public:
{ {
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
if (instance) if (instance)
instance->SetData(TYPE_NERUB, IN_PROGRESS); instance->SetData(TYPE_NERUB, IN_PROGRESS);
@@ -96,30 +96,34 @@ public:
{ {
} }
void JustDied(Unit* Killer) void JustDied(Unit* killer)
{ {
if (instance) if (!instance)
return;
switch (me->GetEntry())
{ {
switch (me->GetEntry()) case SH_AELMAR:
{ instance->SetData(TYPE_SH_AELMAR, 2);
case SH_AELMAR: break;
instance->SetData(TYPE_SH_AELMAR, 2); case SH_CATHELA:
break; instance->SetData(TYPE_SH_CATHELA, 2);
case SH_CATHELA: break;
instance->SetData(TYPE_SH_CATHELA, 2); case SH_GREGOR:
break; instance->SetData(TYPE_SH_GREGOR, 2);
case SH_GREGOR: break;
instance->SetData(TYPE_SH_GREGOR, 2); case SH_NEMAS:
break; instance->SetData(TYPE_SH_NEMAS, 2);
case SH_NEMAS: break;
instance->SetData(TYPE_SH_NEMAS, 2); case SH_VICAR:
break; instance->SetData(TYPE_SH_VICAR, 2);
case SH_VICAR: break;
instance->SetData(TYPE_SH_VICAR, 2); }
break;
} if (instance->GetData(TYPE_SH_QUEST))
if (instance->GetData(TYPE_SH_QUEST) && Killer->GetTypeId() == TYPEID_PLAYER) {
CAST_PLR(Killer)->KilledMonsterCredit(SH_QUEST_CREDIT, 0); if (Player* player = killer->ToPlayer())
player->KilledMonsterCredit(SH_QUEST_CREDIT, 0);
} }
} }
@@ -63,7 +63,7 @@ public:
{ {
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
for (uint8 i = 0; i < 30; ++i) for (uint8 i = 0; i < 30; ++i)
{ {
@@ -165,7 +165,7 @@ public:
summoned->CastSpell(summoned, SPELL_SOUL_FREED, false); summoned->CastSpell(summoned, SPELL_SOUL_FREED, false);
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
if (Tagged) if (Tagged)
me->SummonCreature(ENTRY_FREED, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 300000); me->SummonCreature(ENTRY_FREED, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 300000);
@@ -230,7 +230,7 @@ public:
Tagged = true; Tagged = true;
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
if (Tagged) if (Tagged)
{ {
@@ -132,7 +132,7 @@ public:
DoScriptText(RAND(YELL_KILL1, YELL_KILL2, YELL_KILL3), me); DoScriptText(RAND(YELL_KILL1, YELL_KILL2, YELL_KILL3), me);
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
DoScriptText(YELL_DEATH, me); DoScriptText(YELL_DEATH, me);
@@ -167,7 +167,7 @@ public:
DoScriptText(RAND(YELL_SAC_KILL_1, YELL_SAC_KILL_2), me); DoScriptText(RAND(YELL_SAC_KILL_1, YELL_SAC_KILL_2), me);
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
// only if ALY death // only if ALY death
if (SisterDeath) if (SisterDeath)
@@ -462,7 +462,7 @@ public:
} }
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
if (SisterDeath) if (SisterDeath)
{ {
@@ -184,7 +184,7 @@ public:
DoScriptText(YELL_BIRTH, me); DoScriptText(YELL_BIRTH, me);
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
DoScriptText(YELL_DEATH, me); DoScriptText(YELL_DEATH, me);
@@ -131,7 +131,7 @@ class boss_akilzon : public CreatureScript
instance->SetData(DATA_AKILZONEVENT, IN_PROGRESS); instance->SetData(DATA_AKILZONEVENT, IN_PROGRESS);
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
me->MonsterYell(SAY_ONDEATH, LANG_UNIVERSAL, 0); me->MonsterYell(SAY_ONDEATH, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_ONDEATH); DoPlaySoundToSet(me, SOUND_ONDEATH);
@@ -324,7 +324,7 @@ class boss_halazzi : public CreatureScript
} }
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
if (instance) if (instance)
instance->SetData(DATA_HALAZZIEVENT, DONE); instance->SetData(DATA_HALAZZIEVENT, DONE);
@@ -293,7 +293,7 @@ class boss_hexlord_malacrass : public CreatureScript
} }
} }
void JustDied(Unit* /*victim*/) void JustDied(Unit* /*killer*/)
{ {
if (instance) if (instance)
instance->SetData(DATA_HEXLORDEVENT, DONE); instance->SetData(DATA_HEXLORDEVENT, DONE);
@@ -159,7 +159,7 @@ class boss_janalai : public CreatureScript
HatchAllEggs(1); HatchAllEggs(1);
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
@@ -276,7 +276,7 @@ class boss_nalorakk : public CreatureScript
DoZoneInCombat(); DoZoneInCombat();
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
if (instance) if (instance)
instance->SetData(DATA_NALORAKKEVENT, DONE); instance->SetData(DATA_NALORAKKEVENT, DONE);
@@ -252,7 +252,7 @@ class boss_zuljin : public CreatureScript
} }
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
if (instance) if (instance)
instance->SetData(DATA_ZULJINEVENT, DONE); instance->SetData(DATA_ZULJINEVENT, DONE);
@@ -136,7 +136,7 @@ class npc_zulaman_hostage : public CreatureScript
void EnterCombat(Unit* /*who*/) {} void EnterCombat(Unit* /*who*/) {}
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
Player* player = Unit::GetPlayer(*me, PlayerGUID); Player* player = Unit::GetPlayer(*me, PlayerGUID);
if (player) if (player)
@@ -94,7 +94,7 @@ class boss_jeklik : public CreatureScript
DoCast(me, SPELL_BAT_FORM); DoCast(me, SPELL_BAT_FORM);
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
@@ -309,7 +309,7 @@ class mob_ohgan : public CreatureScript
void EnterCombat(Unit* /*who*/) {} void EnterCombat(Unit* /*who*/) {}
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
if (instance) if (instance)
instance->SetData(DATA_OHGAN, DONE); instance->SetData(DATA_OHGAN, DONE);
@@ -88,7 +88,7 @@ class boss_marli : public CreatureScript
DoScriptText(SAY_AGGRO, me); DoScriptText(SAY_AGGRO, me);
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
if (instance) if (instance)
@@ -108,7 +108,7 @@ class boss_thekal : public CreatureScript
DoScriptText(SAY_AGGRO, me); DoScriptText(SAY_AGGRO, me);
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
if (instance) if (instance)
@@ -98,7 +98,7 @@ class npc_professor_phizzlethorpe : public CreatureScript
case 20: case 20:
Talk(EMOTE_PROGRESS_8); Talk(EMOTE_PROGRESS_8);
Talk(SAY_PROGRESS_9, player->GetGUID()); Talk(SAY_PROGRESS_9, player->GetGUID());
CAST_PLR(player)->GroupEventHappens(QUEST_SUNKEN_TREASURE, me); player->GroupEventHappens(QUEST_SUNKEN_TREASURE, me);
break; break;
} }
} }
@@ -54,9 +54,9 @@ public:
void EnterCombat(Unit* /*who*/) {} void EnterCombat(Unit* /*who*/) {}
void JustDied(Unit* Killer) void JustDied(Unit* killer)
{ {
if (Killer->GetTypeId() == TYPEID_PLAYER) if (Player* player = killer->ToPlayer())
me->SummonCreature(11064, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 60000); me->SummonCreature(11064, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 60000);
} }
}; };
@@ -247,7 +247,7 @@ public:
CAST_PLR(Killed)->FailQuest(QUEST_SECOND_TRIAL); CAST_PLR(Killed)->FailQuest(QUEST_SECOND_TRIAL);
} }
void JustDied(Unit* Killer); void JustDied(Unit* killer);
}; };
}; };
@@ -125,9 +125,9 @@ public:
} }
} }
void JustDied(Unit* victim) void JustDied(Unit* killer)
{ {
hyjal_trashAI::JustDied(victim); hyjal_trashAI::JustDied(killer);
if (instance && IsEvent) if (instance && IsEvent)
instance->SetData(DATA_ANETHERONEVENT, DONE); instance->SetData(DATA_ANETHERONEVENT, DONE);
DoPlaySoundToSet(me, SOUND_ONDEATH); DoPlaySoundToSet(me, SOUND_ONDEATH);
@@ -272,7 +272,7 @@ public:
{ {
} }
void JustDied(Unit* /*victim*/) void JustDied(Unit* /*killer*/)
{ {
} }
@@ -343,9 +343,9 @@ public:
++SoulChargeCount; ++SoulChargeCount;
} }
void JustDied(Unit* victim) void JustDied(Unit* killer)
{ {
hyjal_trashAI::JustDied(victim); hyjal_trashAI::JustDied(killer);
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
if (instance) if (instance)
@@ -121,9 +121,9 @@ public:
} }
} }
void JustDied(Unit* victim) void JustDied(Unit* killer)
{ {
hyjal_trashAI::JustDied(victim); hyjal_trashAI::JustDied(killer);
if (instance && IsEvent) if (instance && IsEvent)
instance->SetData(DATA_AZGALOREVENT, DONE); instance->SetData(DATA_AZGALOREVENT, DONE);
DoPlaySoundToSet(me, SOUND_ONDEATH); DoPlaySoundToSet(me, SOUND_ONDEATH);
@@ -251,7 +251,7 @@ public:
AttackStart(who); AttackStart(who);
} }
void JustDied(Unit* /*victim*/) void JustDied(Unit* /*killer*/)
{ {
} }
@@ -113,9 +113,9 @@ public:
} }
} }
void JustDied(Unit* victim) void JustDied(Unit* killer)
{ {
hyjal_trashAI::JustDied(victim); hyjal_trashAI::JustDied(killer);
if (instance && IsEvent) if (instance && IsEvent)
instance->SetData(DATA_KAZROGALEVENT, DONE); instance->SetData(DATA_KAZROGALEVENT, DONE);
DoPlaySoundToSet(me, SOUND_ONDEATH); DoPlaySoundToSet(me, SOUND_ONDEATH);
@@ -115,9 +115,9 @@ public:
} }
} }
void JustDied(Unit* victim) void JustDied(Unit* killer)
{ {
hyjal_trashAI::JustDied(victim); hyjal_trashAI::JustDied(killer);
if (instance && IsEvent) if (instance && IsEvent)
instance->SetData(DATA_RAGEWINTERCHILLEVENT, DONE); instance->SetData(DATA_RAGEWINTERCHILLEVENT, DONE);
DoPlaySoundToSet(me, SOUND_ONDEATH); DoPlaySoundToSet(me, SOUND_ONDEATH);
@@ -377,10 +377,11 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/)
} }
} }
void hyjal_trashAI::JustDied(Unit* /*victim*/) void hyjal_trashAI::JustDied(Unit* /*killer*/)
{ {
if (!instance) if (!instance)
return; return;
if (IsEvent && !me->isWorldBoss()) if (IsEvent && !me->isWorldBoss())
instance->SetData(DATA_TRASH, 0);//signal trash is dead instance->SetData(DATA_TRASH, 0);//signal trash is dead
@@ -1194,7 +1195,7 @@ public:
} }
} }
void JustDied(Unit* /*victim*/) void JustDied(Unit* /*killer*/)
{ {
if (instance && IsEvent) if (instance && IsEvent)
instance->SetData(DATA_TRASH, 0);//signal trash is dead instance->SetData(DATA_TRASH, 0);//signal trash is dead
@@ -1313,14 +1314,14 @@ public:
} }
} }
void JustDied(Unit* victim) void JustDied(Unit* killer)
{ {
float x, y, z; float x, y, z;
me->GetPosition(x, y, z); me->GetPosition(x, y, z);
z = me->GetMap()->GetHeight(me->GetPhaseMask(), x, y, z); z = me->GetMap()->GetHeight(me->GetPhaseMask(), x, y, z);
me->GetMotionMaster()->MovePoint(0, x, y, z); me->GetMotionMaster()->MovePoint(0, x, y, z);
me->SetPosition(x, y, z, 0); me->SetPosition(x, y, z, 0);
hyjal_trashAI::JustDied(victim); hyjal_trashAI::JustDied(killer);
} }
void UpdateAI(const uint32 diff) void UpdateAI(const uint32 diff)
@@ -1422,7 +1423,7 @@ public:
uint32 ExplodeTimer; uint32 ExplodeTimer;
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
} }
@@ -93,7 +93,7 @@ public:
ScriptedAI::MoveInLineOfSight(who); ScriptedAI::MoveInLineOfSight(who);
} }
void JustDied(Unit* /*victim*/) void JustDied(Unit* /*killer*/)
{ {
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
@@ -100,7 +100,7 @@ public:
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
} }
void JustDied(Unit* /*victim*/) void JustDied(Unit* /*killer*/)
{ {
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
@@ -84,7 +84,7 @@ public:
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
} }
void JustDied(Unit* /*victim*/) void JustDied(Unit* /*killer*/)
{ {
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
@@ -153,9 +153,9 @@ public:
SpellCorrupt_Timer = 3000; SpellCorrupt_Timer = 3000;
} }
void JustDied(Unit* Killer) void JustDied(Unit* killer)
{ {
if (Killer->GetEntry() == me->GetEntry()) if (killer->GetEntry() == me->GetEntry())
return; return;
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
@@ -88,7 +88,7 @@ public:
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
} }
void JustDied(Unit* /*victim*/) void JustDied(Unit* /*killer*/)
{ {
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
@@ -84,7 +84,7 @@ public:
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
} }
void JustDied(Unit* /*victim*/) void JustDied(Unit* /*killer*/)
{ {
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
@@ -142,7 +142,7 @@ public:
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
} }
void JustDied(Unit* /*victim*/) void JustDied(Unit* /*killer*/)
{ {
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
} }
@@ -59,7 +59,7 @@ public:
void EnterCombat(Unit* /*who*/) { } void EnterCombat(Unit* /*who*/) { }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
me->SummonCreature(13716, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 600000); me->SummonCreature(13716, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 600000);
} }
@@ -168,7 +168,7 @@ public:
Enraged = false; Enraged = false;
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
if (instance) if (instance)
{ {
@@ -261,7 +261,7 @@ public:
VemDead = false; VemDead = false;
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
if (instance) if (instance)
{ {
@@ -949,7 +949,7 @@ public:
uint32 KillSelfTimer; uint32 KillSelfTimer;
uint64 Portal; uint64 Portal;
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
if (Unit* p = Unit::GetUnit(*me, Portal)) if (Unit* p = Unit::GetUnit(*me, Portal))
p->Kill(p); p->Kill(p);
@@ -1025,7 +1025,7 @@ public:
uint32 EvadeTimer; uint32 EvadeTimer;
uint64 Portal; uint64 Portal;
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
if (Unit* p = Unit::GetUnit(*me, Portal)) if (Unit* p = Unit::GetUnit(*me, Portal))
p->Kill(p); p->Kill(p);
@@ -1136,7 +1136,7 @@ public:
uint32 EvadeTimer; uint32 EvadeTimer;
uint64 Portal; uint64 Portal;
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
if (Unit* p = Unit::GetUnit(*me, Portal)) if (Unit* p = Unit::GetUnit(*me, Portal))
p->Kill(p); p->Kill(p);
@@ -1252,7 +1252,7 @@ public:
uint32 BeamTimer; uint32 BeamTimer;
uint64 Portal; uint64 Portal;
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
if (Unit* p = Unit::GetUnit(*me, Portal)) if (Unit* p = Unit::GetUnit(*me, Portal))
p->Kill(p); p->Kill(p);
@@ -84,7 +84,7 @@ public:
DoScriptText(SAY_AGGRO, me); DoScriptText(SAY_AGGRO, me);
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
} }
@@ -105,7 +105,7 @@ public:
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me);
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
if (!IsImage) if (!IsImage)
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
@@ -120,7 +120,7 @@ struct boss_twinemperorsAI : public ScriptedAI
} }
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
Creature* pOtherBoss = GetOtherBoss(); Creature* pOtherBoss = GetOtherBoss();
if (pOtherBoss) if (pOtherBoss)
@@ -242,7 +242,7 @@ public:
DoZoneInCombat(); DoZoneInCombat();
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
for (int ni=0; ni<3; ++ni) for (int ni=0; ni<3; ++ni)
{ {
@@ -322,7 +322,7 @@ public:
AttackStartCaster(victim, 10);//keep back & toss bombs/shoot AttackStartCaster(victim, 10);//keep back & toss bombs/shoot
} }
void JustDied(Unit* /*victim*/) void JustDied(Unit* /*killer*/)
{ {
/*if (instance) /*if (instance)
instance->SetData(0, DONE);*/ instance->SetData(0, DONE);*/
@@ -59,7 +59,7 @@ public:
{ {
} }
void JustDied(Unit* Killer) void JustDied(Unit* killer)
{ {
uint32 spawnCreatureID = 0; uint32 spawnCreatureID = 0;
@@ -67,8 +67,8 @@ public:
{ {
case 0: case 0:
spawnCreatureID = 17681; spawnCreatureID = 17681;
if (Killer->GetTypeId() == TYPEID_PLAYER) if (Player* player = killer->ToPlayer())
CAST_PLR(Killer)->KilledMonsterCredit(spawnCreatureID, 0); player->KilledMonsterCredit(spawnCreatureID, 0);
break; break;
case 1: case 1:
case 2: case 2:
@@ -83,7 +83,7 @@ public:
} }
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
if (instance) if (instance)
{ {
@@ -105,7 +105,7 @@ class boss_elder_nadox : public CreatureScript
DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me);
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
DoScriptText(SAY_SLAY_3, me); //SAY_SLAY_3 on death? DoScriptText(SAY_SLAY_3, me); //SAY_SLAY_3 on death?
@@ -229,7 +229,7 @@ class mob_ahnkahar_nerubian : public CreatureScript
uiSprintTimer = 10000; uiSprintTimer = 10000;
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
if (me->GetEntry() == MOB_AHNKAHAR_GUARDIAN_ENTRY) if (me->GetEntry() == MOB_AHNKAHAR_GUARDIAN_ENTRY)
if (Creature* Nadox = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_ELDER_NADOX))) if (Creature* Nadox = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_ELDER_NADOX)))
@@ -149,7 +149,7 @@ public:
DoScriptText(RAND(TEXT_SLAY_1, TEXT_SLAY_2, TEXT_SLAY_3), me); DoScriptText(RAND(TEXT_SLAY_1, TEXT_SLAY_2, TEXT_SLAY_3), me);
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
DoScriptText(TEXT_DEATH, me); DoScriptText(TEXT_DEATH, me);
if (instance) if (instance)
@@ -390,9 +390,9 @@ public:
} }
} }
void JustDied(Unit* Killer) void JustDied(Unit* killer)
{ {
if (!Killer || !instance) if (!killer || !instance)
return; return;
if (bWalking) if (bWalking)
@@ -402,7 +402,7 @@ public:
if (!CAST_AI(boss_jedoga_shadowseeker::boss_jedoga_shadowseekerAI, boss->AI())->bOpFerok) if (!CAST_AI(boss_jedoga_shadowseeker::boss_jedoga_shadowseekerAI, boss->AI())->bOpFerok)
CAST_AI(boss_jedoga_shadowseeker::boss_jedoga_shadowseekerAI, boss->AI())->bOpFerokFail = true; CAST_AI(boss_jedoga_shadowseeker::boss_jedoga_shadowseekerAI, boss->AI())->bOpFerokFail = true;
if (Killer->GetTypeId() == TYPEID_PLAYER) if (killer->GetTypeId() == TYPEID_PLAYER)
boss->AI()->DoAction(ACTION_INITIAND_KILLED); boss->AI()->DoAction(ACTION_INITIAND_KILLED);
} }
@@ -410,8 +410,8 @@ public:
bWalking = false; bWalking = false;
} }
if (Killer->GetTypeId() == TYPEID_PLAYER) if (killer->GetTypeId() == TYPEID_PLAYER)
instance->SetData64(DATA_PL_JEDOGA_TARGET, Killer->GetGUID()); instance->SetData64(DATA_PL_JEDOGA_TARGET, killer->GetGUID());
} }
void EnterCombat(Unit* who) void EnterCombat(Unit* who)
@@ -364,7 +364,7 @@ public:
void EnterCombat(Unit* /*who*/) {} void EnterCombat(Unit* /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) {} void MoveInLineOfSight(Unit* /*who*/) {}
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
DoCast(me, SPELL_FLAME_SPHERE_DEATH_EFFECT); DoCast(me, SPELL_FLAME_SPHERE_DEATH_EFFECT);
} }
@@ -99,7 +99,7 @@ public:
me->ModifyHealth(int32(me->CountPctFromMaxHealth(10))); me->ModifyHealth(int32(me->CountPctFromMaxHealth(10)));
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
if (instance) if (instance)
instance->SetData(DATA_HADRONOX_EVENT, DONE); instance->SetData(DATA_HADRONOX_EVENT, DONE);
@@ -161,7 +161,7 @@ class boss_dred : public CreatureScript
return 0; return 0;
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
if (instance) if (instance)
instance->SetData(DATA_DRED_EVENT, DONE); instance->SetData(DATA_DRED_EVENT, DONE);
@@ -211,7 +211,7 @@ class npc_drakkari_gutripper : public CreatureScript
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
if (Creature* Dred = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_DRED))) if (Creature* Dred = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_DRED)))
Dred->AI()->DoAction(ACTION_RAPTOR_KILLED); Dred->AI()->DoAction(ACTION_RAPTOR_KILLED);
@@ -261,7 +261,7 @@ class npc_drakkari_scytheclaw : public CreatureScript
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
if (Creature* Dred = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_DRED))) if (Creature* Dred = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_DRED)))
Dred->AI()->DoAction(ACTION_RAPTOR_KILLED); Dred->AI()->DoAction(ACTION_RAPTOR_KILLED);
@@ -796,7 +796,7 @@ public:
{ {
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
DoCast(SPELL_HALLUCINATION_2); DoCast(SPELL_HALLUCINATION_2);
} }
@@ -152,7 +152,7 @@ public:
InstanceScript* instance; InstanceScript* instance;
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
if (instance) if (instance)
{ {
@@ -328,7 +328,7 @@ class npc_stinky_icc : public CreatureScript
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
if (Creature* festergut = me->GetCreature(*me, _instance->GetData64(DATA_FESTERGUT))) if (Creature* festergut = me->GetCreature(*me, _instance->GetData64(DATA_FESTERGUT)))
if (festergut->isAlive()) if (festergut->isAlive())
@@ -99,7 +99,7 @@ public:
DoScriptText(SAY_SLAY, me); DoScriptText(SAY_SLAY, me);
} }
void JustDied(Unit*) void JustDied(Unit* /*killer*/)
{ {
_JustDied(); _JustDied();
@@ -234,7 +234,7 @@ class boss_gothik : public CreatureScript
DoScriptText(SAY_KILL, me); DoScriptText(SAY_KILL, me);
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
LiveTriggerGUID.clear(); LiveTriggerGUID.clear();
DeadTriggerGUID.clear(); DeadTriggerGUID.clear();
@@ -86,7 +86,7 @@ public:
return 0; return 0;
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
_JustDied(); _JustDied();
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
@@ -338,7 +338,7 @@ public:
DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
_JustDied(); _JustDied();
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
@@ -760,7 +760,7 @@ class npc_kelthuzad_abomination : public CreatureScript
} }
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
if (instance) if (instance)
instance->SetData(DATA_ABOMINATION_KILLED, instance->GetData(DATA_ABOMINATION_KILLED) + 1); instance->SetData(DATA_ABOMINATION_KILLED, instance->GetData(DATA_ABOMINATION_KILLED) + 1);
@@ -124,7 +124,7 @@ public:
summon->AI()->DoZoneInCombat(); summon->AI()->DoZoneInCombat();
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
_JustDied(); _JustDied();
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
@@ -80,7 +80,7 @@ public:
DoScriptText(SAY_SLAY, me); DoScriptText(SAY_SLAY, me);
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
_JustDied(); _JustDied();
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
@@ -145,7 +145,7 @@ public:
} }
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
_JustDied(); _JustDied();
me->CastSpell(me, SPELL_DIES, true); me->CastSpell(me, SPELL_DIES, true);
@@ -158,7 +158,7 @@ public:
DoScriptText(SAY_SLAY, me); DoScriptText(SAY_SLAY, me);
} }
void JustDied(Unit* /*Killer*/) void JustDied(Unit* /*killer*/)
{ {
_JustDied(); _JustDied();
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
@@ -101,7 +101,7 @@ class boss_anomalus : public CreatureScript
instance->SetData(DATA_ANOMALUS_EVENT, IN_PROGRESS); instance->SetData(DATA_ANOMALUS_EVENT, IN_PROGRESS);
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
@@ -251,7 +251,7 @@ class boss_steelbreaker : public CreatureScript
} }
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
DoScriptText(RAND(SAY_STEELBREAKER_DEATH_1, SAY_STEELBREAKER_DEATH_2), me); DoScriptText(RAND(SAY_STEELBREAKER_DEATH_1, SAY_STEELBREAKER_DEATH_2), me);
if (IsEncounterComplete(instance, me)) if (IsEncounterComplete(instance, me))
@@ -375,7 +375,7 @@ class boss_runemaster_molgeim : public CreatureScript
} }
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
DoScriptText(RAND(SAY_MOLGEIM_DEATH_1, SAY_MOLGEIM_DEATH_2), me); DoScriptText(RAND(SAY_MOLGEIM_DEATH_1, SAY_MOLGEIM_DEATH_2), me);
if (IsEncounterComplete(instance, me)) if (IsEncounterComplete(instance, me))
@@ -616,7 +616,7 @@ class boss_stormcaller_brundir : public CreatureScript
} }
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
DoScriptText(RAND(SAY_BRUNDIR_DEATH_1, SAY_BRUNDIR_DEATH_2), me); DoScriptText(RAND(SAY_BRUNDIR_DEATH_1, SAY_BRUNDIR_DEATH_2), me);
if (IsEncounterComplete(instance, me)) if (IsEncounterComplete(instance, me))
@@ -204,7 +204,7 @@ class boss_auriaya : public CreatureScript
} }
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
DoScriptText(SAY_DEATH, me); DoScriptText(SAY_DEATH, me);
_JustDied(); _JustDied();
@@ -376,7 +376,7 @@ class npc_sanctum_sentry : public CreatureScript
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
if (Creature* Auriaya = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_AURIAYA))) if (Creature* Auriaya = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_AURIAYA)))
Auriaya->AI()->DoAction(ACTION_CRAZY_CAT_LADY); Auriaya->AI()->DoAction(ACTION_CRAZY_CAT_LADY);
@@ -451,7 +451,7 @@ class npc_feral_defender : public CreatureScript
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
void JustDied(Unit* /*who*/) void JustDied(Unit* /*killer*/)
{ {
DoCast(me, SPELL_SUMMON_ESSENCE); DoCast(me, SPELL_SUMMON_ESSENCE);
if (Creature* Auriaya = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_AURIAYA))) if (Creature* Auriaya = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_AURIAYA)))
@@ -328,7 +328,7 @@ class boss_flame_leviathan : public CreatureScript
DoScriptText(SAY_AGGRO, me); DoScriptText(SAY_AGGRO, me);
} }
void JustDied(Unit* /*victim*/) void JustDied(Unit* /*killer*/)
{ {
_JustDied(); _JustDied();
// Set Field Flags 67108928 = 64 | 67108864 = UNIT_FLAG_UNK_6 | UNIT_FLAG_SKINNABLE // Set Field Flags 67108928 = 64 | 67108864 = UNIT_FLAG_UNK_6 | UNIT_FLAG_SKINNABLE
@@ -887,7 +887,7 @@ class npc_colossus : public CreatureScript
InstanceScript* instance; InstanceScript* instance;
void JustDied(Unit* /*Who*/) void JustDied(Unit* /*killer*/)
{ {
if (me->GetHomePosition().IsInDist(Center, 50.f)) if (me->GetHomePosition().IsInDist(Center, 50.f))
instance->SetData(DATA_COLOSSUS, instance->GetData(DATA_COLOSSUS)+1); instance->SetData(DATA_COLOSSUS, instance->GetData(DATA_COLOSSUS)+1);

Some files were not shown because too many files have changed in this diff Show More