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

Add spaces after commas

Browse Source
This commit is contained in:
leak
2011-04-29 20:47:02 +02:00
parent 01a79947d5
commit 1003f30448
645 changed files with 9439 additions and 9439 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
+1 -1
View File
@@ -86,7 +86,7 @@ class boss_broggok : public CreatureScript
summoned->setFaction(16);
summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
summoned->CastSpell(summoned,SPELL_POISON,false,0,0,me->GetGUID());
summoned->CastSpell(summoned, SPELL_POISON, false, 0, 0, me->GetGUID());
}
void UpdateAI(const uint32 diff)
src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
+9 -9
View File
@@ -60,11 +60,11 @@ enum eKelidan
const float ShadowmoonChannelers[5][4]=
{
{302.0f,-87.0f,-24.4f,0.157f},
{321.0f,-63.5f,-24.6f,4.887f},
{346.0f,-74.5f,-24.6f,3.595f},
{344.0f,-103.5f,-24.5f,2.356f},
{316.0f,-109.0f,-24.6f,1.257f}
{302.0f, -87.0f, -24.4f, 0.157f},
{321.0f, -63.5f, -24.6f, 4.887f},
{346.0f, -74.5f, -24.6f, 3.595f},
{344.0f, -103.5f, -24.5f, 2.356f},
{316.0f, -109.0f, -24.6f, 1.257f}
};
class boss_kelidan_the_breaker : public CreatureScript
@@ -124,7 +124,7 @@ class boss_kelidan_the_breaker : public CreatureScript
if (rand()%2)
return;
DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me);
DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me);
}
void ChannelerEngaged(Unit* who)
@@ -132,7 +132,7 @@ class boss_kelidan_the_breaker : public CreatureScript
if (who && !addYell)
{
addYell = true;
DoScriptText(RAND(SAY_ADD_AGGRO_1,SAY_ADD_AGGRO_2,SAY_ADD_AGGRO_3), me);
DoScriptText(RAND(SAY_ADD_AGGRO_1, SAY_ADD_AGGRO_2, SAY_ADD_AGGRO_3), me);
}
for (uint8 i=0; i<5; ++i)
{
@@ -175,7 +175,7 @@ class boss_kelidan_the_breaker : public CreatureScript
{
Creature *channeler = Unit::GetCreature(*me, Channelers[i]);
if (!channeler || channeler->isDead())
channeler = me->SummonCreature(ENTRY_CHANNELER,ShadowmoonChannelers[i][0],ShadowmoonChannelers[i][1],ShadowmoonChannelers[i][2],ShadowmoonChannelers[i][3],TEMPSUMMON_CORPSE_TIMED_DESPAWN,300000);
channeler = me->SummonCreature(ENTRY_CHANNELER, ShadowmoonChannelers[i][0], ShadowmoonChannelers[i][1], ShadowmoonChannelers[i][2], ShadowmoonChannelers[i][3], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
if (channeler)
Channelers[i] = channeler->GetGUID();
else
@@ -254,7 +254,7 @@ class boss_kelidan_the_breaker : public CreatureScript
}
if (IsHeroic())
DoTeleportAll(me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation());
DoTeleportAll(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation());
BurningNova_Timer = 20000+rand()%8000;
Firenova_Timer= 5000;
src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
+4 -4
View File
@@ -80,7 +80,7 @@ class boss_the_maker : public CreatureScript
void EnterCombat(Unit * /*who*/)
{
DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me);
DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
if (!pInstance)
return;
@@ -91,7 +91,7 @@ class boss_the_maker : public CreatureScript
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me);
DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me);
}
void JustDied(Unit* /*Killer*/)
@@ -122,7 +122,7 @@ class boss_the_maker : public CreatureScript
if (ExplodingBreaker_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_EXPLODING_BREAKER);
ExplodingBreaker_Timer = 4000+rand()%8000;
}
@@ -133,7 +133,7 @@ class boss_the_maker : public CreatureScript
if (domination_timer_timer <= diff)
{
Unit *pTarget;
pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
DoCast(pTarget, SPELL_DOMINATION);
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
+5 -5
View File
@@ -92,7 +92,7 @@ class boss_omor_the_unscarred : public CreatureScript
void EnterCombat(Unit * /*who*/)
{
DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me);
DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
}
void KilledUnit(Unit* /*victim*/)
@@ -107,7 +107,7 @@ class boss_omor_the_unscarred : public CreatureScript
{
DoScriptText(SAY_SUMMON, me);
if (Unit* random = SelectTarget(SELECT_TARGET_RANDOM,0))
if (Unit* random = SelectTarget(SELECT_TARGET_RANDOM, 0))
summoned->AI()->AttackStart(random);
++SummonedCount;
@@ -162,7 +162,7 @@ class boss_omor_the_unscarred : public CreatureScript
Unit* temp = NULL;
if (me->IsWithinMeleeRange(me->getVictim()))
temp = me->getVictim();
else temp = SelectTarget(SELECT_TARGET_RANDOM,0);
else temp = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (temp && temp->GetTypeId() == TYPEID_PLAYER)
{
@@ -192,7 +192,7 @@ class boss_omor_the_unscarred : public CreatureScript
{
DoScriptText(SAY_CURSE, me);
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
DoCast(pTarget, SPELL_TREACHEROUS_AURA);
Aura_Timer = 8000+rand()%8000;
@@ -203,7 +203,7 @@ class boss_omor_the_unscarred : public CreatureScript
if (Shadowbolt_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
if (pTarget)
pTarget = me->getVictim();
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+19 -19
View File
@@ -112,15 +112,15 @@ class boss_nazan : public CreatureScript
{
summoned->SetLevel(me->getLevel());
summoned->setFaction(me->getFaction());
summoned->CastSpell(summoned, DUNGEON_MODE(SPELL_SUMMON_LIQUID_FIRE,SPELL_SUMMON_LIQUID_FIRE_H),true);
summoned->CastSpell(summoned,SPELL_FIRE_NOVA_VISUAL,true);
summoned->CastSpell(summoned, DUNGEON_MODE(SPELL_SUMMON_LIQUID_FIRE, SPELL_SUMMON_LIQUID_FIRE_H), true);
summoned->CastSpell(summoned, SPELL_FIRE_NOVA_VISUAL, true);
}
}
void SpellHitTarget(Unit *pTarget, const SpellEntry* entry)
{
if (pTarget && entry->Id == uint32(SPELL_FIREBALL))
me->SummonCreature(ENTRY_LIQUID_FIRE,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),pTarget->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,30000);
me->SummonCreature(ENTRY_LIQUID_FIRE, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), pTarget->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 30000);
}
void UpdateAI(const uint32 diff)
@@ -130,16 +130,16 @@ class boss_nazan : public CreatureScript
if (Fireball_Timer <= diff)
{
if (Unit* pVictim = SelectTarget(SELECT_TARGET_RANDOM,0))
if (Unit* pVictim = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pVictim, DUNGEON_MODE(SPELL_FIREBALL, SPELL_FIREBALL_H), true);
Fireball_Timer = urand(4000,7000);
Fireball_Timer = urand(4000, 7000);
}
else
Fireball_Timer -= diff;
if (flight) // phase 1 - the flight
{
Creature *Vazruden = Unit::GetCreature(*me,VazrudenGUID);
Creature *Vazruden = Unit::GetCreature(*me, VazrudenGUID);
if (Fly_Timer < diff || !(Vazruden && Vazruden->isAlive() && Vazruden->HealthAbovePct(20)))
{
flight = false;
@@ -148,7 +148,7 @@ class boss_nazan : public CreatureScript
me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
me->GetMotionMaster()->Clear();
if (Unit* pVictim = SelectTarget(SELECT_TARGET_NEAREST,0))
if (Unit* pVictim = SelectTarget(SELECT_TARGET_NEAREST, 0))
me->AI()->AttackStart(pVictim);
DoStartMovement(me->getVictim());
DoScriptText(EMOTE, me);
@@ -160,8 +160,8 @@ class boss_nazan : public CreatureScript
if (Turn_Timer <= diff)
{
uint32 waypoint = (Fly_Timer/10000)%2;
if (!me->IsWithinDist3d(VazrudenRing[waypoint][0],VazrudenRing[waypoint][1],VazrudenRing[waypoint][2], 5))
me->GetMotionMaster()->MovePoint(0,VazrudenRing[waypoint][0],VazrudenRing[waypoint][1],VazrudenRing[waypoint][2]);
if (!me->IsWithinDist3d(VazrudenRing[waypoint][0], VazrudenRing[waypoint][1], VazrudenRing[waypoint][2], 5))
me->GetMotionMaster()->MovePoint(0, VazrudenRing[waypoint][0], VazrudenRing[waypoint][1], VazrudenRing[waypoint][2]);
Turn_Timer = 10000;
}
else
@@ -227,13 +227,13 @@ class boss_vazruden : public CreatureScript
void EnterCombat(Unit * /*who*/)
{
DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me);
DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
}
void KilledUnit(Unit* who)
{
if (who && who->GetEntry() != ENTRY_VAZRUDEN)
DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me);
DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me);
}
void JustDied(Unit* who)
@@ -263,7 +263,7 @@ class boss_vazruden : public CreatureScript
if (Revenge_Timer <= diff)
{
if (Unit *victim = me->getVictim())
DoCast(victim, DUNGEON_MODE(SPELL_REVENGE,SPELL_REVENGE_H));
DoCast(victim, DUNGEON_MODE(SPELL_REVENGE, SPELL_REVENGE_H));
Revenge_Timer = 5000;
}
else
@@ -346,9 +346,9 @@ class boss_vazruden_the_herald : public CreatureScript
{
if (!summoned)
{
if (Creature* Vazruden = me->SummonCreature(ENTRY_VAZRUDEN,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,6000000))
if (Creature* Vazruden = me->SummonCreature(ENTRY_VAZRUDEN, VazrudenMiddle[0], VazrudenMiddle[1], VazrudenMiddle[2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 6000000))
VazrudenGUID = Vazruden->GetGUID();
if (Creature* Nazan = me->SummonCreature(ENTRY_NAZAN,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,6000000))
if (Creature* Nazan = me->SummonCreature(ENTRY_NAZAN, VazrudenMiddle[0], VazrudenMiddle[1], VazrudenMiddle[2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 6000000))
NazanGUID = Nazan->GetGUID();
summoned = true;
me->SetVisible(false);
@@ -405,10 +405,10 @@ class boss_vazruden_the_herald : public CreatureScript
case 1: // go to the middle and begin the fight
if (check <= diff)
{
if (!me->IsWithinDist3d(VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],5))
if (!me->IsWithinDist3d(VazrudenMiddle[0], VazrudenMiddle[1], VazrudenMiddle[2], 5))
{
me->GetMotionMaster()->Clear();
me->GetMotionMaster()->MovePoint(0,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2]);
me->GetMotionMaster()->MovePoint(0, VazrudenMiddle[0], VazrudenMiddle[1], VazrudenMiddle[2]);
check = 1000;
}
else
@@ -439,7 +439,7 @@ class boss_vazruden_the_herald : public CreatureScript
}
else if (!lootSpawned)
{
me->SummonGameObject(DUNGEON_MODE(ENTRY_REINFORCED_FEL_IRON_CHEST, ENTRY_REINFORCED_FEL_IRON_CHEST_H),VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,0,0,0,0,0);
me->SummonGameObject(DUNGEON_MODE(ENTRY_REINFORCED_FEL_IRON_CHEST, ENTRY_REINFORCED_FEL_IRON_CHEST_H), VazrudenMiddle[0], VazrudenMiddle[1], VazrudenMiddle[2], 0, 0, 0, 0, 0, 0);
me->SetLootRecipient(NULL); // don't think this is necessary..
//me->Kill(me);
lootSpawned = true;
@@ -475,14 +475,14 @@ class mob_hellfire_sentry : public CreatureScript
void Reset()
{
KidneyShot_Timer = urand(3000,7000);
KidneyShot_Timer = urand(3000, 7000);
}
void EnterCombat(Unit* /*who*/) {}
void JustDied(Unit* who)
{
if (Creature *herald = me->FindNearestCreature(ENTRY_VAZRUDEN_HERALD,150))
if (Creature *herald = me->FindNearestCreature(ENTRY_VAZRUDEN_HERALD, 150))
CAST_AI(boss_vazruden_the_herald::boss_vazruden_the_heraldAI, herald->AI())->SentryDownBy(who);
}
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
+3 -3
View File
@@ -80,7 +80,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript
void EnterCombat(Unit * /*who*/)
{
DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me);
DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
}
void MoveInLineOfSight(Unit* who)
@@ -106,7 +106,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me);
DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me);
}
void JustDied(Unit* /*Killer*/)
@@ -131,7 +131,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript
{
DoScriptText(SAY_SURGE, me);
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_SURGE);
Surge_Timer = 5000+rand()%8000;
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
+1 -1
View File
@@ -66,7 +66,7 @@ class instance_ramparts : public InstanceMapScript
void SetData(uint32 uiType, uint32 uiData)
{
sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Ramparts: SetData received for type %u with data %u",uiType,uiData);
sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Ramparts: SetData received for type %u with data %u", uiType, uiData);
switch(uiType)
{
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+14 -14
View File
@@ -158,7 +158,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript
void DoTauntPeons()
{
DoScriptText(RAND(SAY_TAUNT_1,SAY_TAUNT_2,SAY_TAUNT_3), me);
DoScriptText(RAND(SAY_TAUNT_1, SAY_TAUNT_2, SAY_TAUNT_3), me);
//TODO: kill the peons first
IsIntroEvent = false;
@@ -194,7 +194,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript
IsIntroEvent = true;
if (pInstance)
pInstance->SetData(TYPE_NETHEKURSE,IN_PROGRESS);
pInstance->SetData(TYPE_NETHEKURSE, IN_PROGRESS);
}
if (IsIntroEvent || !IsMainEvent)
@@ -205,7 +205,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript
void EnterCombat(Unit * /*who*/)
{
DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me);
DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
}
void JustSummoned(Creature *summoned)
@@ -215,13 +215,13 @@ class boss_grand_warlock_nethekurse : public CreatureScript
summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
//triggered spell of consumption does not properly show it's SpellVisual, wrong spellid?
summoned->CastSpell(summoned,SPELL_TEMPORARY_VISUAL,true);
summoned->CastSpell(summoned,SPELL_CONSUMPTION,false,0,0,me->GetGUID());
summoned->CastSpell(summoned, SPELL_TEMPORARY_VISUAL, true);
summoned->CastSpell(summoned, SPELL_CONSUMPTION, false, 0, 0, me->GetGUID());
}
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me);
DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
}
void JustDied(Unit* /*Killer*/)
@@ -231,7 +231,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript
if (!pInstance)
return;
pInstance->SetData(TYPE_NETHEKURSE,DONE);
pInstance->SetData(TYPE_NETHEKURSE, DONE);
pInstance->HandleGameObject(pInstance->GetData64(DATA_NETHEKURSE_DOOR), true);
}
@@ -277,18 +277,18 @@ class boss_grand_warlock_nethekurse : public CreatureScript
{
if (ShadowFissure_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_SHADOW_FISSURE);
ShadowFissure_Timer = urand(7500,15000);
ShadowFissure_Timer = urand(7500, 15000);
}
else
ShadowFissure_Timer -= diff;
if (DeathCoil_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_DEATH_COIL);
DeathCoil_Timer = urand(15000,20000);
DeathCoil_Timer = urand(15000, 20000);
}
else
DeathCoil_Timer -= diff;
@@ -342,7 +342,7 @@ class mob_fel_orc_convert : public CreatureScript
{
if (pInstance->GetData64(DATA_NETHEKURSE))
{
Creature *pKurse = Unit::GetCreature(*me,pInstance->GetData64(DATA_NETHEKURSE));
Creature *pKurse = Unit::GetCreature(*me, pInstance->GetData64(DATA_NETHEKURSE));
if (pKurse && me->IsWithinDist(pKurse, 45.0f))
{
CAST_AI(boss_grand_warlock_nethekurse::boss_grand_warlock_nethekurseAI, pKurse->AI())->DoYellForPeonAggro();
@@ -350,7 +350,7 @@ class mob_fel_orc_convert : public CreatureScript
if (pInstance->GetData(TYPE_NETHEKURSE) == IN_PROGRESS)
return;
else
pInstance->SetData(TYPE_NETHEKURSE,IN_PROGRESS);
pInstance->SetData(TYPE_NETHEKURSE, IN_PROGRESS);
}
}
}
@@ -363,7 +363,7 @@ class mob_fel_orc_convert : public CreatureScript
if (pInstance->GetData(TYPE_NETHEKURSE) != IN_PROGRESS)
return;
if (pInstance->GetData64(DATA_NETHEKURSE))
if (Creature *pKurse = Unit::GetCreature(*me,pInstance->GetData64(DATA_NETHEKURSE)))
if (Creature *pKurse = Unit::GetCreature(*me, pInstance->GetData64(DATA_NETHEKURSE)))
CAST_AI(boss_grand_warlock_nethekurse::boss_grand_warlock_nethekurseAI, pKurse->AI())->DoYellForPeonDeath();
}
}
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
+12 -12
View File
@@ -190,13 +190,13 @@ class boss_warbringer_omrogg : public CreatureScript
void Reset()
{
if (Unit* pLeftHead = Unit::GetUnit(*me,LeftHeadGUID))
if (Unit* pLeftHead = Unit::GetUnit(*me, LeftHeadGUID))
{
pLeftHead->setDeathState(JUST_DIED);
LeftHeadGUID = 0;
}
if (Unit* pRightHead = Unit::GetUnit(*me,RightHeadGUID))
if (Unit* pRightHead = Unit::GetUnit(*me, RightHeadGUID))
{
pRightHead->setDeathState(JUST_DIED);
RightHeadGUID = 0;
@@ -221,8 +221,8 @@ class boss_warbringer_omrogg : public CreatureScript
void DoYellForThreat()
{
Unit *pLeftHead = Unit::GetUnit(*me,LeftHeadGUID);
Unit *pRightHead = Unit::GetUnit(*me,RightHeadGUID);
Unit *pLeftHead = Unit::GetUnit(*me, LeftHeadGUID);
Unit *pRightHead = Unit::GetUnit(*me, RightHeadGUID);
if (!pLeftHead || !pRightHead)
return;
@@ -242,7 +242,7 @@ class boss_warbringer_omrogg : public CreatureScript
me->SummonCreature(NPC_LEFT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
me->SummonCreature(NPC_RIGHT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
if (Unit *pLeftHead = Unit::GetUnit(*me,LeftHeadGUID))
if (Unit *pLeftHead = Unit::GetUnit(*me, LeftHeadGUID))
{
iaggro = rand()%3;
@@ -271,8 +271,8 @@ class boss_warbringer_omrogg : public CreatureScript
void KilledUnit(Unit* /*victim*/)
{
Unit* pLeftHead = Unit::GetUnit(*me,LeftHeadGUID);
Unit* pRightHead = Unit::GetUnit(*me,RightHeadGUID);
Unit* pLeftHead = Unit::GetUnit(*me, LeftHeadGUID);
Unit* pRightHead = Unit::GetUnit(*me, RightHeadGUID);
if (!pLeftHead || !pRightHead)
return;
@@ -297,8 +297,8 @@ class boss_warbringer_omrogg : public CreatureScript
void JustDied(Unit* /*Killer*/)
{
Unit* pLeftHead = Unit::GetUnit(*me,LeftHeadGUID);
Unit* pRightHead = Unit::GetUnit(*me,RightHeadGUID);
Unit* pLeftHead = Unit::GetUnit(*me, LeftHeadGUID);
Unit* pRightHead = Unit::GetUnit(*me, RightHeadGUID);
if (!pLeftHead || !pRightHead)
return;
@@ -317,8 +317,8 @@ class boss_warbringer_omrogg : public CreatureScript
{
Delay_Timer = 3500;
Unit* pLeftHead = Unit::GetUnit(*me,LeftHeadGUID);
Unit* pRightHead = Unit::GetUnit(*me,RightHeadGUID);
Unit* pLeftHead = Unit::GetUnit(*me, LeftHeadGUID);
Unit* pRightHead = Unit::GetUnit(*me, RightHeadGUID);
if (!pLeftHead || !pRightHead)
return;
@@ -383,7 +383,7 @@ class boss_warbringer_omrogg : public CreatureScript
if (ResetThreat_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
DoYellForThreat();
DoResetThreat();
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
+26 -26
View File
@@ -55,9 +55,9 @@ enum eCreatures
#define TARGET_NUM 5
float AssassEntrance[3] = {275.136f,-84.29f,2.3f}; // y -8
float AssassExit[3] = {184.233f,-84.29f,2.3f}; // y -8
float AddsEntrance[3] = {306.036f,-84.29f,1.93f};
float AssassEntrance[3] = {275.136f, -84.29f, 2.3f}; // y -8
float AssassExit[3] = {184.233f, -84.29f, 2.3f}; // y -8
float AddsEntrance[3] = {306.036f, -84.29f, 1.93f};
class boss_warchief_kargath_bladefist : public CreatureScript
{
@@ -94,7 +94,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
{
removeAdds();
me->SetSpeed(MOVE_RUN,2);
me->SetSpeed(MOVE_RUN, 2);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
summoned = 2;
@@ -110,7 +110,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
void EnterCombat(Unit * /*who*/)
{
DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me);
DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me);
}
void JustSummoned(Creature *summoned)
@@ -120,7 +120,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
case MOB_HEARTHEN_GUARD:
case MOB_SHARPSHOOTER_GUARD:
case MOB_REAVER_GUARD:
summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM,0));
summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0));
adds.push_back(summoned->GetGUID());
break;
case MOB_SHATTERED_ASSASSIN:
@@ -133,7 +133,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
{
if (victim->GetTypeId() == TYPEID_PLAYER)
{
DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me);
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
}
}
@@ -166,11 +166,11 @@ 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);
me->DealDamage(temp,temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
me->DealDamage(temp, temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
CAST_CRE(temp)->RemoveCorpse();
}
}
@@ -178,11 +178,11 @@ 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);
me->DealDamage(temp,temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
me->DealDamage(temp, temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
CAST_CRE(temp)->RemoveCorpse();
}
}
@@ -190,10 +190,10 @@ class boss_warchief_kargath_bladefist : public CreatureScript
}
void SpawnAssassin()
{
me->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassEntrance[0],AssassEntrance[1]+8, AssassEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000);
me->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassEntrance[0],AssassEntrance[1]-8, AssassEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000);
me->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassExit[0],AssassExit[1]+8, AssassExit[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000);
me->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassExit[0],AssassExit[1]-8, AssassExit[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000);
me->SummonCreature(MOB_SHATTERED_ASSASSIN, AssassEntrance[0], AssassEntrance[1]+8, AssassEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
me->SummonCreature(MOB_SHATTERED_ASSASSIN, AssassEntrance[0], AssassEntrance[1]-8, AssassEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
me->SummonCreature(MOB_SHATTERED_ASSASSIN, AssassExit[0], AssassExit[1]+8, AssassExit[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
me->SummonCreature(MOB_SHATTERED_ASSASSIN, AssassExit[0], AssassExit[1]-8, AssassExit[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
}
void UpdateAI(const uint32 diff)
@@ -223,7 +223,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
{
// stop bladedance
InBlade = false;
me->SetSpeed(MOVE_RUN,2);
me->SetSpeed(MOVE_RUN, 2);
me->GetMotionMaster()->MoveChase(me->getVictim());
Blade_Dance_Timer = 30000;
Wait_Timer = 0;
@@ -233,12 +233,12 @@ class boss_warchief_kargath_bladefist : public CreatureScript
else
{
//move in bladedance
float x,y,randx,randy;
float x, y, randx, randy;
randx = 0.0f + rand()%40;
randy = 0.0f + rand()%40;
x = 210+ randx ;
y = -60- randy ;
me->GetMotionMaster()->MovePoint(1,x,y,me->GetPositionZ());
me->GetMotionMaster()->MovePoint(1, x, y, me->GetPositionZ());
Wait_Timer = 0;
}
}
@@ -256,7 +256,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
Wait_Timer = 1;
InBlade = true;
Blade_Dance_Timer = 0;
me->SetSpeed(MOVE_RUN,4);
me->SetSpeed(MOVE_RUN, 4);
return;
}
else
@@ -278,22 +278,22 @@ class boss_warchief_kargath_bladefist : public CreatureScript
{
for (uint8 i = 0; i < summoned; ++i)
{
switch (urand(0,2))
switch (urand(0, 2))
{
case 0:
me->SummonCreature(MOB_HEARTHEN_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000);
me->SummonCreature(MOB_HEARTHEN_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
break;
case 1:
me->SummonCreature(MOB_SHARPSHOOTER_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000);
me->SummonCreature(MOB_SHARPSHOOTER_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
break;
case 2:
me->SummonCreature(MOB_REAVER_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000);
me->SummonCreature(MOB_REAVER_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
break;
}
}
if (urand(0,9) < 2)
if (urand(0, 9) < 2)
++summoned;
Summon_Assistant_Timer = urand(25000,35000);
Summon_Assistant_Timer = urand(25000, 35000);
}
else
Summon_Assistant_Timer -= diff;
@@ -303,7 +303,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
if (resetcheck_timer <= diff)
{
uint32 tempx,tempy;
uint32 tempx, tempy;
tempx = uint32(me->GetPositionX());
tempy = uint32(me->GetPositionY());
if (tempx > 255 || tempx < 205)