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

Scripts/EasternKingdoms: ScarletMonastery

Browse Source 
* Fixed a few derps i missed on last patch
This commit is contained in:
Bootz
2012-01-26 02:40:15 -06:00
parent 2db052b109
commit c0cd16e51d
10 changed files with 83 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
+6 -3
View File
@@ -105,21 +105,24 @@ public:
DoCast(target, SPELL_POLYMORPH); DoCast(target, SPELL_POLYMORPH);
Polymorph_Timer = 20000; Polymorph_Timer = 20000;
} else Polymorph_Timer -= diff; }
else Polymorph_Timer -= diff;
//AoESilence_Timer //AoESilence_Timer
if (AoESilence_Timer <= diff) if (AoESilence_Timer <= diff)
{ {
DoCast(me->getVictim(), SPELL_AOESILENCE); DoCast(me->getVictim(), SPELL_AOESILENCE);
AoESilence_Timer = urand(15000, 20000); AoESilence_Timer = urand(15000, 20000);
} else AoESilence_Timer -= diff; }
else AoESilence_Timer -= diff;
//ArcaneExplosion_Timer //ArcaneExplosion_Timer
if (ArcaneExplosion_Timer <= diff) if (ArcaneExplosion_Timer <= diff)
{ {
DoCast(me->getVictim(), SPELL_ARCANEEXPLOSION); DoCast(me->getVictim(), SPELL_ARCANEEXPLOSION);
ArcaneExplosion_Timer = 8000; ArcaneExplosion_Timer = 8000;
} else ArcaneExplosion_Timer -= diff; }
else ArcaneExplosion_Timer -= diff;
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
+7 -3
View File
@@ -24,6 +24,7 @@ SDCategory: Scarlet Monastery
EndScriptData */ EndScriptData */
#include "ScriptPCH.h" #include "ScriptPCH.h"
enum Spells enum Spells
{ {
SPELL_CALLOFTHEGRAVE = 17831, SPELL_CALLOFTHEGRAVE = 17831,
@@ -73,7 +74,8 @@ public:
return; return;
//SoulSiphon_Timer = 20000; //SoulSiphon_Timer = 20000;
} else SoulSiphon_Timer -= diff; }
else SoulSiphon_Timer -= diff;
} }
//CallOfTheGrave_Timer //CallOfTheGrave_Timer
@@ -81,14 +83,16 @@ public:
{ {
DoCast(me->getVictim(), SPELL_CALLOFTHEGRAVE); DoCast(me->getVictim(), SPELL_CALLOFTHEGRAVE);
CallOftheGrave_Timer = 30000; CallOftheGrave_Timer = 30000;
} else CallOftheGrave_Timer -= diff; }
else CallOftheGrave_Timer -= diff;
//Terrify_Timer //Terrify_Timer
if (Terrify_Timer <= diff) if (Terrify_Timer <= diff)
{ {
DoCast(me->getVictim(), SPELL_TERRIFY); DoCast(me->getVictim(), SPELL_TERRIFY);
Terrify_Timer = 20000; Terrify_Timer = 20000;
} else Terrify_Timer -= diff; }
else Terrify_Timer -= diff;
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
+8 -4
View File
@@ -93,28 +93,32 @@ public:
{ {
DoCast(me->getVictim(), SPELL_FLAMESHOCK); DoCast(me->getVictim(), SPELL_FLAMESHOCK);
FlameShock_Timer = urand(10000, 15000); FlameShock_Timer = urand(10000, 15000);
} else FlameShock_Timer -= diff; }
else FlameShock_Timer -= diff;
//FlameSpike_Timer //FlameSpike_Timer
if (FlameSpike_Timer <= diff) if (FlameSpike_Timer <= diff)
{ {
DoCast(me->getVictim(), SPELL_FLAMESPIKE); DoCast(me->getVictim(), SPELL_FLAMESPIKE);
FlameSpike_Timer = 30000; FlameSpike_Timer = 30000;
} else FlameSpike_Timer -= diff; }
else FlameSpike_Timer -= diff;
//FireNova_Timer //FireNova_Timer
if (FireNova_Timer <= diff) if (FireNova_Timer <= diff)
{ {
DoCast(me->getVictim(), SPELL_FIRENOVA); DoCast(me->getVictim(), SPELL_FIRENOVA);
FireNova_Timer = 40000; FireNova_Timer = 40000;
} else FireNova_Timer -= diff; }
else FireNova_Timer -= diff;
//ShadowBolt_Timer //ShadowBolt_Timer
if (ShadowBolt_Timer <= diff) if (ShadowBolt_Timer <= diff)
{ {
DoCast(me->getVictim(), SPELL_SHADOWBOLT); DoCast(me->getVictim(), SPELL_SHADOWBOLT);
ShadowBolt_Timer = 2000; ShadowBolt_Timer = 2000;
} else ShadowBolt_Timer -= diff; }
else ShadowBolt_Timer -= diff;
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
+23 -11
View File
@@ -322,7 +322,8 @@ public:
if (!me->getVictim()) return; if (!me->getVictim()) return;
me->GetMotionMaster()->Clear(false); me->GetMotionMaster()->Clear(false);
me->GetMotionMaster()->MoveFleeing(me->getVictim()); me->GetMotionMaster()->MoveFleeing(me->getVictim());
} else wait -= diff; }
else wait -= diff;
if (laugh <= diff) if (laugh <= diff)
{ {
@@ -333,7 +334,8 @@ public:
if (speaker) if (speaker)
speaker->CastSpell(speaker, SPELL_HEAD_SPEAKS, false); speaker->CastSpell(speaker, SPELL_HEAD_SPEAKS, false);
me->MonsterTextEmote(EMOTE_LAUGHS, 0); me->MonsterTextEmote(EMOTE_LAUGHS, 0);
} else laugh -= diff; }
else laugh -= diff;
} }
else else
{ {
@@ -345,7 +347,8 @@ public:
if (Unit* body = Unit::GetUnit((*me), bodyGUID)) if (Unit* body = Unit::GetUnit((*me), bodyGUID))
body->Kill(body); body->Kill(body);
me->Kill(me); me->Kill(me);
} else wait -= diff; }
else wait -= diff;
} }
} }
} }
@@ -641,7 +644,8 @@ public:
break; break;
} }
++count; ++count;
} else say_timer -= diff; }
else say_timer -= diff;
} }
else else
{ {
@@ -662,7 +666,8 @@ public:
if (Creature* flame = me->SummonCreature(HELPER, Spawn[0].x, Spawn[0].y, Spawn[0].z, 0, TEMPSUMMON_TIMED_DESPAWN, 17000)) 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); CAST_AI(mob_wisp_invis::mob_wisp_invisAI, flame->AI())->SetType(2);
burned = true; burned = true;
} else burn -= diff; }
else burn -= diff;
break; break;
case 2: case 2:
if (conflagrate <= diff) if (conflagrate <= diff)
@@ -670,7 +675,8 @@ public:
if (Unit* player = SelectRandomPlayer(30.0f)) if (Unit* player = SelectRandomPlayer(30.0f))
DoCast(player, SPELL_CONFLAGRATION, false); DoCast(player, SPELL_CONFLAGRATION, false);
conflagrate = urand(10000, 16000); conflagrate = urand(10000, 16000);
} else conflagrate -= diff; }
else conflagrate -= diff;
break; break;
case 3: case 3:
if (summonadds <= diff) if (summonadds <= diff)
@@ -679,7 +685,8 @@ public:
DoCast(me, SPELL_SUMMON_PUMPKIN); DoCast(me, SPELL_SUMMON_PUMPKIN);
SaySound(SAY_SPROUTING_PUMPKINS); SaySound(SAY_SPROUTING_PUMPKINS);
summonadds = urand(25000, 35000); summonadds = urand(25000, 35000);
} else summonadds -= diff; }
else summonadds -= diff;
break; break;
} }
@@ -688,7 +695,8 @@ public:
laugh = urand(11000, 22000); laugh = urand(11000, 22000);
me->MonsterTextEmote(EMOTE_LAUGHS, 0); me->MonsterTextEmote(EMOTE_LAUGHS, 0);
DoPlaySoundToSet(me, RandomLaugh[rand()%3]); DoPlaySoundToSet(me, RandomLaugh[rand()%3]);
} else laugh -= diff; }
else laugh -= diff;
if (UpdateVictim()) if (UpdateVictim())
{ {
@@ -697,7 +705,8 @@ public:
{ {
DoCast(me->getVictim(), SPELL_CLEAVE); DoCast(me->getVictim(), SPELL_CLEAVE);
cleave = urand(2000, 6000); //1 cleave per 2.0f-6.0fsec cleave = urand(2000, 6000); //1 cleave per 2.0f-6.0fsec
} else cleave -= diff; }
else cleave -= diff;
} }
} }
else else
@@ -730,9 +739,11 @@ public:
me->RemoveAurasDueToSpell(SPELL_CONFUSE); me->RemoveAurasDueToSpell(SPELL_CONFUSE);
DoCast(me, SPELL_WHIRLWIND, true); DoCast(me, SPELL_WHIRLWIND, true);
DoCast(me, SPELL_CONFUSE); DoCast(me, SPELL_CONFUSE);
} else }
else
me->RemoveAurasDueToSpell(SPELL_WHIRLWIND); me->RemoveAurasDueToSpell(SPELL_WHIRLWIND);
} else whirlwind -= diff; }
else whirlwind -= diff;
} }
} }
}; };
@@ -855,6 +866,7 @@ void mob_head::mob_headAI::Disappear()
{ {
if (withbody) if (withbody)
return; return;
if (bodyGUID) if (bodyGUID)
{ {
Creature* body = Unit::GetCreature((*me), bodyGUID); Creature* body = Unit::GetCreature((*me), bodyGUID);
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
+5 -2
View File
@@ -33,6 +33,7 @@ enum Says
SAY_ENRAGE = -1189002, SAY_ENRAGE = -1189002,
SAY_KILL = -1189003 SAY_KILL = -1189003
}; };
enum Emotes enum Emotes
{ {
EMOTE_ENRAGE = -1189004 EMOTE_ENRAGE = -1189004
@@ -114,7 +115,8 @@ public:
{ {
DoCast(me->getVictim(), SPELL_CLEAVE); DoCast(me->getVictim(), SPELL_CLEAVE);
Cleave_Timer = 12000; Cleave_Timer = 12000;
} else Cleave_Timer -= diff; }
else Cleave_Timer -= diff;
// Whirlwind_Timer // Whirlwind_Timer
if (Whirlwind_Timer <= diff) if (Whirlwind_Timer <= diff)
@@ -122,7 +124,8 @@ public:
DoScriptText(SAY_WHIRLWIND, me); DoScriptText(SAY_WHIRLWIND, me);
DoCast(me->getVictim(), SPELL_WHIRLWIND); DoCast(me->getVictim(), SPELL_WHIRLWIND);
Whirlwind_Timer = 30000; Whirlwind_Timer = 30000;
} else Whirlwind_Timer -= diff; }
else Whirlwind_Timer -= diff;
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
+10 -5
View File
@@ -80,7 +80,8 @@ public:
{ {
DoCast(me, SPELL_HEAL); DoCast(me, SPELL_HEAL);
Heal_Timer = 30000; Heal_Timer = 30000;
} else Heal_Timer -= diff; }
else Heal_Timer -= diff;
//Fear_Timer //Fear_Timer
if (Fear_Timer <= diff) if (Fear_Timer <= diff)
@@ -89,7 +90,8 @@ public:
DoCast(target, SPELL_FEAR); DoCast(target, SPELL_FEAR);
Fear_Timer = 40000; Fear_Timer = 40000;
} else Fear_Timer -= diff; }
else Fear_Timer -= diff;
//Sleep_Timer //Sleep_Timer
if (Sleep_Timer <= diff) if (Sleep_Timer <= diff)
@@ -98,7 +100,8 @@ public:
DoCast(target, SPELL_SLEEP); DoCast(target, SPELL_SLEEP);
Sleep_Timer = 30000; Sleep_Timer = 30000;
} else Sleep_Timer -= diff; }
else Sleep_Timer -= diff;
//PowerWordShield_Timer //PowerWordShield_Timer
if (!PowerWordShield && !HealthAbovePct(25)) if (!PowerWordShield && !HealthAbovePct(25))
@@ -114,14 +117,16 @@ public:
DoCast(target, SPELL_DISPELMAGIC); DoCast(target, SPELL_DISPELMAGIC);
DispelMagic_Timer = 30000; DispelMagic_Timer = 30000;
} else DispelMagic_Timer -= diff; }
else DispelMagic_Timer -= diff;
//CurseOfBlood_Timer //CurseOfBlood_Timer
if (CurseOfBlood_Timer <= diff) if (CurseOfBlood_Timer <= diff)
{ {
DoCast(me->getVictim(), SPELL_CURSEOFBLOOD); DoCast(me->getVictim(), SPELL_CURSEOFBLOOD);
CurseOfBlood_Timer = 25000; CurseOfBlood_Timer = 25000;
} else CurseOfBlood_Timer -= diff; }
else CurseOfBlood_Timer -= diff;
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
+2 -1
View File
@@ -67,7 +67,8 @@ public:
{ {
DoCast(me, SPELL_BLOODLUST); DoCast(me, SPELL_BLOODLUST);
BloodLust_Timer = 20000; BloodLust_Timer = 20000;
} else BloodLust_Timer -= diff; }
else BloodLust_Timer -= diff;
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
+2 -1
View File
@@ -111,7 +111,8 @@ public:
{ {
DoCast(me->getVictim(), SPELL_SHADOWWORDPAIN); DoCast(me->getVictim(), SPELL_SHADOWWORDPAIN);
ShadowWordPain_Timer = urand(5000, 15000); ShadowWordPain_Timer = urand(5000, 15000);
} else ShadowWordPain_Timer -= diff; }
else ShadowWordPain_Timer -= diff;
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
+10 -5
View File
@@ -206,14 +206,16 @@ public:
{ {
DoCast(me->getVictim(), SPELL_CRUSADERSTRIKE); DoCast(me->getVictim(), SPELL_CRUSADERSTRIKE);
CrusaderStrike_Timer = 10000; CrusaderStrike_Timer = 10000;
} else CrusaderStrike_Timer -= diff; }
else CrusaderStrike_Timer -= diff;
//HammerOfJustice_Timer //HammerOfJustice_Timer
if (HammerOfJustice_Timer <= diff) if (HammerOfJustice_Timer <= diff)
{ {
DoCast(me->getVictim(), SPELL_HAMMEROFJUSTICE); DoCast(me->getVictim(), SPELL_HAMMEROFJUSTICE);
HammerOfJustice_Timer = 60000; HammerOfJustice_Timer = 60000;
} else HammerOfJustice_Timer -= diff; }
else HammerOfJustice_Timer -= diff;
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
@@ -338,21 +340,24 @@ public:
DoCast(target, SPELL_HEAL); DoCast(target, SPELL_HEAL);
Heal_Timer = 13000; Heal_Timer = 13000;
} else Heal_Timer -= diff; }
else Heal_Timer -= diff;
//PowerWordShield_Timer //PowerWordShield_Timer
if (PowerWordShield_Timer <= diff) if (PowerWordShield_Timer <= diff)
{ {
DoCast(me, SPELL_POWERWORDSHIELD); DoCast(me, SPELL_POWERWORDSHIELD);
PowerWordShield_Timer = 15000; PowerWordShield_Timer = 15000;
} else PowerWordShield_Timer -= diff; }
else PowerWordShield_Timer -= diff;
//HolySmite_Timer //HolySmite_Timer
if (HolySmite_Timer <= diff) if (HolySmite_Timer <= diff)
{ {
DoCast(me->getVictim(), SPELL_HOLYSMITE); DoCast(me->getVictim(), SPELL_HOLYSMITE);
HolySmite_Timer = 6000; HolySmite_Timer = 6000;
} else HolySmite_Timer -= diff; }
else HolySmite_Timer -= diff;
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
+8 -4
View File
@@ -72,28 +72,32 @@ public:
{ {
DoCast(me->getVictim(), SPELL_LICHSLAP); DoCast(me->getVictim(), SPELL_LICHSLAP);
LichSlap_Timer = 45000; LichSlap_Timer = 45000;
} else LichSlap_Timer -= diff; }
else LichSlap_Timer -= diff;
//FrostboltVolley_Timer //FrostboltVolley_Timer
if (FrostboltVolley_Timer <= diff) if (FrostboltVolley_Timer <= diff)
{ {
DoCast(me->getVictim(), SPELL_FROSTBOLTVOLLEY); DoCast(me->getVictim(), SPELL_FROSTBOLTVOLLEY);
FrostboltVolley_Timer = 20000; FrostboltVolley_Timer = 20000;
} else FrostboltVolley_Timer -= diff; }
else FrostboltVolley_Timer -= diff;
//MindFlay_Timer //MindFlay_Timer
if (MindFlay_Timer <= diff) if (MindFlay_Timer <= diff)
{ {
DoCast(me->getVictim(), SPELL_MINDFLAY); DoCast(me->getVictim(), SPELL_MINDFLAY);
MindFlay_Timer = 20000; MindFlay_Timer = 20000;
} else MindFlay_Timer -= diff; }
else MindFlay_Timer -= diff;
//FrostNova_Timer //FrostNova_Timer
if (FrostNova_Timer <= diff) if (FrostNova_Timer <= diff)
{ {
DoCast(me->getVictim(), SPELL_FROSTNOVA); DoCast(me->getVictim(), SPELL_FROSTNOVA);
FrostNova_Timer = 15000; FrostNova_Timer = 15000;
} else FrostNova_Timer -= diff; }
else FrostNova_Timer -= diff;
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }