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/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
+4 -4
View File
@@ -201,7 +201,7 @@ public:
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 * /*killer*/)
@@ -432,7 +432,7 @@ public:
pet = true;
//uint32 spell_id;
uint32 pet_id;
if (!urand(0,1))
if (!urand(0, 1))
{
//spell_id = SPELL_SUMMON_FATHOM_LURKER;
pet_id = CREATURE_FATHOM_LURKER;
@@ -443,8 +443,8 @@ public:
pet_id = CREATURE_FATHOM_SPOREBAT;
}
//DoCast(me, spell_id, true);
Creature *Pet = DoSpawnCreature(pet_id,0,0,0,0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
Creature *Pet = DoSpawnCreature(pet_id, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (Pet && pTarget)
{
Pet->AI()->AttackStart(pTarget);
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
+9 -9
View File
@@ -137,18 +137,18 @@ public:
void SummonBeams()
{
Creature* beamer = me->SummonCreature(ENTRY_BEAM_DUMMY,-258.333f,-356.34f,22.0499f,5.90835f,TEMPSUMMON_CORPSE_DESPAWN,0);
Creature* beamer = me->SummonCreature(ENTRY_BEAM_DUMMY, -258.333f, -356.34f, 22.0499f, 5.90835f, TEMPSUMMON_CORPSE_DESPAWN, 0);
if (beamer)
{
beamer->CastSpell(me,SPELL_BLUE_BEAM,true);
beamer->CastSpell(me, SPELL_BLUE_BEAM, true);
beamer->SetDisplayId(11686); //invisible
beamer->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
beams[0]=beamer->GetGUID();
}
beamer = me->SummonCreature(ENTRY_BEAM_DUMMY,-219.918f,-371.308f,22.0042f,2.73072f,TEMPSUMMON_CORPSE_DESPAWN,0);
beamer = me->SummonCreature(ENTRY_BEAM_DUMMY, -219.918f, -371.308f, 22.0042f, 2.73072f, TEMPSUMMON_CORPSE_DESPAWN, 0);
if (beamer)
{
beamer->CastSpell(me,SPELL_BLUE_BEAM,true);
beamer->CastSpell(me, SPELL_BLUE_BEAM, true);
beamer->SetDisplayId(11686); //invisible
beamer->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
beams[1]=beamer->GetGUID();
@@ -158,7 +158,7 @@ public:
{
for (uint8 i=0; i<2; ++i)
{
Creature* mob = Unit::GetCreature(*me,beams[i]);
Creature* mob = Unit::GetCreature(*me, beams[i]);
if (mob)
{
mob->setDeathState(DEAD);
@@ -178,11 +178,11 @@ public:
{
if (CorruptedForm)
{
DoScriptText(RAND(SAY_CORRUPT_SLAY1,SAY_CORRUPT_SLAY2), me);
DoScriptText(RAND(SAY_CORRUPT_SLAY1, SAY_CORRUPT_SLAY2), me);
}
else
{
DoScriptText(RAND(SAY_CLEAN_SLAY1,SAY_CLEAN_SLAY2), me);
DoScriptText(RAND(SAY_CLEAN_SLAY1, SAY_CLEAN_SLAY2), me);
}
}
@@ -191,13 +191,13 @@ public:
if (summoned->GetEntry() == ENTRY_PURE_SPAWN)
{
summoned->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true);
summoned->CastSpell(summoned,SPELL_ELEMENTAL_SPAWNIN,true);
summoned->CastSpell(summoned, SPELL_ELEMENTAL_SPAWNIN, true);
Summons.Summon(summoned);
}
if (summoned->GetEntry() == ENTRY_TAINTED_SPAWN)
{
summoned->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, true);
summoned->CastSpell(summoned,SPELL_ELEMENTAL_SPAWNIN,true);
summoned->CastSpell(summoned, SPELL_ELEMENTAL_SPAWNIN, true);
Summons.Summon(summoned);
}
}
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
+13 -13
View File
@@ -228,7 +228,7 @@ public:
}
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*/)
@@ -241,7 +241,7 @@ public:
void StartEvent()
{
DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3,SAY_AGGRO4), me);
DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3, SAY_AGGRO4), me);
Phase = 1;
@@ -301,7 +301,7 @@ public:
void CastShootOrMultishot()
{
switch (urand(0,1))
switch (urand(0, 1))
{
case 0:
//Shoot
@@ -316,7 +316,7 @@ public:
}
if (rand()%3)
{
DoScriptText(RAND(SAY_BOWSHOT1,SAY_BOWSHOT2), me);
DoScriptText(RAND(SAY_BOWSHOT1, SAY_BOWSHOT2), me);
}
}
@@ -601,8 +601,8 @@ public:
void Reset()
{
me->SetSpeed(MOVE_WALK,0.6f);//walk
me->SetSpeed(MOVE_RUN,0.6f);//run
me->SetSpeed(MOVE_WALK, 0.6f);//walk
me->SetSpeed(MOVE_RUN, 0.6f);//run
move = 0;
phase = 1;
@@ -618,7 +618,7 @@ public:
}
else
{
if (me->GetDistance(ElementWPPos[i][0],ElementWPPos[i][1],ElementWPPos[i][2]) < me->GetDistance(x,y,z))
if (me->GetDistance(ElementWPPos[i][0], ElementWPPos[i][1], ElementWPPos[i][2]) < me->GetDistance(x, y, z))
{
x = ElementWPPos[i][0];
y = ElementWPPos[i][1];
@@ -647,7 +647,7 @@ public:
me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
if (phase == 1)
me->GetMotionMaster()->MovePoint(0, x, y, z);
if (phase == 1 && me->IsWithinDist3d(x,y,z, 0.1f))
if (phase == 1 && me->IsWithinDist3d(x, y, z, 0.1f))
phase = 2;
if (phase == 2)
{
@@ -676,7 +676,7 @@ public:
};
//Tainted Elemental
//This mob has 7,900 life, doesn't move, and shoots Poison Bolts at one person anywhere in the area, doing 3,000 nature damage and placing a posion doing 2,000 damage every 2 seconds. He will switch targets often, or sometimes just hang on a single player, but there is nothing you can do about it except heal the damage and kill the Tainted Elemental
//This mob has 7, 900 life, doesn't move, and shoots Poison Bolts at one person anywhere in the area, doing 3, 000 nature damage and placing a posion doing 2, 000 damage every 2 seconds. He will switch targets often, or sometimes just hang on a single player, but there is nothing you can do about it except heal the damage and kill the Tainted Elemental
class mob_tainted_elemental : public CreatureScript
{
public:
@@ -812,7 +812,7 @@ public:
if (movement_timer <= diff)
{
uint32 rndpos = rand()%8;
me->GetMotionMaster()->MovePoint(1,SporebatWPPos[rndpos][0], SporebatWPPos[rndpos][1], SporebatWPPos[rndpos][2]);
me->GetMotionMaster()->MovePoint(1, SporebatWPPos[rndpos][0], SporebatWPPos[rndpos][1], SporebatWPPos[rndpos][2]);
movement_timer = 6000;
} else movement_timer -= diff;
@@ -823,11 +823,11 @@ public:
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget)
{
Creature* trig = me->SummonCreature(TOXIC_SPORES_TRIGGER,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,30000);
Creature* trig = me->SummonCreature(TOXIC_SPORES_TRIGGER, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 30000);
if (trig)
{
trig->setFaction(14);
trig->CastSpell(trig, SPELL_TOXIC_SPORES,true);
trig->CastSpell(trig, SPELL_TOXIC_SPORES, true);
}
}
bolt_timer = 10000+rand()%5000;
@@ -859,7 +859,7 @@ public:
};
//Coilfang Elite
//It's an elite Naga mob with 170,000 HP. It does about 5000 damage on plate, and has a nasty cleave hitting for about 7500 damage
//It's an elite Naga mob with 170, 000 HP. It does about 5000 damage on plate, and has a nasty cleave hitting for about 7500 damage
class mob_coilfang_elite : public CreatureScript
{
public:
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
+14 -14
View File
@@ -96,7 +96,7 @@ public:
}
void JustDied(Unit * /*victim*/)
{
Unit* pUnit = Unit::GetUnit((*me),victimGUID);
Unit* pUnit = Unit::GetUnit((*me), victimGUID);
if (pUnit && pUnit->HasAura(SPELL_INSIDIOUS_WHISPER))
pUnit->RemoveAurasDueToSpell(SPELL_INSIDIOUS_WHISPER);
}
@@ -124,10 +124,10 @@ 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);
me->AddThreat(owner, 999999);
AttackStart(owner);
} else if (owner && owner->isDead())
{
@@ -172,7 +172,7 @@ public:
{
boss_leotheras_the_blindAI(Creature *c) : ScriptedAI(c)
{
c->GetPosition(x,y,z);
c->GetPosition(x, y, z);
pInstance = c->GetInstanceScript();
Demon = 0;
@@ -195,7 +195,7 @@ public:
bool DemonForm;
bool IsFinalForm;
bool EnrageUsed;
float x,y,z;
float x, y, z;
uint64 InnderDemon[5];
uint32 InnerDemon_Count;
@@ -233,7 +233,7 @@ public:
{
for (uint8 i = 0; i < 3; ++i)
{
if (Creature *add = Unit::GetCreature(*me,SpellBinderGUID[i]))
if (Creature *add = Unit::GetCreature(*me, SpellBinderGUID[i]))
add->DisappearAndDie();
float nx = x;
@@ -242,7 +242,7 @@ public:
if (i == 0) {nx += 10; ny -= 5; o=2.5f;}
if (i == 1) {nx -= 8; ny -= 7; o=0.9f;}
if (i == 2) {nx -= 3; ny += 9; o=5.0f;}
Creature* binder = me->SummonCreature(MOB_SPELLBINDER,nx,ny,z,o,TEMPSUMMON_DEAD_DESPAWN,0);
Creature* binder = me->SummonCreature(MOB_SPELLBINDER, nx, ny, z, o, TEMPSUMMON_DEAD_DESPAWN, 0);
if (binder)
SpellBinderGUID[i] = binder->GetGUID();
@@ -282,7 +282,7 @@ public:
uint8 AliveChannelers = 0;
for (uint8 i = 0; i < 3; ++i)
{
Unit *add = Unit::GetUnit(*me,SpellBinderGUID[i]);
Unit *add = Unit::GetUnit(*me, SpellBinderGUID[i]);
if (add && add->isAlive())
++AliveChannelers;
}
@@ -374,11 +374,11 @@ public:
if (DemonForm)
{
DoScriptText(RAND(SAY_DEMON_SLAY1,SAY_DEMON_SLAY2,SAY_DEMON_SLAY3), me);
DoScriptText(RAND(SAY_DEMON_SLAY1, SAY_DEMON_SLAY2, SAY_DEMON_SLAY3), me);
}
else
{
DoScriptText(RAND(SAY_NIGHTELF_SLAY1,SAY_NIGHTELF_SLAY2,SAY_NIGHTELF_SLAY3), me);
DoScriptText(RAND(SAY_NIGHTELF_SLAY1, SAY_NIGHTELF_SLAY2, SAY_NIGHTELF_SLAY3), me);
}
}
@@ -425,7 +425,7 @@ public:
{
DoResetThreat();
me->GetMotionMaster()->Clear();
me->GetMotionMaster()->MovePoint(0,newTarget->GetPositionX(),newTarget->GetPositionY(),newTarget->GetPositionZ());
me->GetMotionMaster()->MovePoint(0, newTarget->GetPositionX(), newTarget->GetPositionY(), newTarget->GetPositionZ());
}
Whirlwind_Timer = 2000;
} else Whirlwind_Timer -= diff;
@@ -474,7 +474,7 @@ public:
if (SwitchToDemon_Timer <= diff)
{
//switch to demon form
me->RemoveAurasDueToSpell(SPELL_WHIRLWIND,0);
me->RemoveAurasDueToSpell(SPELL_WHIRLWIND, 0);
me->SetDisplayId(MODEL_DEMON);
DoScriptText(SAY_SWITCH_TO_DEMON, me);
me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID , 0);
@@ -621,7 +621,7 @@ public:
if (victim->GetTypeId() != TYPEID_PLAYER)
return;
DoScriptText(RAND(SAY_DEMON_SLAY1,SAY_DEMON_SLAY2,SAY_DEMON_SLAY3), me);
DoScriptText(RAND(SAY_DEMON_SLAY1, SAY_DEMON_SLAY2, SAY_DEMON_SLAY3), me);
}
void JustDied(Unit * /*victim*/)
@@ -760,7 +760,7 @@ public:
if (Mindblast_Timer <= diff)
{
Unit *pTarget = NULL;
pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget)DoCast(pTarget, SPELL_MINDBLAST);
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+8 -8
View File
@@ -239,7 +239,7 @@ public:
if (SpoutTimer <= diff)
{
me->MonsterTextEmote(EMOTE_SPOUT,0,true);
me->MonsterTextEmote(EMOTE_SPOUT, 0, true);
me->SetReactState(REACT_PASSIVE);
me->GetMotionMaster()->MoveRotate(20000, rand()%2 ? ROTATE_DIRECTION_LEFT : ROTATE_DIRECTION_RIGHT);
SpoutTimer = 45000;
@@ -279,7 +279,7 @@ public:
Map::PlayerList const &PlayerList = pMap->GetPlayers();
for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
{
if (i->getSource() && i->getSource()->isAlive() && me->HasInArc(float(diff/20000*M_PI*2),i->getSource()) && me->IsWithinDist(i->getSource(), SPOUT_DIST) && !i->getSource()->IsInWater())
if (i->getSource() && i->getSource()->isAlive() && me->HasInArc(float(diff/20000*M_PI*2), i->getSource()) && me->IsWithinDist(i->getSource(), SPOUT_DIST) && !i->getSource()->IsInWater())
DoCast(i->getSource(), SPELL_SPOUT, true);//only knock back palyers in arc, in 100yards, not in water
}
}
@@ -299,7 +299,7 @@ public:
if (GeyserTimer <= diff)
{
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1);
if (!pTarget && me->getVictim())
pTarget = me->getVictim();
if (pTarget)
@@ -311,7 +311,7 @@ public:
{
if (WaterboltTimer <= diff)
{
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (!pTarget && me->getVictim())
pTarget = me->getVictim();
if (pTarget)
@@ -333,7 +333,7 @@ public:
me->InterruptNonMeleeSpells(false);//shouldn't be any
me->RemoveAllAuras();
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
me->RemoveFlag(UNIT_NPC_EMOTESTATE,EMOTE_STATE_SUBMERGED);
me->RemoveFlag(UNIT_NPC_EMOTESTATE, EMOTE_STATE_SUBMERGED);
DoCast(me, SPELL_EMERGE, true);
Spawned = false;
SpoutTimer = 3000; // directly cast Spout after emerging!
@@ -357,8 +357,8 @@ public:
{
Creature* Summoned;
if (i < 6)
Summoned = me->SummonCreature(MOB_COILFANG_AMBUSHER,AddPos[i][0],AddPos[i][1],AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
else Summoned = me->SummonCreature(MOB_COILFANG_GUARDIAN,AddPos[i][0],AddPos[i][1],AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
Summoned = me->SummonCreature(MOB_COILFANG_AMBUSHER, AddPos[i][0], AddPos[i][1], AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
else Summoned = me->SummonCreature(MOB_COILFANG_GUARDIAN, AddPos[i][0], AddPos[i][1], AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
if (Summoned)
Summons.Summon(Summoned);
@@ -457,7 +457,7 @@ public:
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
int bp0 = 1100;
if (pTarget)
me->CastCustomSpell(pTarget,SPELL_SHOOT,&bp0,NULL,NULL,true);
me->CastCustomSpell(pTarget, SPELL_SHOOT, &bp0, NULL, NULL, true);
ShootBowTimer = 4000+rand()%5000;
MultiShotTimer += 1500;//add global cooldown
} else ShootBowTimer -= diff;
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
+3 -3
View File
@@ -137,7 +137,7 @@ public:
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*/)
@@ -183,7 +183,7 @@ public:
}
else
{
DoScriptText(RAND(SAY_SUMMON1,SAY_SUMMON2), me);
DoScriptText(RAND(SAY_SUMMON1, SAY_SUMMON2), me);
for (uint8 i = 0; i < 10; ++i)
{
@@ -234,7 +234,7 @@ public:
}
}
DoScriptText(RAND(SAY_SUMMON_BUBL1,SAY_SUMMON_BUBL2), me);
DoScriptText(RAND(SAY_SUMMON_BUBL1, SAY_SUMMON_BUBL2), me);
DoScriptText(EMOTE_WATERY_GRAVE, me);
WateryGrave_Timer = 30000;
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
+3 -3
View File
@@ -143,16 +143,16 @@ class instance_serpent_shrine : public InstanceMapScript
if (!pPlayer->HasAura(SPELL_SCALDINGWATER))
{
pPlayer->CastSpell(pPlayer, SPELL_SCALDINGWATER,true);
pPlayer->CastSpell(pPlayer, SPELL_SCALDINGWATER, true);
}
} else if (Water == WATERSTATE_FRENZY)
{
//spawn frenzy
if (DoSpawnFrenzy)
{
if (Creature* frenzy = pPlayer->SummonCreature(MOB_COILFANG_FRENZY,pPlayer->GetPositionX(),pPlayer->GetPositionY(),pPlayer->GetPositionZ(),pPlayer->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,2000))
if (Creature* frenzy = pPlayer->SummonCreature(MOB_COILFANG_FRENZY, pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ(), pPlayer->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 2000))
{
frenzy->Attack(pPlayer,false);
frenzy->Attack(pPlayer, false);
frenzy->AddUnitMovementFlag(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_LEVITATING);
}
DoSpawnFrenzy = false;
src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
+7 -7
View File
@@ -89,12 +89,12 @@ public:
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me);
DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
}
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)
pInstance->SetData(TYPE_HYDROMANCER_THESPIA, IN_PROGRESS);
@@ -108,12 +108,12 @@ public:
//LightningCloud_Timer
if (LightningCloud_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_LIGHTNING_CLOUD);
//cast twice in Heroic mode
if (IsHeroic())
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_LIGHTNING_CLOUD);
LightningCloud_Timer = 15000+rand()%10000;
@@ -122,7 +122,7 @@ public:
//LungBurst_Timer
if (LungBurst_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_LUNG_BURST);
LungBurst_Timer = 7000+rand()%5000;
} else LungBurst_Timer -=diff;
@@ -130,12 +130,12 @@ public:
//EnvelopingWinds_Timer
if (EnvelopingWinds_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_ENVELOPING_WINDS);
//cast twice in Heroic mode
if (IsHeroic())
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_ENVELOPING_WINDS);
EnvelopingWinds_Timer = 10000+rand()%5000;
} else EnvelopingWinds_Timer -=diff;
src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
+9 -9
View File
@@ -98,12 +98,12 @@ public:
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me);
DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me);
}
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)
pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER, IN_PROGRESS);
@@ -114,14 +114,14 @@ public:
{
DoScriptText(SAY_MECHANICS, me);
DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,5,5,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000);
DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,-5,5,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000);
DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,-5,-5,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000);
DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, 5, 5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000);
DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, -5, 5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000);
DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, -5, -5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000);
if (rand()%2)
DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,5,-7,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000);
DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, 5, -7, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000);
if (rand()%2)
DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,7,-5,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000);
DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, 7, -5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000);
}
void UpdateAI(const uint32 diff)
@@ -137,7 +137,7 @@ public:
if (Saw_Blade_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1))
DoCast(pTarget, SPELL_SAW_BLADE);
else
DoCast(me->getVictim(), SPELL_SAW_BLADE);
@@ -248,7 +248,7 @@ public:
else
{
//me->GetMotionMaster()->MovementExpired();
//me->GetMotionMaster()->MoveFollow(pMekgineer,0,0);
//me->GetMotionMaster()->MoveFollow(pMekgineer, 0, 0);
}
}
} else Repair_Timer = 5000;
src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
+5 -5
View File
@@ -87,14 +87,14 @@ public:
DoCast(me, SPELL_WARLORDS_RAGE_NAGA, true);
if (pInstance)
pInstance->SetData(TYPE_DISTILLER,IN_PROGRESS);
pInstance->SetData(TYPE_DISTILLER, IN_PROGRESS);
}
void DamageTaken(Unit * /*done_by*/, uint32 &damage)
{
if (me->GetHealth() <= damage)
if (pInstance)
pInstance->SetData(TYPE_DISTILLER,DONE);
pInstance->SetData(TYPE_DISTILLER, DONE);
}
};
@@ -137,7 +137,7 @@ public:
void EnterCombat(Unit * /*who*/)
{
DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me);
DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me);
if (pInstance)
pInstance->SetData(TYPE_WARLORD_KALITHRESH, IN_PROGRESS);
@@ -145,7 +145,7 @@ public:
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me);
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
}
void SpellHit(Unit * /*caster*/, const SpellEntry *spell)
@@ -191,7 +191,7 @@ public:
//Impale_Timer
if (Impale_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_IMPALE);
Impale_Timer = 7500+rand()%5000;
src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
+2 -2
View File
@@ -51,10 +51,10 @@ public:
return false;
if (go->GetEntry() == ACCESS_PANEL_HYDRO && (pInstance->GetData(TYPE_HYDROMANCER_THESPIA) == DONE || pInstance->GetData(TYPE_HYDROMANCER_THESPIA) == SPECIAL))
pInstance->SetData(TYPE_HYDROMANCER_THESPIA,SPECIAL);
pInstance->SetData(TYPE_HYDROMANCER_THESPIA, SPECIAL);
if (go->GetEntry() == ACCESS_PANEL_MEK && (pInstance->GetData(TYPE_MEKGINEER_STEAMRIGGER) == DONE || pInstance->GetData(TYPE_MEKGINEER_STEAMRIGGER) == SPECIAL))
pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER,SPECIAL);
pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER, SPECIAL);
return true;
}
src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp
+2 -2
View File
@@ -75,7 +75,7 @@ public:
if (Mushroom_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
me->SummonCreature(17990, pTarget->GetPositionX()+(rand()%8), pTarget->GetPositionY()+(rand()%8), pTarget->GetPositionZ(), float(rand()%5), TEMPSUMMON_TIMED_DESPAWN, 22000);
else
me->SummonCreature(17990, me->GetPositionX()+(rand()%8), me->GetPositionY()+(rand()%8), me->GetPositionZ(), float(rand()%5), TEMPSUMMON_TIMED_DESPAWN, 22000);
@@ -85,7 +85,7 @@ public:
if (AcidGeyser_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_ACID_GEYSER);
AcidGeyser_Timer = 10000+rand()%7500;
} else AcidGeyser_Timer -= diff;
src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
+7 -7
View File
@@ -80,7 +80,7 @@ public:
if (summon && summon->GetEntry() == ENTRY_SPORE_STRIDER)
{
Striders.push_back(summon->GetGUID());
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1))
summon->AI()->AttackStart(pTarget);
else
if (me->getVictim())
@@ -103,9 +103,9 @@ public:
// Evade if too far
if (check_Timer <= diff)
{
float x,y,z,o;
me->GetHomePosition(x,y,z,o);
if (!me->IsWithinDist3d(x,y,z, 60))
float x, y, z, o;
me->GetHomePosition(x, y, z, o);
if (!me->IsWithinDist3d(x, y, z, 60))
{
EnterEvadeMode();
return;
@@ -150,7 +150,7 @@ public:
}
if (Levitate_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1))
{
DoCast(pTarget, SPELL_LEVITATE);
LevitatedTarget = pTarget->GetGUID();
@@ -163,7 +163,7 @@ public:
// Chain Lightning
if (ChainLightning_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_CHAIN_LIGHTNING);
ChainLightning_Timer = 7000;
} else ChainLightning_Timer -= diff;
@@ -171,7 +171,7 @@ public:
// Static Charge
if (StaticCharge_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,30,true))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true))
DoCast(pTarget, SPELL_STATIC_CHARGE);
StaticCharge_Timer = 10000;
} else StaticCharge_Timer -= diff;