sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests 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
src/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
+7 -7
View File
@@ -269,7 +269,7 @@ public:
DoCast(SelectTarget(SELECT_TARGET_RANDOM, 1, 45, true), SPELL_VOIDZONE, true); DoCast(SelectTarget(SELECT_TARGET_RANDOM, 1, 45, true), SPELL_VOIDZONE, true);
VoidZoneTimer = 15000; VoidZoneTimer = 15000;
} else } else
VoidZoneTimer -= diff; VoidZoneTimer -= diff;
// NetherInfusion Berserk // NetherInfusion Berserk
if (!Berserk && NetherInfusionTimer <= diff) if (!Berserk && NetherInfusionTimer <= diff)
@@ -278,7 +278,7 @@ public:
DoCast(me, SPELL_NETHERSPITE_ROAR); DoCast(me, SPELL_NETHERSPITE_ROAR);
Berserk = true; Berserk = true;
} else } else
NetherInfusionTimer -= diff; NetherInfusionTimer -= diff;
if (PortalPhase) // PORTAL PHASE if (PortalPhase) // PORTAL PHASE
{ {
@@ -288,7 +288,7 @@ public:
UpdatePortals(); UpdatePortals();
PortalTimer = 1000; PortalTimer = 1000;
} else } else
PortalTimer -= diff; PortalTimer -= diff;
// Empowerment & Nether Burn // Empowerment & Nether Burn
if (EmpowermentTimer <= diff) if (EmpowermentTimer <= diff)
@@ -297,7 +297,7 @@ public:
me->AddAura(SPELL_NETHERBURN_AURA, me); me->AddAura(SPELL_NETHERBURN_AURA, me);
EmpowermentTimer = 90000; EmpowermentTimer = 90000;
} else } else
EmpowermentTimer -= diff; EmpowermentTimer -= diff;
if (PhaseTimer <= diff) if (PhaseTimer <= diff)
{ {
@@ -307,7 +307,7 @@ public:
return; return;
} }
} else } else
PhaseTimer -= diff; PhaseTimer -= diff;
} }
else // BANISH PHASE else // BANISH PHASE
{ {
@@ -318,7 +318,7 @@ public:
DoCast(target, SPELL_NETHERBREATH); DoCast(target, SPELL_NETHERBREATH);
NetherbreathTimer = urand(5000, 7000); NetherbreathTimer = urand(5000, 7000);
} else } else
NetherbreathTimer -= diff; NetherbreathTimer -= diff;
if (PhaseTimer <= diff) if (PhaseTimer <= diff)
{ {
@@ -328,7 +328,7 @@ public:
return; return;
} }
} else } else
PhaseTimer -= diff; PhaseTimer -= diff;
} }
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
src/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
+9 -9
View File
@@ -296,14 +296,14 @@ public:
DoCastVictim(SPELL_BELLOWING_ROAR); DoCastVictim(SPELL_BELLOWING_ROAR);
BellowingRoarTimer = urand(30000, 40000); BellowingRoarTimer = urand(30000, 40000);
} else } else
BellowingRoarTimer -= diff; BellowingRoarTimer -= diff;
if (SmolderingBreathTimer <= diff) if (SmolderingBreathTimer <= diff)
{ {
DoCastVictim(SPELL_SMOLDERING_BREATH); DoCastVictim(SPELL_SMOLDERING_BREATH);
SmolderingBreathTimer = 20000; SmolderingBreathTimer = 20000;
} else } else
SmolderingBreathTimer -= diff; SmolderingBreathTimer -= diff;
if (CharredEarthTimer <= diff) if (CharredEarthTimer <= diff)
{ {
@@ -311,7 +311,7 @@ public:
DoCast(target, SPELL_CHARRED_EARTH); DoCast(target, SPELL_CHARRED_EARTH);
CharredEarthTimer = 20000; CharredEarthTimer = 20000;
} else } else
CharredEarthTimer -= diff; CharredEarthTimer -= diff;
if (TailSweepTimer <= diff) if (TailSweepTimer <= diff)
{ {
@@ -320,7 +320,7 @@ public:
DoCast(target, SPELL_TAIL_SWEEP); DoCast(target, SPELL_TAIL_SWEEP);
TailSweepTimer = 15000; TailSweepTimer = 15000;
} else } else
TailSweepTimer -= diff; TailSweepTimer -= diff;
if (SearingCindersTimer <= diff) if (SearingCindersTimer <= diff)
{ {
@@ -328,7 +328,7 @@ public:
DoCast(target, SPELL_SEARING_CINDERS); DoCast(target, SPELL_SEARING_CINDERS);
SearingCindersTimer = 10000; SearingCindersTimer = 10000;
} else } else
SearingCindersTimer -= diff; SearingCindersTimer -= diff;
uint32 Prozent = uint32(me->GetHealthPct()); uint32 Prozent = uint32(me->GetHealthPct());
@@ -364,7 +364,7 @@ public:
RainBones = true; RainBones = true;
SmokingBlastTimer = 20000; SmokingBlastTimer = 20000;
} else } else
RainofBonesTimer -= diff; RainofBonesTimer -= diff;
if (DistractingAshTimer <= diff) if (DistractingAshTimer <= diff)
{ {
@@ -372,7 +372,7 @@ public:
DoCast(target, SPELL_DISTRACTING_ASH); DoCast(target, SPELL_DISTRACTING_ASH);
DistractingAshTimer = 2000; //timer wrong DistractingAshTimer = 2000; //timer wrong
} else } else
DistractingAshTimer -= diff; DistractingAshTimer -= diff;
} }
if (RainBones) if (RainBones)
@@ -382,7 +382,7 @@ public:
DoCastVictim(SPELL_SMOKING_BLAST); DoCastVictim(SPELL_SMOKING_BLAST);
SmokingBlastTimer = 1500; //timer wrong SmokingBlastTimer = 1500; //timer wrong
} else } else
SmokingBlastTimer -= diff; SmokingBlastTimer -= diff;
} }
if (FireballBarrageTimer <= diff) if (FireballBarrageTimer <= diff)
@@ -391,7 +391,7 @@ public:
DoCast(target, SPELL_FIREBALL_BARRAGE); DoCast(target, SPELL_FIREBALL_BARRAGE);
FireballBarrageTimer = 20000; FireballBarrageTimer = 20000;
} else } else
FireballBarrageTimer -= diff; FireballBarrageTimer -= diff;
if (FlyTimer <= diff) //landing if (FlyTimer <= diff) //landing
{ {
src/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
+13 -11
View File
@@ -193,7 +193,7 @@ public:
CloseDoorTimer = 0; CloseDoorTimer = 0;
} }
else else
CloseDoorTimer -= diff; CloseDoorTimer -= diff;
} }
//Cooldowns for casts //Cooldowns for casts
@@ -202,7 +202,7 @@ public:
if (ArcaneCooldown >= diff) if (ArcaneCooldown >= diff)
ArcaneCooldown -= diff; ArcaneCooldown -= diff;
else else
ArcaneCooldown = 0; ArcaneCooldown = 0;
} }
if (FireCooldown) if (FireCooldown)
@@ -210,7 +210,7 @@ public:
if (FireCooldown >= diff) if (FireCooldown >= diff)
FireCooldown -= diff; FireCooldown -= diff;
else else
FireCooldown = 0; FireCooldown = 0;
} }
if (FrostCooldown) if (FrostCooldown)
@@ -218,7 +218,7 @@ public:
if (FrostCooldown >= diff) if (FrostCooldown >= diff)
FrostCooldown -= diff; FrostCooldown -= diff;
else else
FrostCooldown = 0; FrostCooldown = 0;
} }
if (!Drinking && me->GetMaxPower(POWER_MANA) && (me->GetPower(POWER_MANA) * 100 / me->GetMaxPower(POWER_MANA)) < 20) if (!Drinking && me->GetMaxPower(POWER_MANA) && (me->GetPower(POWER_MANA) * 100 / me->GetMaxPower(POWER_MANA)) < 20)
@@ -306,7 +306,7 @@ public:
NormalCastTimer = 1000; NormalCastTimer = 1000;
} }
else else
NormalCastTimer -= diff; NormalCastTimer -= diff;
if (SecondarySpellTimer <= diff) if (SecondarySpellTimer <= diff)
{ {
@@ -323,7 +323,7 @@ public:
SecondarySpellTimer = urand(5000, 20000); SecondarySpellTimer = urand(5000, 20000);
} }
else else
SecondarySpellTimer -= diff; SecondarySpellTimer -= diff;
if (SuperCastTimer <= diff) if (SuperCastTimer <= diff)
{ {
@@ -384,7 +384,8 @@ public:
SuperCastTimer = urand(35000, 40000); SuperCastTimer = urand(35000, 40000);
} }
else SuperCastTimer -= diff; else
SuperCastTimer -= diff;
if (!ElementalsSpawned && HealthBelowPct(40)) if (!ElementalsSpawned && HealthBelowPct(40))
{ {
@@ -479,7 +480,7 @@ public:
BerserkTimer = 60000; BerserkTimer = 60000;
} }
else else
BerserkTimer -= diff; BerserkTimer -= diff;
//Flame Wreath check //Flame Wreath check
if (FlameWreathTimer) if (FlameWreathTimer)
@@ -487,7 +488,7 @@ public:
if (FlameWreathTimer >= diff) if (FlameWreathTimer >= diff)
FlameWreathTimer -= diff; FlameWreathTimer -= diff;
else else
FlameWreathTimer = 0; FlameWreathTimer = 0;
if (FlameWreathCheckTime <= diff) if (FlameWreathCheckTime <= diff)
{ {
@@ -507,7 +508,7 @@ public:
FlameWreathCheckTime = 500; FlameWreathCheckTime = 500;
} }
else else
FlameWreathCheckTime -= diff; FlameWreathCheckTime -= diff;
} }
if (ArcaneCooldown && FireCooldown && FrostCooldown) if (ArcaneCooldown && FireCooldown && FrostCooldown)
@@ -585,7 +586,8 @@ public:
DoCastVictim(SPELL_WATERBOLT); DoCastVictim(SPELL_WATERBOLT);
CastTimer = urand(2000, 5000); CastTimer = urand(2000, 5000);
} }
else CastTimer -= diff; else
CastTimer -= diff;
} }
}; };
}; };
src/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
+7 -7
View File
@@ -109,7 +109,7 @@ public:
AmplifyTimer = urand(10000, 20000); AmplifyTimer = urand(10000, 20000);
} else } else
AmplifyTimer -= diff; AmplifyTimer -= diff;
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
@@ -224,7 +224,7 @@ public:
DoCastVictim(SPELL_FIREBOLT); DoCastVictim(SPELL_FIREBOLT);
FireboltTimer = 2200; FireboltTimer = 2200;
} else } else
FireboltTimer -= diff; FireboltTimer -= diff;
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
@@ -370,7 +370,7 @@ public:
me->RemoveAura(SPELL_BROKEN_PACT); me->RemoveAura(SPELL_BROKEN_PACT);
} }
else else
SummonKilrekTimer -= diff; SummonKilrekTimer -= diff;
if (SacrificeTimer <= diff) if (SacrificeTimer <= diff)
{ {
@@ -390,14 +390,14 @@ public:
} }
} }
} else } else
SacrificeTimer -= diff; SacrificeTimer -= diff;
if (ShadowboltTimer <= diff) if (ShadowboltTimer <= diff)
{ {
DoCast(SelectTarget(SELECT_TARGET_TOPAGGRO, 0), SPELL_SHADOW_BOLT); DoCast(SelectTarget(SELECT_TARGET_TOPAGGRO, 0), SPELL_SHADOW_BOLT);
ShadowboltTimer = 10000; ShadowboltTimer = 10000;
} else } else
ShadowboltTimer -= diff; ShadowboltTimer -= diff;
if (SummonTimer <= diff) if (SummonTimer <= diff)
{ {
@@ -414,7 +414,7 @@ public:
SummonTimer = 5000; SummonTimer = 5000;
} }
} else } else
SummonTimer -= diff; SummonTimer -= diff;
if (!Berserk) if (!Berserk)
{ {
@@ -423,7 +423,7 @@ public:
DoCast(me, SPELL_BERSERK); DoCast(me, SPELL_BERSERK);
Berserk = true; Berserk = true;
} else } else
BerserkTimer -= diff; BerserkTimer -= diff;
} }
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
src/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
+38 -36
View File
@@ -193,7 +193,8 @@ public:
{ {
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
AggroTimer = 0; AggroTimer = 0;
} else AggroTimer -= diff; } else
AggroTimer -= diff;
} }
if (!UpdateVictim()) if (!UpdateVictim())
@@ -204,21 +205,21 @@ public:
DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_WATERBOLT); DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_WATERBOLT);
WaterBoltTimer = TitoDied ? 1500 : 5000; WaterBoltTimer = TitoDied ? 1500 : 5000;
} else } else
WaterBoltTimer -= diff; WaterBoltTimer -= diff;
if (FearTimer <= diff) if (FearTimer <= diff)
{ {
DoCastVictim(SPELL_SCREAM); DoCastVictim(SPELL_SCREAM);
FearTimer = 30000; FearTimer = 30000;
} else } else
FearTimer -= diff; FearTimer -= diff;
if (!SummonedTito) if (!SummonedTito)
{ {
if (SummonTitoTimer <= diff) if (SummonTitoTimer <= diff)
SummonTito(); SummonTito();
else else
SummonTitoTimer -= diff; SummonTitoTimer -= diff;
} }
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
@@ -277,7 +278,7 @@ public:
DoCastVictim(SPELL_YIPPING); DoCastVictim(SPELL_YIPPING);
YipTimer = 10000; YipTimer = 10000;
} else } else
YipTimer -= diff; YipTimer -= diff;
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
@@ -387,7 +388,8 @@ public:
{ {
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
AggroTimer = 0; AggroTimer = 0;
} else AggroTimer -= diff; } else
AggroTimer -= diff;
} }
if (!UpdateVictim()) if (!UpdateVictim())
@@ -398,7 +400,7 @@ public:
DoCastVictim(SPELL_BRAIN_BASH); DoCastVictim(SPELL_BRAIN_BASH);
BrainBashTimer = 15000; BrainBashTimer = 15000;
} else } else
BrainBashTimer -= diff; BrainBashTimer -= diff;
if (BrainWipeTimer <= diff) if (BrainWipeTimer <= diff)
{ {
@@ -406,7 +408,7 @@ public:
DoCast(target, SPELL_BRAIN_WIPE); DoCast(target, SPELL_BRAIN_WIPE);
BrainWipeTimer = 20000; BrainWipeTimer = 20000;
} else } else
BrainWipeTimer -= diff; BrainWipeTimer -= diff;
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
@@ -496,7 +498,7 @@ public:
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
AggroTimer = 0; AggroTimer = 0;
} else } else
AggroTimer -= diff; AggroTimer -= diff;
} }
if (!UpdateVictim()) if (!UpdateVictim())
@@ -507,7 +509,7 @@ public:
DoCastVictim(SPELL_CLEAVE); DoCastVictim(SPELL_CLEAVE);
CleaveTimer = 5000; CleaveTimer = 5000;
} else } else
CleaveTimer -= diff; CleaveTimer -= diff;
if (RustCount < 8) if (RustCount < 8)
{ {
@@ -518,7 +520,7 @@ public:
DoCast(me, SPELL_RUST); DoCast(me, SPELL_RUST);
RustTimer = 6000; RustTimer = 6000;
} else } else
RustTimer -= diff; RustTimer -= diff;
} }
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
@@ -607,7 +609,7 @@ public:
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
AggroTimer = 0; AggroTimer = 0;
} else } else
AggroTimer -= diff; AggroTimer -= diff;
} }
if (!UpdateVictim()) if (!UpdateVictim())
@@ -618,21 +620,21 @@ public:
DoCastVictim(SPELL_MANGLE); DoCastVictim(SPELL_MANGLE);
MangleTimer = urand(5000, 8000); MangleTimer = urand(5000, 8000);
} else } else
MangleTimer -= diff; MangleTimer -= diff;
if (ShredTimer <= diff) if (ShredTimer <= diff)
{ {
DoCastVictim(SPELL_SHRED); DoCastVictim(SPELL_SHRED);
ShredTimer = urand(10000, 15000); ShredTimer = urand(10000, 15000);
} else } else
ShredTimer -= diff; ShredTimer -= diff;
if (ScreamTimer <= diff) if (ScreamTimer <= diff)
{ {
DoCastVictim(SPELL_FRIGHTENED_SCREAM); DoCastVictim(SPELL_FRIGHTENED_SCREAM);
ScreamTimer = urand(20000, 30000); ScreamTimer = urand(20000, 30000);
} else } else
ScreamTimer -= diff; ScreamTimer -= diff;
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
@@ -709,14 +711,14 @@ public:
Cyclone->CastSpell(Cyclone, SPELL_CYCLONE_VISUAL, true); Cyclone->CastSpell(Cyclone, SPELL_CYCLONE_VISUAL, true);
CycloneTimer = 22000; CycloneTimer = 22000;
} else } else
CycloneTimer -= diff; CycloneTimer -= diff;
if (ChainLightningTimer <= diff) if (ChainLightningTimer <= diff)
{ {
DoCastVictim(SPELL_CHAIN_LIGHTNING); DoCastVictim(SPELL_CHAIN_LIGHTNING);
ChainLightningTimer = 8000; ChainLightningTimer = 8000;
} else } else
ChainLightningTimer -= diff; ChainLightningTimer -= diff;
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
@@ -763,7 +765,7 @@ public:
me->GetMotionMaster()->MovePoint(0, pos); me->GetMotionMaster()->MovePoint(0, pos);
MoveTimer = urand(3000, 5000); MoveTimer = urand(3000, 5000);
} else } else
MoveTimer -= diff; MoveTimer -= diff;
} }
}; };
}; };
@@ -926,7 +928,7 @@ public:
ChaseTimer = 40000; ChaseTimer = 40000;
} }
} else } else
ChaseTimer -= diff; ChaseTimer -= diff;
if (IsChasing) if (IsChasing)
return; return;
@@ -936,14 +938,14 @@ public:
DoCastVictim(SPELL_TERRIFYING_HOWL); DoCastVictim(SPELL_TERRIFYING_HOWL);
FearTimer = urand(25000, 35000); FearTimer = urand(25000, 35000);
} else } else
FearTimer -= diff; FearTimer -= diff;
if (SwipeTimer <= diff) if (SwipeTimer <= diff)
{ {
DoCastVictim(SPELL_WIDE_SWIPE); DoCastVictim(SPELL_WIDE_SWIPE);
SwipeTimer = urand(25000, 30000); SwipeTimer = urand(25000, 30000);
} else } else
SwipeTimer -= diff; SwipeTimer -= diff;
} }
}; };
}; };
@@ -1313,7 +1315,7 @@ public:
ResurrectTimer = 10000; ResurrectTimer = 10000;
} }
} else } else
ResurrectTimer -= diff; ResurrectTimer -= diff;
} }
if (BackwardLungeTimer <= diff) if (BackwardLungeTimer <= diff)
@@ -1325,14 +1327,14 @@ public:
BackwardLungeTimer = urand(15000, 30000); BackwardLungeTimer = urand(15000, 30000);
} }
} else } else
BackwardLungeTimer -= diff; BackwardLungeTimer -= diff;
if (DaringTimer <= diff) if (DaringTimer <= diff)
{ {
DoCast(me, SPELL_DARING); DoCast(me, SPELL_DARING);
DaringTimer = urand(20000, 40000); DaringTimer = urand(20000, 40000);
} else } else
DaringTimer -= diff; DaringTimer -= diff;
if (DeadlySwatheTimer <= diff) if (DeadlySwatheTimer <= diff)
{ {
@@ -1340,14 +1342,14 @@ public:
DoCast(target, SPELL_DEADLY_SWATHE); DoCast(target, SPELL_DEADLY_SWATHE);
DeadlySwatheTimer = urand(15000, 25000); DeadlySwatheTimer = urand(15000, 25000);
} else } else
DeadlySwatheTimer -= diff; DeadlySwatheTimer -= diff;
if (PoisonThrustTimer <= diff) if (PoisonThrustTimer <= diff)
{ {
DoCastVictim(SPELL_POISON_THRUST); DoCastVictim(SPELL_POISON_THRUST);
PoisonThrustTimer = urand(10000, 20000); PoisonThrustTimer = urand(10000, 20000);
} else } else
PoisonThrustTimer -= diff; PoisonThrustTimer -= diff;
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
@@ -1363,7 +1365,7 @@ void boss_julianne::boss_julianneAI::UpdateAI(uint32 diff)
Talk(SAY_JULIANNE_ENTER); Talk(SAY_JULIANNE_ENTER);
EntryYellTimer = 0; EntryYellTimer = 0;
} else } else
EntryYellTimer -= diff; EntryYellTimer -= diff;
} }
if (AggroYellTimer) if (AggroYellTimer)
@@ -1375,7 +1377,7 @@ void boss_julianne::boss_julianneAI::UpdateAI(uint32 diff)
me->setFaction(16); me->setFaction(16);
AggroYellTimer = 0; AggroYellTimer = 0;
} else } else
AggroYellTimer -= diff; AggroYellTimer -= diff;
} }
if (DrinkPoisonTimer) if (DrinkPoisonTimer)
@@ -1388,7 +1390,7 @@ void boss_julianne::boss_julianneAI::UpdateAI(uint32 diff)
SummonRomuloTimer = 10000; SummonRomuloTimer = 10000;
DrinkPoisonTimer = 0; DrinkPoisonTimer = 0;
} else } else
DrinkPoisonTimer -= diff; DrinkPoisonTimer -= diff;
} }
if (Phase == PHASE_ROMULO && !SummonedRomulo) if (Phase == PHASE_ROMULO && !SummonedRomulo)
@@ -1406,7 +1408,7 @@ void boss_julianne::boss_julianneAI::UpdateAI(uint32 diff)
} }
SummonedRomulo = true; SummonedRomulo = true;
} else } else
SummonRomuloTimer -= diff; SummonRomuloTimer -= diff;
} }
if (ResurrectSelfTimer) if (ResurrectSelfTimer)
@@ -1423,7 +1425,7 @@ void boss_julianne::boss_julianneAI::UpdateAI(uint32 diff)
ResurrectSelfTimer = 0; ResurrectSelfTimer = 0;
ResurrectTimer = 1000; ResurrectTimer = 1000;
} else } else
ResurrectSelfTimer -= diff; ResurrectSelfTimer -= diff;
} }
if (!UpdateVictim() || IsFakingDeath) if (!UpdateVictim() || IsFakingDeath)
@@ -1443,7 +1445,7 @@ void boss_julianne::boss_julianneAI::UpdateAI(uint32 diff)
ResurrectTimer = 10000; ResurrectTimer = 10000;
} }
} else } else
ResurrectTimer -= diff; ResurrectTimer -= diff;
} }
if (BlindingPassionTimer <= diff) if (BlindingPassionTimer <= diff)
@@ -1452,21 +1454,21 @@ void boss_julianne::boss_julianneAI::UpdateAI(uint32 diff)
DoCast(target, SPELL_BLINDING_PASSION); DoCast(target, SPELL_BLINDING_PASSION);
BlindingPassionTimer = urand(30000, 45000); BlindingPassionTimer = urand(30000, 45000);
} else } else
BlindingPassionTimer -= diff; BlindingPassionTimer -= diff;
if (DevotionTimer <= diff) if (DevotionTimer <= diff)
{ {
DoCast(me, SPELL_DEVOTION); DoCast(me, SPELL_DEVOTION);
DevotionTimer = urand(15000, 45000); DevotionTimer = urand(15000, 45000);
} else } else
DevotionTimer -= diff; DevotionTimer -= diff;
if (PowerfulAttractionTimer <= diff) if (PowerfulAttractionTimer <= diff)
{ {
DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_POWERFUL_ATTRACTION); DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_POWERFUL_ATTRACTION);
PowerfulAttractionTimer = urand(5000, 30000); PowerfulAttractionTimer = urand(5000, 30000);
} else } else
PowerfulAttractionTimer -= diff; PowerfulAttractionTimer -= diff;
if (EternalAffectionTimer <= diff) if (EternalAffectionTimer <= diff)
{ {
@@ -1479,7 +1481,7 @@ void boss_julianne::boss_julianneAI::UpdateAI(uint32 diff)
EternalAffectionTimer = urand(45000, 60000); EternalAffectionTimer = urand(45000, 60000);
} else } else
EternalAffectionTimer -= diff; EternalAffectionTimer -= diff;
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }