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

Sourcefile sleanups -> tabs to spaces, remove whitespace - also update the cleanupscripts very slightly

Browse Source 
--HG--
branch : trunk
This commit is contained in:
click
2010-08-08 19:45:53 +02:00
parent 31160bcfce
commit 1f80c7b3c0
174 changed files with 1066 additions and 1066 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+17 -17
View File
@@ -219,8 +219,8 @@ class boss_alar : public CreatureScript
{
DoCast(me, SPELL_BERSERK, true);
Berserk_Timer = 60000;
}
else
}
else
Berserk_Timer -= diff;
if (ForceMove)
@@ -229,8 +229,8 @@ class boss_alar : public CreatureScript
{
me->GetMotionMaster()->MovePoint(0, waypoint[cur_wp][0], waypoint[cur_wp][1], waypoint[cur_wp][2]);
ForceTimer = 5000;
}
else
}
else
ForceTimer -= diff;
}
@@ -319,8 +319,8 @@ class boss_alar : public CreatureScript
WaitEvent = WE_NONE;
WaitTimer = 0;
}
else
}
else
WaitTimer -= diff;
}
return;
@@ -363,8 +363,8 @@ class boss_alar : public CreatureScript
me->GetMotionMaster()->MovePoint(0, waypoint[cur_wp][0], waypoint[cur_wp][1], waypoint[cur_wp][2]);
WaitTimer = 0;
return;
}
else
}
else
Platforms_Move_Timer -= diff;
}
else
@@ -376,14 +376,14 @@ class boss_alar : public CreatureScript
DoCast(pTarget, SPELL_CHARGE);
Charge_Timer = 30000;
}
else
else
Charge_Timer -= diff;
if (MeltArmor_Timer <= diff)
{
DoCast(me->getVictim(), SPELL_MELT_ARMOR);
MeltArmor_Timer = 60000;
}
}
else
MeltArmor_Timer -= diff;
@@ -397,8 +397,8 @@ class boss_alar : public CreatureScript
WaitTimer = 0;
DiveBomb_Timer = 40000+rand()%5000;
return;
}
else
}
else
DiveBomb_Timer -= diff;
if (FlamePatch_Timer <= diff)
@@ -417,8 +417,8 @@ class boss_alar : public CreatureScript
}
}
FlamePatch_Timer = 30000;
}
else
}
else
FlamePatch_Timer -= diff;
}
@@ -477,15 +477,15 @@ class mob_ember_of_alar : public CreatureScript
InstanceScript *pInstance;
bool toDie;
void Reset()
void Reset()
{
toDie = false;
}
void EnterCombat(Unit * /*who*/)
void EnterCombat(Unit * /*who*/)
{
DoZoneInCombat();
}
void EnterEvadeMode()
void EnterEvadeMode()
{
me->setDeathState(JUST_DIED);
}
src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+19 -19
View File
@@ -79,7 +79,7 @@ class boss_high_astromancer_solarian : public CreatureScript
: CreatureScript("boss_high_astromancer_solarian")
{
}
struct boss_high_astromancer_solarianAI : public ScriptedAI
{
boss_high_astromancer_solarianAI(Creature* pCreature) : ScriptedAI(pCreature), Summons(me)
@@ -197,7 +197,7 @@ class boss_high_astromancer_solarian : public CreatureScript
if (!UpdateVictim())
return;
if (AppearDelay)
{
{
me->StopMoving();
me->AttackStop();
if (AppearDelay_Timer <= diff)
@@ -228,7 +228,7 @@ class boss_high_astromancer_solarian : public CreatureScript
me->InterruptNonMeleeSpells(false);
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true))
DoCast(pTarget, SPELL_WRATH_OF_THE_ASTROMANCER, true);
Wrath_Timer = 20000+rand()%5000;
Wrath_Timer = 20000+rand()%5000;
}
else
Wrath_Timer -= diff;
@@ -249,8 +249,8 @@ class boss_high_astromancer_solarian : public CreatureScript
DoCast(pTarget, SPELL_ARCANE_MISSILES);
}
ArcaneMissiles_Timer = 3000;
}
else
}
else
ArcaneMissiles_Timer -= diff;
if (m_uiWrathOfTheAstromancer_Timer <= diff)
@@ -268,7 +268,7 @@ class boss_high_astromancer_solarian : public CreatureScript
m_uiWrathOfTheAstromancer_Timer = 1000;
}
}
else
else
m_uiWrathOfTheAstromancer_Timer -= diff;
//Phase1_Timer
@@ -311,8 +311,8 @@ class boss_high_astromancer_solarian : public CreatureScript
}
}
AppearDelay = true;
}
else
}
else
Phase1_Timer-=diff;
}
else
@@ -334,9 +334,9 @@ class boss_high_astromancer_solarian : public CreatureScript
else
Phase2_Timer -= diff;
}
else
else
if (Phase == 3)
{
{
me->AttackStop();
me->StopMoving();
//Check Phase3_Timer
@@ -344,7 +344,7 @@ class boss_high_astromancer_solarian : public CreatureScript
{
Phase = 1;
//15 seconds later Solarian reappears out of one of the 3 portals. Simultaneously, 2 healers appear in the two other portals.
int i = rand()%3;
int i = rand()%3;
me->GetMotionMaster()->Clear();
me->GetMap()->CreatureRelocation(me, Portals[i][0], Portals[i][1], Portals[i][2], CENTER_O);
@@ -358,7 +358,7 @@ class boss_high_astromancer_solarian : public CreatureScript
DoScriptText(SAY_SUMMON2, me);
AppearDelay = true;
Phase3_Timer = 15000;
}
}
else
Phase3_Timer -= diff;
}
@@ -370,7 +370,7 @@ class boss_high_astromancer_solarian : public CreatureScript
{
DoCast(me, SPELL_FEAR);
Fear_Timer = 20000;
}
}
else
Fear_Timer -= diff;
//VoidBolt_Timer
@@ -413,7 +413,7 @@ class mob_solarium_priest : public CreatureScript
: CreatureScript("mob_solarium_priest")
{
}
struct mob_solarium_priestAI : public ScriptedAI
{
mob_solarium_priestAI(Creature* pCreature) : ScriptedAI(pCreature)
@@ -463,23 +463,23 @@ class mob_solarium_priest : public CreatureScript
healTimer = 9000;
}
}
else
else
healTimer -= diff;
if (holysmiteTimer <= diff)
{
DoCast(me->getVictim(), SPELL_SOLARIUM_HOLY_SMITE);
holysmiteTimer = 4000;
}
else
}
else
holysmiteTimer -= diff;
if (aoesilenceTimer <= diff)
{
DoCast(me->getVictim(), SPELL_SOLARIUM_ARCANE_TORRENT);
aoesilenceTimer = 13000;
}
else
}
else
aoesilenceTimer -= diff;
DoMeleeAttackIfReady();
src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+37 -37
View File
@@ -644,7 +644,7 @@ class boss_kaelthas : public CreatureScript
if (Phase_Timer <= diff)
{
PhaseSubphase = 1;
}
}
else
Phase_Timer -= diff;
}
@@ -672,8 +672,8 @@ class boss_kaelthas : public CreatureScript
m_pInstance->SetData(DATA_KAELTHASEVENT, 3);
Phase = 3;
PhaseSubphase = 0;
}
else
}
else
Phase_Timer -= diff;
}
}
@@ -719,8 +719,8 @@ class boss_kaelthas : public CreatureScript
AttackStart(pTarget);
Phase_Timer = 30000;
}
else
}
else
Phase_Timer -= diff;
}
break;
@@ -757,7 +757,7 @@ class boss_kaelthas : public CreatureScript
IsCastingFireball = false;
Fireball_Timer = 5000+rand()%10000;
}
}
}
else
Fireball_Timer -= diff;
@@ -766,8 +766,8 @@ class boss_kaelthas : public CreatureScript
{
DoCast(me->getVictim(), SPELL_ARCANE_DISRUPTION, true);
ArcaneDisruption_Timer = 60000;
}
else
}
else
ArcaneDisruption_Timer -= diff;
if (FlameStrike_Timer <= diff)
@@ -776,8 +776,8 @@ class boss_kaelthas : public CreatureScript
DoCast(pUnit, SPELL_FLAME_STRIKE);
FlameStrike_Timer = 30000;
}
else
}
else
FlameStrike_Timer -= diff;
if (MindControl_Timer <= diff)
@@ -790,8 +790,8 @@ class boss_kaelthas : public CreatureScript
}
MindControl_Timer = 60000;
}
else
}
else
MindControl_Timer -= diff;
}
@@ -802,8 +802,8 @@ class boss_kaelthas : public CreatureScript
DoScriptText(RAND(SAY_SUMMON_PHOENIX1,SAY_SUMMON_PHOENIX2), me);
Phoenix_Timer = 60000;
}
else
}
else
Phoenix_Timer -= diff;
//Phase 4 specific spells
@@ -836,8 +836,8 @@ class boss_kaelthas : public CreatureScript
ChainPyros = true;
PyrosCasted = 0;
ShockBarrier_Timer = 60000;
}
else
}
else
ShockBarrier_Timer -= diff;
//Chain Pyros (3 of them max)
@@ -869,7 +869,7 @@ class boss_kaelthas : public CreatureScript
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
Phase = 6;
AttackStart(me->getVictim());
}
}
else
Phase_Timer -= diff;
}
@@ -978,7 +978,7 @@ class boss_kaelthas : public CreatureScript
DoCast(me, SPELL_SHOCK_BARRIER);
ShockBarrier_Timer = 20000;
}
else
else
ShockBarrier_Timer -= diff;
//NetherBeam_Timer
@@ -1073,7 +1073,7 @@ class boss_thaladred_the_darkener : public CreatureScript
Gaze_Timer = 8500;
}
}
else
else
Gaze_Timer -= diff;
//Silence_Timer
@@ -1251,7 +1251,7 @@ class boss_grand_astromancer_capernian : public CreatureScript
DoScriptText(SAY_CAPERNIAN_AGGRO, me);
Yell = true;
}
else
else
Yell_Timer -= diff;
}
@@ -1260,8 +1260,8 @@ class boss_grand_astromancer_capernian : public CreatureScript
{
DoCast(me->getVictim(), SPELL_CAPERNIAN_FIREBALL);
Fireball_Timer = 4000;
}
else
}
else
Fireball_Timer -= diff;
//Conflagration_Timer
@@ -1276,8 +1276,8 @@ class boss_grand_astromancer_capernian : public CreatureScript
DoCast(me->getVictim(), SPELL_CONFLAGRATION);
Conflagration_Timer = 10000+rand()%5000;
}
else
}
else
Conflagration_Timer -= diff;
//ArcaneExplosion_Timer
@@ -1302,8 +1302,8 @@ class boss_grand_astromancer_capernian : public CreatureScript
DoCast(pTarget, SPELL_ARCANE_EXPLOSION);
ArcaneExplosion_Timer = 4000+rand()%2000;
}
else
}
else
ArcaneExplosion_Timer -= diff;
//Do NOT deal any melee damage.
@@ -1374,8 +1374,8 @@ class boss_master_engineer_telonicus : public CreatureScript
{
DoCast(me->getVictim(), SPELL_BOMB);
Bomb_Timer = 25000;
}
else
}
else
Bomb_Timer -= diff;
//RemoteToy_Timer
@@ -1385,7 +1385,7 @@ class boss_master_engineer_telonicus : public CreatureScript
DoCast(pTarget, SPELL_REMOTE_TOY);
RemoteToy_Timer = 10000+rand()%5000;
}
}
else
RemoteToy_Timer -= diff;
@@ -1445,14 +1445,14 @@ class mob_kael_flamestrike : public CreatureScript
{
me->InterruptNonMeleeSpells(false);
DoCast(me, SPELL_FLAME_STRIKE_DMG);
}
else
}
else
me->Kill(me);
KillSelf = true;
Timer = 1000;
}
else
}
else
Timer -= diff;
}
};
@@ -1503,8 +1503,8 @@ class mob_phoenix_tk : public CreatureScript
if (me->GetHealth() > dmg)
me->SetHealth(uint32(me->GetHealth()-dmg));
Cycle_Timer = 2000;
}
else
}
else
Cycle_Timer -= diff;
DoMeleeAttackIfReady();
@@ -1567,8 +1567,8 @@ class mob_phoenix_egg_tk : public CreatureScript
{
me->SummonCreature(NPC_PHOENIX,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation(),TEMPSUMMON_CORPSE_DESPAWN,5000);
Rebirth_Timer = 0;
}
else
}
else
Rebirth_Timer -= diff;
}
};
src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
+6 -6
View File
@@ -50,7 +50,7 @@ class boss_void_reaver : public CreatureScript
: CreatureScript("boss_void_reaver")
{
}
struct boss_void_reaverAI : public ScriptedAI
{
boss_void_reaverAI(Creature* pCreature) : ScriptedAI(pCreature)
@@ -113,7 +113,7 @@ class boss_void_reaver : public CreatureScript
DoScriptText(RAND(SAY_POUNDING1,SAY_POUNDING2), me);
Pounding_Timer = 15000; //cast time(3000) + cooldown time(12000)
}
else
else
Pounding_Timer -= diff;
// Arcane Orb
if (ArcaneOrb_Timer <= diff)
@@ -154,16 +154,16 @@ class boss_void_reaver : public CreatureScript
if (DoGetThreat(me->getVictim()))
DoModifyThreatPercent(me->getVictim(),-25);
KnockAway_Timer = 30000;
}
else
}
else
KnockAway_Timer -= diff;
//Berserk
if (Berserk_Timer < diff && !Enraged)
{
DoCast(me, SPELL_BERSERK);
Enraged = true;
}
else
}
else
Berserk_Timer -= diff;
DoMeleeAttackIfReady();
src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
+27 -27
View File
@@ -42,7 +42,7 @@ class instance_mechanar : public InstanceMapScript
: InstanceMapScript("instance_mechanar")
{
}
struct instance_the_eye_InstanceMapScript : public InstanceScript
{
instance_the_eye_InstanceMapScript(Map* pMap) : InstanceScript(pMap) {Initialize();};
@@ -87,30 +87,30 @@ class instance_mechanar : public InstanceMapScript
{
switch(pCreature->GetEntry())
{
case 20064:
ThaladredTheDarkener = pCreature->GetGUID();
case 20064:
ThaladredTheDarkener = pCreature->GetGUID();
break;
case 20063:
MasterEngineerTelonicus = pCreature->GetGUID();
case 20063:
MasterEngineerTelonicus = pCreature->GetGUID();
break;
case 20062:
GrandAstromancerCapernian = pCreature->GetGUID();
case 20062:
GrandAstromancerCapernian = pCreature->GetGUID();
break;
case 20060:
LordSanguinar = pCreature->GetGUID();
case 20060:
LordSanguinar = pCreature->GetGUID();
break;
case 19622:
Kaelthas = pCreature->GetGUID();
case 19622:
Kaelthas = pCreature->GetGUID();
break;
case 18805:
Astromancer = pCreature->GetGUID();
case 18805:
Astromancer = pCreature->GetGUID();
break;
case 19514:
Alar = pCreature->GetGUID();
case 19514:
Alar = pCreature->GetGUID();
break;
}
}
uint64 GetData64(uint32 identifier)
{
switch(identifier)
@@ -130,19 +130,19 @@ class instance_mechanar : public InstanceMapScript
{
switch(type)
{
case DATA_ALAREVENT:
AlarEventPhase = data;
m_auiEncounter[0] = data;
case DATA_ALAREVENT:
AlarEventPhase = data;
m_auiEncounter[0] = data;
break;
case DATA_HIGHASTROMANCERSOLARIANEVENT:
m_auiEncounter[1] = data;
case DATA_HIGHASTROMANCERSOLARIANEVENT:
m_auiEncounter[1] = data;
break;
case DATA_VOIDREAVEREVENT:
m_auiEncounter[2] = data;
case DATA_VOIDREAVEREVENT:
m_auiEncounter[2] = data;
break;
case DATA_KAELTHASEVENT:
KaelthasEventPhase = data;
m_auiEncounter[3] = data;
case DATA_KAELTHASEVENT:
KaelthasEventPhase = data;
m_auiEncounter[3] = data;
break;
}
if (data == DONE)
@@ -184,7 +184,7 @@ class instance_mechanar : public InstanceMapScript
return;
}
OUT_LOAD_INST_DATA(in);
std::istringstream stream(in);
stream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3];
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
+4 -4
View File
@@ -56,7 +56,7 @@ class mob_crystalcore_devastator : public CreatureScript
Countercharge_Timer = 9000;
Knockaway_Timer = 25000;
}
void EnterCombat(Unit * /*who*/)
{
}
@@ -83,7 +83,7 @@ class mob_crystalcore_devastator : public CreatureScript
Knockaway_Timer = 23000;
}
else
else
Knockaway_Timer -= diff;
//Countercharge_Timer
@@ -91,8 +91,8 @@ class mob_crystalcore_devastator : public CreatureScript
{
DoCast(me, SPELL_COUNTERCHARGE);
Countercharge_Timer = 45000;
}
else
}
else
Countercharge_Timer -= diff;
DoMeleeAttackIfReady();
src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
+7 -7
View File
@@ -103,8 +103,8 @@ class boss_gatewatcher_iron_hand : public CreatureScript
{
DoCast(me, SPELL_SHADOW_POWER);
Shadow_Power_Timer = 20000 + rand()%8000;
}
else
}
else
Shadow_Power_Timer -= diff;
//Jack Hammer
@@ -120,8 +120,8 @@ class boss_gatewatcher_iron_hand : public CreatureScript
DoScriptText(RAND(SAY_HAMMER_1,SAY_HAMMER_2), me);
Jackhammer_Timer = 30000;
}
else
}
else
Jackhammer_Timer -= diff;
//Stream of Machine Fluid
@@ -129,8 +129,8 @@ class boss_gatewatcher_iron_hand : public CreatureScript
{
DoCast(me->getVictim(), SPELL_STREAM_OF_MACHINE_FLUID);
Stream_of_Machine_Fluid_Timer = 35000 + rand()%15000;
}
else
}
else
Stream_of_Machine_Fluid_Timer -= diff;
DoMeleeAttackIfReady();
@@ -140,7 +140,7 @@ class boss_gatewatcher_iron_hand : public CreatureScript
CreatureAI* GetAI(Creature* creature) const
{
return new boss_gatewatcher_iron_handAI(creature);
}
}
};
void AddSC_boss_gatewatcher_iron_hand()
src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
+17 -17
View File
@@ -45,7 +45,7 @@ enum eSpells
SPELL_DRAGONS_BREATH = 35250,
SPELL_KNOCKBACK = 37317,
SPELL_SOLARBURN = 35267,
H_SPELL_SUMMON_RAGIN_FLAMES = 39084,
H_SPELL_SUMMON_RAGIN_FLAMES = 39084,
SPELL_INFERNO = 35268,
H_SPELL_INFERNO = 39346,
SPELL_FIRE_TAIL = 35278,
@@ -65,15 +65,15 @@ class boss_nethermancer_sepethrea : public CreatureScript
{
pInstance = pCreature->GetInstanceScript();
}
InstanceScript *pInstance;
uint32 frost_attack_Timer;
uint32 arcane_blast_Timer;
uint32 dragons_breath_Timer;
uint32 knockback_Timer;
uint32 solarburn_Timer;
void Reset()
{
frost_attack_Timer = 7000 + rand()%3000;
@@ -121,17 +121,17 @@ class boss_nethermancer_sepethrea : public CreatureScript
DoCast(me->getVictim(), SPELL_FROST_ATTACK);
frost_attack_Timer = 7000 + rand()%3000;
}
else
}
else
frost_attack_Timer -= diff;
//Arcane Blast
//Arcane Blast
if (arcane_blast_Timer <= diff)
{
DoCast(me->getVictim(), SPELL_ARCANE_BLAST);
arcane_blast_Timer = 15000;
}
else
}
else
arcane_blast_Timer -= diff;
//Dragons Breath
if (dragons_breath_Timer <= diff)
@@ -143,8 +143,8 @@ class boss_nethermancer_sepethrea : public CreatureScript
DoScriptText(RAND(SAY_DRAGONS_BREATH_1,SAY_DRAGONS_BREATH_2), me);
}
dragons_breath_Timer = 12000 + rand()%10000;
}
else
}
else
dragons_breath_Timer -= diff;
//Knockback
@@ -152,8 +152,8 @@ class boss_nethermancer_sepethrea : public CreatureScript
{
DoCast(me->getVictim(), SPELL_KNOCKBACK);
knockback_Timer = 15000 + rand()%10000;
}
else
}
else
knockback_Timer -= diff;
//Solarburn
@@ -161,13 +161,13 @@ class boss_nethermancer_sepethrea : public CreatureScript
{
DoCast(me->getVictim(), SPELL_SOLARBURN);
solarburn_Timer = 30000;
}
else
}
else
solarburn_Timer -= diff;
DoMeleeAttackIfReady();
}
};
};
CreatureAI* GetAI(Creature* creature) const
{
@@ -259,7 +259,7 @@ class mob_ragin_flames : public CreatureScript
CreatureAI* GetAI(Creature* creature) const
{
return new mob_ragin_flamesAI(creature);
}
}
};
void AddSC_boss_nethermancer_sepethrea()
{
src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
+29 -29
View File
@@ -45,7 +45,7 @@ enum eSpells
H_SPELL_ARCANE_EXPLOSION = 15453,
SPELL_FRENZY = 36992,
//Spells work, but not implemented
SPELL_SUMMON_NETHER_WRAITH_1 = 35285,
SPELL_SUMMON_NETHER_WRAITH_1 = 35285,
SPELL_SUMMON_NETHER_WRAITH_2 = 35286,
SPELL_SUMMON_NETHER_WRAITH_3 = 35287,
SPELL_SUMMON_NETHER_WRAITH_4 = 35288,
@@ -62,22 +62,22 @@ class boss_pathaleon_the_calculator : public CreatureScript
: CreatureScript("boss_pathaleon_the_calculator")
{
}
struct boss_pathaleon_the_calculatorAI : public ScriptedAI
{
boss_pathaleon_the_calculatorAI(Creature* pCreature) : ScriptedAI(pCreature), summons(me)
{
}
uint32 Summon_Timer;
SummonList summons;
uint32 ManaTap_Timer;
uint32 ArcaneTorrent_Timer;
uint32 Domination_Timer;
uint32 ArcaneExplosion_Timer;
bool Enraged;
uint32 Counter;
void Reset()
@@ -107,24 +107,24 @@ class boss_pathaleon_the_calculator : public CreatureScript
{
DoScriptText(SAY_DEATH, me);
summons.DespawnAll();
summons.DespawnAll();
}
void JustSummoned(Creature *summon)
void JustSummoned(Creature *summon)
{
summons.Summon(summon);
}
void SummonedCreatureDespawn(Creature *summon)
void SummonedCreatureDespawn(Creature *summon)
{
summons.Despawn(summon);
}
void UpdateAI(const uint32 diff)
{
{
//Return since we have no target
if (!UpdateVictim())
return;
if (Summon_Timer <= diff)
{
for (uint8 i = 0; i < 3; ++i)
@@ -136,7 +136,7 @@ class boss_pathaleon_the_calculator : public CreatureScript
}
DoScriptText(SAY_SUMMON, me);
Summon_Timer = 30000 + rand()%15000;
}
}
else
Summon_Timer -= diff;
@@ -144,18 +144,18 @@ class boss_pathaleon_the_calculator : public CreatureScript
{
DoCast(me->getVictim(), SPELL_MANA_TAP);
ManaTap_Timer = 14000 + rand()%8000;
}
}
else
ManaTap_Timer -= diff;
if (ArcaneTorrent_Timer <= diff)
{
DoCast(me->getVictim(), SPELL_ARCANE_TORRENT);
ArcaneTorrent_Timer = 12000 + rand()%6000;
}
else
else
ArcaneTorrent_Timer -= diff;
if (Domination_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1))
@@ -164,8 +164,8 @@ class boss_pathaleon_the_calculator : public CreatureScript
DoCast(pTarget, SPELL_DOMINATION);
}
Domination_Timer = 25000 + rand()%5000;
}
else
}
else
Domination_Timer -= diff;
//Only casting if Heroic Mode is used
@@ -176,10 +176,10 @@ class boss_pathaleon_the_calculator : public CreatureScript
DoCast(me->getVictim(), H_SPELL_ARCANE_EXPLOSION);
ArcaneExplosion_Timer = 10000 + rand()%4000;
}
else
ArcaneExplosion_Timer -= diff;
else
ArcaneExplosion_Timer -= diff;
}
if (!Enraged && me->GetHealth()*100 / me->GetMaxHealth() < 21)
{
DoCast(me, SPELL_FRENZY);
@@ -187,7 +187,7 @@ class boss_pathaleon_the_calculator : public CreatureScript
Enraged = true;
}
DoMeleeAttackIfReady();
}
};
@@ -206,7 +206,7 @@ class mob_nether_wraith : public CreatureScript
: CreatureScript("mob_nether_wraith")
{
}
struct mob_nether_wraithAI : public ScriptedAI
{
mob_nether_wraithAI(Creature* pCreature) : ScriptedAI(pCreature) {}
@@ -238,8 +238,8 @@ class mob_nether_wraith : public CreatureScript
else
DoCast(me->getVictim(), SPELL_ARCANE_MISSILES);
ArcaneMissiles_Timer = 5000 + rand()%5000;
}
else
}
else
ArcaneMissiles_Timer -=diff;
if (!Detonation)
@@ -249,7 +249,7 @@ class mob_nether_wraith : public CreatureScript
DoCast(me, SPELL_DETONATION);
Detonation = true;
}
else
else
Detonation_Timer -= diff;
}
@@ -259,13 +259,13 @@ class mob_nether_wraith : public CreatureScript
{
me->setDeathState(JUST_DIED);
me->RemoveCorpse();
}
else
}
else
Die_Timer -= diff;
}
DoMeleeAttackIfReady();
}
};
};
CreatureAI* GetAI(Creature* pCreature) const
{
src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
+6 -6
View File
@@ -35,18 +35,18 @@ class instance_mechanar : public InstanceMapScript
: InstanceMapScript("instance_mechanar")
{
}
struct instance_mechanar_InstanceMapScript : public InstanceScript
{
instance_mechanar_InstanceMapScript(Map* pMap) : InstanceScript(pMap) { Initialize(); };
uint32 m_auiEncounter[MAX_ENCOUNTER];
void Initialize()
{
memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
}
bool IsEncounterInProgress() const
{
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
@@ -55,7 +55,7 @@ class instance_mechanar : public InstanceMapScript
return false;
}
uint32 GetData(uint32 type)
{
switch(type)
@@ -83,7 +83,7 @@ class instance_mechanar : public InstanceMapScript
{
return new instance_mechanar_InstanceMapScript(pMap);
}
};
src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
+26 -26
View File
@@ -80,7 +80,7 @@ class npc_millhouse_manastorm : public CreatureScript
{
pInstance = pCreature->GetInstanceScript();
}
InstanceScript* pInstance;
uint32 EventProgress_Timer;
@@ -90,7 +90,7 @@ class npc_millhouse_manastorm : public CreatureScript
uint32 Pyroblast_Timer;
uint32 Fireball_Timer;
void Reset()
{
EventProgress_Timer = 2000;
@@ -106,11 +106,11 @@ class npc_millhouse_manastorm : public CreatureScript
if (pInstance->GetData(TYPE_WARDEN_2) == DONE)
Init = true;
if (pInstance->GetData(TYPE_HARBINGERSKYRISS) == DONE)
DoScriptText(SAY_COMPLETE, me);
if (pInstance->GetData(TYPE_HARBINGERSKYRISS) == DONE)
DoScriptText(SAY_COMPLETE, me);
}
}
void AttackStart(Unit* pWho)
{
if (me->Attack(pWho, true))
@@ -137,7 +137,7 @@ class npc_millhouse_manastorm : public CreatureScript
if (pInstance && pInstance->GetData(TYPE_HARBINGERSKYRISS) != DONE)
->FailQuest();*/
}
void UpdateAI(const uint32 diff)
{
if (!Init)
@@ -183,12 +183,12 @@ class npc_millhouse_manastorm : public CreatureScript
}
++Phase;
}
}
else
}
else
EventProgress_Timer -= diff;
}
if (!UpdateVictim())
if (!UpdateVictim())
return;
if (!LowHp && ((me->GetHealth()*100 / me->GetMaxHealth()) < 20))
{
@@ -425,11 +425,11 @@ class npc_warden_mellichar : public CreatureScript
case 2:
switch (urand(0,1))
{
case 0:
me->SummonCreature(ENTRY_TRICKSTER,478.326,-148.505,42.56,3.19,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
case 0:
me->SummonCreature(ENTRY_TRICKSTER,478.326,-148.505,42.56,3.19,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
break;
case 1:
me->SummonCreature(ENTRY_PH_HUNTER,478.326,-148.505,42.56,3.19,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
me->SummonCreature(ENTRY_PH_HUNTER,478.326,-148.505,42.56,3.19,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
break;
}
break;
@@ -442,22 +442,22 @@ class npc_warden_mellichar : public CreatureScript
case 5:
switch (urand(0,1))
{
case 0:
me->SummonCreature(ENTRY_AKKIRIS,420.179,-174.396,42.58,0.02,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
case 0:
me->SummonCreature(ENTRY_AKKIRIS,420.179,-174.396,42.58,0.02,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
break;
case 1:
me->SummonCreature(ENTRY_SULFURON,420.179,-174.396,42.58,0.02,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
case 1:
me->SummonCreature(ENTRY_SULFURON,420.179,-174.396,42.58,0.02,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
break;
}
break;
case 6:
switch (urand(0,1))
{
case 0:
me->SummonCreature(ENTRY_TW_DRAK,471.795,-174.58,42.58,3.06,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
case 0:
me->SummonCreature(ENTRY_TW_DRAK,471.795,-174.58,42.58,3.06,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
break;
case 1:
me->SummonCreature(ENTRY_BL_DRAK,471.795,-174.58,42.58,3.06,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
case 1:
me->SummonCreature(ENTRY_BL_DRAK,471.795,-174.58,42.58,3.06,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
break;
}
break;
@@ -508,8 +508,8 @@ class npc_warden_mellichar : public CreatureScript
break;
}
}
}
else
}
else
EventProgress_Timer -= diff;
}
};
@@ -517,7 +517,7 @@ class npc_warden_mellichar : public CreatureScript
CreatureAI* OnGetAI(Creature* creature) const
{
return new npc_warden_mellicharAI(creature);
}
}
};
/*#####
@@ -543,13 +543,13 @@ class mob_zerekethvoidzone : public CreatureScript
me->SetUInt32Value(UNIT_NPC_FLAGS,0);
me->setFaction(16);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
DoCast(me, SPELL_VOID_ZONE_DAMAGE);
}
void EnterCombat(Unit* /*who*/) {}
};
CreatureAI* OnGetAI(Creature* creature) const
{
return new mob_zerekethvoidzoneAI(creature);
src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
+6 -6
View File
@@ -96,7 +96,7 @@ class boss_harbinger_skyriss : public CreatureScript
IsImage66 = false;
Intro_Phase = 1;
Intro_Timer = 5000;
Intro_Timer = 5000;
MindRend_Timer = 3000;
Fear_Timer = 15000;
Domination_Timer = 30000;
@@ -107,10 +107,10 @@ class boss_harbinger_skyriss : public CreatureScript
{
if (!Intro)
return;
ScriptedAI::MoveInLineOfSight(who);
}
void EnterCombat(Unit * /*who*/) {}
void JustDied(Unit* /*Killer*/)
@@ -189,7 +189,7 @@ class boss_harbinger_skyriss : public CreatureScript
Intro = true;
break;
}
}
}
else
Intro_Timer -=diff;
}
@@ -271,7 +271,7 @@ class boss_harbinger_skyriss : public CreatureScript
DoMeleeAttackIfReady();
}
};
CreatureAI* GetAI(Creature* pCreature) const
{
return new boss_harbinger_skyrissAI (pCreature);
@@ -295,7 +295,7 @@ class boss_harbinger_skyriss_illusion : public CreatureScript
boss_harbinger_skyriss_illusionAI(Creature* pCreature) : ScriptedAI(pCreature) {}
void Reset() { }
void EnterCombat(Unit * /*who*/) { }
};
src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
+8 -8
View File
@@ -98,7 +98,7 @@ class instance_arcatraz : public InstanceMapScript
return false;
}
void OnGameObjectCreate(GameObject* pGo, bool /*add*/)
{
@@ -155,7 +155,7 @@ class instance_arcatraz : public InstanceMapScript
m_auiEncounter[8] = NOT_STARTED;
}
m_auiEncounter[3] = data;
break;
break;
case TYPE_WARDEN_1:
if (data == IN_PROGRESS)
if (GameObject *pGo = instance->GetGameObject(Pod_AlphaGUID))
@@ -163,7 +163,7 @@ class instance_arcatraz : public InstanceMapScript
m_auiEncounter[4] = data;
break;
case TYPE_WARDEN_2:
if (data == IN_PROGRESS)
if (data == IN_PROGRESS)
{
if (GameObject *pGo = instance->GetGameObject(Pod_BetaGUID))
pGo->UseDoorOrButton();
@@ -201,23 +201,23 @@ class instance_arcatraz : public InstanceMapScript
pGo->UseDoorOrButton();
}
break;
}
}
}
uint32 GetData(uint32 type)
{
{
switch(type)
{
case TYPE_HARBINGERSKYRISS: return m_auiEncounter[3];
case TYPE_WARDEN_1: return m_auiEncounter[4];
case TYPE_WARDEN_2: return m_auiEncounter[5];
case TYPE_WARDEN_2: return m_auiEncounter[5];
case TYPE_WARDEN_3: return m_auiEncounter[6];
case TYPE_WARDEN_4: return m_auiEncounter[7];
case TYPE_WARDEN_5: return m_auiEncounter[8];
}
return 0;
}
uint64 GetData64(uint32 data)
{
switch(data)
src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
+6 -6
View File
@@ -36,7 +36,7 @@ enum eSays
};
enum eSpells
{
{
SPELL_TRANQUILITY = 34550,
SPELL_TREE_FORM = 34551,
SPELL_SUMMON_FRAYER = 34557,
@@ -134,8 +134,8 @@ class boss_high_botanist_freywinn : public CreatureScript
MoveFree = false;
TreeForm_Timer = 75000;
}
else
}
else
TreeForm_Timer -= diff;
if (!MoveFree)
@@ -173,7 +173,7 @@ class boss_high_botanist_freywinn : public CreatureScript
}
MoveCheck_Timer = 500;
}
else
else
MoveCheck_Timer -= diff;
return;
@@ -187,8 +187,8 @@ class boss_high_botanist_freywinn : public CreatureScript
{
DoSummonSeedling();
SummonSeedling_Timer = 6000;
}
else
}
else
SummonSeedling_Timer -= diff;
DoMeleeAttackIfReady();
src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
+9 -9
View File
@@ -26,7 +26,7 @@ EndScriptData */
#include "ScriptPCH.h"
enum eSpells
{
{
SPELL_ALLERGIC_REACTION = 34697,
SPELL_TELEPORT_SELF = 34673,
@@ -177,8 +177,8 @@ class boss_laj : public CreatureScript
DoScriptText(EMOTE_SUMMON, me);
DoSummons();
Summon_Timer = 2500;
}
else
}
else
Summon_Timer -= diff;
}
@@ -186,8 +186,8 @@ class boss_laj : public CreatureScript
{
DoCast(me->getVictim(), SPELL_ALLERGIC_REACTION);
Allergic_Timer = 25000+rand()%15000;
}
else
}
else
Allergic_Timer -= diff;
if (Teleport_Timer <= diff)
@@ -195,16 +195,16 @@ class boss_laj : public CreatureScript
DoCast(me, SPELL_TELEPORT_SELF);
Teleport_Timer = 30000+rand()%10000;
CanSummon = true;
}
else
}
else
Teleport_Timer -= diff;
if (Transform_Timer <= diff)
{
DoTransform();
Transform_Timer = 25000+rand()%15000;
}
else
}
else
Transform_Timer -= diff;
DoMeleeAttackIfReady();
src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
+6 -6
View File
@@ -40,7 +40,7 @@ enum eSpells
WAR_STOMP = 34716,
SUMMON_TREANTS = 34727, // DBC: 34727, 34731, 34733, 34734, 34736, 34739, 34741 (with Ancestral Life spell 34742) // won't work (guardian summon)
ARCANE_VOLLEY = 36705,
ARCANE_VOLLEY_H = 39133,
ARCANE_VOLLEY_H = 39133,
SPELL_HEAL_FATHER = 6262,
};
@@ -109,7 +109,7 @@ class mob_warp_splinter_treant : public CreatureScript
}
check_Timer = 1000;
}
else
else
check_Timer -= diff;
return;
}
@@ -201,7 +201,7 @@ class boss_warp_splinter : public CreatureScript
DoCast(me->getVictim(), WAR_STOMP);
War_Stomp_Timer = 25000 + rand()%15000;
}
else
else
War_Stomp_Timer -= diff;
//Check for Arcane Volley
@@ -209,7 +209,7 @@ class boss_warp_splinter : public CreatureScript
{
DoCast(me->getVictim(), DUNGEON_MODE(ARCANE_VOLLEY,ARCANE_VOLLEY_H));
Arcane_Volley_Timer = 20000 + rand()%15000;
}
}
else
Arcane_Volley_Timer -= diff;
@@ -218,8 +218,8 @@ class boss_warp_splinter : public CreatureScript
{
SummonTreants();
Summon_Treants_Timer = 45000;
}
else
}
else
Summon_Treants_Timer -= diff;
DoMeleeAttackIfReady();