Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_desolace.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_thousand_needles.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
This commit is contained in:
Vincent_Michael committed 2013-02-19 18:57:36 +01:00
commit 0c16890774
440 files changed
+1316 -1155

No files matched your search

+1 -1
View File
@@ -657,7 +657,7 @@ public:
handler->PSendSysMessage(LANG_NPCINFO_DUNGEON_ID, target->GetInstanceId());
handler->PSendSysMessage(LANG_NPCINFO_PHASEMASK, target->GetPhaseMask());
handler->PSendSysMessage(LANG_NPCINFO_ARMOR, target->GetArmor());
handler->PSendSysMessage(LANG_NPCINFO_POSITION, float(target->GetPositionX()), float(target->GetPositionY()), float(target->GetPositionZ()));
handler->PSendSysMessage(LANG_NPCINFO_POSITION, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ());
handler->PSendSysMessage(LANG_NPCINFO_AIINFO, target->GetAIName().c_str(), target->GetScriptName().c_str());
for (uint8 i = 0; i < NPCFLAG_COUNT; i++)
@@ -104,7 +104,7 @@ class mob_av_marshal_or_warmaster : public CreatureScript
Reset();
}
void UpdateAI(uint32 const diff)
void UpdateAI(uint32 diff)
{
// I have a feeling this isn't blizzlike, but owell, I'm only passing by and cleaning up.
if (!_hasAura)
@@ -62,7 +62,7 @@ public:
resetTimer = 5 * IN_MILLISECONDS;
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -145,7 +145,7 @@ public:
summons.DespawnAll();
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -75,7 +75,7 @@ public:
Talk(YELL_RESPAWN);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -69,7 +69,7 @@ public:
Reset();
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -64,7 +64,7 @@ public:
Talk(YELL_AGGRO);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -128,7 +128,7 @@ class boss_alizabal : public CreatureScript
_DespawnAtEvade();
}
void DoAction(int32 const action)
void DoAction(int32 action)
{
switch (action)
{
@@ -152,7 +152,7 @@ class boss_alizabal : public CreatureScript
}
}
void UpdateAI(uint32 const diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -222,7 +222,7 @@ public:
instance->HandleGameObject(instance->GetData64(id), open);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!instance)
return;
@@ -372,7 +372,7 @@ public:
MightyBlow_Timer = 15000;
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
//Return since we have no target
if (!UpdateVictim())
@@ -648,7 +648,7 @@ public:
}
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return;
if ((instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_FAILED || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_ENDED)&& instance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_ENDED)
@@ -807,7 +807,7 @@ public:
instance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_FAILED);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED)
return;
@@ -1017,7 +1017,7 @@ public:
instance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_FAILED);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED)
return;
@@ -1151,7 +1151,7 @@ public:
}
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED)
return;
@@ -1284,7 +1284,7 @@ public:
}
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!instance)
return;
@@ -55,7 +55,7 @@ public:
Spirit->AI()->AttackStart(victim);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
//Return since we have no target
if (!UpdateVictim())
@@ -59,7 +59,7 @@ public:
void EnterCombat(Unit* /*who*/) {}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
//Return since we have no target
if (!UpdateVictim())
@@ -81,7 +81,7 @@ public:
}
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
//Return since we have no target
if (!UpdateVictim())
@@ -69,7 +69,7 @@ public:
SummonedMedic->AI()->AttackStart(victim);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
//Return since we have no target
if (!UpdateVictim())
@@ -52,7 +52,7 @@ public:
{
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
//Return since we have no target
if (!UpdateVictim())
@@ -51,7 +51,7 @@ public:
void EnterCombat(Unit* /*who*/) {}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
//Return since we have no target
if (!UpdateVictim())
@@ -56,7 +56,7 @@ public:
void EnterCombat(Unit* /*who*/) {}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
//Return since we have no target
if (!UpdateVictim())
@@ -55,7 +55,7 @@ public:
void EnterCombat(Unit* /*who*/) {}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
//Return since we have no target
if (!UpdateVictim())
@@ -58,7 +58,7 @@ public:
void EnterCombat(Unit* /*who*/) {}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
//Return since we have no target
if (!UpdateVictim())
@@ -202,7 +202,7 @@ public:
instance->SetData(DATA_GHOSTKILL, 1);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -69,7 +69,7 @@ public:
_JustDied();
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -92,7 +92,7 @@ public:
Summoned->AddThreat(target, 250.0f);
}
void UpdateAI(uint32 const diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -68,7 +68,7 @@ public:
_JustDied();
}
void UpdateAI(uint32 const diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -78,7 +78,7 @@ public:
_JustDied();
}
void UpdateAI(uint32 const diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -70,7 +70,7 @@ public:
DoCast(me, SPELL_SUMMON_SPIRE_SPIDERLING, true);
}
void UpdateAI(uint32 const diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -81,7 +81,7 @@ public:
_JustDied();
}
void UpdateAI(uint32 const diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -97,7 +97,7 @@ public:
door3->SetGoState(GO_STATE_ACTIVE);
}
void UpdateAI(uint32 const diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -65,7 +65,7 @@ public:
_JustDied();
}
void UpdateAI(uint32 const diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -66,7 +66,7 @@ public:
_JustDied();
}
void UpdateAI(uint32 const diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -67,7 +67,7 @@ public:
_JustDied();
}
void UpdateAI(uint32 const diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -66,7 +66,7 @@ public:
_JustDied();
}
void UpdateAI(uint32 const diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -75,7 +75,7 @@ public:
_JustDied();
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -77,7 +77,7 @@ public:
DoZoneInCombat();
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -200,7 +200,7 @@ public:
void EnterCombat(Unit* /*who*/) {}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -63,7 +63,7 @@ public:
DoZoneInCombat();
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -60,7 +60,7 @@ public:
DoZoneInCombat();
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -68,7 +68,7 @@ public:
DoZoneInCombat();
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -123,7 +123,7 @@ public:
DoZoneInCombat();
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (DespawnTimer <= diff)
{
@@ -81,7 +81,7 @@ public:
Talk(SAY_DEATH);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -156,7 +156,7 @@ public:
me->ResetPlayerDamageReq();
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
//Speech
if (DoingSpeech)
@@ -270,7 +270,7 @@ public:
}
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -94,7 +94,7 @@ public:
return true;
}
void UpdateAI(const uint32 uiDiff)
void UpdateAI(uint32 uiDiff)
{
if (!UpdateVictim())
return;
@@ -572,7 +572,7 @@ public:
CAST_CRE(summon)->AI()->SetData(2, 1);
}
void UpdateAI(const uint32 /*diff*/)
void UpdateAI(uint32 /*diff*/)
{
if (!UpdateVictim())
return;
@@ -95,7 +95,7 @@ public:
Talk(SAY_AGGRO);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -89,7 +89,7 @@ public:
Talk(SAY_AGGRO);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -104,7 +104,7 @@ public:
midnight->Kill(midnight);
}
void UpdateAI(const uint32 diff);
void UpdateAI(uint32 diff);
void SpellHit(Unit* /*source*/, const SpellInfo* spell)
{
@@ -153,7 +153,7 @@ public:
}
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -234,7 +234,7 @@ public:
};
};
void boss_attumen::boss_attumenAI::UpdateAI(const uint32 diff)
void boss_attumen::boss_attumenAI::UpdateAI(uint32 diff)
{
if (ResetTimer)
{
@@ -228,7 +228,7 @@ public:
}
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -354,7 +354,7 @@ struct boss_moroes_guestAI : public ScriptedAI
return me;
}
void UpdateAI(const uint32 /*diff*/)
void UpdateAI(uint32 /*diff*/)
{
if (instance && !instance->GetData(TYPE_MOROES))
EnterEvadeMode();
@@ -421,7 +421,7 @@ public:
boss_moroes_guestAI::Reset();
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -482,7 +482,7 @@ public:
boss_moroes_guestAI::Reset();
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -543,7 +543,7 @@ public:
boss_moroes_guestAI::Reset();
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -613,7 +613,7 @@ public:
boss_moroes_guestAI::Reset();
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -683,7 +683,7 @@ public:
boss_moroes_guestAI::Reset();
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -741,7 +741,7 @@ public:
boss_moroes_guestAI::Reset();
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -269,7 +269,7 @@ public:
DestroyPortals();
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -260,7 +260,7 @@ public:
Skeletons = false;
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
/* The timer for this was never setup apparently, not sure if the code works properly:
if (WaitTimer <= diff)
@@ -121,7 +121,7 @@ public:
void EnterCombat(Unit* /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) {}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (HellfireTimer)
{
@@ -386,7 +386,7 @@ public:
Talk(SAY_SUMMON);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -217,7 +217,7 @@ public:
}
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -531,7 +531,7 @@ public:
void EnterCombat(Unit* /*who*/) {}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -111,7 +111,7 @@ public:
} else ERROR_INST_DATA(me);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
//Return since we have no target
if (!UpdateVictim())
@@ -228,7 +228,7 @@ public:
void EnterCombat(Unit* /*who*/) {}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
//Return since we have no target
if (!UpdateVictim())
@@ -362,7 +362,7 @@ public:
instance->SetData(TYPE_TERESTIAN, DONE);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -187,7 +187,7 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (AggroTimer)
{
@@ -263,7 +263,7 @@ public:
}
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -373,7 +373,7 @@ public:
Talk(SAY_STRAWMAN_SLAY);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (AggroTimer)
{
@@ -478,7 +478,7 @@ public:
Talk(SAY_TINHEAD_SLAY);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (AggroTimer)
{
@@ -585,7 +585,7 @@ public:
Talk(SAY_ROAR_SLAY);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (AggroTimer)
{
@@ -682,7 +682,7 @@ public:
}
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -735,7 +735,7 @@ public:
{
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!me->HasAura(SPELL_KNOCKBACK))
DoCast(me, SPELL_KNOCKBACK, true);
@@ -871,7 +871,7 @@ public:
}
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -1121,7 +1121,7 @@ public:
Talk(SAY_JULIANNE_SLAY);
}
void UpdateAI(const uint32 diff);
void UpdateAI(uint32 diff);
};
};
@@ -1276,7 +1276,7 @@ public:
Talk(SAY_ROMULO_SLAY);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim() || IsFakingDeath)
return;
@@ -1331,7 +1331,7 @@ public:
};
};
void boss_julianne::boss_julianneAI::UpdateAI(const uint32 diff)
void boss_julianne::boss_julianneAI::UpdateAI(uint32 diff)
{
if (EntryYellTimer)
{
@@ -266,7 +266,7 @@ public:
RaidWiped = false;
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
npc_escortAI::UpdateAI(diff);
@@ -613,7 +613,7 @@ public:
}
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (YellTimer <= diff)
{
@@ -280,7 +280,7 @@ public:
}
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
//Return since we have no target
if (!UpdateVictim())
@@ -462,7 +462,7 @@ public:
void EnterCombat(Unit* /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) {}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (FlameStrikeTimer <= diff)
{
@@ -548,7 +548,7 @@ public:
me->SummonCreature(CREATURE_PHOENIX_EGG, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 45000);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
//If we are fake death, we cast revbirth and after that we kill the phoenix to spawn the egg.
if (FakeDeath)
@@ -610,7 +610,7 @@ public:
void EnterCombat(Unit* /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) {}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (HatchTimer <= diff)
{
@@ -651,7 +651,7 @@ public:
void EnterCombat(Unit* /*who*/) {}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (DespawnTimer <= diff)
me->Kill(me);
@@ -238,7 +238,7 @@ public:
}
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -456,7 +456,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI
}
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UsedPotion && HealthBelowPct(25))
{
@@ -517,7 +517,7 @@ public:
boss_priestess_lackey_commonAI::Reset();
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -623,7 +623,7 @@ public:
DoCast(me, SPELL_SUMMON_IMP);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -703,7 +703,7 @@ public:
boss_priestess_lackey_commonAI::Reset();
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -780,7 +780,7 @@ public:
boss_priestess_lackey_commonAI::Reset();
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -907,7 +907,7 @@ public:
DoCast(me, SPELL_BATTLE_SHOUT);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -1036,7 +1036,7 @@ public:
m_uiPetGUID = summoned->GetGUID();
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -1144,7 +1144,7 @@ public:
boss_priestess_lackey_commonAI::Reset();
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -1240,7 +1240,7 @@ public:
boss_priestess_lackey_commonAI::Reset();
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -242,7 +242,7 @@ public:
ShatterRemainingCrystals();
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -338,7 +338,7 @@ public:
void EnterCombat(Unit* /*who*/) {}
void AttackStart(Unit* /*who*/) {}
void MoveInLineOfSight(Unit* /*who*/) {}
void UpdateAI(const uint32 /*diff*/) {}
void UpdateAI(uint32 /*diff*/) {}
void JustDied(Unit* /*killer*/)
{
@@ -127,7 +127,7 @@ public:
summoned->CastSpell(summoned, SPELL_ENERGY_BOLT, false, 0, 0, me->GetGUID());
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -154,7 +154,7 @@ public:
}
}
void UpdateAI(const uint32 uiDiff)
void UpdateAI(uint32 uiDiff)
{
if (m_uiTransformTimer)
{
@@ -67,7 +67,7 @@ class boss_baron_geddon : public CreatureScript
events.ScheduleEvent(EVENT_LIVING_BOMB, 35000);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -64,7 +64,7 @@ class boss_garr : public CreatureScript
events.ScheduleEvent(EVENT_MAGMA_SHACKLES, 15000);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -129,7 +129,7 @@ class mob_firesworn : public CreatureScript
}
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -61,7 +61,7 @@ class boss_gehennas : public CreatureScript
events.ScheduleEvent(EVENT_SHADOW_BOLT, 6000);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -84,7 +84,7 @@ class boss_golemagg : public CreatureScript
events.ScheduleEvent(EVENT_EARTHQUAKE, 3000);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -155,7 +155,7 @@ class mob_core_rager : public CreatureScript
}
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -61,7 +61,7 @@ class boss_lucifron : public CreatureScript
events.ScheduleEvent(EVENT_SHADOW_SHOCK, 6000);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -73,7 +73,7 @@ class boss_magmadar : public CreatureScript
events.ScheduleEvent(EVENT_LAVA_BOMB, 12000);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -94,7 +94,7 @@ class boss_majordomo : public CreatureScript
events.ScheduleEvent(EVENT_TELEPORT, 20000);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (instance && instance->GetBossState(BOSS_MAJORDOMO_EXECUTUS) != DONE)
{
@@ -174,7 +174,7 @@ class boss_majordomo : public CreatureScript
}
}
void DoAction(const int32 action)
void DoAction(int32 action)
{
if (action == ACTION_START_RAGNAROS)
{
@@ -115,7 +115,7 @@ class boss_ragnaros : public CreatureScript
Talk(SAY_KILL);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (_introState != 2)
{
@@ -328,7 +328,7 @@ class mob_son_of_flame : public CreatureScript
instance->SetData(DATA_RAGNAROS_ADDS, 1);
}
void UpdateAI(const uint32 /*diff*/)
void UpdateAI(uint32 /*diff*/)
{
if (!UpdateVictim())
return;
@@ -66,7 +66,7 @@ class boss_shazzrah : public CreatureScript
events.ScheduleEvent(EVENT_BLINK, 30000);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -77,7 +77,7 @@ class boss_sulfuron : public CreatureScript
events.ScheduleEvent(EVENT_FLAMESPEAR, 2000);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -162,7 +162,7 @@ class mob_flamewaker_priest : public CreatureScript
events.ScheduleEvent(EVENT_IMMOLATE, 8000);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -166,7 +166,7 @@ public:
Talk(SAY_EVENT_START);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
switch (phase)
{
@@ -457,7 +457,7 @@ public:
}
}
void UpdateAI(const uint32 uiDiff)
void UpdateAI(uint32 uiDiff)
{
if (!UpdateVictim())
{
@@ -542,7 +542,7 @@ public:
TargetGUID = 0;
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!Intro || !TargetGUID)
return;
@@ -814,7 +814,7 @@ public:
}
}
void UpdateAI(const uint32 /*diff*/)
void UpdateAI(uint32 /*diff*/)
{
if (!me->isInCombat())
{
@@ -888,7 +888,7 @@ public:
minerGUID = guid;
}
void DoAction(const int32 /*param*/)
void DoAction(int32 /*param*/)
{
if (Creature* miner = Unit::GetCreature(*me, minerGUID))
{
@@ -1022,7 +1022,7 @@ public:
}
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (IntroPhase)
{
@@ -90,7 +90,7 @@ public:
}
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (speechCounter)
{
@@ -275,7 +275,7 @@ public:
me->SummonCreature(NPC_CRIMSON_ACOLYTE, 1642.329f, -6045.818f, 127.583f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
}
void UpdateAI(const uint32 uiDiff)
void UpdateAI(uint32 uiDiff)
{
npc_escortAI::UpdateAI(uiDiff);
@@ -403,7 +403,7 @@ public:
uiStage = 2;
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (uiStage && !me->isInCombat())
{
@@ -486,7 +486,7 @@ public:
DoCast(who, SPELL_VALROTH_SMITE);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (uiRenew_timer <= diff)
{
@@ -676,7 +676,7 @@ public:
PlayerGUID = who->GetGUID();
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (PlayerGUID && !me->getVictim() && me->isAlive())
{
@@ -606,7 +606,7 @@ public:
npc_escortAI::EnterEvadeMode();
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
npc_escortAI::UpdateAI(diff);
@@ -1662,7 +1662,7 @@ public:
npc_the_lich_king_tirion_dawnAI(Creature* creature) : ScriptedAI(creature) { Reset(); }
void Reset() {}
void AttackStart(Unit* /*who*/) {} // very sample, just don't make them aggreesive
void UpdateAI(const uint32 /*diff*/) {}
void UpdateAI(uint32 /*diff*/) {}
void JustDied(Unit* /*killer*/) {}
};
@@ -69,7 +69,7 @@ public:
me->SetPosition(x, y, z, 0.0f);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (FlyBackTimer <= diff)
{
@@ -72,7 +72,7 @@ public:
Talk(SAY_AGGRO);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -60,7 +60,7 @@ public:
void EnterCombat(Unit* /*who*/) {}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -77,7 +77,7 @@ public:
Talk(SAY_KILL);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -204,7 +204,7 @@ public:
DoCast(who, SPELL_SQUASH_SOUL);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (delay)
{
@@ -325,7 +325,7 @@ public:
}
void Disappear();
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!withbody)
{
@@ -639,7 +639,7 @@ public:
}
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (withhead)
{
@@ -858,7 +858,7 @@ public:
DoStartMovement(who);
}
void UpdateAI(const uint32 /*diff*/)
void UpdateAI(uint32 /*diff*/)
{
if (sprouted && UpdateVictim())
DoMeleeAttackIfReady();
@@ -93,7 +93,7 @@ public:
me->SummonCreature(ENTRY_SCARLET_TRAINEE, 1939.18f, -431.58f, 17.09f, 6.22f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -152,7 +152,7 @@ public:
void WaypointReached(uint32 /*waypointId*/) {}
void EnterCombat(Unit* /*who*/) {}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (Start_Timer)
{
@@ -77,7 +77,7 @@ public:
me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -59,7 +59,7 @@ public:
Talk(SAY_AGGRO);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -89,7 +89,7 @@ public:
vorrel->AI()->Talk(SAY_TRIGGER_VORREL);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -175,7 +175,7 @@ public:
}
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -290,7 +290,7 @@ public:
damage = me->GetHealth() - 1;
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -63,7 +63,7 @@ public:
void EnterCombat(Unit* /*who*/) {}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -88,7 +88,7 @@ class boss_darkmaster_gandling : public CreatureScript
me->GetMotionMaster()->MoveRandom(5);
}
void UpdateAI(uint32 const diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -61,7 +61,7 @@ class boss_doctor_theolen_krastinov : public CreatureScript
events.ScheduleEvent(EVENT_FRENZY, 1000);
}
void UpdateAI(uint32 const diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -59,7 +59,7 @@ class boss_illucia_barov : public CreatureScript
events.ScheduleEvent(EVENT_FEAR, 30000);
}
void UpdateAI(uint32 const diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -72,7 +72,7 @@ class boss_instructor_malicia : public CreatureScript
events.ScheduleEvent(EVENT_HEALINGTOUCH, 45000);
}
void UpdateAI(uint32 const diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -70,7 +70,7 @@ public:
Illusion->AI()->AttackStart(victim);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (Invisible && Invisible_Timer <= diff)
{
@@ -180,7 +180,7 @@ public:
{
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
//Return since we have no target
if (!UpdateVictim())
@@ -142,7 +142,7 @@ class boss_kirtonos_the_herald : public CreatureScript
}
}
void UpdateAI(uint32 const diff)
void UpdateAI(uint32 diff)
{
events.Update(diff);
@@ -74,7 +74,7 @@ public:
SummonedMage->AI()->AttackStart(victim);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -59,7 +59,7 @@ class boss_lord_alexei_barov : public CreatureScript
events.ScheduleEvent(EVENT_VEILOFSHADOW, 15000);
}
void UpdateAI(uint32 const diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -59,7 +59,7 @@ class boss_lorekeeper_polkelt : public CreatureScript
events.ScheduleEvent(EVENT_NOXIOUSCATALYST, 35000);
}
void UpdateAI(uint32 const diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -71,7 +71,7 @@ public:
void EnterCombat(Unit* /*who*/){}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -59,7 +59,7 @@ class boss_the_ravenian : public CreatureScript
events.ScheduleEvent(EVENT_KNOCKAWAY, 32000);
}
void UpdateAI(uint32 const diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -60,7 +60,7 @@ public:
m_uiFrenzy_Timer = 0;
}
void UpdateAI(const uint32 uiDiff)
void UpdateAI(uint32 uiDiff)
{
if (!UpdateVictim())
return;
@@ -172,7 +172,7 @@ public:
uiDarkOffering = urand(200, 1000);
}
void UpdateAI(uint32 const uiDiff)
void UpdateAI(uint32 uiDiff)
{
if (!UpdateVictim())
return;
@@ -116,7 +116,7 @@ public:
instance->SetData(TYPE_BARON, DONE);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -74,7 +74,7 @@ public:
instance->SetData(TYPE_BARONESS, IN_PROGRESS);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
if (!UpdateVictim())
return;
@@ -119,7 +119,7 @@ public:
{
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
//Return since we have no target
if (!UpdateVictim())
@@ -120,7 +120,7 @@ public:
{
}
void UpdateAI(const uint32 uiDiff)
void UpdateAI(uint32 uiDiff)
{
if (!UpdateVictim())
return;
@@ -85,7 +85,7 @@ public:
{
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
//Return since we have no target
if (!UpdateVictim())
@@ -72,7 +72,7 @@ public:
instance->SetData(TYPE_PALLID, IN_PROGRESS);
}
void UpdateAI(const uint32 diff)
void UpdateAI(uint32 diff)
{
//Return since we have no target
if (!UpdateVictim())
Loaded 100 of 440 files, more files were not shown because too many files have changed in this diff. Show more