nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-29 16:43:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

indention fix

Browse Source
This commit is contained in:
lee1991
2017-01-09 00:02:55 +00:00
parent a395678bb2
commit b2f011c748
5 changed files with 74 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
View File

@@ -269,7 +269,7 @@ public:
DoCast(SelectTarget(SELECT_TARGET_RANDOM, 1, 45, true), SPELL_VOIDZONE, true);
VoidZoneTimer = 15000;
} else
VoidZoneTimer -= diff;
VoidZoneTimer -= diff;
// NetherInfusion Berserk
if (!Berserk && NetherInfusionTimer <= diff)
@@ -278,7 +278,7 @@ public:
DoCast(me, SPELL_NETHERSPITE_ROAR);
Berserk = true;
} else
NetherInfusionTimer -= diff;
NetherInfusionTimer -= diff;
if (PortalPhase) // PORTAL PHASE
{
@@ -288,7 +288,7 @@ public:
UpdatePortals();
PortalTimer = 1000;
} else
PortalTimer -= diff;
PortalTimer -= diff;
// Empowerment & Nether Burn
if (EmpowermentTimer <= diff)
@@ -297,7 +297,7 @@ public:
me->AddAura(SPELL_NETHERBURN_AURA, me);
EmpowermentTimer = 90000;
} else
EmpowermentTimer -= diff;
EmpowermentTimer -= diff;
if (PhaseTimer <= diff)
{
@@ -307,7 +307,7 @@ public:
return;
}
} else
PhaseTimer -= diff;
PhaseTimer -= diff;
}
else // BANISH PHASE
{
@@ -318,7 +318,7 @@ public:
DoCast(target, SPELL_NETHERBREATH);
NetherbreathTimer = urand(5000, 7000);
} else
NetherbreathTimer -= diff;
NetherbreathTimer -= diff;
if (PhaseTimer <= diff)
{
@@ -328,7 +328,7 @@ public:
return;
}
} else
PhaseTimer -= diff;
PhaseTimer -= diff;
}
DoMeleeAttackIfReady();

18
src/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
View File

@@ -296,14 +296,14 @@ public:
DoCastVictim(SPELL_BELLOWING_ROAR);
BellowingRoarTimer = urand(30000, 40000);
} else
BellowingRoarTimer -= diff;
BellowingRoarTimer -= diff;
if (SmolderingBreathTimer <= diff)
{
DoCastVictim(SPELL_SMOLDERING_BREATH);
SmolderingBreathTimer = 20000;
} else
SmolderingBreathTimer -= diff;
SmolderingBreathTimer -= diff;
if (CharredEarthTimer <= diff)
{
@@ -311,7 +311,7 @@ public:
DoCast(target, SPELL_CHARRED_EARTH);
CharredEarthTimer = 20000;
} else
CharredEarthTimer -= diff;
CharredEarthTimer -= diff;
if (TailSweepTimer <= diff)
{
@@ -320,7 +320,7 @@ public:
DoCast(target, SPELL_TAIL_SWEEP);
TailSweepTimer = 15000;
} else
TailSweepTimer -= diff;
TailSweepTimer -= diff;
if (SearingCindersTimer <= diff)
{
@@ -328,7 +328,7 @@ public:
DoCast(target, SPELL_SEARING_CINDERS);
SearingCindersTimer = 10000;
} else
SearingCindersTimer -= diff;
SearingCindersTimer -= diff;
uint32 Prozent = uint32(me->GetHealthPct());
@@ -364,7 +364,7 @@ public:
RainBones = true;
SmokingBlastTimer = 20000;
} else
RainofBonesTimer -= diff;
RainofBonesTimer -= diff;
if (DistractingAshTimer <= diff)
{
@@ -372,7 +372,7 @@ public:
DoCast(target, SPELL_DISTRACTING_ASH);
DistractingAshTimer = 2000; //timer wrong
} else
DistractingAshTimer -= diff;
DistractingAshTimer -= diff;
}
if (RainBones)
@@ -382,7 +382,7 @@ public:
DoCastVictim(SPELL_SMOKING_BLAST);
SmokingBlastTimer = 1500; //timer wrong
} else
SmokingBlastTimer -= diff;
SmokingBlastTimer -= diff;
}
if (FireballBarrageTimer <= diff)
@@ -391,7 +391,7 @@ public:
DoCast(target, SPELL_FIREBALL_BARRAGE);
FireballBarrageTimer = 20000;
} else
FireballBarrageTimer -= diff;
FireballBarrageTimer -= diff;
if (FlyTimer <= diff) //landing
{

24
src/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
View File

@@ -193,7 +193,7 @@ public:
CloseDoorTimer = 0;
}
else
CloseDoorTimer -= diff;
CloseDoorTimer -= diff;
}
//Cooldowns for casts
@@ -202,7 +202,7 @@ public:
if (ArcaneCooldown >= diff)
ArcaneCooldown -= diff;
else
ArcaneCooldown = 0;
ArcaneCooldown = 0;
}
if (FireCooldown)
@@ -210,7 +210,7 @@ public:
if (FireCooldown >= diff)
FireCooldown -= diff;
else
FireCooldown = 0;
FireCooldown = 0;
}
if (FrostCooldown)
@@ -218,7 +218,7 @@ public:
if (FrostCooldown >= diff)
FrostCooldown -= diff;
else
FrostCooldown = 0;
FrostCooldown = 0;
}
if (!Drinking && me->GetMaxPower(POWER_MANA) && (me->GetPower(POWER_MANA) * 100 / me->GetMaxPower(POWER_MANA)) < 20)
@@ -306,7 +306,7 @@ public:
NormalCastTimer = 1000;
}
else
NormalCastTimer -= diff;
NormalCastTimer -= diff;
if (SecondarySpellTimer <= diff)
{
@@ -323,7 +323,7 @@ public:
SecondarySpellTimer = urand(5000, 20000);
}
else
SecondarySpellTimer -= diff;
SecondarySpellTimer -= diff;
if (SuperCastTimer <= diff)
{
@@ -384,7 +384,8 @@ public:
SuperCastTimer = urand(35000, 40000);
}
else SuperCastTimer -= diff;
else
SuperCastTimer -= diff;
if (!ElementalsSpawned && HealthBelowPct(40))
{
@@ -479,7 +480,7 @@ public:
BerserkTimer = 60000;
}
else
BerserkTimer -= diff;
BerserkTimer -= diff;
//Flame Wreath check
if (FlameWreathTimer)
@@ -487,7 +488,7 @@ public:
if (FlameWreathTimer >= diff)
FlameWreathTimer -= diff;
else
FlameWreathTimer = 0;
FlameWreathTimer = 0;
if (FlameWreathCheckTime <= diff)
{
@@ -507,7 +508,7 @@ public:
FlameWreathCheckTime = 500;
}
else
FlameWreathCheckTime -= diff;
FlameWreathCheckTime -= diff;
}
if (ArcaneCooldown && FireCooldown && FrostCooldown)
@@ -585,7 +586,8 @@ public:
DoCastVictim(SPELL_WATERBOLT);
CastTimer = urand(2000, 5000);
}
else CastTimer -= diff;
else
CastTimer -= diff;
}
};
};

14
src/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
View File

@@ -109,7 +109,7 @@ public:
AmplifyTimer = urand(10000, 20000);
} else
AmplifyTimer -= diff;
AmplifyTimer -= diff;
DoMeleeAttackIfReady();
}
@@ -224,7 +224,7 @@ public:
DoCastVictim(SPELL_FIREBOLT);
FireboltTimer = 2200;
} else
FireboltTimer -= diff;
FireboltTimer -= diff;
DoMeleeAttackIfReady();
}
@@ -370,7 +370,7 @@ public:
me->RemoveAura(SPELL_BROKEN_PACT);
}
else
SummonKilrekTimer -= diff;
SummonKilrekTimer -= diff;
if (SacrificeTimer <= diff)
{
@@ -390,14 +390,14 @@ public:
}
}
} else
SacrificeTimer -= diff;
SacrificeTimer -= diff;
if (ShadowboltTimer <= diff)
{
DoCast(SelectTarget(SELECT_TARGET_TOPAGGRO, 0), SPELL_SHADOW_BOLT);
ShadowboltTimer = 10000;
} else
ShadowboltTimer -= diff;
ShadowboltTimer -= diff;
if (SummonTimer <= diff)
{
@@ -414,7 +414,7 @@ public:
SummonTimer = 5000;
}
} else
SummonTimer -= diff;
SummonTimer -= diff;
if (!Berserk)
{
@@ -423,7 +423,7 @@ public:
DoCast(me, SPELL_BERSERK);
Berserk = true;
} else
BerserkTimer -= diff;
BerserkTimer -= diff;
}
DoMeleeAttackIfReady();

74
src/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
View File

@@ -193,7 +193,8 @@ public:
{
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
AggroTimer = 0;
} else AggroTimer -= diff;
} else
AggroTimer -= diff;
}
if (!UpdateVictim())
@@ -204,21 +205,21 @@ public:
DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_WATERBOLT);
WaterBoltTimer = TitoDied ? 1500 : 5000;
} else
WaterBoltTimer -= diff;
WaterBoltTimer -= diff;
if (FearTimer <= diff)
{
DoCastVictim(SPELL_SCREAM);
FearTimer = 30000;
} else
FearTimer -= diff;
FearTimer -= diff;
if (!SummonedTito)
{
if (SummonTitoTimer <= diff)
SummonTito();
else
SummonTitoTimer -= diff;
SummonTitoTimer -= diff;
}
DoMeleeAttackIfReady();
@@ -277,7 +278,7 @@ public:
DoCastVictim(SPELL_YIPPING);
YipTimer = 10000;
} else
YipTimer -= diff;
YipTimer -= diff;
DoMeleeAttackIfReady();
}
@@ -387,7 +388,8 @@ public:
{
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
AggroTimer = 0;
} else AggroTimer -= diff;
} else
AggroTimer -= diff;
}
if (!UpdateVictim())
@@ -398,7 +400,7 @@ public:
DoCastVictim(SPELL_BRAIN_BASH);
BrainBashTimer = 15000;
} else
BrainBashTimer -= diff;
BrainBashTimer -= diff;
if (BrainWipeTimer <= diff)
{
@@ -406,7 +408,7 @@ public:
DoCast(target, SPELL_BRAIN_WIPE);
BrainWipeTimer = 20000;
} else
BrainWipeTimer -= diff;
BrainWipeTimer -= diff;
DoMeleeAttackIfReady();
}
@@ -496,7 +498,7 @@ public:
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
AggroTimer = 0;
} else
AggroTimer -= diff;
AggroTimer -= diff;
}
if (!UpdateVictim())
@@ -507,7 +509,7 @@ public:
DoCastVictim(SPELL_CLEAVE);
CleaveTimer = 5000;
} else
CleaveTimer -= diff;
CleaveTimer -= diff;
if (RustCount < 8)
{
@@ -518,7 +520,7 @@ public:
DoCast(me, SPELL_RUST);
RustTimer = 6000;
} else
RustTimer -= diff;
RustTimer -= diff;
}
DoMeleeAttackIfReady();
@@ -607,7 +609,7 @@ public:
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
AggroTimer = 0;
} else
AggroTimer -= diff;
AggroTimer -= diff;
}
if (!UpdateVictim())
@@ -618,21 +620,21 @@ public:
DoCastVictim(SPELL_MANGLE);
MangleTimer = urand(5000, 8000);
} else
MangleTimer -= diff;
MangleTimer -= diff;
if (ShredTimer <= diff)
{
DoCastVictim(SPELL_SHRED);
ShredTimer = urand(10000, 15000);
} else
ShredTimer -= diff;
ShredTimer -= diff;
if (ScreamTimer <= diff)
{
DoCastVictim(SPELL_FRIGHTENED_SCREAM);
ScreamTimer = urand(20000, 30000);
} else
ScreamTimer -= diff;
ScreamTimer -= diff;
DoMeleeAttackIfReady();
}
@@ -709,14 +711,14 @@ public:
Cyclone->CastSpell(Cyclone, SPELL_CYCLONE_VISUAL, true);
CycloneTimer = 22000;
} else
CycloneTimer -= diff;
CycloneTimer -= diff;
if (ChainLightningTimer <= diff)
{
DoCastVictim(SPELL_CHAIN_LIGHTNING);
ChainLightningTimer = 8000;
} else
ChainLightningTimer -= diff;
ChainLightningTimer -= diff;
DoMeleeAttackIfReady();
}
@@ -763,7 +765,7 @@ public:
me->GetMotionMaster()->MovePoint(0, pos);
MoveTimer = urand(3000, 5000);
} else
MoveTimer -= diff;
MoveTimer -= diff;
}
};
};
@@ -926,7 +928,7 @@ public:
ChaseTimer = 40000;
}
} else
ChaseTimer -= diff;
ChaseTimer -= diff;
if (IsChasing)
return;
@@ -936,14 +938,14 @@ public:
DoCastVictim(SPELL_TERRIFYING_HOWL);
FearTimer = urand(25000, 35000);
} else
FearTimer -= diff;
FearTimer -= diff;
if (SwipeTimer <= diff)
{
DoCastVictim(SPELL_WIDE_SWIPE);
SwipeTimer = urand(25000, 30000);
} else
SwipeTimer -= diff;
SwipeTimer -= diff;
}
};
};
@@ -1313,7 +1315,7 @@ public:
ResurrectTimer = 10000;
}
} else
ResurrectTimer -= diff;
ResurrectTimer -= diff;
}
if (BackwardLungeTimer <= diff)
@@ -1325,14 +1327,14 @@ public:
BackwardLungeTimer = urand(15000, 30000);
}
} else
BackwardLungeTimer -= diff;
BackwardLungeTimer -= diff;
if (DaringTimer <= diff)
{
DoCast(me, SPELL_DARING);
DaringTimer = urand(20000, 40000);
} else
DaringTimer -= diff;
DaringTimer -= diff;
if (DeadlySwatheTimer <= diff)
{
@@ -1340,14 +1342,14 @@ public:
DoCast(target, SPELL_DEADLY_SWATHE);
DeadlySwatheTimer = urand(15000, 25000);
} else
DeadlySwatheTimer -= diff;
DeadlySwatheTimer -= diff;
if (PoisonThrustTimer <= diff)
{
DoCastVictim(SPELL_POISON_THRUST);
PoisonThrustTimer = urand(10000, 20000);
} else
PoisonThrustTimer -= diff;
PoisonThrustTimer -= diff;
DoMeleeAttackIfReady();
}
@@ -1363,7 +1365,7 @@ void boss_julianne::boss_julianneAI::UpdateAI(uint32 diff)
Talk(SAY_JULIANNE_ENTER);
EntryYellTimer = 0;
} else
EntryYellTimer -= diff;
EntryYellTimer -= diff;
}
if (AggroYellTimer)
@@ -1375,7 +1377,7 @@ void boss_julianne::boss_julianneAI::UpdateAI(uint32 diff)
me->setFaction(16);
AggroYellTimer = 0;
} else
AggroYellTimer -= diff;
AggroYellTimer -= diff;
}
if (DrinkPoisonTimer)
@@ -1388,7 +1390,7 @@ void boss_julianne::boss_julianneAI::UpdateAI(uint32 diff)
SummonRomuloTimer = 10000;
DrinkPoisonTimer = 0;
} else
DrinkPoisonTimer -= diff;
DrinkPoisonTimer -= diff;
}
if (Phase == PHASE_ROMULO && !SummonedRomulo)
@@ -1406,7 +1408,7 @@ void boss_julianne::boss_julianneAI::UpdateAI(uint32 diff)
}
SummonedRomulo = true;
} else
SummonRomuloTimer -= diff;
SummonRomuloTimer -= diff;
}
if (ResurrectSelfTimer)
@@ -1423,7 +1425,7 @@ void boss_julianne::boss_julianneAI::UpdateAI(uint32 diff)
ResurrectSelfTimer = 0;
ResurrectTimer = 1000;
} else
ResurrectSelfTimer -= diff;
ResurrectSelfTimer -= diff;
}
if (!UpdateVictim() || IsFakingDeath)
@@ -1443,7 +1445,7 @@ void boss_julianne::boss_julianneAI::UpdateAI(uint32 diff)
ResurrectTimer = 10000;
}
} else
ResurrectTimer -= diff;
ResurrectTimer -= diff;
}
if (BlindingPassionTimer <= diff)
@@ -1452,21 +1454,21 @@ void boss_julianne::boss_julianneAI::UpdateAI(uint32 diff)
DoCast(target, SPELL_BLINDING_PASSION);
BlindingPassionTimer = urand(30000, 45000);
} else
BlindingPassionTimer -= diff;
BlindingPassionTimer -= diff;
if (DevotionTimer <= diff)
{
DoCast(me, SPELL_DEVOTION);
DevotionTimer = urand(15000, 45000);
} else
DevotionTimer -= diff;
DevotionTimer -= diff;
if (PowerfulAttractionTimer <= diff)
{
DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_POWERFUL_ATTRACTION);
PowerfulAttractionTimer = urand(5000, 30000);
} else
PowerfulAttractionTimer -= diff;
PowerfulAttractionTimer -= diff;
if (EternalAffectionTimer <= diff)
{
@@ -1479,7 +1481,7 @@ void boss_julianne::boss_julianneAI::UpdateAI(uint32 diff)
EternalAffectionTimer = urand(45000, 60000);
} else
EternalAffectionTimer -= diff;
EternalAffectionTimer -= diff;
DoMeleeAttackIfReady();
}