josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Script: Code style and some rewriting.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
+1 -1
View File
@@ -233,7 +233,7 @@ public:
DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
//When Exarch Maladar is defeated D'ore appear.
src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
+1 -1
View File
@@ -145,7 +145,7 @@ public:
DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEAD, me);
summons.DespawnAll();
src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
+1 -1
View File
@@ -68,7 +68,7 @@ public:
VoidBlast_Counter = 0;
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
}
src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
+1 -1
View File
@@ -97,7 +97,7 @@ public:
DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
}
src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp
+1 -1
View File
@@ -118,7 +118,7 @@ public:
DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
+1 -1
View File
@@ -136,7 +136,7 @@ public:
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
+1 -1
View File
@@ -96,7 +96,7 @@ public:
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
+1 -1
View File
@@ -232,7 +232,7 @@ public:
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
destroyPortals();
src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
+1 -1
View File
@@ -130,7 +130,7 @@ public:
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
if (instance)
instance->SetData(DATA_GURTOGGBLOODBOILEVENT, DONE);
src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
+1 -1
View File
@@ -149,7 +149,7 @@ public:
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
if (instance)
instance->SetData(DATA_MOTHERSHAHRAZEVENT, DONE);
src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+1 -1
View File
@@ -643,7 +643,7 @@ public:
DoCast(me, AURA_OF_ANGER, true);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(ANGER_SAY_DEATH, me);
}
src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
+1 -1
View File
@@ -293,7 +293,7 @@ public:
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
if (instance)
instance->SetData(DATA_TERONGOREFIENDEVENT, DONE);
src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
+1 -1
View File
@@ -98,7 +98,7 @@ public:
events.DelayEvents(5000, GCD_YELL);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
if (instance)
instance->SetData(DATA_HIGHWARLORDNAJENTUSEVENT, DONE);
src/server/scripts/Outland/BlackTemple/illidari_council.cpp
+4 -4
View File
@@ -498,7 +498,7 @@ public:
DoScriptText(SAY_GATH_SLAY, me);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_GATH_DEATH, me);
}
@@ -632,7 +632,7 @@ public:
DoScriptText(SAY_ZERE_SLAY, me);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_ZERE_DEATH, me);
}
@@ -732,7 +732,7 @@ public:
DoScriptText(SAY_MALA_SLAY, me);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_MALA_DEATH, me);
}
@@ -818,7 +818,7 @@ public:
DoScriptText(SAY_VERA_SLAY, me);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_VERA_DEATH, me);
}
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
+3 -3
View File
@@ -354,7 +354,7 @@ public:
instance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
if (instance)
{
@@ -494,7 +494,7 @@ public:
instance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
if (instance)
{
@@ -621,7 +621,7 @@ public:
instance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
if (instance)
{
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
+1 -1
View File
@@ -203,7 +203,7 @@ public:
Summons.Despawn(summon);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
if (CorruptedForm)
DoScriptText(SAY_CORRUPT_DEATH, me);
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
+1 -1
View File
@@ -226,7 +226,7 @@ public:
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
+3 -3
View File
@@ -109,7 +109,7 @@ public:
return 0;
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
Unit* unit = Unit::GetUnit((*me), victimGUID);
if (unit && unit->HasAura(SPELL_INSIDIOUS_WHISPER))
@@ -399,7 +399,7 @@ public:
}
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
@@ -641,7 +641,7 @@ public:
DoScriptText(RAND(SAY_DEMON_SLAY1, SAY_DEMON_SLAY2, SAY_DEMON_SLAY3), me);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
//invisibility (blizzlike, at the end of the fight he doesn't die, he disappears)
DoCast(me, 8149, true);
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
+1 -1
View File
@@ -140,7 +140,7 @@ public:
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
+1 -1
View File
@@ -79,7 +79,7 @@ public:
instance->SetData(TYPE_HYDROMANCER_THESPIA, NOT_STARTED);
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEAD, me);
src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
+1 -1
View File
@@ -88,7 +88,7 @@ public:
instance->SetData(TYPE_MEKGINEER_STEAMRIGGER, NOT_STARTED);
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
+1 -1
View File
@@ -157,7 +157,7 @@ public:
me->RemoveAurasDueToSpell(SPELL_WARLORDS_RAGE_PROC);
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
+1 -1
View File
@@ -88,7 +88,7 @@ public:
}
}
void JustDied(Unit* /*who*/)
void JustDied(Unit* /*killer*/)
{
for (std::list<uint64>::const_iterator i = Striders.begin(); i != Striders.end(); ++i)
if (Creature* strider = Unit::GetCreature(*me, *i))
src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
+1 -1
View File
@@ -109,7 +109,7 @@ public:
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me);
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
+5 -5
View File
@@ -173,7 +173,7 @@ public:
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me);
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
@@ -363,7 +363,7 @@ public:
}
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
if (instance)
{
@@ -478,7 +478,7 @@ public:
}
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
if (instance)
{
@@ -598,7 +598,7 @@ public:
}
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
if (instance)
{
@@ -708,7 +708,7 @@ public:
}
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
if (instance)
{
src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
+1 -1
View File
@@ -121,7 +121,7 @@ class boss_broggok : public CreatureScript
DoMeleeAttackIfReady();
}
void JustDied(Unit* /*who*/)
void JustDied(Unit* /*killer*/)
{
if (instance)
{
src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
+3 -3
View File
@@ -185,7 +185,7 @@ class boss_kelidan_the_breaker : public CreatureScript
}
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DIE, me);
@@ -326,10 +326,10 @@ class mob_shadowmoon_channeler : public CreatureScript
DoStartMovement(who);
}
void JustDied(Unit* Killer)
void JustDied(Unit* killer)
{
if (Creature* Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100))
CAST_AI(boss_kelidan_the_breaker::boss_kelidan_the_breakerAI, Kelidan->AI())->ChannelerDied(Killer);
CAST_AI(boss_kelidan_the_breaker::boss_kelidan_the_breakerAI, Kelidan->AI())->ChannelerDied(killer);
}
void UpdateAI(const uint32 diff)
src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
+1 -1
View File
@@ -94,7 +94,7 @@ class boss_the_maker : public CreatureScript
DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me);
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DIE, me);
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
+1 -1
View File
@@ -113,7 +113,7 @@ class boss_omor_the_unscarred : public CreatureScript
++SummonedCount;
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DIE, me);
}
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+4 -4
View File
@@ -236,9 +236,9 @@ class boss_vazruden : public CreatureScript
DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me);
}
void JustDied(Unit* who)
void JustDied(Unit* killer)
{
if (who && who != me)
if (killer && killer != me)
DoScriptText(SAY_DIE, me);
}
@@ -480,10 +480,10 @@ class mob_hellfire_sentry : public CreatureScript
void EnterCombat(Unit* /*who*/) {}
void JustDied(Unit* who)
void JustDied(Unit* killer)
{
if (Creature* herald = me->FindNearestCreature(ENTRY_VAZRUDEN_HERALD, 150))
CAST_AI(boss_vazruden_the_herald::boss_vazruden_the_heraldAI, herald->AI())->SentryDownBy(who);
CAST_AI(boss_vazruden_the_herald::boss_vazruden_the_heraldAI, herald->AI())->SentryDownBy(killer);
}
void UpdateAI(const uint32 diff)
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
+1 -1
View File
@@ -109,7 +109,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript
DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me);
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DIE, me);
}
src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
+2 -2
View File
@@ -322,7 +322,7 @@ class boss_magtheridon : public CreatureScript
DoScriptText(SAY_PLAYER_KILLED, me);
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
if (instance)
instance->SetData(DATA_MAGTHERIDON_EVENT, DONE);
@@ -533,7 +533,7 @@ class mob_hellfire_channeler : public CreatureScript
DoCast(me, SPELL_SOUL_TRANSFER, true);
}
void JustDied(Unit* /*who*/)
void JustDied(Unit* /*killer*/)
{
if (instance)
instance->SetData(DATA_CHANNELER_EVENT, DONE);
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+2 -2
View File
@@ -224,7 +224,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript
DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DIE, me);
@@ -356,7 +356,7 @@ class mob_fel_orc_convert : public CreatureScript
}
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
if (instance)
{
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
+1 -1
View File
@@ -295,7 +295,7 @@ class boss_warbringer_omrogg : public CreatureScript
}
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
Unit* pLeftHead = Unit::GetUnit(*me, LeftHeadGUID);
Unit* pRightHead = Unit::GetUnit(*me, RightHeadGUID);
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
+1 -1
View File
@@ -137,7 +137,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
}
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
removeAdds();
src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+1 -1
View File
@@ -145,7 +145,7 @@ class boss_alar : public CreatureScript
me->setActive(true);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
if (instance)
instance->SetData(DATA_ALAREVENT, DONE);
src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+1 -1
View File
@@ -151,7 +151,7 @@ class boss_high_astromancer_solarian : public CreatureScript
DoScriptText(RAND(SAY_KILL1, SAY_KILL2, SAY_KILL3), me);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
me->SetFloatValue(OBJECT_FIELD_SCALE_X, defaultsize);
me->SetDisplayId(MODEL_HUMAN);
src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+2 -2
View File
@@ -450,7 +450,7 @@ class boss_kaelthas : public CreatureScript
summons.Despawn(summon);
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -1137,7 +1137,7 @@ class boss_lord_sanguinar : public CreatureScript
DoScriptText(SAY_SANGUINAR_AGGRO, me);
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
if (instance && instance->GetData(DATA_KAELTHASEVENT) == 3)
DoScriptText(SAY_SANGUINAR_DEATH, me);
src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
+1 -1
View File
@@ -85,7 +85,7 @@ class boss_void_reaver : public CreatureScript
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
DoZoneInCombat();
src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
+1 -1
View File
@@ -86,7 +86,7 @@ class boss_gatewatcher_iron_hand : public CreatureScript
DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH_1, me);
//TODO: Add door check/open code
src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
+1 -1
View File
@@ -101,7 +101,7 @@ class boss_nethermancer_sepethrea : public CreatureScript
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
if (instance)
src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
+1 -1
View File
@@ -103,7 +103,7 @@ class boss_pathaleon_the_calculator : public CreatureScript
DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
+1 -1
View File
@@ -128,7 +128,7 @@ class npc_millhouse_manastorm : public CreatureScript
Talk(SAY_KILL);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
Talk(SAY_DEATH);
src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
+1 -1
View File
@@ -112,7 +112,7 @@ class boss_harbinger_skyriss : public CreatureScript
void EnterCombat(Unit* /*who*/) {}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
if (instance)
src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
+1 -1
View File
@@ -107,7 +107,7 @@ class boss_high_botanist_freywinn : public CreatureScript
DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me);
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
}
src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
+1 -1
View File
@@ -169,7 +169,7 @@ class boss_warp_splinter : public CreatureScript
DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
DoScriptText(SAY_DEATH, me);
}
src/server/scripts/Outland/boss_doomlord_kazzak.cpp
+1 -1
View File
@@ -97,7 +97,7 @@ class boss_doomlord_kazzak : public CreatureScript
Talk(SAY_KILL);
}
void JustDied(Unit* /*victim*/)
void JustDied(Unit* /*killer*/)
{
Talk(SAY_DEATH);
}
src/server/scripts/Outland/boss_doomwalker.cpp
+1 -1
View File
@@ -79,7 +79,7 @@ class boss_doomwalker : public CreatureScript
Talk(SAY_SLAY);
}
void JustDied(Unit* /*Killer*/)
void JustDied(Unit* /*killer*/)
{
Talk(SAY_DEATH);
}
src/server/scripts/Outland/shadowmoon_valley.cpp
+17 -18
View File
@@ -1398,27 +1398,25 @@ public:
DoMeleeAttackIfReady();
}
void JustDied(Unit* slayer)
void JustDied(Unit* killer)
{
if (slayer)
switch (slayer->GetTypeId())
{
case TYPEID_UNIT:
if (Unit* owner = slayer->GetOwner())
if (owner->GetTypeId() == TYPEID_PLAYER)
CAST_PLR(owner)->GroupEventHappens(QUEST_BATTLE_OF_THE_CRIMSON_WATCH, me);
break;
case TYPEID_PLAYER:
CAST_PLR(slayer)->GroupEventHappens(QUEST_BATTLE_OF_THE_CRIMSON_WATCH, me);
break;
default:
break;
}
switch (killer->GetTypeId())
{
case TYPEID_UNIT:
if (Unit* owner = killer->GetOwner())
if (owner->GetTypeId() == TYPEID_PLAYER)
CAST_PLR(owner)->GroupEventHappens(QUEST_BATTLE_OF_THE_CRIMSON_WATCH, me);
break;
case TYPEID_PLAYER:
CAST_PLR(killer)->GroupEventHappens(QUEST_BATTLE_OF_THE_CRIMSON_WATCH, me);
break;
default:
break;
}
if (Creature* LordIllidan = (Unit::GetCreature(*me, LordIllidanGUID)))
{
DoScriptText(END_TEXT, LordIllidan, slayer);
DoScriptText(END_TEXT, LordIllidan, killer);
LordIllidan->AI()->EnterEvadeMode();
}
}
@@ -1599,7 +1597,8 @@ public:
}
void EnterCombat(Unit* /*who*/) {}
void JustDied(Unit* /*slayer*/)
void JustDied(Unit* /*killer*/)
{
me->RemoveCorpse();
if (Creature* LordIllidan = (Unit::GetCreature(*me, LordIllidanGUID)))
src/server/scripts/Outland/terokkar_forest.cpp
+17 -15
View File
@@ -306,24 +306,26 @@ public:
void EnterCombat(Unit* /*who*/) { }
void MoveInLineOfSight(Unit* /*who*/) { }
void JustDied(Unit* Killer)
void JustDied(Unit* killer)
{
if (Killer->GetTypeId() == TYPEID_PLAYER)
{
if (CAST_PLR(Killer)->GetQuestStatus(10873) == QUEST_STATUS_INCOMPLETE)
{
if (rand()%100 < 25)
{
me->SummonCreature(QUEST_TARGET, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
CAST_PLR(Killer)->KilledMonsterCredit(QUEST_TARGET, 0);
}
else
me->SummonCreature(netherwebVictims[rand()%6], 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
Player* player = killer->ToPlayer();
if (!player)
return;
if (rand()%100 < 75)
me->SummonCreature(netherwebVictims[rand()%6], 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
me->SummonCreature(netherwebVictims[rand()%6], 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
if (player->GetQuestStatus(10873) == QUEST_STATUS_INCOMPLETE)
{
if (rand()%100 < 25)
{
me->SummonCreature(QUEST_TARGET, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
player->KilledMonsterCredit(QUEST_TARGET, 0);
}
else
me->SummonCreature(netherwebVictims[rand()%6], 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
if (rand()%100 < 75)
me->SummonCreature(netherwebVictims[rand()%6], 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
me->SummonCreature(netherwebVictims[rand()%6], 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
}
}
};