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/TempestKeep/Eye/boss_alar.cpp
+3 -3
View File
@@ -28,7 +28,7 @@ EndScriptData */
enum eSpells
{
SPELL_FLAME_BUFFET = 34121, // Flame Buffet - every 1,5 secs in phase 1 if there is no victim in melee range and after Dive Bomb in phase 2 with same conditions
SPELL_FLAME_BUFFET = 34121, // Flame Buffet - every 1, 5 secs in phase 1 if there is no victim in melee range and after Dive Bomb in phase 2 with same conditions
SPELL_FLAME_QUILLS = 34229, // Randomly after changing position in phase after watching tons of movies, set probability 20%
SPELL_REBIRTH = 34342, // Rebirth - beginning of second phase(after losing all health in phase 1)
SPELL_REBIRTH_2 = 35369, // Rebirth(another, without healing to full HP) - after Dive Bomb in phase 2
@@ -291,7 +291,7 @@ class boss_alar : public CreatureScript
if (me->IsWithinDist3d(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 5.0f))
dist = 5.0f;
WaitTimer = 1000 + uint32(floor(dist / 80 * 1000.0f));
me->GetMap()->CreatureRelocation(me, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(),0.0f);
me->GetMap()->CreatureRelocation(me, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0.0f);
me->StopMoving();
WaitEvent = WE_LAND;
}
@@ -343,7 +343,7 @@ class boss_alar : public CreatureScript
}
else
{
if (urand(0,4)) // next platform
if (urand(0, 4)) // next platform
{
DoSpawnCreature(CREATURE_EMBER_OF_ALAR, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
if (cur_wp == 3)
src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+3 -3
View File
@@ -145,7 +145,7 @@ class boss_high_astromancer_solarian : public CreatureScript
void KilledUnit(Unit * /*victim*/)
{
DoScriptText(RAND(SAY_KILL1,SAY_KILL2,SAY_KILL3), me);
DoScriptText(RAND(SAY_KILL1, SAY_KILL2, SAY_KILL3), me);
}
void JustDied(Unit * /*victim*/)
@@ -180,7 +180,7 @@ class boss_high_astromancer_solarian : public CreatureScript
float Portal_X(float radius)
{
if (urand(0,1))
if (urand(0, 1))
radius = -radius;
return radius * (float)(rand()%100)/100.0f + CENTER_X;
@@ -447,7 +447,7 @@ class mob_solarium_priest : public CreatureScript
if (healTimer <= diff)
{
Unit *pTarget = NULL;
switch (urand(0,1))
switch (urand(0, 1))
{
case 0:
if (pInstance)
src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+8 -8
View File
@@ -236,7 +236,7 @@ struct advisorbase_ai : public ScriptedAI
me->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->ClearAllReactives();
me->SetUInt64Value(UNIT_FIELD_TARGET,0);
me->SetUInt64Value(UNIT_FIELD_TARGET, 0);
me->GetMotionMaster()->Clear();
me->GetMotionMaster()->MoveIdle();
me->SetStandState(UNIT_STAND_STATE_DEAD);
@@ -431,7 +431,7 @@ class boss_kaelthas : public CreatureScript
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me);
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me);
}
void JustSummoned(Creature* pSummoned)
@@ -798,7 +798,7 @@ class boss_kaelthas : public CreatureScript
if (Phoenix_Timer <= diff)
{
DoCast(me, SPELL_PHOENIX_ANIMATION);
DoScriptText(RAND(SAY_SUMMON_PHOENIX1,SAY_SUMMON_PHOENIX2), me);
DoScriptText(RAND(SAY_SUMMON_PHOENIX1, SAY_SUMMON_PHOENIX2), me);
Phoenix_Timer = 60000;
}
@@ -909,7 +909,7 @@ class boss_kaelthas : public CreatureScript
break;
case 1:
DoScriptText(RAND(SAY_GRAVITYLAPSE1,SAY_GRAVITYLAPSE2), me);
DoScriptText(RAND(SAY_GRAVITYLAPSE1, SAY_GRAVITYLAPSE2), me);
// 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)
@@ -1487,7 +1487,7 @@ class mob_phoenix_tk : public CreatureScript
{
//is this spell in use anylonger?
//DoCast(me, SPELL_EMBER_BLAST, true);
me->SummonCreature(NPC_PHOENIX_EGG,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,16000);
me->SummonCreature(NPC_PHOENIX_EGG, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 16000);
}
void UpdateAI(const uint32 diff)
@@ -1498,7 +1498,7 @@ class mob_phoenix_tk : public CreatureScript
if (Cycle_Timer <= diff)
{
//spell Burn should possible do this, but it doesn't, so do this for now.
uint32 dmg = urand(4500,5500);
uint32 dmg = urand(4500, 5500);
if (me->GetHealth() > dmg)
me->ModifyHealth(-int32(dmg));
Cycle_Timer = 2000;
@@ -1553,7 +1553,7 @@ class mob_phoenix_egg_tk : public CreatureScript
void JustSummoned(Creature* summoned)
{
summoned->AddThreat(me->getVictim(), 0.0f);
summoned->CastSpell(summoned,SPELL_REBIRTH,false);
summoned->CastSpell(summoned, SPELL_REBIRTH, false);
}
void UpdateAI(const uint32 diff)
@@ -1563,7 +1563,7 @@ class mob_phoenix_egg_tk : public CreatureScript
if (Rebirth_Timer <= diff)
{
me->SummonCreature(NPC_PHOENIX,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation(),TEMPSUMMON_CORPSE_DESPAWN,5000);
me->SummonCreature(NPC_PHOENIX, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_CORPSE_DESPAWN, 5000);
Rebirth_Timer = 0;
}
else
src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
+4 -4
View File
@@ -82,7 +82,7 @@ class boss_void_reaver : public CreatureScript
void KilledUnit(Unit * /*victim*/)
{
DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me);
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me);
}
void JustDied(Unit * /*victim*/)
@@ -110,7 +110,7 @@ class boss_void_reaver : public CreatureScript
if (Pounding_Timer <= diff)
{
DoCast(me->getVictim(), SPELL_POUNDING);
DoScriptText(RAND(SAY_POUNDING1,SAY_POUNDING2), me);
DoScriptText(RAND(SAY_POUNDING1, SAY_POUNDING2), me);
Pounding_Timer = 15000; //cast time(3000) + cooldown time(12000)
}
else
@@ -141,7 +141,7 @@ class boss_void_reaver : public CreatureScript
pTarget = me->getVictim();
if (pTarget)
me->CastSpell(pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(), SPELL_ARCANE_ORB, false, NULL, NULL, 0, pTarget);
me->CastSpell(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), SPELL_ARCANE_ORB, false, NULL, NULL, 0, pTarget);
ArcaneOrb_Timer = 3000;
}
else
@@ -152,7 +152,7 @@ class boss_void_reaver : public CreatureScript
DoCast(me->getVictim(), SPELL_KNOCK_AWAY);
//Drop 25% aggro
if (DoGetThreat(me->getVictim()))
DoModifyThreatPercent(me->getVictim(),-25);
DoModifyThreatPercent(me->getVictim(), -25);
KnockAway_Timer = 30000;
}
else
src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
+2 -2
View File
@@ -83,7 +83,7 @@ class boss_gatewatcher_iron_hand : public CreatureScript
if (rand()%2)
return;
DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me);
DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
}
void JustDied(Unit* /*Killer*/)
@@ -118,7 +118,7 @@ class boss_gatewatcher_iron_hand : public CreatureScript
if (rand()%2)
return;
DoScriptText(RAND(SAY_HAMMER_1,SAY_HAMMER_2), me);
DoScriptText(RAND(SAY_HAMMER_1, SAY_HAMMER_2), me);
Jackhammer_Timer = 30000;
}
else
src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
+3 -3
View File
@@ -98,7 +98,7 @@ class boss_nethermancer_sepethrea : public CreatureScript
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me);
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
}
void JustDied(Unit* /*Killer*/)
@@ -139,7 +139,7 @@ class boss_nethermancer_sepethrea : public CreatureScript
{
if (rand()%2)
return;
DoScriptText(RAND(SAY_DRAGONS_BREATH_1,SAY_DRAGONS_BREATH_2), me);
DoScriptText(RAND(SAY_DRAGONS_BREATH_1, SAY_DRAGONS_BREATH_2), me);
}
dragons_breath_Timer = 12000 + rand()%10000;
}
@@ -233,7 +233,7 @@ class mob_ragin_flames : public CreatureScript
if (!onlyonce)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
me->GetMotionMaster()->MoveChase(pTarget);
onlyonce = true;
}
src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
+6 -6
View File
@@ -100,7 +100,7 @@ class boss_pathaleon_the_calculator : public CreatureScript
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*/)
@@ -129,8 +129,8 @@ class boss_pathaleon_the_calculator : public CreatureScript
{
for (uint8 i = 0; i < 3; ++i)
{
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
Creature* Wraith = me->SummonCreature(21062,me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
Creature* Wraith = me->SummonCreature(21062, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
if (pTarget && Wraith)
Wraith->AI()->AttackStart(pTarget);
}
@@ -158,9 +158,9 @@ class boss_pathaleon_the_calculator : public CreatureScript
if (Domination_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1))
{
DoScriptText(RAND(SAY_DOMINATION_1,SAY_DOMINATION_2), me);
DoScriptText(RAND(SAY_DOMINATION_1, SAY_DOMINATION_2), me);
DoCast(pTarget, SPELL_DOMINATION);
}
Domination_Timer = 25000 + rand()%5000;
@@ -233,7 +233,7 @@ class mob_nether_wraith : public CreatureScript
if (ArcaneMissiles_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1))
DoCast(pTarget, SPELL_ARCANE_MISSILES);
else
DoCast(me->getVictim(), SPELL_ARCANE_MISSILES);
src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
+22 -22
View File
@@ -126,7 +126,7 @@ class npc_millhouse_manastorm : 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 * /*victim*/)
@@ -177,7 +177,7 @@ class npc_millhouse_manastorm : public CreatureScript
break;
case 7:
if (pInstance)
pInstance->SetData(TYPE_WARDEN_2,DONE);
pInstance->SetData(TYPE_WARDEN_2, DONE);
Init = true;
break;
}
@@ -301,11 +301,11 @@ class npc_warden_mellichar : public CreatureScript
EventProgress_Timer = 22000;
Phase = 1;
me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
DoCast(me, SPELL_TARGET_OMEGA);
if (pInstance)
pInstance->SetData(TYPE_HARBINGERSKYRISS,NOT_STARTED);
pInstance->SetData(TYPE_HARBINGERSKYRISS, NOT_STARTED);
}
void AttackStart(Unit* /*who*/) {}
@@ -335,7 +335,7 @@ class npc_warden_mellichar : public CreatureScript
if (pInstance)
{
pInstance->SetData(TYPE_HARBINGERSKYRISS,IN_PROGRESS);
pInstance->SetData(TYPE_HARBINGERSKYRISS, IN_PROGRESS);
pInstance->HandleGameObject(pInstance->GetData64(DATA_SPHERE_SHIELD), false);
IsRunning = true;
}
@@ -375,23 +375,23 @@ class npc_warden_mellichar : public CreatureScript
{
case 2:
DoCast(me, SPELL_TARGET_ALPHA);
pInstance->SetData(TYPE_WARDEN_1,IN_PROGRESS);
pInstance->SetData(TYPE_WARDEN_1, IN_PROGRESS);
pInstance->HandleGameObject(pInstance->GetData64(DATA_SPHERE_SHIELD), false);
break;
case 3:
DoCast(me, SPELL_TARGET_BETA);
pInstance->SetData(TYPE_WARDEN_2,IN_PROGRESS);
pInstance->SetData(TYPE_WARDEN_2, IN_PROGRESS);
break;
case 5:
DoCast(me, SPELL_TARGET_DELTA);
pInstance->SetData(TYPE_WARDEN_3,IN_PROGRESS);
pInstance->SetData(TYPE_WARDEN_3, IN_PROGRESS);
break;
case 6:
DoCast(me, SPELL_TARGET_GAMMA);
pInstance->SetData(TYPE_WARDEN_4,IN_PROGRESS);
pInstance->SetData(TYPE_WARDEN_4, IN_PROGRESS);
break;
case 7:
pInstance->SetData(TYPE_WARDEN_5,IN_PROGRESS);
pInstance->SetData(TYPE_WARDEN_5, IN_PROGRESS);
break;
}
CanSpawn = true;
@@ -423,46 +423,46 @@ class npc_warden_mellichar : public CreatureScript
switch(Phase)
{
case 2:
switch (urand(0,1))
switch (urand(0, 1))
{
case 0:
me->SummonCreature(ENTRY_TRICKSTER,478.326f,-148.505f,42.56f,3.19f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
me->SummonCreature(ENTRY_TRICKSTER, 478.326f, -148.505f, 42.56f, 3.19f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
break;
case 1:
me->SummonCreature(ENTRY_PH_HUNTER,478.326f,-148.505f,42.56f,3.19f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
me->SummonCreature(ENTRY_PH_HUNTER, 478.326f, -148.505f, 42.56f, 3.19f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
break;
}
break;
case 3:
me->SummonCreature(ENTRY_MILLHOUSE,413.292f,-148.378f,42.56f,6.27f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
me->SummonCreature(ENTRY_MILLHOUSE, 413.292f, -148.378f, 42.56f, 6.27f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
break;
case 4:
DoScriptText(YELL_RELEASE2B, me);
break;
case 5:
switch (urand(0,1))
switch (urand(0, 1))
{
case 0:
me->SummonCreature(ENTRY_AKKIRIS,420.179f,-174.396f,42.58f,0.02f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
me->SummonCreature(ENTRY_AKKIRIS, 420.179f, -174.396f, 42.58f, 0.02f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
break;
case 1:
me->SummonCreature(ENTRY_SULFURON,420.179f,-174.396f,42.58f,0.02f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
me->SummonCreature(ENTRY_SULFURON, 420.179f, -174.396f, 42.58f, 0.02f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
break;
}
break;
case 6:
switch (urand(0,1))
switch (urand(0, 1))
{
case 0:
me->SummonCreature(ENTRY_TW_DRAK,471.795f,-174.58f,42.58f,3.06f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
me->SummonCreature(ENTRY_TW_DRAK, 471.795f, -174.58f, 42.58f, 3.06f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
break;
case 1:
me->SummonCreature(ENTRY_BL_DRAK,471.795f,-174.58f,42.58f,3.06f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
me->SummonCreature(ENTRY_BL_DRAK, 471.795f, -174.58f, 42.58f, 3.06f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
break;
}
break;
case 7:
me->SummonCreature(ENTRY_SKYRISS,445.763f,-191.639f,44.64f,1.60f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
me->SummonCreature(ENTRY_SKYRISS, 445.763f, -191.639f, 44.64f, 1.60f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
DoScriptText(YELL_WELCOME, me);
break;
}
@@ -540,7 +540,7 @@ class mob_zerekethvoidzone : public CreatureScript
void Reset()
{
me->SetUInt32Value(UNIT_NPC_FLAGS,0);
me->SetUInt32Value(UNIT_NPC_FLAGS, 0);
me->setFaction(16);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
+12 -12
View File
@@ -89,7 +89,7 @@ class boss_harbinger_skyriss : public CreatureScript
void Reset()
{
if (!Intro)
me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
IsImage33 = false;
IsImage66 = false;
@@ -116,7 +116,7 @@ class boss_harbinger_skyriss : public CreatureScript
{
DoScriptText(SAY_DEATH, me);
if (pInstance)
pInstance->SetData(TYPE_HARBINGERSKYRISS,DONE);
pInstance->SetData(TYPE_HARBINGERSKYRISS, DONE);
}
void JustSummoned(Creature *summon)
@@ -138,7 +138,7 @@ class boss_harbinger_skyriss : public CreatureScript
if (victim->GetEntry() == 21436)
return;
DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me);
DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me);
}
void DoSplit(uint32 val)
@@ -173,18 +173,18 @@ class boss_harbinger_skyriss : public CreatureScript
break;
case 2:
DoScriptText(SAY_AGGRO, me);
if (Unit *mellic = Unit::GetUnit(*me,pInstance->GetData64(DATA_MELLICHAR)))
if (Unit *mellic = Unit::GetUnit(*me, pInstance->GetData64(DATA_MELLICHAR)))
{
//should have a better way to do this. possibly spell exist.
mellic->setDeathState(JUST_DIED);
mellic->SetHealth(0);
pInstance->SetData(TYPE_SHIELD_OPEN,IN_PROGRESS);
pInstance->SetData(TYPE_SHIELD_OPEN, IN_PROGRESS);
}
++Intro_Phase;
Intro_Timer = 3000;
break;
case 3:
me->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
Intro = true;
break;
}
@@ -208,7 +208,7 @@ class boss_harbinger_skyriss : public CreatureScript
if (MindRend_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1))
DoCast(pTarget, SPELL_MIND_REND);
else
DoCast(me->getVictim(), SPELL_MIND_REND);
@@ -223,9 +223,9 @@ class boss_harbinger_skyriss : public CreatureScript
if (me->IsNonMeleeSpellCasted(false))
return;
DoScriptText(RAND(SAY_FEAR_1,SAY_FEAR_2), me);
DoScriptText(RAND(SAY_FEAR_1, SAY_FEAR_2), me);
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1))
DoCast(pTarget, SPELL_FEAR);
else
DoCast(me->getVictim(), SPELL_FEAR);
@@ -240,9 +240,9 @@ class boss_harbinger_skyriss : public CreatureScript
if (me->IsNonMeleeSpellCasted(false))
return;
DoScriptText(RAND(SAY_MIND_1,SAY_MIND_2), me);
DoScriptText(RAND(SAY_MIND_1, SAY_MIND_2), me);
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1))
DoCast(pTarget, SPELL_DOMINATION);
else
DoCast(me->getVictim(), SPELL_DOMINATION);
@@ -259,7 +259,7 @@ class boss_harbinger_skyriss : public CreatureScript
if (me->IsNonMeleeSpellCasted(false))
return;
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1))
DoCast(pTarget, H_SPELL_MANA_BURN);
ManaBurn_Timer = 16000+rand()%16000;
src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
+10 -10
View File
@@ -30,17 +30,17 @@ EndScriptData */
enum eUnits
{
CONTAINMENT_CORE_SECURITY_FIELD_ALPHA = 184318,//door opened when Wrath-Scryer Soccothrates dies
CONTAINMENT_CORE_SECURITY_FIELD_BETA = 184319,//door opened when Dalliah the Doomsayer dies
POD_ALPHA = 183961,//pod first boss wave
POD_BETA = 183963,//pod second boss wave
POD_DELTA = 183964,//pod third boss wave
POD_GAMMA = 183962,//pod fourth boss wave
POD_OMEGA = 183965,//pod fifth boss wave
WARDENS_SHIELD = 184802,// warden shield
SEAL_SPHERE = 184802,//shield 'protecting' mellichar
CONTAINMENT_CORE_SECURITY_FIELD_ALPHA = 184318, //door opened when Wrath-Scryer Soccothrates dies
CONTAINMENT_CORE_SECURITY_FIELD_BETA = 184319, //door opened when Dalliah the Doomsayer dies
POD_ALPHA = 183961, //pod first boss wave
POD_BETA = 183963, //pod second boss wave
POD_DELTA = 183964, //pod third boss wave
POD_GAMMA = 183962, //pod fourth boss wave
POD_OMEGA = 183965, //pod fifth boss wave
WARDENS_SHIELD = 184802, // warden shield
SEAL_SPHERE = 184802, //shield 'protecting' mellichar
MELLICHAR = 20904,//skyriss will kill this unit
MELLICHAR = 20904, //skyriss will kill this unit
};
/* Arcatraz encounters:
src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
+4 -4
View File
@@ -104,7 +104,7 @@ class boss_high_botanist_freywinn : 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*/)
@@ -119,7 +119,7 @@ class boss_high_botanist_freywinn : public CreatureScript
if (TreeForm_Timer <= diff)
{
DoScriptText(RAND(SAY_TREE_1,SAY_TREE_2), me);
DoScriptText(RAND(SAY_TREE_1, SAY_TREE_2), me);
if (me->IsNonMeleeSpellCasted(false))
me->InterruptNonMeleeSpells(true);
@@ -146,7 +146,7 @@ class boss_high_botanist_freywinn : public CreatureScript
{
for (std::list<uint64>::iterator itr = Adds_List.begin(); itr != Adds_List.end(); ++itr)
{
if (Unit *temp = Unit::GetUnit(*me,*itr))
if (Unit *temp = Unit::GetUnit(*me, *itr))
{
if (!temp->isAlive())
{
@@ -179,7 +179,7 @@ class boss_high_botanist_freywinn : public CreatureScript
return;
}
/*if (me->HasAura(SPELL_TREE_FORM,0) || me->HasAura(SPELL_TRANQUILITY,0))
/*if (me->HasAura(SPELL_TREE_FORM, 0) || me->HasAura(SPELL_TRANQUILITY, 0))
return;*/
//one random seedling every 5 secs, but not in tree form
src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
+8 -8
View File
@@ -98,14 +98,14 @@ class mob_warp_splinter_treant : public CreatureScript
{
if (Unit *Warp = Unit::GetUnit(*me, WarpGuid))
{
if (me->IsWithinMeleeRange(Warp,2.5f))
if (me->IsWithinMeleeRange(Warp, 2.5f))
{
int32 CurrentHP_Treant = (int32)me->GetHealth();
Warp->CastCustomSpell(Warp,SPELL_HEAL_FATHER,&CurrentHP_Treant, 0, 0, true,0 ,0, me->GetGUID());
Warp->CastCustomSpell(Warp, SPELL_HEAL_FATHER, &CurrentHP_Treant, 0, 0, true, 0 , 0, me->GetGUID());
me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
return;
}
me->GetMotionMaster()->MoveFollow(Warp,0,0);
me->GetMotionMaster()->MoveFollow(Warp, 0, 0);
}
check_Timer = 1000;
}
@@ -166,7 +166,7 @@ class boss_warp_splinter : public CreatureScript
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*/)
@@ -182,12 +182,12 @@ class boss_warp_splinter : public CreatureScript
float X = Treant_Spawn_Pos_X + TREANT_SPAWN_DIST * cos(angle);
float Y = Treant_Spawn_Pos_Y + TREANT_SPAWN_DIST * sin(angle);
float O = - me->GetAngle(X,Y);
float O = - me->GetAngle(X, Y);
if (Creature *pTreant = me->SummonCreature(CREATURE_TREANT,treant_pos[i][0],treant_pos[i][1],treant_pos[i][2],O,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,25000))
if (Creature *pTreant = me->SummonCreature(CREATURE_TREANT, treant_pos[i][0], treant_pos[i][1], treant_pos[i][2], O, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 25000))
CAST_AI(mob_warp_splinter_treant::mob_warp_splinter_treantAI, pTreant->AI())->WarpGuid = me->GetGUID();
}
DoScriptText(RAND(SAY_SUMMON_1,SAY_SUMMON_2), me);
DoScriptText(RAND(SAY_SUMMON_1, SAY_SUMMON_2), me);
}
void UpdateAI(const uint32 diff)
@@ -207,7 +207,7 @@ class boss_warp_splinter : public CreatureScript
//Check for Arcane Volley
if (Arcane_Volley_Timer <= diff)
{
DoCast(me->getVictim(), DUNGEON_MODE(ARCANE_VOLLEY,ARCANE_VOLLEY_H));
DoCast(me->getVictim(), DUNGEON_MODE(ARCANE_VOLLEY, ARCANE_VOLLEY_H));
Arcane_Volley_Timer = 20000 + rand()%15000;
}
else