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 
MoveInLineOfSight(Unit* unit) -> MoveInLineOfSight(Unit* who)

Signed-off-by: Gyx <[email protected]>
This commit is contained in:
Gyx
2012-04-01 19:56:41 +08:00
parent 00264e45cf
commit a1c4786ba0
66 changed files with 417 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
+1 -1
View File
@@ -201,7 +201,7 @@ public:
{
for (uint8 i = 0; i < 5; ++i)
{
Unit* Portal = Unit::GetUnit((*me), PortalsGuid[i]);
Unit* Portal = Unit::GetUnit(*me, PortalsGuid[i]);
if (Portal && Portal->isAlive())
Portal->DealDamage(Portal, Portal->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
PortalsGuid[i] = 0;
src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
+2 -2
View File
@@ -166,7 +166,7 @@ public:
{
std::list<HostileReference*>& m_threatlist = me->getThreatManager().getThreatList();
for (std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i)
if (Unit* target = Unit::GetUnit((*me), (*i)->getUnitGuid()))
if (Unit* target = Unit::GetUnit(*me, (*i)->getUnitGuid()))
if (target->isAlive() && !me->IsWithinDist(target, 35, false))
DoCast(target, SPELL_THUNDERING_STORM, true);
ThunderingStorm_Timer = 15000;
@@ -189,7 +189,7 @@ public:
{
std::list<HostileReference*>& m_threatlist = me->getThreatManager().getThreatList();
for (std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i)
if (Unit* target = Unit::GetUnit((*me), (*i)->getUnitGuid()))
if (Unit* target = Unit::GetUnit(*me, (*i)->getUnitGuid()))
if (target->isAlive() && me->IsWithinMeleeRange(target))
{
me->TauntApply(target);
src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
+1 -1
View File
@@ -186,7 +186,7 @@ public:
void RevertThreatOnTarget(uint64 guid)
{
Unit* unit = NULL;
unit = Unit::GetUnit((*me), guid);
unit = Unit::GetUnit(*me, guid);
if (unit)
{
if (DoGetThreat(unit))
src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+6 -6
View File
@@ -865,7 +865,7 @@ public:
{
if (GlaiveGUID[i])
{
Unit* Glaive = Unit::GetUnit((*me), GlaiveGUID[i]);
Unit* Glaive = Unit::GetUnit(*me, GlaiveGUID[i]);
if (Glaive)
{
Glaive->CastSpell(me, SPELL_GLAIVE_RETURNS, false); // Make it look like the Glaive flies back up to us
@@ -1492,7 +1492,7 @@ public:
std::vector<Unit*> eliteList;
for (std::list<HostileReference*>::const_iterator itr = threatList.begin(); itr != threatList.end(); ++itr)
{
Unit* unit = Unit::GetUnit((*me), (*itr)->getUnitGuid());
Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid());
if (unit && unit->GetEntry() == ILLIDARI_ELITE)
eliteList.push_back(unit);
}
@@ -1649,9 +1649,9 @@ public:
Unit* Channel = NULL, *Spirit[2] = { NULL, NULL };
if (ChannelCount <= 5)
{
Channel = Unit::GetUnit((*me), ChannelGUID);
Spirit[0] = Unit::GetUnit((*me), SpiritGUID[0]);
Spirit[1] = Unit::GetUnit((*me), SpiritGUID[1]);
Channel = Unit::GetUnit(*me, ChannelGUID);
Spirit[0] = Unit::GetUnit(*me, SpiritGUID[0]);
Spirit[1] = Unit::GetUnit(*me, SpiritGUID[1]);
if (!Channel || !Spirit[0] || !Spirit[1])
return;
}
@@ -2145,7 +2145,7 @@ public:
void JustDied(Unit* /*killer*/)
{
if (Unit* target = Unit::GetUnit((*me), TargetGUID))
if (Unit* target = Unit::GetUnit(*me, TargetGUID))
target->RemoveAurasDueToSpell(SPELL_PARALYZE);
}
src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
+1 -1
View File
@@ -250,7 +250,7 @@ public:
Unit* unit = NULL;
if (TargetGUID[i])
{
unit = Unit::GetUnit((*me), TargetGUID[i]);
unit = Unit::GetUnit(*me, TargetGUID[i]);
if (unit)
unit->CastSpell(unit, SPELL_ATTRACTION, true);
TargetGUID[i] = 0;
src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+2 -2
View File
@@ -219,7 +219,7 @@ public:
std::list<HostileReference*>::const_iterator itr = m_threatlist.begin();
for (; itr != m_threatlist.end(); ++itr)
{
Unit* unit = Unit::GetUnit((*me), (*itr)->getUnitGuid());
Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid());
if (unit)
{
DoModifyThreatPercent(unit, -100);
@@ -441,7 +441,7 @@ public:
std::list<HostileReference*>::const_iterator itr = m_threatlist.begin();
for (; itr != m_threatlist.end(); ++itr)
{
Unit* unit = Unit::GetUnit((*me), (*itr)->getUnitGuid());
Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid());
if (unit && unit->isAlive() && (unit->GetTypeId() == TYPEID_PLAYER)) // Only alive players
targets.push_back(unit);
}
src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
+1 -1
View File
@@ -184,7 +184,7 @@ public:
std::list<HostileReference*>::const_iterator i = m_threatlist.begin();
for (i = m_threatlist.begin(); i!= m_threatlist.end(); ++i)
{
Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid());
Unit* unit = Unit::GetUnit(*me, (*i)->getUnitGuid());
if (unit && me->IsWithinMeleeRange(unit))
{
if (unit->GetHealth() > health)
src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
+4 -4
View File
@@ -175,7 +175,7 @@ public:
std::list<Unit*> targets;
for (; itr != m_threatlist.end(); ++itr)
{
Unit* unit = Unit::GetUnit((*me), (*itr)->getUnitGuid());
Unit* unit = Unit::GetUnit(*me, (*itr)->getUnitGuid());
if (unit && unit->isAlive())
targets.push_back(unit);
}
@@ -325,7 +325,7 @@ public:
std::list<HostileReference*>::const_iterator i = m_threatlist.begin();
for (i = m_threatlist.begin(); i != m_threatlist.end(); ++i)
{
Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid());
Unit* unit = Unit::GetUnit(*me, (*i)->getUnitGuid());
if (unit && unit->isAlive())
{
float threat = DoGetThreat(unit);
@@ -345,7 +345,7 @@ public:
Unit* Ghost = NULL;
if (GhostGUID)
Ghost = Unit::GetUnit((*me), GhostGUID);
Ghost = Unit::GetUnit(*me, GhostGUID);
if (Ghost && Ghost->isAlive() && Ghost->HasAura(SPELL_SHADOW_OF_DEATH))
{
/*float x, y, z;
@@ -392,7 +392,7 @@ public:
Done = true;
if (AggroTargetGUID)
{
Unit* unit = Unit::GetUnit((*me), AggroTargetGUID);
Unit* unit = Unit::GetUnit(*me, AggroTargetGUID);
if (unit)
AttackStart(unit);
src/server/scripts/Outland/BlackTemple/illidari_council.cpp
+3 -3
View File
@@ -299,7 +299,7 @@ public:
Unit* Member = NULL;
if (Council[i])
{
Member = Unit::GetUnit((*me), Council[i]);
Member = Unit::GetUnit(*me, Council[i]);
if (Member && Member->isAlive())
CAST_CRE(Member)->AI()->AttackStart(target);
}
@@ -512,7 +512,7 @@ public:
member = urand(1, 3);
if (member != 2) // No need to create another pointer to us using Unit::GetUnit
unit = Unit::GetUnit((*me), Council[member]);
unit = Unit::GetUnit(*me, Council[member]);
return unit;
}
@@ -526,7 +526,7 @@ public:
}
for (uint8 i = 0; i < 4; ++i)
{
Unit* unit = Unit::GetUnit((*me), Council[i]);
Unit* unit = Unit::GetUnit(*me, Council[i]);
if (unit)
unit->CastSpell(unit, spellid, true, 0, 0, me->GetGUID());
}
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
+7 -7
View File
@@ -225,7 +225,7 @@ public:
//Only if not incombat check if the event is started
if (!me->isInCombat() && instance && instance->GetData(DATA_KARATHRESSEVENT))
{
Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_KARATHRESSEVENT_STARTER));
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_KARATHRESSEVENT_STARTER));
if (target)
{
@@ -381,7 +381,7 @@ public:
//Only if not incombat check if the event is started
if (!me->isInCombat() && instance && instance->GetData(DATA_KARATHRESSEVENT))
{
Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_KARATHRESSEVENT_STARTER));
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_KARATHRESSEVENT_STARTER));
if (target)
{
@@ -522,7 +522,7 @@ public:
//Only if not incombat check if the event is started
if (!me->isInCombat() && instance && instance->GetData(DATA_KARATHRESSEVENT))
{
Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_KARATHRESSEVENT_STARTER));
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_KARATHRESSEVENT_STARTER));
if (target)
{
@@ -648,7 +648,7 @@ public:
//Only if not incombat check if the event is started
if (!me->isInCombat() && instance && instance->GetData(DATA_KARATHRESSEVENT))
{
Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_KARATHRESSEVENT_STARTER));
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_KARATHRESSEVENT_STARTER));
if (target)
{
@@ -730,13 +730,13 @@ public:
switch (rand()%4)
{
case 0:
unit = Unit::GetUnit((*me), instance->GetData64(DATA_KARATHRESS));
unit = Unit::GetUnit(*me, instance->GetData64(DATA_KARATHRESS));
break;
case 1:
unit = Unit::GetUnit((*me), instance->GetData64(DATA_SHARKKIS));
unit = Unit::GetUnit(*me, instance->GetData64(DATA_SHARKKIS));
break;
case 2:
unit = Unit::GetUnit((*me), instance->GetData64(DATA_TIDALVESS));
unit = Unit::GetUnit(*me, instance->GetData64(DATA_TIDALVESS));
break;
case 3:
unit = me;
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
+2 -2
View File
@@ -783,7 +783,7 @@ public:
if (instance)
{
// check if vashj is death
Unit* Vashj = Unit::GetUnit((*me), instance->GetData64(DATA_LADYVASHJ));
Unit* Vashj = Unit::GetUnit(*me, instance->GetData64(DATA_LADYVASHJ));
if (!Vashj || (Vashj && !Vashj->isAlive()) || (Vashj && CAST_AI(boss_lady_vashj::boss_lady_vashjAI, CAST_CRE(Vashj)->AI())->Phase != 3))
{
// remove
@@ -839,7 +839,7 @@ public:
if (CheckTimer <= diff)
{
Unit* vashj = Unit::GetUnit((*me), instance->GetData64(DATA_LADYVASHJ));
Unit* vashj = Unit::GetUnit(*me, instance->GetData64(DATA_LADYVASHJ));
if (vashj && vashj->isAlive())
{
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
+2 -2
View File
@@ -111,7 +111,7 @@ public:
void JustDied(Unit* /*killer*/)
{
Unit* unit = Unit::GetUnit((*me), victimGUID);
Unit* unit = Unit::GetUnit(*me, victimGUID);
if (unit && unit->HasAura(SPELL_INSIDIOUS_WHISPER))
unit->RemoveAurasDueToSpell(SPELL_INSIDIOUS_WHISPER);
}
@@ -140,7 +140,7 @@ public:
if (me->getVictim()->GetGUID() != victimGUID)
{
DoModifyThreatPercent(me->getVictim(), -100);
Unit* owner = Unit::GetUnit((*me), victimGUID);
Unit* owner = Unit::GetUnit(*me, victimGUID);
if (owner && owner->isAlive())
{
me->AddThreat(owner, 999999);
src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
+1 -1
View File
@@ -231,7 +231,7 @@ public:
{
if (instance && instance->GetData64(DATA_MEKGINEERSTEAMRIGGER) && instance->GetData(TYPE_MEKGINEER_STEAMRIGGER) == IN_PROGRESS)
{
if (Unit* pMekgineer = Unit::GetUnit((*me), instance->GetData64(DATA_MEKGINEERSTEAMRIGGER)))
if (Unit* pMekgineer = Unit::GetUnit(*me, instance->GetData64(DATA_MEKGINEERSTEAMRIGGER)))
{
if (me->IsWithinDistInMap(pMekgineer, MAX_REPAIR_RANGE))
{
src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
+5 -5
View File
@@ -223,7 +223,7 @@ public:
//Only if not incombat check if the event is started
if (!me->isInCombat() && instance && instance->GetData(DATA_MAULGAREVENT))
{
Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_MAULGAREVENT_TANK));
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_MAULGAREVENT_TANK));
if (target)
{
@@ -383,7 +383,7 @@ public:
//Only if not incombat check if the event is started
if (!me->isInCombat() && instance && instance->GetData(DATA_MAULGAREVENT))
{
Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_MAULGAREVENT_TANK));
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_MAULGAREVENT_TANK));
if (target)
{
@@ -498,7 +498,7 @@ public:
//Only if not incombat check if the event is started
if (!me->isInCombat() && instance && instance->GetData(DATA_MAULGAREVENT))
{
Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_MAULGAREVENT_TANK));
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_MAULGAREVENT_TANK));
if (target)
{
@@ -618,7 +618,7 @@ public:
//Only if not incombat check if the event is started
if (!me->isInCombat() && instance && instance->GetData(DATA_MAULGAREVENT))
{
Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_MAULGAREVENT_TANK));
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_MAULGAREVENT_TANK));
if (target)
{
@@ -728,7 +728,7 @@ public:
//Only if not incombat check if the event is started
if (!me->isInCombat() && instance && instance->GetData(DATA_MAULGAREVENT))
{
Unit* target = Unit::GetUnit((*me), instance->GetData64(DATA_MAULGAREVENT_TANK));
Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_MAULGAREVENT_TANK));
if (target)
{
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
+2 -2
View File
@@ -166,7 +166,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
{
for (std::vector<uint64>::const_iterator itr = adds.begin(); itr!= adds.end(); ++itr)
{
Unit* temp = Unit::GetUnit((*me), *itr);
Unit* temp = Unit::GetUnit(*me, *itr);
if (temp && temp->isAlive())
{
(*temp).GetMotionMaster()->Clear(true);
@@ -178,7 +178,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
for (std::vector<uint64>::const_iterator itr = assassins.begin(); itr!= assassins.end(); ++itr)
{
Unit* temp = Unit::GetUnit((*me), *itr);
Unit* temp = Unit::GetUnit(*me, *itr);
if (temp && temp->isAlive())
{
(*temp).GetMotionMaster()->Clear(true);
src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+1 -1
View File
@@ -500,7 +500,7 @@ class mob_ember_of_alar : public CreatureScript
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
if (instance && instance->GetData(DATA_ALAREVENT) == 2)
{
if (Unit* Alar = Unit::GetUnit((*me), instance->GetData64(DATA_ALAR)))
if (Unit* Alar = Unit::GetUnit(*me, instance->GetData64(DATA_ALAR)))
{
int32 AlarHealth = int32(Alar->GetHealth()) - int32(Alar->CountPctFromMaxHealth(3));
if (AlarHealth > 0)
src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+1 -1
View File
@@ -454,7 +454,7 @@ class mob_solarium_priest : public CreatureScript
{
case 0:
if (instance)
target = Unit::GetUnit((*me), instance->GetData64(DATA_ASTROMANCER));
target = Unit::GetUnit(*me, instance->GetData64(DATA_ASTROMANCER));
break;
case 1:
target = me;
src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+6 -6
View File
@@ -253,7 +253,7 @@ struct advisorbase_ai : public ScriptedAI
DelayRes_Timer = 0;
FakeDeath = false;
Unit* Target = Unit::GetUnit((*me), DelayRes_Target);
Unit* Target = Unit::GetUnit(*me, DelayRes_Target);
if (!Target)
Target = me->getVictim();
@@ -464,7 +464,7 @@ class boss_kaelthas : public CreatureScript
for (uint8 i = 0; i < MAX_ADVISORS; ++i)
{
if (Unit* pAdvisor = Unit::GetUnit((*me), m_auiAdvisorGuid[i]))
if (Unit* pAdvisor = Unit::GetUnit(*me, m_auiAdvisorGuid[i]))
pAdvisor->Kill(pAdvisor);
}
}
@@ -895,7 +895,7 @@ class boss_kaelthas : public CreatureScript
// 1) Kael'thas will portal the whole raid right into his body
for (i = me->getThreatManager().getThreatList().begin(); i!= me->getThreatManager().getThreatList().end(); ++i)
{
Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid());
Unit* unit = Unit::GetUnit(*me, (*i)->getUnitGuid());
if (unit && (unit->GetTypeId() == TYPEID_PLAYER))
{
//Use work around packet to prevent player from being dropped from combat
@@ -916,7 +916,7 @@ class boss_kaelthas : public CreatureScript
// 2) At that point he will put a Gravity Lapse debuff on everyone
for (i = me->getThreatManager().getThreatList().begin(); i != me->getThreatManager().getThreatList().end(); ++i)
{
if (Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid()))
if (Unit* unit = Unit::GetUnit(*me, (*i)->getUnitGuid()))
{
DoCast(unit, SPELL_KNOCKBACK, true);
//Gravity lapse - needs an exception in Spell system to work
@@ -949,7 +949,7 @@ class boss_kaelthas : public CreatureScript
//Remove flight
for (i = me->getThreatManager().getThreatList().begin(); i!= me->getThreatManager().getThreatList().end(); ++i)
{
if (Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid()))
if (Unit* unit = Unit::GetUnit(*me, (*i)->getUnitGuid()))
{
//Using packet workaround
WorldPacket data(12);
@@ -1289,7 +1289,7 @@ class boss_grand_astromancer_capernian : public CreatureScript
std::list<HostileReference*>& m_threatlist = me->getThreatManager().getThreatList();
for (std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); i!= m_threatlist.end(); ++i)
{
Unit* unit = Unit::GetUnit((*me), (*i)->getUnitGuid());
Unit* unit = Unit::GetUnit(*me, (*i)->getUnitGuid());
//if in melee range
if (unit && unit->IsWithinDistInMap(me, 5))
{
src/server/scripts/Outland/netherstorm.cpp
+5 -5
View File
@@ -115,7 +115,7 @@ public:
if (someplayer)
{
Unit* p = Unit::GetUnit((*me), someplayer);
Unit* p = Unit::GetUnit(*me, someplayer);
if (p && p->GetTypeId() == TYPEID_PLAYER)
{
switch (me->GetEntry())
@@ -142,7 +142,7 @@ public:
if (goConsole)
{
if (GameObject* go = GameObject::GetGameObject((*me), goConsole))
if (GameObject* go = GameObject::GetGameObject(*me, goConsole))
go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE);
}
}
@@ -243,7 +243,7 @@ public:
case 1:
if (someplayer)
{
Unit* u = Unit::GetUnit((*me), someplayer);
Unit* u = Unit::GetUnit(*me, someplayer);
if (u && u->GetTypeId() == TYPEID_PLAYER) DoScriptText(EMOTE_START, me, u);
}
Event_Timer = 60000;
@@ -271,14 +271,14 @@ public:
DoScriptText(EMOTE_COMPLETE, me);
if (someplayer)
{
Unit* u = Unit::GetUnit((*me), someplayer);
Unit* u = Unit::GetUnit(*me, someplayer);
if (u && u->GetTypeId() == TYPEID_PLAYER)
CAST_PLR(u)->KilledMonsterCredit(me->GetEntry(), me->GetGUID());
DoCast(me, SPELL_DISABLE_VISUAL);
}
if (goConsole)
{
if (GameObject* go = GameObject::GetGameObject((*me), goConsole))
if (GameObject* go = GameObject::GetGameObject(*me, goConsole))
go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE);
}
++Phase;
src/server/scripts/Outland/shadowmoon_valley.cpp
+172 -207
View File
@@ -262,7 +262,7 @@ public:
{
if (PlayerGUID)
{
Unit* player = Unit::GetUnit((*me), PlayerGUID);
Unit* player = Unit::GetUnit(*me, PlayerGUID);
if (player)
DoCast(player, SPELL_FORCE_OF_NELTHARAKU, true);
@@ -758,8 +758,8 @@ public:
uint32 NextStep(uint32 Step)
{
Unit* player = Unit::GetUnit((*me), PlayerGUID);
Unit* Illi = Unit::GetUnit((*me), IllidanGUID);
Player* player = Unit::GetPlayer(*me, PlayerGUID);
Unit* Illi = Unit::GetUnit(*me, IllidanGUID);
if (!player || !Illi)
{
@@ -769,213 +769,178 @@ public:
switch (Step)
{
case 0:
return 0;
break;
case 1:
me->GetMotionMaster()->MovePoint(0, -5104.41f, 595.297f, 85.6838f);
return 9000;
break;
case 2:
DoScriptText(OVERLORD_YELL_1, me, player);
return 4500;
break;
case 3:
me->SetInFront(player);
return 3200;
break;
case 4:
DoScriptText(OVERLORD_SAY_2, me, player);
return 2000;
break;
case 5:
Illi->SetVisible(true);
Illi->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
return 350;
break;
case 6:
Illi->CastSpell(Illi, SPELL_ONE, true);
Illi->SetTarget(me->GetGUID());
me->SetTarget(IllidanGUID);
return 2000;
break;
case 7:
DoScriptText(OVERLORD_YELL_2, me);
return 4500;
break;
case 8:
me->SetUInt32Value(UNIT_FIELD_BYTES_1, 8);
return 2500;
break;
case 9:
DoScriptText(OVERLORD_SAY_3, me);
return 6500;
break;
case 10:
DoScriptText(LORD_ILLIDAN_SAY_1, Illi);
return 5000;
break;
case 11:
DoScriptText(OVERLORD_SAY_4, me, player);
return 6000;
break;
case 12:
DoScriptText(LORD_ILLIDAN_SAY_2, Illi);
return 5500;
break;
case 13:
DoScriptText(LORD_ILLIDAN_SAY_3, Illi);
return 4000;
break;
case 14:
Illi->SetTarget(PlayerGUID);
return 1500;
break;
case 15:
DoScriptText(LORD_ILLIDAN_SAY_4, Illi);
return 1500;
break;
case 16:
if (player)
{
Illi->CastSpell(player, SPELL_TWO, true);
player->RemoveAurasDueToSpell(SPELL_THREE);
player->RemoveAurasDueToSpell(SPELL_FOUR);
case 0:
return 0;
break;
case 1:
me->GetMotionMaster()->MovePoint(0, -5104.41f, 595.297f, 85.6838f);
return 9000;
break;
case 2:
DoScriptText(OVERLORD_YELL_1, me, player);
return 4500;
break;
case 3:
me->SetInFront(player);
return 3200;
break;
case 4:
DoScriptText(OVERLORD_SAY_2, me, player);
return 2000;
break;
case 5:
Illi->SetVisible(true);
Illi->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
return 350;
break;
case 6:
Illi->CastSpell(Illi, SPELL_ONE, true);
Illi->SetTarget(me->GetGUID());
me->SetTarget(IllidanGUID);
return 2000;
break;
case 7:
DoScriptText(OVERLORD_YELL_2, me);
return 4500;
break;
case 8:
me->SetUInt32Value(UNIT_FIELD_BYTES_1, 8);
return 2500;
break;
case 9:
DoScriptText(OVERLORD_SAY_3, me);
return 6500;
break;
case 10:
DoScriptText(LORD_ILLIDAN_SAY_1, Illi);
return 5000;
}
else
{
CAST_PLR(player)->FailQuest(QUEST_LORD_ILLIDAN_STORMRAGE);
Step = 30;
return 100;
}
break;
case 17:
DoScriptText(LORD_ILLIDAN_SAY_5, Illi);
return 5000;
break;
case 18:
DoScriptText(LORD_ILLIDAN_SAY_6, Illi);
return 5000;
break;
case 19:
DoScriptText(LORD_ILLIDAN_SAY_7, Illi);
return 5000;
break;
case 20:
Illi->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF);
Illi->SetDisableGravity(true);
return 500;
break;
case 21:
DoScriptText(OVERLORD_SAY_5, me);
return 500;
break;
case 22:
Illi->SetVisible(false);
Illi->setDeathState(JUST_DIED);
return 1000;
break;
case 23:
me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
return 2000;
break;
case 24:
me->SetTarget(PlayerGUID);
return 5000;
break;
case 25:
DoScriptText(OVERLORD_SAY_6, me);
return 2000;
break;
case 26:
if (player)
CAST_PLR(player)->GroupEventHappens(QUEST_LORD_ILLIDAN_STORMRAGE, me);
return 6000;
break;
case 27:
{
Unit* Yarzill = me->FindNearestCreature(C_YARZILL, 50);
if (Yarzill)
Yarzill->SetTarget(PlayerGUID);
break;
case 11:
DoScriptText(OVERLORD_SAY_4, me, player);
return 6000;
break;
case 12:
DoScriptText(LORD_ILLIDAN_SAY_2, Illi);
return 5500;
break;
case 13:
DoScriptText(LORD_ILLIDAN_SAY_3, Illi);
return 4000;
break;
case 14:
Illi->SetTarget(PlayerGUID);
return 1500;
break;
case 15:
DoScriptText(LORD_ILLIDAN_SAY_4, Illi);
return 1500;
break;
case 16:
if (player)
{
Illi->CastSpell(player, SPELL_TWO, true);
player->RemoveAurasDueToSpell(SPELL_THREE);
player->RemoveAurasDueToSpell(SPELL_FOUR);
return 5000;
}
else
{
player->FailQuest(QUEST_LORD_ILLIDAN_STORMRAGE);
Step = 30;
return 100;
}
break;
case 17:
DoScriptText(LORD_ILLIDAN_SAY_5, Illi);
return 5000;
break;
case 18:
DoScriptText(LORD_ILLIDAN_SAY_6, Illi);
return 5000;
break;
case 19:
DoScriptText(LORD_ILLIDAN_SAY_7, Illi);
return 5000;
break;
case 20:
Illi->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF);
Illi->SetDisableGravity(true);
return 500;
}
break;
case 28:
player->RemoveAurasDueToSpell(SPELL_TWO);
player->RemoveAurasDueToSpell(41519);
player->CastSpell(player, SPELL_THREE, true);
player->CastSpell(player, SPELL_FOUR, true);
return 1000;
break;
case 29:
{
Unit* Yarzill = me->FindNearestCreature(C_YARZILL, 50);
if (Yarzill)
DoScriptText(YARZILL_THE_MERC_SAY, Yarzill, player);
return 5000;
}
break;
case 30:
{
Unit* Yarzill = me->FindNearestCreature(C_YARZILL, 50);
if (Yarzill)
Yarzill->SetTarget(0);
return 5000;
}
break;
case 31:
{
Unit* Yarzill = me->FindNearestCreature(C_YARZILL, 50);
if (Yarzill)
Yarzill->CastSpell(player, 41540, true);
break;
case 21:
DoScriptText(OVERLORD_SAY_5, me);
return 500;
break;
case 22:
Illi->SetVisible(false);
Illi->setDeathState(JUST_DIED);
return 1000;
}
break;
case 32:
me->GetMotionMaster()->MovePoint(0, -5085.77f, 577.231f, 86.6719f); return 5000;
break;
case 33:
Reset();
return 100;
break;
default :
return 0;
break;
break;
case 23:
me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
return 2000;
break;
case 24:
me->SetTarget(PlayerGUID);
return 5000;
break;
case 25:
DoScriptText(OVERLORD_SAY_6, me);
return 2000;
break;
case 26:
player->GroupEventHappens(QUEST_LORD_ILLIDAN_STORMRAGE, me);
return 6000;
break;
case 27:
{
Unit* Yarzill = me->FindNearestCreature(C_YARZILL, 50);
if (Yarzill)
Yarzill->SetTarget(PlayerGUID);
return 500;
}
break;
case 28:
player->RemoveAurasDueToSpell(SPELL_TWO);
player->RemoveAurasDueToSpell(41519);
player->CastSpell(player, SPELL_THREE, true);
player->CastSpell(player, SPELL_FOUR, true);
return 1000;
break;
case 29:
{
Unit* Yarzill = me->FindNearestCreature(C_YARZILL, 50);
if (Yarzill)
DoScriptText(YARZILL_THE_MERC_SAY, Yarzill, player);
return 5000;
}
break;
case 30:
{
Unit* Yarzill = me->FindNearestCreature(C_YARZILL, 50);
if (Yarzill)
Yarzill->SetTarget(0);
return 5000;
}
break;
case 31:
{
Unit* Yarzill = me->FindNearestCreature(C_YARZILL, 50);
if (Yarzill)
Yarzill->CastSpell(player, 41540, true);
return 1000;
}
break;
case 32:
me->GetMotionMaster()->MovePoint(0, -5085.77f, 577.231f, 86.6719f); return 5000;
break;
case 33:
Reset();
return 100;
break;
default :
return 0;
break;
}
}