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/EasternKingdoms/Karazhan/boss_curator.cpp
+3 -3
View File
@@ -77,7 +77,7 @@ public:
void KilledUnit(Unit * /*victim*/)
{
DoScriptText(RAND(SAY_KILL1,SAY_KILL2), me);
DoScriptText(RAND(SAY_KILL1, SAY_KILL2), me);
}
void JustDied(Unit * /*victim*/)
@@ -159,9 +159,9 @@ public:
}
else
{
if (urand(0,1) == 0)
if (urand(0, 1) == 0)
{
DoScriptText(RAND(SAY_SUMMON1,SAY_SUMMON2), me);
DoScriptText(RAND(SAY_SUMMON1, SAY_SUMMON2), me);
}
}
}
src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
+6 -6
View File
@@ -74,8 +74,8 @@ public:
void KilledUnit(Unit* /*Victim*/)
{
if (urand(0,1) == 0)
DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me);
if (urand(0, 1) == 0)
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me);
}
void JustDied(Unit* /*Killer*/)
@@ -108,9 +108,9 @@ public:
if (Repentance_Timer <= diff)
{
DoCast(me->getVictim(), SPELL_REPENTANCE);
DoScriptText(RAND(SAY_REPENTANCE1,SAY_REPENTANCE2), me);
DoScriptText(RAND(SAY_REPENTANCE1, SAY_REPENTANCE2), me);
Repentance_Timer = urand(25000,35000); //A little randomness on that spell
Repentance_Timer = urand(25000, 35000); //A little randomness on that spell
} else Repentance_Timer -= diff;
if (Holyfire_Timer <= diff)
@@ -118,7 +118,7 @@ public:
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
DoCast(pTarget, SPELL_HOLYFIRE);
Holyfire_Timer = urand(8000,23000); //Anywhere from 8 to 23 seconds, good luck having several of those in a row!
Holyfire_Timer = urand(8000, 23000); //Anywhere from 8 to 23 seconds, good luck having several of those in a row!
} else Holyfire_Timer -= diff;
if (Holywrath_Timer <= diff)
@@ -126,7 +126,7 @@ public:
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
DoCast(pTarget, SPELL_HOLYWRATH);
Holywrath_Timer = urand(20000,25000); //20-30 secs sounds nice
Holywrath_Timer = urand(20000, 25000); //20-30 secs sounds nice
} else Holywrath_Timer -= diff;
DoMeleeAttackIfReady();
src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
+10 -10
View File
@@ -62,9 +62,9 @@ public:
{
Phase = 1;
CleaveTimer = urand(10000,15000);
CleaveTimer = urand(10000, 15000);
CurseTimer = 30000;
RandomYellTimer = urand(30000,60000); //Occasionally yell
RandomYellTimer = urand(30000, 60000); //Occasionally yell
ChargeTimer = 20000;
ResetTimer = 0;
}
@@ -86,7 +86,7 @@ public:
void KilledUnit(Unit * /*victim*/)
{
DoScriptText(RAND(SAY_KILL1,SAY_KILL2), me);
DoScriptText(RAND(SAY_KILL1, SAY_KILL2), me);
}
void JustDied(Unit * /*victim*/)
@@ -159,7 +159,7 @@ public:
Attumen = pAttumen->GetGUID();
pAttumen->AI()->AttackStart(me->getVictim());
SetMidnight(pAttumen, me->GetGUID());
DoScriptText(RAND(SAY_APPEAR1,SAY_APPEAR2,SAY_APPEAR3), pAttumen);
DoScriptText(RAND(SAY_APPEAR1, SAY_APPEAR2, SAY_APPEAR3), pAttumen);
}
}
else if (Phase == 2 && HealthBelowPct(25))
@@ -185,7 +185,7 @@ public:
pAttumen->GetMotionMaster()->MoveChase(pAttumen->getVictim());
pAttumen->SetUInt64Value(UNIT_FIELD_TARGET, pAttumen->getVictim()->GetGUID());
}
pAttumen->SetFloatValue(OBJECT_FIELD_SCALE_X,1);
pAttumen->SetFloatValue(OBJECT_FIELD_SCALE_X, 1);
}
} else Mount_Timer -= diff;
}
@@ -206,7 +206,7 @@ public:
float newX = me->GetPositionX() + cos(angle)*(distance/2) ;
float newY = me->GetPositionY() + sin(angle)*(distance/2) ;
float newZ = 50;
//me->Relocate(newX,newY,newZ,angle);
//me->Relocate(newX, newY, newZ, angle);
//me->SendMonsterMove(newX, newY, newZ, 0, true, 1000);
me->GetMotionMaster()->Clear();
me->GetMotionMaster()->MovePoint(0, newX, newY, newZ);
@@ -215,7 +215,7 @@ public:
newY = me->GetPositionY() + sin(angle)*(distance/2) ;
pAttumen->GetMotionMaster()->Clear();
pAttumen->GetMotionMaster()->MovePoint(0, newX, newY, newZ);
//pAttumen->Relocate(newX,newY,newZ,-angle);
//pAttumen->Relocate(newX, newY, newZ, -angle);
//pAttumen->SendMonsterMove(newX, newY, newZ, 0, true, 1000);
Mount_Timer = 1000;
}
@@ -257,7 +257,7 @@ void boss_attumen::boss_attumenAI::UpdateAI(const uint32 diff)
if (CleaveTimer <= diff)
{
DoCast(me->getVictim(), SPELL_SHADOWCLEAVE);
CleaveTimer = urand(10000,15000);
CleaveTimer = urand(10000, 15000);
} else CleaveTimer -= diff;
if (CurseTimer <= diff)
@@ -268,8 +268,8 @@ void boss_attumen::boss_attumenAI::UpdateAI(const uint32 diff)
if (RandomYellTimer <= diff)
{
DoScriptText(RAND(SAY_RANDOM1,SAY_RANDOM2), me);
RandomYellTimer = urand(30000,60000);
DoScriptText(RAND(SAY_RANDOM1, SAY_RANDOM2), me);
RandomYellTimer = urand(30000, 60000);
} else RandomYellTimer -= diff;
if (me->GetUInt32Value(UNIT_FIELD_DISPLAYID) == MOUNTED_DISPLAYID)
src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
+6 -6
View File
@@ -133,7 +133,7 @@ public:
void KilledUnit(Unit* /*victim*/)
{
DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2,SAY_KILL_3), me);
DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2, SAY_KILL_3), me);
}
void JustDied(Unit* /*victim*/)
@@ -207,7 +207,7 @@ public:
Creature* Temp = NULL;
if (AddGUID[i])
{
Temp = Creature::GetCreature((*me),AddGUID[i]);
Temp = Creature::GetCreature((*me), AddGUID[i]);
if (Temp && Temp->isAlive())
Temp->DisappearAndDie();
}
@@ -221,7 +221,7 @@ public:
Creature* Temp = NULL;
if (AddGUID[i])
{
Temp = Creature::GetCreature((*me),AddGUID[i]);
Temp = Creature::GetCreature((*me), AddGUID[i]);
if (Temp && Temp->isAlive())
{
Temp->AI()->AttackStart(me->getVictim());
@@ -256,7 +256,7 @@ public:
Creature* Temp = NULL;
if (AddGUID[i])
{
Temp = Unit::GetCreature((*me),AddGUID[i]);
Temp = Unit::GetCreature((*me), AddGUID[i]);
if (Temp && Temp->isAlive())
if (!Temp->getVictim())
Temp->AI()->AttackStart(me->getVictim());
@@ -300,10 +300,10 @@ public:
{
if (Wait_Timer <= diff)
{
DoScriptText(RAND(SAY_SPECIAL_1,SAY_SPECIAL_2), me);
DoScriptText(RAND(SAY_SPECIAL_1, SAY_SPECIAL_2), me);
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
pTarget->CastSpell(pTarget, SPELL_GARROTE,true);
pTarget->CastSpell(pTarget, SPELL_GARROTE, true);
InVanish = false;
} else Wait_Timer -= diff;
src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
+17 -17
View File
@@ -52,11 +52,11 @@ enum Netherspite_Portal{
};
const uint32 PortalID[3] = {17369, 17367, 17368};
const uint32 PortalVisual[3] = {30487,30490,30491};
const uint32 PortalBeam[3] = {30465,30464,30463};
const uint32 PlayerBuff[3] = {30421,30422,30423};
const uint32 NetherBuff[3] = {30466,30467,30468};
const uint32 PlayerDebuff[3] = {38637,38638,38639};
const uint32 PortalVisual[3] = {30487, 30490, 30491};
const uint32 PortalBeam[3] = {30465, 30464, 30463};
const uint32 PlayerBuff[3] = {30421, 30422, 30423};
const uint32 NetherBuff[3] = {30466, 30467, 30468};
const uint32 PlayerDebuff[3] = {38637, 38638, 38639};
class boss_netherspite : public CreatureScript
{
@@ -110,10 +110,10 @@ public:
yh = pTarget->GetPositionY();
// check if target is between (not checking distance from the beam yet)
if (dist(xn,yn,xh,yh) >= dist(xn,yn,xp,yp) || dist(xp,yp,xh,yh) >= dist(xn,yn,xp,yp))
if (dist(xn, yn, xh, yh) >= dist(xn, yn, xp, yp) || dist(xp, yp, xh, yh) >= dist(xn, yn, xp, yp))
return false;
// check distance from the beam
return (abs((xn-xp)*yh+(yp-yn)*xh-xn*yp+xp*yn)/dist(xn,yn,xp,yp) < 1.5f);
return (abs((xn-xp)*yh+(yp-yn)*xh-xn*yp+xp*yn)/dist(xn, yn, xp, yp) < 1.5f);
}
float dist(float xa, float ya, float xb, float yb) // auxiliary method for distance
@@ -141,7 +141,7 @@ public:
pos[BLUE_PORTAL] = (r>1 ? 1: 2); // Blue Portal not on the left side (0)
for (int i=0; i<3; ++i)
if (Creature *portal = me->SummonCreature(PortalID[i],PortalCoord[pos[i]][0],PortalCoord[pos[i]][1],PortalCoord[pos[i]][2],0,TEMPSUMMON_TIMED_DESPAWN,60000))
if (Creature *portal = me->SummonCreature(PortalID[i], PortalCoord[pos[i]][0], PortalCoord[pos[i]][1], PortalCoord[pos[i]][2], 0, TEMPSUMMON_TIMED_DESPAWN, 60000))
{
PortalGUID[i] = portal->GetGUID();
portal->AddAura(PortalVisual[i], portal);
@@ -181,9 +181,9 @@ public:
Player* p = i->getSource();
if (p && p->isAlive() // alive
&& (!pTarget || pTarget->GetDistance2d(portal)>p->GetDistance2d(portal)) // closer than current best
&& !p->HasAura(PlayerDebuff[j],0) // not exhausted
&& !p->HasAura(PlayerBuff[(j+1)%3],0) // not on another beam
&& !p->HasAura(PlayerBuff[(j+2)%3],0)
&& !p->HasAura(PlayerDebuff[j], 0) // not exhausted
&& !p->HasAura(PlayerBuff[(j+1)%3], 0) // not on another beam
&& !p->HasAura(PlayerBuff[(j+2)%3], 0)
&& IsBetween(me, p, portal)) // on the beam
pTarget = p;
}
@@ -206,7 +206,7 @@ public:
BeamerGUID[j] = 0;
}
// create new one and start beaming on the target
if (Creature *beamer = portal->SummonCreature(PortalID[j],portal->GetPositionX(),portal->GetPositionY(),portal->GetPositionZ(),portal->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,60000))
if (Creature *beamer = portal->SummonCreature(PortalID[j], portal->GetPositionX(), portal->GetPositionY(), portal->GetPositionZ(), portal->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 60000))
{
beamer->CastSpell(pTarget, PortalBeam[j], false);
BeamerGUID[j] = beamer->GetGUID();
@@ -227,7 +227,7 @@ public:
PortalPhase = true;
PortalTimer = 10000;
EmpowermentTimer = 10000;
DoScriptText(EMOTE_PHASE_PORTAL,me);
DoScriptText(EMOTE_PHASE_PORTAL, me);
}
void SwitchToBanishPhase()
@@ -239,7 +239,7 @@ public:
DestroyPortals();
PhaseTimer = 30000;
PortalPhase = false;
DoScriptText(EMOTE_PHASE_BANISH,me);
DoScriptText(EMOTE_PHASE_BANISH, me);
for (int i=0; i<3; ++i)
me->RemoveAurasDueToSpell(NetherBuff[i]);
@@ -271,7 +271,7 @@ public:
// Void Zone
if (VoidZoneTimer <= diff)
{
DoCast(SelectTarget(SELECT_TARGET_RANDOM,1,45,true),SPELL_VOIDZONE,true);
DoCast(SelectTarget(SELECT_TARGET_RANDOM, 1, 45, true), SPELL_VOIDZONE, true);
VoidZoneTimer = 15000;
} else VoidZoneTimer -= diff;
@@ -314,9 +314,9 @@ public:
// Netherbreath
if (NetherbreathTimer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,40,true))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true))
DoCast(pTarget, SPELL_NETHERBREATH);
NetherbreathTimer = urand(5000,7000);
NetherbreathTimer = urand(5000, 7000);
} else NetherbreathTimer -= diff;
if (PhaseTimer <= diff)
src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
+19 -19
View File
@@ -48,14 +48,14 @@ EndScriptData */
float IntroWay[8][3] =
{
{-11053.37f,-1794.48f,149.00f},
{-11141.07f,-1841.40f,125.00f},
{-11187.28f,-1890.23f,125.00f},
{-11189.20f,-1931.25f,125.00f},
{-11153.76f,-1948.93f,125.00f},
{-11128.73f,-1929.75f,125.00f},
{-11140.00f,-1915.00f,122.00f},
{-11163.00f,-1903.00f,91.473f}
{-11053.37f, -1794.48f, 149.00f},
{-11141.07f, -1841.40f, 125.00f},
{-11187.28f, -1890.23f, 125.00f},
{-11189.20f, -1931.25f, 125.00f},
{-11153.76f, -1948.93f, 125.00f},
{-11128.73f, -1929.75f, 125.00f},
{-11140.00f, -1915.00f, 122.00f},
{-11163.00f, -1903.00f, 91.473f}
};
class boss_nightbane : public CreatureScript
@@ -140,7 +140,7 @@ public:
if (!Intro)
{
me->SetHomePosition(IntroWay[7][0],IntroWay[7][1],IntroWay[7][2],0);
me->SetHomePosition(IntroWay[7][0], IntroWay[7][1], IntroWay[7][2], 0);
me->GetMotionMaster()->MoveTargetedHome();
}
}
@@ -193,7 +193,7 @@ public:
if (id >= 8)
{
Intro = false;
me->SetHomePosition(IntroWay[7][0],IntroWay[7][1],IntroWay[7][2],0);
me->SetHomePosition(IntroWay[7][0], IntroWay[7][1], IntroWay[7][2], 0);
return;
}
@@ -242,11 +242,11 @@ public:
me->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF);
me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
(*me).GetMotionMaster()->Clear(false);
(*me).GetMotionMaster()->MovePoint(0,IntroWay[2][0],IntroWay[2][1],IntroWay[2][2]);
(*me).GetMotionMaster()->MovePoint(0, IntroWay[2][0], IntroWay[2][1], IntroWay[2][2]);
Flying = true;
FlyTimer = urand(45000,60000); //timer wrong between 45 and 60 seconds
FlyTimer = urand(45000, 60000); //timer wrong between 45 and 60 seconds
++FlyCount;
RainofBonesTimer = 5000; //timer wrong (maybe)
@@ -265,11 +265,11 @@ public:
{
me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
me->HandleEmoteCommand(EMOTE_ONESHOT_LAND);
me->GetMotionMaster()->MovePoint(8,IntroWay[7][0],IntroWay[7][1],IntroWay[7][2]);
me->GetMotionMaster()->MovePoint(8, IntroWay[7][0], IntroWay[7][1], IntroWay[7][2]);
}
else
{
me->GetMotionMaster()->MovePoint(MovePhase,IntroWay[MovePhase][0],IntroWay[MovePhase][1],IntroWay[MovePhase][2]);
me->GetMotionMaster()->MovePoint(MovePhase, IntroWay[MovePhase][0], IntroWay[MovePhase][1], IntroWay[MovePhase][2]);
++MovePhase;
}
}
@@ -279,11 +279,11 @@ public:
{
me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
me->HandleEmoteCommand(EMOTE_ONESHOT_LAND);
me->GetMotionMaster()->MovePoint(8,IntroWay[7][0],IntroWay[7][1],IntroWay[7][2]);
me->GetMotionMaster()->MovePoint(8, IntroWay[7][0], IntroWay[7][1], IntroWay[7][2]);
}
else
{
me->GetMotionMaster()->MovePoint(MovePhase,IntroWay[MovePhase][0],IntroWay[MovePhase][1],IntroWay[MovePhase][2]);
me->GetMotionMaster()->MovePoint(MovePhase, IntroWay[MovePhase][0], IntroWay[MovePhase][1], IntroWay[MovePhase][2]);
++MovePhase;
}
}
@@ -310,7 +310,7 @@ public:
if (BellowingRoarTimer <= diff)
{
DoCast(me->getVictim(), SPELL_BELLOWING_ROAR);
BellowingRoarTimer = urand(30000,40000);
BellowingRoarTimer = urand(30000, 40000);
} else BellowingRoarTimer -= diff;
if (SmolderingBreathTimer <= diff)
@@ -402,10 +402,10 @@ public:
if (FlyTimer <= diff) //landing
{
me->MonsterYell(RAND(*YELL_LAND_PHASE_1,*YELL_LAND_PHASE_2), LANG_UNIVERSAL, 0);
me->MonsterYell(RAND(*YELL_LAND_PHASE_1, *YELL_LAND_PHASE_2), LANG_UNIVERSAL, 0);
me->GetMotionMaster()->Clear(false);
me->GetMotionMaster()->MovePoint(3,IntroWay[3][0],IntroWay[3][1],IntroWay[3][2]);
me->GetMotionMaster()->MovePoint(3, IntroWay[3][0], IntroWay[3][1], IntroWay[3][2]);
Flying = true;
} else FlyTimer -= diff;
src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
+9 -9
View File
@@ -42,7 +42,7 @@ EndScriptData */
// 18 Coordinates for Infernal spawns
struct InfernalPoint
{
float x,y;
float x, y;
};
#define INFERNAL_Z 275.5f
@@ -230,8 +230,8 @@ public:
Cleave_Timer = 8000;
InfernalTimer = 45000;
InfernalCleanupTimer = 47000;
AxesTargetSwitchTimer = urand(7500,20000);
SunderArmorTimer = urand(5000,10000);
AxesTargetSwitchTimer = urand(7500, 20000);
SunderArmorTimer = urand(5000, 10000);
phase = 1;
if (pInstance)
@@ -240,7 +240,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*/)
@@ -379,7 +379,7 @@ public:
DoCast(Infernal, SPELL_INFERNAL_RELAY);
}
DoScriptText(RAND(SAY_SUMMON1,SAY_SUMMON2), me);
DoScriptText(RAND(SAY_SUMMON1, SAY_SUMMON2), me);
}
void UpdateAI(const uint32 diff)
@@ -477,14 +477,14 @@ public:
if (SunderArmorTimer <= diff)
{
DoCast(me->getVictim(), SPELL_SUNDER_ARMOR);
SunderArmorTimer = urand(10000,18000);
SunderArmorTimer = urand(10000, 18000);
} else SunderArmorTimer -= diff;
if (Cleave_Timer <= diff)
{
DoCast(me->getVictim(), SPELL_CLEAVE);
Cleave_Timer = urand(6000,12000);
Cleave_Timer = urand(6000, 12000);
} else Cleave_Timer -= diff;
}
@@ -492,7 +492,7 @@ public:
{
if (AxesTargetSwitchTimer <= diff)
{
AxesTargetSwitchTimer = urand(7500,20000);
AxesTargetSwitchTimer = urand(7500, 20000);
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
{
@@ -515,7 +515,7 @@ public:
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
DoCast(pTarget, SPELL_AMPLIFY_DAMAGE);
AmplifyDamageTimer = urand(20000,30000);
AmplifyDamageTimer = urand(20000, 30000);
} else AmplifyDamageTimer -= diff;
}
src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
+10 -10
View File
@@ -159,7 +159,7 @@ public:
void KilledUnit(Unit * /*victim*/)
{
DoScriptText(RAND(SAY_KILL1,SAY_KILL2), me);
DoScriptText(RAND(SAY_KILL1, SAY_KILL2), me);
}
void JustDied(Unit * /*victim*/)
@@ -175,7 +175,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)
{
@@ -345,7 +345,7 @@ public:
if (SecondarySpellTimer <= diff)
{
switch (urand(0,1))
switch (urand(0, 1))
{
case 0:
DoCast(me, SPELL_AOE_CS);
@@ -355,7 +355,7 @@ public:
DoCast(pTarget, SPELL_CHAINSOFICE);
break;
}
SecondarySpellTimer = urand(5000,20000);
SecondarySpellTimer = urand(5000, 20000);
} else SecondarySpellTimer -= diff;
if (SuperCastTimer <= diff)
@@ -378,12 +378,12 @@ public:
break;
}
LastSuperSpell = Available[urand(0,1)];
LastSuperSpell = Available[urand(0, 1)];
switch (LastSuperSpell)
{
case SUPER_AE:
DoScriptText(RAND(SAY_EXPLOSION1,SAY_EXPLOSION2), me);
DoScriptText(RAND(SAY_EXPLOSION1, SAY_EXPLOSION2), me);
DoCast(me, SPELL_BLINK_CENTER, true);
DoCast(me, SPELL_PLAYERPULL, true);
@@ -392,7 +392,7 @@ public:
break;
case SUPER_FLAME:
DoScriptText(RAND(SAY_FLAMEWREATH1,SAY_FLAMEWREATH2), me);
DoScriptText(RAND(SAY_FLAMEWREATH1, SAY_FLAMEWREATH2), me);
FlameWreathTimer = 20000;
FlameWreathCheckTime = 500;
@@ -405,7 +405,7 @@ public:
break;
case SUPER_BLIZZARD:
DoScriptText(RAND(SAY_BLIZZARD1,SAY_BLIZZARD2), me);
DoScriptText(RAND(SAY_BLIZZARD1, SAY_BLIZZARD2), me);
if (Creature* pSpawn = me->SummonCreature(CREATURE_ARAN_BLIZZARD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 25000))
{
@@ -415,7 +415,7 @@ public:
break;
}
SuperCastTimer = urand(35000,40000);
SuperCastTimer = urand(35000, 40000);
} else SuperCastTimer -= diff;
if (!ElementalsSpawned && HealthBelowPct(40))
@@ -542,7 +542,7 @@ public:
if (CastTimer <= diff)
{
DoCast(me->getVictim(), SPELL_WATERBOLT);
CastTimer = urand(2000,5000);
CastTimer = urand(2000, 5000);
} else CastTimer -= diff;
}
};
src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
+7 -7
View File
@@ -119,7 +119,7 @@ public:
me->InterruptNonMeleeSpells(false);
DoCast(me->getVictim(), SPELL_AMPLIFY_FLAMES);
AmplifyTimer = urand(10000,20000);
AmplifyTimer = urand(10000, 20000);
} else AmplifyTimer -= diff;
DoMeleeAttackIfReady();
@@ -157,7 +157,7 @@ public:
{
if (SacrificeGUID)
{
Unit* Sacrifice = Unit::GetUnit((*me),SacrificeGUID);
Unit* Sacrifice = Unit::GetUnit((*me), SacrificeGUID);
if (Sacrifice)
Sacrifice->RemoveAurasDueToSpell(SPELL_SACRIFICE);
}
@@ -178,7 +178,7 @@ public:
struct mob_fiendish_portalAI : public PassiveAI
{
mob_fiendish_portalAI(Creature *c) : PassiveAI(c),summons(me){}
mob_fiendish_portalAI(Creature *c) : PassiveAI(c), summons(me){}
SummonList summons;
@@ -333,7 +333,7 @@ public:
if (pSummoned->GetUInt32Value(UNIT_CREATED_BY_SPELL) == SPELL_FIENDISH_PORTAL_1)
{
DoScriptText(RAND(SAY_SUMMON1,SAY_SUMMON2), me);
DoScriptText(RAND(SAY_SUMMON1, SAY_SUMMON2), me);
SummonedPortals = true;
}
}
@@ -341,7 +341,7 @@ public:
void KilledUnit(Unit * /*victim*/)
{
DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me);
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
}
void JustDied(Unit * /*killer*/)
@@ -380,7 +380,7 @@ public:
{
CAST_AI(mob_demon_chain::mob_demon_chainAI, Chains->AI())->SacrificeGUID = pTarget->GetGUID();
Chains->CastSpell(Chains, SPELL_DEMON_CHAINS, true);
DoScriptText(RAND(SAY_SACRIFICE1,SAY_SACRIFICE2), me);
DoScriptText(RAND(SAY_SACRIFICE1, SAY_SACRIFICE2), me);
SacrificeTimer = 30000;
}
}
@@ -402,7 +402,7 @@ public:
if (PortalGUID[0] && PortalGUID[1])
{
if (Creature* pPortal = Unit::GetCreature(*me, PortalGUID[urand(0,1)]))
if (Creature* pPortal = Unit::GetCreature(*me, PortalGUID[urand(0, 1)]))
pPortal->CastSpell(me->getVictim(), SPELL_SUMMON_FIENDISIMP, false);
SummonTimer = 5000;
}
src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
+18 -18
View File
@@ -345,7 +345,7 @@ public:
if ((Spell->SchoolMask == SPELL_SCHOOL_MASK_FIRE) && (!(rand()%10)))
{
/*
if (not direct damage(aoe,dot))
if (not direct damage(aoe, dot))
return;
*/
@@ -597,19 +597,19 @@ public:
if (MangleTimer <= diff)
{
DoCast(me->getVictim(), SPELL_MANGLE);
MangleTimer = urand(5000,8000);
MangleTimer = urand(5000, 8000);
} else MangleTimer -= diff;
if (ShredTimer <= diff)
{
DoCast(me->getVictim(), SPELL_SHRED);
ShredTimer = urand(10000,15000);
ShredTimer = urand(10000, 15000);
} else ShredTimer -= diff;
if (ScreamTimer <= diff)
{
DoCast(me->getVictim(), SPELL_FRIGHTENED_SCREAM);
ScreamTimer = urand(20000,30000);
ScreamTimer = urand(20000, 30000);
} else ScreamTimer -= diff;
DoMeleeAttackIfReady();
@@ -653,7 +653,7 @@ public:
void EnterCombat(Unit* /*who*/)
{
DoScriptText(RAND(SAY_CRONE_AGGRO,SAY_CRONE_AGGRO2), me);
DoScriptText(RAND(SAY_CRONE_AGGRO, SAY_CRONE_AGGRO2), me);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
}
@@ -683,7 +683,7 @@ public:
if (CycloneTimer <= diff)
{
if (Creature* Cyclone = DoSpawnCreature(CREATURE_CYCLONE, float(urand(0,9)), float(urand(0,9)), 0, 0, TEMPSUMMON_TIMED_DESPAWN, 15000))
if (Creature* Cyclone = DoSpawnCreature(CREATURE_CYCLONE, float(urand(0, 9)), float(urand(0, 9)), 0, 0, TEMPSUMMON_TIMED_DESPAWN, 15000))
Cyclone->CastSpell(Cyclone, SPELL_CYCLONE_VISUAL, true);
CycloneTimer = 30000;
} else CycloneTimer -= diff;
@@ -737,7 +737,7 @@ public:
Position pos;
me->GetRandomNearPosition(pos, 10);
me->GetMotionMaster()->MovePoint(0, pos);
MoveTimer = urand(5000,8000);
MoveTimer = urand(5000, 8000);
} else MoveTimer -= diff;
}
};
@@ -905,13 +905,13 @@ public:
if (FearTimer <= diff)
{
DoCast(me->getVictim(), SPELL_TERRIFYING_HOWL);
FearTimer = urand(25000,35000);
FearTimer = urand(25000, 35000);
} else FearTimer -= diff;
if (SwipeTimer <= diff)
{
DoCast(me->getVictim(), SPELL_WIDE_SWIPE);
SwipeTimer = urand(25000,30000);
SwipeTimer = urand(25000, 30000);
} else SwipeTimer -= diff;
}
@@ -1293,27 +1293,27 @@ public:
if (pTarget && !me->HasInArc(M_PI, pTarget))
{
DoCast(pTarget, SPELL_BACKWARD_LUNGE);
BackwardLungeTimer = urand(15000,30000);
BackwardLungeTimer = urand(15000, 30000);
}
} else BackwardLungeTimer -= diff;
if (DaringTimer <= diff)
{
DoCast(me, SPELL_DARING);
DaringTimer = urand(20000,40000);
DaringTimer = urand(20000, 40000);
} else DaringTimer -= diff;
if (DeadlySwatheTimer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
DoCast(pTarget, SPELL_DEADLY_SWATHE);
DeadlySwatheTimer = urand(15000,25000);
DeadlySwatheTimer = urand(15000, 25000);
} else DeadlySwatheTimer -= diff;
if (PoisonThrustTimer <= diff)
{
DoCast(me->getVictim(), SPELL_POISON_THRUST);
PoisonThrustTimer = urand(10000,20000);
PoisonThrustTimer = urand(10000, 20000);
} else PoisonThrustTimer -= diff;
DoMeleeAttackIfReady();
@@ -1412,31 +1412,31 @@ void boss_julianne::boss_julianneAI::UpdateAI(const uint32 diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
DoCast(pTarget, SPELL_BLINDING_PASSION);
BlindingPassionTimer = urand(30000,45000);
BlindingPassionTimer = urand(30000, 45000);
} else BlindingPassionTimer -= diff;
if (DevotionTimer <= diff)
{
DoCast(me, SPELL_DEVOTION);
DevotionTimer = urand(15000,45000);
DevotionTimer = urand(15000, 45000);
} else DevotionTimer -= diff;
if (PowerfulAttractionTimer <= diff)
{
DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_POWERFUL_ATTRACTION);
PowerfulAttractionTimer = urand(5000,30000);
PowerfulAttractionTimer = urand(5000, 30000);
} else PowerfulAttractionTimer -= diff;
if (EternalAffectionTimer <= diff)
{
if (urand(0,1) && SummonedRomulo)
if (urand(0, 1) && SummonedRomulo)
{
Creature* Romulo = (Unit::GetCreature((*me), RomuloGUID));
if (Romulo && Romulo->isAlive() && !RomuloDead)
DoCast(Romulo, SPELL_ETERNAL_AFFECTION);
} else DoCast(me, SPELL_ETERNAL_AFFECTION);
EternalAffectionTimer = urand(45000,60000);
EternalAffectionTimer = urand(45000, 60000);
} else EternalAffectionTimer -= diff;
DoMeleeAttackIfReady();
src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
+2 -2
View File
@@ -84,7 +84,7 @@ public:
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
// 1 - OZ, 2 - HOOD, 3 - RAJ, this never gets altered.
m_uiOperaEvent = urand(1,3);
m_uiOperaEvent = urand(1, 3);
m_uiOzDeathCount = 0;
m_uiCurtainGUID = 0;
@@ -149,7 +149,7 @@ public:
case TYPE_NETHERSPITE: m_auiEncounter[8] = uiData; break;
case TYPE_CHESS:
if (uiData == DONE)
DoRespawnGameObject(DustCoveredChest,DAY);
DoRespawnGameObject(DustCoveredChest, DAY);
m_auiEncounter[9] = uiData;
break;
case TYPE_MALCHEZZAR: m_auiEncounter[10] = uiData; break;
src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+14 -14
View File
@@ -342,17 +342,17 @@ public:
case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->CLOSE_GOSSIP_MENU();
pBarnesAI->m_uiEventId = EVENT_OZ;
sLog->outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_OZ",pPlayer->GetGUID());
sLog->outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_OZ", pPlayer->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+4:
pPlayer->CLOSE_GOSSIP_MENU();
pBarnesAI->m_uiEventId = EVENT_HOOD;
sLog->outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_HOOD",pPlayer->GetGUID());
sLog->outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_HOOD", pPlayer->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+5:
pPlayer->CLOSE_GOSSIP_MENU();
pBarnesAI->m_uiEventId = EVENT_RAJ;
sLog->outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_RAJ",pPlayer->GetGUID());
sLog->outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_RAJ", pPlayer->GetGUID());
break;
}
@@ -375,7 +375,7 @@ public:
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_DOT, OZ_GM_GOSSIP3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
}
if (npc_barnesAI* pBarnesAI = CAST_AI(npc_barnes::npc_barnesAI,pCreature->AI()))
if (npc_barnesAI* pBarnesAI = CAST_AI(npc_barnes::npc_barnesAI, pCreature->AI()))
{
if (!pBarnesAI->RaidWiped)
pPlayer->SEND_GOSSIP_MENU(8970, pCreature->GetGUID());
@@ -459,8 +459,8 @@ public:
#define SPELL_CONFLAGRATION_BLAST 30977
#define SPELL_MANA_SHIELD 31635
static float MedivPos[4] = {-11161.49f,-1902.24f,91.48f,1.94f};
static float ArcanagosPos[4] = {-11169.75f,-1881.48f,95.39f,4.83f};
static float MedivPos[4] = {-11161.49f, -1902.24f, 91.48f, 1.94f};
static float ArcanagosPos[4] = {-11169.75f, -1881.48f, 95.39f, 4.83f};
class npc_image_of_medivh : public CreatureScript
{
@@ -497,11 +497,11 @@ public:
if (pInstance && pInstance->GetData64(DATA_IMAGE_OF_MEDIVH) == 0)
{
pInstance->SetData64(DATA_IMAGE_OF_MEDIVH, me->GetGUID());
(*me).GetMotionMaster()->MovePoint(1,MedivPos[0],MedivPos[1],MedivPos[2]);
(*me).GetMotionMaster()->MovePoint(1, MedivPos[0], MedivPos[1], MedivPos[2]);
Step = 0;
}else
{
me->DealDamage(me,me->GetHealth(),NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
me->RemoveCorpse();
}
}
@@ -523,12 +523,12 @@ public:
{
Step = 1;
EventStarted = true;
Creature* Arcanagos = me->SummonCreature(MOB_ARCANAGOS,ArcanagosPos[0],ArcanagosPos[1],ArcanagosPos[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000);
Creature* Arcanagos = me->SummonCreature(MOB_ARCANAGOS, ArcanagosPos[0], ArcanagosPos[1], ArcanagosPos[2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000);
if (!Arcanagos)
return;
ArcanagosGUID = Arcanagos->GetGUID();
Arcanagos->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
(*Arcanagos).GetMotionMaster()->MovePoint(0,ArcanagosPos[0],ArcanagosPos[1],ArcanagosPos[2]);
(*Arcanagos).GetMotionMaster()->MovePoint(0, ArcanagosPos[0], ArcanagosPos[1], ArcanagosPos[2]);
Arcanagos->SetOrientation(ArcanagosPos[3]);
me->SetOrientation(MedivPos[3]);
YellTimer = 10000;
@@ -536,7 +536,7 @@ public:
uint32 NextStep(uint32 Step)
{
Unit* arca = Unit::GetUnit((*me),ArcanagosGUID);
Unit* arca = Unit::GetUnit((*me), ArcanagosGUID);
Map* pMap = me->GetMap();
switch(Step)
{
@@ -581,7 +581,7 @@ public:
CAST_CRE(arca)->MonsterYell(SAY_DIALOG_ARCANAGOS_8, LANG_UNIVERSAL, 0);
return 5000;
case 12:
arca->GetMotionMaster()->MovePoint(0, -11010.82f,-1761.18f, 156.47f);
arca->GetMotionMaster()->MovePoint(0, -11010.82f, -1761.18f, 156.47f);
arca->setActive(true);
arca->InterruptNonMeleeSpells(true);
arca->SetSpeed(MOVE_FLIGHT, 2.0f);
@@ -607,7 +607,7 @@ public:
}
return 50000;
case 15:
arca->DealDamage(arca,arca->GetHealth(),NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
arca->DealDamage(arca, arca->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
return 5000;
default : return 9999999;
}
@@ -625,7 +625,7 @@ public:
if (Step >= 7 && Step <= 12)
{
Unit* arca = Unit::GetUnit((*me),ArcanagosGUID);
Unit* arca = Unit::GetUnit((*me), ArcanagosGUID);
if (FireArcanagosTimer <= diff)
{