diff options
10 files changed, 41 insertions, 41 deletions
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp index a9a9c67e6df..e5886cc39d4 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp @@ -113,7 +113,7 @@ public: { DoCast(me->getVictim(), SPELL_AOESILENCE); AoESilence_Timer = urand(15000, 20000); - } + } else AoESilence_Timer -= diff; //ArcaneExplosion_Timer @@ -121,7 +121,7 @@ public: { DoCast(me->getVictim(), SPELL_ARCANEEXPLOSION); ArcaneExplosion_Timer = 8000; - } + } else ArcaneExplosion_Timer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp index 6a8a1f8fc61..30105cc7315 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp @@ -74,7 +74,7 @@ public: return; //SoulSiphon_Timer = 20000; - } + } else SoulSiphon_Timer -= diff; } @@ -83,7 +83,7 @@ public: { DoCast(me->getVictim(), SPELL_CALLOFTHEGRAVE); CallOftheGrave_Timer = 30000; - } + } else CallOftheGrave_Timer -= diff; //Terrify_Timer @@ -91,7 +91,7 @@ public: { DoCast(me->getVictim(), SPELL_TERRIFY); Terrify_Timer = 20000; - } + } else Terrify_Timer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp index f54e93eba21..466f940621d 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp @@ -93,7 +93,7 @@ public: { DoCast(me->getVictim(), SPELL_FLAMESHOCK); FlameShock_Timer = urand(10000, 15000); - } + } else FlameShock_Timer -= diff; //FlameSpike_Timer @@ -101,7 +101,7 @@ public: { DoCast(me->getVictim(), SPELL_FLAMESPIKE); FlameSpike_Timer = 30000; - } + } else FlameSpike_Timer -= diff; //FireNova_Timer @@ -109,7 +109,7 @@ public: { DoCast(me->getVictim(), SPELL_FIRENOVA); FireNova_Timer = 40000; - } + } else FireNova_Timer -= diff; //ShadowBolt_Timer @@ -117,7 +117,7 @@ public: { DoCast(me->getVictim(), SPELL_SHADOWBOLT); ShadowBolt_Timer = 2000; - } + } else ShadowBolt_Timer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 834b1a8ac75..77099f2e2d7 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -322,7 +322,7 @@ public: if (!me->getVictim()) return; me->GetMotionMaster()->Clear(false); me->GetMotionMaster()->MoveFleeing(me->getVictim()); - } + } else wait -= diff; if (laugh <= diff) @@ -334,7 +334,7 @@ public: if (speaker) speaker->CastSpell(speaker, SPELL_HEAD_SPEAKS, false); me->MonsterTextEmote(EMOTE_LAUGHS, 0); - } + } else laugh -= diff; } else @@ -347,7 +347,7 @@ public: if (Unit* body = Unit::GetUnit((*me), bodyGUID)) body->Kill(body); me->Kill(me); - } + } else wait -= diff; } } @@ -644,7 +644,7 @@ public: break; } ++count; - } + } else say_timer -= diff; } else @@ -666,7 +666,7 @@ public: if (Creature* flame = me->SummonCreature(HELPER, Spawn[0].x, Spawn[0].y, Spawn[0].z, 0, TEMPSUMMON_TIMED_DESPAWN, 17000)) CAST_AI(mob_wisp_invis::mob_wisp_invisAI, flame->AI())->SetType(2); burned = true; - } + } else burn -= diff; break; case 2: @@ -675,7 +675,7 @@ public: if (Unit* player = SelectRandomPlayer(30.0f)) DoCast(player, SPELL_CONFLAGRATION, false); conflagrate = urand(10000, 16000); - } + } else conflagrate -= diff; break; case 3: @@ -685,7 +685,7 @@ public: DoCast(me, SPELL_SUMMON_PUMPKIN); SaySound(SAY_SPROUTING_PUMPKINS); summonadds = urand(25000, 35000); - } + } else summonadds -= diff; break; } @@ -695,7 +695,7 @@ public: laugh = urand(11000, 22000); me->MonsterTextEmote(EMOTE_LAUGHS, 0); DoPlaySoundToSet(me, RandomLaugh[rand()%3]); - } + } else laugh -= diff; if (UpdateVictim()) @@ -705,7 +705,7 @@ public: { DoCast(me->getVictim(), SPELL_CLEAVE); cleave = urand(2000, 6000); //1 cleave per 2.0f-6.0fsec - } + } else cleave -= diff; } } @@ -739,10 +739,10 @@ public: me->RemoveAurasDueToSpell(SPELL_CONFUSE); DoCast(me, SPELL_WHIRLWIND, true); DoCast(me, SPELL_CONFUSE); - } + } else me->RemoveAurasDueToSpell(SPELL_WHIRLWIND); - } + } else whirlwind -= diff; } } @@ -843,12 +843,12 @@ public: if (instance->GetData(DATA_HORSEMAN_EVENT) != NOT_STARTED) return true; instance->SetData(DATA_HORSEMAN_EVENT, IN_PROGRESS); - } + } /* if (soil->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER && player->getLevel() > 64) { player->PrepareQuestMenu(soil->GetGUID()); player->SendPreparedQuest(soil->GetGUID()); - } + } if (player->GetQuestStatus(11405) == QUEST_STATUS_INCOMPLETE && player->getLevel() > 64) { */ player->AreaExploredOrEventHappens(11405); @@ -866,7 +866,7 @@ void mob_head::mob_headAI::Disappear() { if (withbody) return; - + if (bodyGUID) { Creature* body = Unit::GetCreature((*me), bodyGUID); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp index e194f064d85..16b90f89bb5 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp @@ -115,7 +115,7 @@ public: { DoCast(me->getVictim(), SPELL_CLEAVE); Cleave_Timer = 12000; - } + } else Cleave_Timer -= diff; // Whirlwind_Timer @@ -124,7 +124,7 @@ public: DoScriptText(SAY_WHIRLWIND, me); DoCast(me->getVictim(), SPELL_WHIRLWIND); Whirlwind_Timer = 30000; - } + } else Whirlwind_Timer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp index e2c14f97381..a64636a4223 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp @@ -80,7 +80,7 @@ public: { DoCast(me, SPELL_HEAL); Heal_Timer = 30000; - } + } else Heal_Timer -= diff; //Fear_Timer @@ -90,7 +90,7 @@ public: DoCast(target, SPELL_FEAR); Fear_Timer = 40000; - } + } else Fear_Timer -= diff; //Sleep_Timer @@ -100,7 +100,7 @@ public: DoCast(target, SPELL_SLEEP); Sleep_Timer = 30000; - } + } else Sleep_Timer -= diff; //PowerWordShield_Timer @@ -117,7 +117,7 @@ public: DoCast(target, SPELL_DISPELMAGIC); DispelMagic_Timer = 30000; - } + } else DispelMagic_Timer -= diff; //CurseOfBlood_Timer @@ -125,7 +125,7 @@ public: { DoCast(me->getVictim(), SPELL_CURSEOFBLOOD); CurseOfBlood_Timer = 25000; - } + } else CurseOfBlood_Timer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp index f8ccc44aede..f311da401d4 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp @@ -67,7 +67,7 @@ public: { DoCast(me, SPELL_BLOODLUST); BloodLust_Timer = 20000; - } + } else BloodLust_Timer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp index c3eccaa7871..058c688641f 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp @@ -111,7 +111,7 @@ public: { DoCast(me->getVictim(), SPELL_SHADOWWORDPAIN); ShadowWordPain_Timer = urand(5000, 15000); - } + } else ShadowWordPain_Timer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp index 9547a152337..ec6ac34b0bb 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp @@ -206,7 +206,7 @@ public: { DoCast(me->getVictim(), SPELL_CRUSADERSTRIKE); CrusaderStrike_Timer = 10000; - } + } else CrusaderStrike_Timer -= diff; //HammerOfJustice_Timer @@ -214,7 +214,7 @@ public: { DoCast(me->getVictim(), SPELL_HAMMEROFJUSTICE); HammerOfJustice_Timer = 60000; - } + } else HammerOfJustice_Timer -= diff; DoMeleeAttackIfReady(); @@ -340,7 +340,7 @@ public: DoCast(target, SPELL_HEAL); Heal_Timer = 13000; - } + } else Heal_Timer -= diff; //PowerWordShield_Timer @@ -348,7 +348,7 @@ public: { DoCast(me, SPELL_POWERWORDSHIELD); PowerWordShield_Timer = 15000; - } + } else PowerWordShield_Timer -= diff; //HolySmite_Timer @@ -356,7 +356,7 @@ public: { DoCast(me->getVictim(), SPELL_HOLYSMITE); HolySmite_Timer = 6000; - } + } else HolySmite_Timer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp index d943053a80d..8035adfc33f 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp @@ -72,7 +72,7 @@ public: { DoCast(me->getVictim(), SPELL_LICHSLAP); LichSlap_Timer = 45000; - } + } else LichSlap_Timer -= diff; //FrostboltVolley_Timer @@ -80,7 +80,7 @@ public: { DoCast(me->getVictim(), SPELL_FROSTBOLTVOLLEY); FrostboltVolley_Timer = 20000; - } + } else FrostboltVolley_Timer -= diff; //MindFlay_Timer @@ -88,7 +88,7 @@ public: { DoCast(me->getVictim(), SPELL_MINDFLAY); MindFlay_Timer = 20000; - } + } else MindFlay_Timer -= diff; //FrostNova_Timer @@ -96,7 +96,7 @@ public: { DoCast(me->getVictim(), SPELL_FROSTNOVA); FrostNova_Timer = 15000; - } + } else FrostNova_Timer -= diff; DoMeleeAttackIfReady(); |