diff options
Diffstat (limited to 'src/server/scripts')
76 files changed, 804 insertions, 804 deletions
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index 904c040722d..e194e6b27d5 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -164,7 +164,7 @@ public: void Cleanup() { Unit *pMalchezaar = Unit::GetUnit(*me, malchezaar); - + if (pMalchezaar && pMalchezaar->isAlive()) CAST_AI(boss_malchezaar::boss_malchezaarAI, CAST_CRE(pMalchezaar)->AI())->Cleanup(me, point); }
//below ... diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index 6c6d46880a2..287d8378c75 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -1171,26 +1171,26 @@ public: { if (damage < me->GetHealth()) return; - + //anything below only used if incoming damage will kill - + if (Phase == PHASE_ROMULO) { DoScriptText(SAY_ROMULO_DEATH, me); PretendToDie(me); IsFakingDeath = true; Phase = PHASE_BOTH; - + if (Creature* Julianne = (Unit::GetCreature((*me), JulianneGUID))) { CAST_AI(boss_julianne::boss_julianneAI, Julianne->AI())->RomuloDead = true; CAST_AI(boss_julianne::boss_julianneAI, Julianne->AI())->ResurrectSelfTimer = 10000; } - + damage = 0; return; } - + if (Phase == PHASE_BOTH) { if (JulianneDead) @@ -1206,7 +1206,7 @@ public: } return; } - + if (Creature* Julianne = (Unit::GetCreature((*me), JulianneGUID))) { PretendToDie(me); @@ -1217,7 +1217,7 @@ public: return; } } - + sLog.outError("TSCR: boss_romuloAI: DamageTaken reach end of code, that should not happen."); } @@ -1267,7 +1267,7 @@ public: { if (!UpdateVictim() || IsFakingDeath) return; - + if (JulianneDead) { if (ResurrectTimer <= diff) @@ -1283,7 +1283,7 @@ public: } } else ResurrectTimer -= diff; } - + if (BackwardLungeTimer <= diff) { Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); @@ -1293,26 +1293,26 @@ public: BackwardLungeTimer = urand(15000,30000); } } else BackwardLungeTimer -= diff; - + if (DaringTimer <= diff) { DoCast(me, SPELL_DARING); DaringTimer = urand(20000,40000); } else DaringTimer -= diff; - + if (DeadlySwatheTimer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_DEADLY_SWATHE); DeadlySwatheTimer = urand(15000,25000); } else DeadlySwatheTimer -= diff; - + if (PoisonThrustTimer <= diff) { DoCast(me->getVictim(), SPELL_POISON_THRUST); PoisonThrustTimer = urand(10000,20000); } else PoisonThrustTimer -= diff; - + DoMeleeAttackIfReady(); } }; diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 0345810478b..72c856730b6 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -185,10 +185,10 @@ public: } else sLog.outError("npc_unworthy_initiateAI: unable to find anchor!"); - + float dist = 99.0f; GameObject *prison = NULL; - + for (uint8 i = 0; i < 12; ++i) { if (GameObject* temp_prison = me->FindNearestGameObject(acherus_soul_prison[i],30)) @@ -200,7 +200,7 @@ public: } } } - + if (prison) prison->ResetDoorOrButton(); else @@ -231,7 +231,7 @@ public: me->setFaction(14); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); phase = PHASE_ATTACKING; - + if (Player *pTarget = Unit::GetPlayer(*me, playerGUID)) me->AI()->AttackStart(pTarget); wait_timer = 0; @@ -241,9 +241,9 @@ public: case PHASE_ATTACKING: if (!UpdateVictim()) return; - + events.Update(diff); - + while (uint32 eventId = events.ExecuteEvent()) { switch(eventId) @@ -270,7 +270,7 @@ public: break; } } - + DoMeleeAttackIfReady(); } } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index 55341d2c2f9..68ed9109f27 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -291,7 +291,7 @@ public: case 2: { Unit *pTarget = pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); - if (!pTarget) + if (!pTarget) pTarget = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0); if (!pTarget) @@ -312,13 +312,13 @@ public: events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 10000); break; } - case 3: + case 3: { DespawnSummons(MOB_VAPOR_TRAIL); //DoCast(me, SPELL_VAPOR_SELECT); need core support Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); - if (!pTarget) + if (!pTarget) pTarget = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0); if (!pTarget) @@ -348,7 +348,7 @@ public: case 5: { Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); - if (!pTarget) + if (!pTarget) pTarget = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0); if (!pTarget) @@ -386,7 +386,7 @@ public: me->RemoveAurasDueToSpell(SPELL_FOG_BREATH); ++uiBreathCount; events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 1); - if (uiBreathCount < 3) + if (uiBreathCount < 3) uiFlightCount = 4; break; case 9: diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index 04d43100bf7..df113b719e2 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -170,10 +170,10 @@ enum Phase }; //Timers -enum KilJaedenTimers +enum KilJaedenTimers { TIMER_SPEECH = 0, - + //Phase 2 Timer TIMER_SOUL_FLAY = 1, TIMER_LEGION_LIGHTNING = 2, @@ -222,11 +222,11 @@ static Speech Speeches[]= //Kil Phase 2 -> Phase 3 {SAY_KALECGOS_AWAKEN, DATA_KALECGOS_KJ, 10000}, {SAY_ANVEENA_IMPRISONED, DATA_ANVEENA, 5000}, - {SAY_KJ_PHASE3, DATA_KILJAEDEN, 5000}, + {SAY_KJ_PHASE3, DATA_KILJAEDEN, 5000}, //Kil Phase 3 -> Phase 4 {SAY_KALECGOS_LETGO, DATA_KALECGOS_KJ, 10000}, {SAY_ANVEENA_LOST, DATA_ANVEENA, 8000}, - {SAY_KJ_PHASE4, DATA_KILJAEDEN, 7000}, + {SAY_KJ_PHASE4, DATA_KILJAEDEN, 7000}, //Kil Phase 4 -> Phase 5 {SAY_KALECGOS_FOCUS, DATA_KALECGOS_KJ, 4000}, {SAY_ANVEENA_KALEC, DATA_ANVEENA, 11000}, @@ -235,7 +235,7 @@ static Speech Speeches[]= {SAY_KJ_PHASE5, DATA_KILJAEDEN, 5500}, // use in End sequence? - {SAY_KALECGOS_GOODBYE, DATA_KALECGOS_KJ, 12000}, + {SAY_KALECGOS_GOODBYE, DATA_KALECGOS_KJ, 12000}, }; //AI for Kalecgos
class boss_kalecgos_kj : public CreatureScript @@ -268,7 +268,7 @@ public: me->setActive(true); for (uint8 i = 0; i < 4; ++i) - if (GameObject* pOrb = GetOrb(i)) + if (GameObject* pOrb = GetOrb(i)) pOrb->SetGoType(GAMEOBJECT_TYPE_BUTTON); } @@ -296,7 +296,7 @@ public: { me->RemoveDynObject(SPELL_RING_OF_BLUE_FLAMES); for (uint8 i = 0; i < 4; ++i) - if (GameObject* pOrb = GetOrb(i)) + if (GameObject* pOrb = GetOrb(i)) pOrb->SetUInt32Value(GAMEOBJECT_FACTION, 0); } @@ -378,7 +378,7 @@ public: { InstanceScript* pInstance = pGo->GetInstanceScript(); pPlayer->SummonCreature(CREATURE_POWER_OF_THE_BLUE_DRAGONFLIGHT, pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 121000); - pPlayer->CastSpell(pPlayer, SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT, false); + pPlayer->CastSpell(pPlayer, SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT, false); pGo->SetUInt32Value(GAMEOBJECT_FACTION, 0); if (Creature* pKalec = Unit::GetCreature(*pPlayer, pInstance->GetData64(DATA_KALECGOS_KJ))) @@ -697,7 +697,7 @@ public: { switch(t) { - case TIMER_SPEECH: + case TIMER_SPEECH: if (SpeechBegins) { SpeechBegins=false; @@ -735,7 +735,7 @@ public: case TIMER_SOUL_FLAY: if (!me->IsNonMeleeSpellCasted(false)) { - DoCast(me->getVictim(), SPELL_SOUL_FLAY_SLOW, false); + DoCast(me->getVictim(), SPELL_SOUL_FLAY_SLOW, false); DoCast(me->getVictim(), SPELL_SOUL_FLAY, false); Timer[TIMER_SOUL_FLAY] = 3500; } @@ -749,7 +749,7 @@ public: for (uint8 z = 0; z < 6; ++z) { pRandomPlayer = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); - if (!pRandomPlayer || !pRandomPlayer->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT,0)) + if (!pRandomPlayer || !pRandomPlayer->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT,0)) break; } @@ -757,7 +757,7 @@ public: DoCast(pRandomPlayer, SPELL_LEGION_LIGHTNING, false); else sLog.outError("try to cast SPELL_LEGION_LIGHTNING on invalid target"); - + Timer[TIMER_LEGION_LIGHTNING] = (Phase == PHASE_SACRIFICE) ? 18000 : 30000; // 18 seconds in PHASE_SACRIFICE Timer[TIMER_SOUL_FLAY] = 2500; } @@ -786,7 +786,7 @@ public: if (!me->IsNonMeleeSpellCasted(false)) { CastSinisterReflection(); - DoCastAOE(SPELL_SHADOW_SPIKE, false); + DoCastAOE(SPELL_SHADOW_SPIKE, false); ChangeTimers(true, 30000); Timer[TIMER_SHADOW_SPIKE] = 0; TimerIsDeactivated[TIMER_SPEECH] = false; @@ -978,8 +978,8 @@ public: { DoCast(me->getVictim(), SPELL_SHADOW_BOLT_VOLLEY); ShadowBoltVolleyTimer = 12000; - } - else + } + else ShadowBoltVolleyTimer -= diff; // Felfire Portal - Creatres a portal, that spawns Volatile Felfire Fiends, which do suicide bombing. @@ -1021,7 +1021,7 @@ public: uint32 uiSpawnFiendTimer; - void Reset() + void Reset() { uiSpawnFiendTimer = 5000; me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_NON_ATTACKABLE); @@ -1227,7 +1227,7 @@ public: { DoTeleportTo(x,y,SHIELD_ORB_Z); bPointReached = true; - } + } else uiCheckTimer -= diff; } diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index 99f7cd56eae..6f0a9acdc43 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -289,7 +289,7 @@ class instance_uldaman : public InstanceMapScript return 0; } // end GetData64 }; - + InstanceScript* OnGetInstanceData(InstanceMap* pMap) { return new instance_uldaman_InstanceMapScript(pMap); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp index 4f86318c5b6..28d21499e30 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp @@ -265,7 +265,7 @@ class boss_arlokk : public CreatureScript class go_gong_of_bethekk : public GameObjectScript { public: - go_gong_of_bethekk() : GameObjectScript("go_gong_of_bethekk") + go_gong_of_bethekk() : GameObjectScript("go_gong_of_bethekk") { } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp index b09d1626db1..e663ff7914e 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp @@ -38,7 +38,7 @@ class boss_grilek : public CreatureScript { } - struct boss_grilekAI : public ScriptedAI + struct boss_grilekAI : public ScriptedAI { boss_grilekAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp index 5d226bca91b..98b7e402554 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp @@ -244,7 +244,7 @@ class boss_hakkar : public CreatureScript DoMeleeAttackIfReady(); } }; - + CreatureAI* GetAI(Creature* creature) const { return new boss_hakkarAI(creature); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp index c9d20db0380..0c5db040b19 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp @@ -216,7 +216,7 @@ class boss_jeklik : public CreatureScript DoMeleeAttackIfReady(); } } - }; + }; CreatureAI* GetAI(Creature* creature) const { @@ -289,7 +289,7 @@ class mob_batrider : public CreatureScript DoMeleeAttackIfReady(); } - }; + }; CreatureAI* GetAI(Creature* creature) const { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp index d98fbf0f559..fb72ad61abd 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp @@ -167,7 +167,7 @@ class boss_jindo : public CreatureScript DoMeleeAttackIfReady(); } - }; + }; CreatureAI* GetAI(Creature* creature) const { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp index 99392a6c7ce..0bbe81f900f 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp @@ -411,7 +411,7 @@ class mob_zealot_lorkhan : public CreatureScript DoMeleeAttackIfReady(); } - }; + }; CreatureAI* GetAI(Creature* creature) const { @@ -429,7 +429,7 @@ class mob_zealot_zath : public CreatureScript { } - struct mob_zealot_zathAI : public ScriptedAI + struct mob_zealot_zathAI : public ScriptedAI { mob_zealot_zathAI(Creature *c) : ScriptedAI(c) { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp index b0172c041a4..cee1ea50032 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp @@ -192,7 +192,7 @@ class boss_venoxis : public CreatureScript } DoMeleeAttackIfReady(); } - }; + }; CreatureAI* GetAI(Creature* creature) const { diff --git a/src/server/scripts/EasternKingdoms/eversong_woods.cpp b/src/server/scripts/EasternKingdoms/eversong_woods.cpp index db377a9fe63..bd80fff1532 100644 --- a/src/server/scripts/EasternKingdoms/eversong_woods.cpp +++ b/src/server/scripts/EasternKingdoms/eversong_woods.cpp @@ -456,11 +456,11 @@ public: if (questPhase > 0) { ++paladinPhase; - + if (paladinPhase < 4) questPhase = 2; else - Reset(); // Quest Complete, QuestComplete handler is + Reset(); // Quest Complete, QuestComplete handler is } } diff --git a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp index 9950955fd44..0a5f9bc28ec 100644 --- a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp @@ -272,16 +272,16 @@ enum eTruuen { NPC_GHOST_UTHER = 17233, NPC_THEL_DANIS = 1854, - NPC_GHOUL = 1791, //ambush + NPC_GHOUL = 1791, //ambush QUEST_TOMB_LIGHTBRINGER = 9446, - SAY_WP_0 = -1999981, //Beware! We are attacked! + SAY_WP_0 = -1999981, //Beware! We are attacked! SAY_WP_1 = -1999982, //It must be the purity of the Mark of the Lightbringer that is drawing forth the Scourge to attack us. We must proceed with caution lest we be overwhelmed! SAY_WP_2 = -1999983, //This land truly needs to be cleansed by the Light! Let us continue on to the tomb. It isn't far now... SAY_WP_3 = -1999984, //Be welcome, friends! - SAY_WP_4 = -1999985, //Thank you for coming here in remembrance of me. Your efforts in recovering that symbol, while unnecessary, are certainly touching to an old man's heart. - SAY_WP_5 = -1999986, //Please, rise my friend. Keep the Blessing as a symbol of the strength of the Light and how heroes long gone might once again rise in each of us to inspire. + SAY_WP_4 = -1999985, //Thank you for coming here in remembrance of me. Your efforts in recovering that symbol, while unnecessary, are certainly touching to an old man's heart. + SAY_WP_5 = -1999986, //Please, rise my friend. Keep the Blessing as a symbol of the strength of the Light and how heroes long gone might once again rise in each of us to inspire. SAY_WP_6 = -1999987 //Thank you my friend for making this possible. This is a day that I shall never forget! I think I will stay a while. Please return to High Priestess MacDonnell at the camp. I know that she'll be keenly interested to know of what has transpired here. };
class npc_anchorite_truuen : public CreatureScript @@ -293,8 +293,8 @@ public: { npc_escortAI* pEscortAI = CAST_AI(npc_anchorite_truuen::npc_anchorite_truuenAI, pCreature->AI()); - if (quest->GetQuestId() == QUEST_TOMB_LIGHTBRINGER) - pEscortAI->Start(true, true, pPlayer->GetGUID()); + if (quest->GetQuestId() == QUEST_TOMB_LIGHTBRINGER) + pEscortAI->Start(true, true, pPlayer->GetGUID()); return false; } @@ -316,7 +316,7 @@ public: Creature* Theldanis; void Reset() - { + { m_uiChatTimer = 7000; } @@ -325,7 +325,7 @@ public: if (pSummoned->GetEntry() == NPC_GHOUL) pSummoned->AI()->AttackStart(me); } - + void WaypointReached(uint32 i) { Player* pPlayer = GetPlayerForEscort(); @@ -339,7 +339,7 @@ public: case 9: DoScriptText(SAY_WP_1, me); break; - case 14: + case 14: me->SummonCreature(NPC_GHOUL, me->GetPositionX()+7.0f, me->GetPositionY()+7.0f, me->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 90000); me->SummonCreature(NPC_GHOUL, me->GetPositionX()+5.0f, me->GetPositionY()+5.0f, me->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 90000); me->SummonCreature(NPC_GHOUL, me->GetPositionX()+10.0f, me->GetPositionY()+10.0f, me->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 90000); @@ -347,14 +347,14 @@ public: break; case 15: DoScriptText(SAY_WP_2, me); - case 21: + case 21: Theldanis = GetClosestCreatureWithEntry(me, NPC_THEL_DANIS, 150); DoScriptText(SAY_WP_3, Theldanis); break; case 22: - break; + break; case 23: - Ughost = me->SummonCreature(NPC_GHOST_UTHER, 971.86,-1825.42 ,81.99 , 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + Ughost = me->SummonCreature(NPC_GHOST_UTHER, 971.86,-1825.42 ,81.99 , 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); Ughost->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); DoScriptText(SAY_WP_4, Ughost, me); m_uiChatTimer = 4000; @@ -369,8 +369,8 @@ public: break; case 26: if (pPlayer) - pPlayer->GroupEventHappens(QUEST_TOMB_LIGHTBRINGER, me); - break; + pPlayer->GroupEventHappens(QUEST_TOMB_LIGHTBRINGER, me); + break; } } @@ -380,7 +380,7 @@ public: { Player* pPlayer = GetPlayerForEscort(); if (pPlayer) - pPlayer->FailQuest(QUEST_TOMB_LIGHTBRINGER); + pPlayer->FailQuest(QUEST_TOMB_LIGHTBRINGER); } void UpdateAI(const uint32 uiDiff) diff --git a/src/server/scripts/Examples/example_spell.cpp b/src/server/scripts/Examples/example_spell.cpp index ae42d050c73..3063f6f6d8b 100644 --- a/src/server/scripts/Examples/example_spell.cpp +++ b/src/server/scripts/Examples/example_spell.cpp @@ -52,9 +52,9 @@ class spell_ex_49375 : public SpellHandlerScript EffectHandlers += EffectHandlerFn(spell_ex_49375SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); // this will prompt an error on startup because effect 0 of spell 49375 is set to SPELL_EFFECT_DUMMY, not SPELL_EFFECT_APPLY_AURA //EffectHandlers += EffectHandlerFn(spell_gen_49375SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_APPLY_AURA); - // this will make HandleDummy function to be called on first != 0 effect of spell 49375 + // this will make HandleDummy function to be called on first != 0 effect of spell 49375 //EffectHandlers += EffectHandlerFn(spell_gen_49375SpellScript::HandleDummy, EFFECT_FIRST_FOUND, SPELL_EFFECT_ANY); - // this will make HandleDummy function to be called on all != 0 effect of spell 49375 + // this will make HandleDummy function to be called on all != 0 effect of spell 49375 //EffectHandlers += EffectHandlerFn(spell_gen_49375SpellScript::HandleDummy, EFFECT_ALL, SPELL_EFFECT_ANY); }; @@ -78,7 +78,7 @@ class spell_ex_49375 : public SpellHandlerScript // script will be immediately removed from the spell // for example - we don't want this script to be executed on a creature // if (GetCaster()->GetTypeID() != TYPEID_PLAYER) - // return false; + // return false; } // function called just before script delete @@ -98,7 +98,7 @@ class spell_ex_49375 : public SpellHandlerScript /* empty script for copypasting class spell_ex : public SpellHandlerScript { - public: + public: spell_ex() : SpellHandlerScript("spell_ex") { } class spell_ex_SpellScript : public SpellScript diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index a78997410dc..28fbb65bf6f 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -18,10 +18,10 @@ /* ScriptData SDName: Boss_Onyxia SD%Complete: 95 -SDComment: <Known bugs> - Ground visual for Deep Breath effect; - Wing Buffet not ignoring armor; - Not summoning whelps on phase 3 (lacks info) +SDComment: <Known bugs> + Ground visual for Deep Breath effect; + Wing Buffet not ignoring armor; + Not summoning whelps on phase 3 (lacks info) </Known bugs> SDCategory: Onyxia's Lair EndScriptData */ @@ -110,7 +110,7 @@ public: struct boss_onyxiaAI : public ScriptedAI { - boss_onyxiaAI(Creature* pCreature) : ScriptedAI(pCreature), Summons(me) + boss_onyxiaAI(Creature* pCreature) : ScriptedAI(pCreature), Summons(me) { m_pInstance = pCreature->GetInstanceScript(); Reset(); @@ -140,7 +140,7 @@ public: uint8 m_uiSummonWhelpCount; uint8 m_uiSummonLairGuardCount; bool m_bIsMoving; - + void Reset() { if (!IsCombatMovement()) @@ -168,7 +168,7 @@ public: m_uiSummonWhelpCount = 0; m_uiSummonLairGuardCount = 0; m_bIsMoving = false; - + if (m_pInstance) { m_pInstance->SetData(DATA_ONYXIA, NOT_STARTED); @@ -181,7 +181,7 @@ public: { DoScriptText(SAY_AGGRO, me); me->SetInCombatWithZone(); - + if (m_pInstance) { m_pInstance->SetData(DATA_ONYXIA, IN_PROGRESS); @@ -203,7 +203,7 @@ public: pSummoned->SetInCombatWithZone(); if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) pSummoned->AI()->AttackStart(pTarget); - + switch (pSummoned->GetEntry()) { case NPC_WHELP: @@ -217,7 +217,7 @@ public: Summons.Summon(pSummoned); } - void SummonedCreatureDespawn(Creature *summon) + void SummonedCreatureDespawn(Creature *summon) { Summons.Despawn(summon); } @@ -265,14 +265,14 @@ public: default: m_bIsMoving = false; break; - } + } } } - - void SpellHitTarget(Unit* target, const SpellEntry* pSpell) + + void SpellHitTarget(Unit* target, const SpellEntry* pSpell) { //Workaround - Couldn't find a way to group this spells (All Eruption) - if (((pSpell->Id >= 17086 && pSpell->Id <= 17095) || + if (((pSpell->Id >= 17086 && pSpell->Id <= 17095) || (pSpell->Id == 17097) || (pSpell->Id >= 18351 && pSpell->Id <= 18361) || (pSpell->Id >= 18564 && pSpell->Id <= 18576) || @@ -331,7 +331,7 @@ public: if (me->GetHealth()*100 / me->GetMaxHealth() < 60) { m_uiPhase = PHASE_BREATH; - + if (m_pInstance) m_pInstance->SetData(DATA_ONYXIA_PHASE, m_uiPhase); @@ -419,7 +419,7 @@ public: if (m_uiDeepBreathTimer <= uiDiff) { - if (!m_bIsMoving) + if (!m_bIsMoving) { if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(false); @@ -434,7 +434,7 @@ public: if (m_uiMovementTimer <= uiDiff) { - if (!m_bIsMoving) + if (!m_bIsMoving) { SetNextRandomPoint(); m_pPointData = GetMoveData(); @@ -463,7 +463,7 @@ public: else m_uiFireballTimer -= uiDiff; - if (m_uiLairGuardTimer <= uiDiff) + if (m_uiLairGuardTimer <= uiDiff) { me->SummonCreature(NPC_LAIRGUARD, aSpawnLocations[2].GetPositionX(), aSpawnLocations[2].GetPositionY(), aSpawnLocations[2].GetPositionZ(), 0.0f, TEMPSUMMON_CORPSE_DESPAWN); if (m_uiSummonLairGuardCount >= RAID_MODE(1,2)) @@ -484,8 +484,8 @@ public: if (m_uiSummonWhelpCount >= RAID_MODE(20,40)) { m_uiSummonWhelpCount = 0; - m_uiWhelpTimer = 90000; - } + m_uiWhelpTimer = 90000; + } else m_uiWhelpTimer = 500; } diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp index 7aebe80247c..094c7456419 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp @@ -18,7 +18,7 @@ /* ScriptData SDName: Instance_Onyxias_Lair SD%Complete: 100 -SDComment: +SDComment: SDCategory: Onyxia's Lair EndScriptData */ @@ -40,9 +40,9 @@ public: //Eruption is a BFS graph problem //One map to remember all floor, one map to keep floor that still need to erupt and one queue to know what needs to be removed - std::map<uint64,uint32> FloorEruptionGUID[2]; - std::queue<uint64> FloorEruptionGUIDQueue; - + std::map<uint64,uint32> FloorEruptionGUID[2]; + std::queue<uint64> FloorEruptionGUIDQueue; + uint64 m_uiOnyxiasGUID; uint32 m_uiOnyxiaLiftoffTimer; uint32 m_uiManyWhelpsCounter; @@ -110,7 +110,7 @@ public: pFloorEruption->SendCustomAnim(); pFloorEruption->CastSpell(NULL, Difficulty(instance->GetSpawnMode()) == RAID_DIFFICULTY_10MAN_NORMAL ? 17731 : 69294); //pFloorEruption->GetGOInfo()->trap.spellId - //Get all immediatly nearby floors + //Get all immediatly nearby floors std::list<GameObject*> nearFloorList; Trinity::GameObjectInRangeCheck check(pFloorEruption->GetPositionX(), pFloorEruption->GetPositionY(), pFloorEruption->GetPositionZ(), 15); Trinity::GameObjectListSearcher<Trinity::GameObjectInRangeCheck> searcher(pFloorEruption, nearFloorList, check); @@ -211,12 +211,12 @@ public: } else m_uiOnyxiaLiftoffTimer -= uiDiff; } - if (!FloorEruptionGUIDQueue.empty()) + if (!FloorEruptionGUIDQueue.empty()) { if (m_uiEruptTimer <= uiDiff) { uint32 treeHeight = 0; - do + do { treeHeight = (*FloorEruptionGUID[1].find(FloorEruptionGUIDQueue.front())).second; FloorEruption(FloorEruptionGUIDQueue.front()); diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index cba513bf520..cb49f66cba7 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -79,7 +79,7 @@ float pyramidSpawns [pyramidSpawnTotal][4] = { {3,7788,1889.94,1212.21}, {3,7275,1889.23,1207.72}, {3,7796,1879.77,1207.96} -}; +}; float Spawnsway[2][3] = { @@ -205,7 +205,7 @@ public: PyramidPhase=data; break; }; - } + } virtual void Update(uint32 diff) { @@ -254,14 +254,14 @@ public: SpawnPyramidWave(3); SetData(EVENT_PYRAMID,PYRAMID_PRE_WAVE_3); major_wave_Timer = 5000; //give NPCs time to return to their home spots - } - else + } + else if (minor_wave_Timer<diff) { SendAddsUpStairs(addGroupSize++); minor_wave_Timer=10000; - } - else + } + else minor_wave_Timer -= diff; break; case PYRAMID_PRE_WAVE_3: @@ -274,8 +274,8 @@ public: MoveNPCIfAlive(ENTRY_RAVEN,1883.68,1227.95,9.543,4.78); MoveNPCIfAlive(ENTRY_WEEGLI,1878.02,1227.65,9.485,4.78); SetData(EVENT_PYRAMID,PYRAMID_WAVE_3); - } - else + } + else major_wave_Timer -= diff; break; case PYRAMID_WAVE_3: diff --git a/src/server/scripts/Kalimdor/desolace.cpp b/src/server/scripts/Kalimdor/desolace.cpp index 565a16169b2..a3fadd2d226 100644 --- a/src/server/scripts/Kalimdor/desolace.cpp +++ b/src/server/scripts/Kalimdor/desolace.cpp @@ -28,7 +28,7 @@ npc_aged_dying_ancient_kodo EndContentData */ #include "ScriptPCH.h" -#include "ScriptedEscortAI.h" +#include "ScriptedEscortAI.h" enum eDyingKodo { @@ -200,7 +200,7 @@ public: bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const* quest) { if (quest->GetQuestId() == QUEST_RETURN_TO_VAHLARRIEL) - { + { if (npc_escortAI* pEscortAI = CAST_AI(npc_dalinda::npc_dalindaAI, pCreature->AI())) { pEscortAI->Start(true, false, pPlayer->GetGUID()); @@ -217,8 +217,8 @@ public: struct npc_dalindaAI : public npc_escortAI { - npc_dalindaAI(Creature* pCreature) : npc_escortAI(pCreature) { } - + npc_dalindaAI(Creature* pCreature) : npc_escortAI(pCreature) { } + void WaypointReached(uint32 i) { Player* pPlayer = GetPlayerForEscort(); @@ -226,11 +226,11 @@ public: { case 1: me->IsStandState(); - break; - case 15: + break; + case 15: if (pPlayer) pPlayer->GroupEventHappens(QUEST_RETURN_TO_VAHLARRIEL, me); - break; + break; } } @@ -247,7 +247,7 @@ public: } void UpdateAI(const uint32 uiDiff) - { + { npc_escortAI::UpdateAI(uiDiff); if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 7ea4afbcb4b..bfc402e5327 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -65,7 +65,7 @@ enum ACHIEV_TIMED_START_EVENT = 20381, }; -enum Phases +enum Phases { PHASE_MELEE = 0, PHASE_UNDERGROUND = 1, @@ -81,7 +81,7 @@ const Position SpawnPoint[2] = }; const Position SpawnPointGuardian[2] = -{ +{ { 550.348633, 316.006805, 234.2947 }, { 550.188660, 324.264557, 237.7412 }, }; @@ -113,11 +113,11 @@ public: uint32 uiUndergroundTimer; uint32 uiVenomancerTimer; uint32 uiDatterTimer; - + uint32 uiImpaleTimer; uint32 uiImpalePhase; uint64 uiImpaleTarget; - + SummonList lSummons; void Reset() @@ -136,7 +136,7 @@ public: me->RemoveAura(SPELL_SUBMERGE); lSummons.DespawnAll(); - + if (pInstance) { pInstance->SetData(DATA_ANUBARAK_EVENT, NOT_STARTED); @@ -177,14 +177,14 @@ public: return; switch (uiPhase) - { + { case PHASE_UNDERGROUND: if (uiImpaleTimer <= diff) { switch(uiImpalePhase) - { + { case IMPALE_PHASE_TARGET: - if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { if (Creature *pImpaleTarget = DoSummonImpaleTarget(target)) pImpaleTarget->CastSpell(pImpaleTarget, SPELL_IMPALE_SHAKEGROUND, true); @@ -288,7 +288,7 @@ public: DoCast(me, SPELL_SUBMERGE, false); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE); - + uiPhase = PHASE_UNDERGROUND; ++uiUndergroundPhase; } @@ -305,7 +305,7 @@ public: DoCastVictim(SPELL_CARRION_BEETLES); uiCarrionBeetlesTimer = 25*IN_MILLISECONDS; } else uiCarrionBeetlesTimer -= diff; - + if (uiLeechingSwarmTimer <= diff) { DoCast(me, SPELL_LEECHING_SWARM, true); @@ -326,7 +326,7 @@ public: break; } } - + void JustDied(Unit * /*pKiller*/) { DoScriptText(SAY_DEATH, me); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp index bc0d56cceae..d3e477b1b2b 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -136,7 +136,7 @@ public: if (data == IN_PROGRESS) for (uint8 i = 0; i < 3; ++i) HandleGameObject(uiAnubarakDoor[i], false); - else if (data == NOT_STARTED || data == DONE) + else if (data == NOT_STARTED || data == DONE) for (uint8 i = 0; i < 3; ++i) HandleGameObject(uiAnubarakDoor[i], true); break; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp index 5ed714e897e..b18b0e01250 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp @@ -33,7 +33,7 @@ enum Spells SPELL_QUIVERING_STRIKE = 72422, SPELL_IMPENDING_DESPAIR = 72426, SPELL_DEFILING_HORROR = 72435, - SPELL_HOPELESSNESS = 72395, + SPELL_HOPELESSNESS = 72395, H_SPELL_HOPELESSNESS = 72390, // TODO: not in dbc. Add in DB. }; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index 89c47a344ed..47e7c7270b4 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -71,7 +71,7 @@ enum Yells enum Events { EVENT_NONE, - + EVENT_START_INTRO, EVENT_SKIP_INTRO, @@ -133,7 +133,7 @@ enum eEnum QUEST_DELIVRANCE_FROM_THE_PIT_H2 = 24712, QUEST_WRATH_OF_THE_LICH_KING_A2 = 24500, QUEST_WRATH_OF_THE_LICH_KING_H2 = 24802, -}; +}; static Position HallsofReflectionLocs[]= { @@ -201,7 +201,7 @@ public: // AI of Part1: handle the intro till start of gauntlet event. struct npc_jaina_or_sylvanas_horAI : public ScriptedAI { - npc_jaina_or_sylvanas_horAI(Creature *pCreature) : ScriptedAI(pCreature) + npc_jaina_or_sylvanas_horAI(Creature *pCreature) : ScriptedAI(pCreature) { pInstance = me->GetInstanceScript(); } @@ -224,7 +224,7 @@ public: me->SetVisibility(VISIBILITY_ON); } - void DoAction(const int32 actionId) + void DoAction(const int32 actionId) { switch(actionId) { @@ -276,7 +276,7 @@ public: events.ScheduleEvent(EVENT_INTRO_A2_5, 2000); break; case EVENT_INTRO_A2_5: - if (Creature* pUther = me->GetCreature(*me, uiUther)) + if (Creature* pUther = me->GetCreature(*me, uiUther)) DoScriptText(SAY_UTHER_INTRO_A2_1, pUther); events.ScheduleEvent(EVENT_INTRO_A2_6, 3000); break; @@ -285,7 +285,7 @@ public: events.ScheduleEvent(EVENT_INTRO_A2_7, 6000); break; case EVENT_INTRO_A2_7: - if (Creature* pUther = me->GetCreature(*me, uiUther)) + if (Creature* pUther = me->GetCreature(*me, uiUther)) DoScriptText(SAY_UTHER_INTRO_A2_2, pUther); events.ScheduleEvent(EVENT_INTRO_A2_8, 6500); break; @@ -294,7 +294,7 @@ public: events.ScheduleEvent(EVENT_INTRO_A2_9, 2000); break; case EVENT_INTRO_A2_9: - if (Creature* pUther = me->GetCreature(*me, uiUther)) + if (Creature* pUther = me->GetCreature(*me, uiUther)) DoScriptText(SAY_UTHER_INTRO_A2_3, pUther); events.ScheduleEvent(EVENT_INTRO_A2_10, 9000); break; @@ -303,7 +303,7 @@ public: events.ScheduleEvent(EVENT_INTRO_A2_11, 5000); break; case EVENT_INTRO_A2_11: - if (Creature* pUther = me->GetCreature(*me, uiUther)) + if (Creature* pUther = me->GetCreature(*me, uiUther)) DoScriptText(SAY_UTHER_INTRO_A2_4, pUther); events.ScheduleEvent(EVENT_INTRO_A2_12, 11000); break; @@ -312,7 +312,7 @@ public: events.ScheduleEvent(EVENT_INTRO_A2_13, 4000); break; case EVENT_INTRO_A2_13: - if (Creature* pUther = me->GetCreature(*me, uiUther)) + if (Creature* pUther = me->GetCreature(*me, uiUther)) DoScriptText(SAY_UTHER_INTRO_A2_5, pUther); events.ScheduleEvent(EVENT_INTRO_A2_14, 12500); break; @@ -321,12 +321,12 @@ public: events.ScheduleEvent(EVENT_INTRO_A2_15, 10000); break; case EVENT_INTRO_A2_15: - if (Creature* pUther = me->GetCreature(*me, uiUther)) + if (Creature* pUther = me->GetCreature(*me, uiUther)) DoScriptText(SAY_UTHER_INTRO_A2_6, pUther); events.ScheduleEvent(EVENT_INTRO_A2_16, 22000); break; case EVENT_INTRO_A2_16: - if (Creature* pUther = me->GetCreature(*me, uiUther)) + if (Creature* pUther = me->GetCreature(*me, uiUther)) DoScriptText(SAY_UTHER_INTRO_A2_7, pUther); events.ScheduleEvent(EVENT_INTRO_A2_17, 4000); break; @@ -335,7 +335,7 @@ public: events.ScheduleEvent(EVENT_INTRO_A2_18, 2000); break; case EVENT_INTRO_A2_18: - if (Creature* pUther = me->GetCreature(*me, uiUther)) + if (Creature* pUther = me->GetCreature(*me, uiUther)) { pUther->HandleEmoteCommand(EMOTE_ONESHOT_NO); DoScriptText(SAY_UTHER_INTRO_A2_8, pUther); @@ -372,7 +372,7 @@ public: events.ScheduleEvent(EVENT_INTRO_H2_5, 2000); break; case EVENT_INTRO_H2_5: - if (Creature* pUther = me->GetCreature(*me, uiUther)) + if (Creature* pUther = me->GetCreature(*me, uiUther)) DoScriptText(SAY_UTHER_INTRO_H2_1, pUther); events.ScheduleEvent(EVENT_INTRO_H2_6, 11000); break; @@ -381,7 +381,7 @@ public: events.ScheduleEvent(EVENT_INTRO_H2_7, 3000); break; case EVENT_INTRO_H2_7: - if (Creature* pUther = me->GetCreature(*me, uiUther)) + if (Creature* pUther = me->GetCreature(*me, uiUther)) DoScriptText(SAY_UTHER_INTRO_H2_2, pUther); events.ScheduleEvent(EVENT_INTRO_H2_8, 6000); break; @@ -424,7 +424,7 @@ public: DoScriptText(SAY_SYLVANAS_INTRO_8, me); events.ScheduleEvent(EVENT_INTRO_LK_1, 2000); break; - + // Remaining Intro Events common for both faction case EVENT_INTRO_LK_1: // Spawn LK in front of door, and make him move to the sword. @@ -451,40 +451,40 @@ public: break; case EVENT_INTRO_LK_3: - // The Lich King banishes Uther to the abyss. + // The Lich King banishes Uther to the abyss. if (Creature* pUther = me->GetCreature(*me, uiUther)) { pUther->DisappearAndDie(); uiUther = 0; } - - // He steps forward and removes the runeblade from the heap of skulls. - + + // He steps forward and removes the runeblade from the heap of skulls. + events.ScheduleEvent(EVENT_INTRO_LK_4, 4000); break; - + case EVENT_INTRO_LK_4: if (Creature* pLichKing = me->GetCreature(*me, uiLichKing)) DoScriptText(SAY_LK_INTRO_2, pLichKing); events.ScheduleEvent(EVENT_INTRO_LK_5, 10000); break; - + case EVENT_INTRO_LK_5: // summon Falric and Marwyn. then go back to the door if (Creature* pFalric = me->GetCreature(*me, pInstance->GetData64(DATA_FALRIC))) pFalric->SetVisibility(VISIBILITY_ON); if (Creature* pMarwyn = me->GetCreature(*me, pInstance->GetData64(DATA_MARWYN))) pMarwyn->SetVisibility(VISIBILITY_ON); - + if (Creature* pLichKing = me->GetCreature(*me, uiLichKing)) { pLichKing->GetMotionMaster()->MovePoint(0, LichKingSpawnPos); DoScriptText(SAY_LK_INTRO_3, pLichKing); } - + events.ScheduleEvent(EVENT_INTRO_LK_6, 8000); break; - + case EVENT_INTRO_LK_6: if (Creature* pFalric = me->GetCreature(*me, pInstance->GetData64(DATA_FALRIC))) DoScriptText(SAY_FALRIC_INTRO_1, pFalric); @@ -498,7 +498,7 @@ public: events.ScheduleEvent(EVENT_INTRO_LK_8, 2000); break; - + case EVENT_INTRO_LK_8: if (Creature* pFalric = me->GetCreature(*me, pInstance->GetData64(DATA_FALRIC))) DoScriptText(SAY_FALRIC_INTRO_2, pFalric); @@ -516,7 +516,7 @@ public: // TODO: Loralen/Koreln shall run also events.ScheduleEvent(EVENT_INTRO_END, 10000); break; - + case EVENT_INTRO_END: if (pInstance) pInstance->SetData(DATA_WAVE_COUNT, SPECIAL); // start first wave diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h index 29fc462b15b..df54e58c574 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h @@ -83,11 +83,11 @@ struct boss_horAI : ScriptedAI { pInstance = me->GetInstanceScript(); } - + InstanceScript* pInstance; EventMap events; SummonList summons; - + void Reset() { events.Reset(); @@ -121,11 +121,11 @@ struct boss_horAI : ScriptedAI break; } } - + void JustSummoned(Creature *pSummoned) { summons.Summon(pSummoned); - + if (Unit *pUnit = pSummoned->SelectNearestTarget()) { if (pSummoned->AI()) diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index 5d1626ec3d1..bd5f551cffd 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -27,7 +27,7 @@ EndScriptData */ enum Spells { - + SPELL_ARCANE_SHIELD = 53813, //Dummy --> Channeled, shields the caster from damage. SPELL_EMPOWERED_ARCANE_EXPLOSION = 51110, SPELL_EMPOWERED_ARCANE_EXPLOSION_2 = 59377, @@ -58,7 +58,7 @@ enum eCreature NPC_PHANTASMAL_AIR = 27650, NPC_PHANTASMAL_FIRE = 27651, NPC_PHANTASMAL_WATER = 27653, - + NPC_PHANTASMAL_MURLOC = 27649, NPC_PHANTASMAL_NAGAL = 27648, NPC_PHANTASMAL_OGRE = 27647 @@ -176,7 +176,7 @@ public: pWho->SetInCombatWith(me); me->GetMotionMaster()->MoveChase(pWho, 0,0); - } + } } } @@ -190,7 +190,7 @@ public: uiGroup[0] = urand(0,2); uiGroup[1] = urand(0,2); uiGroup[2] = urand(0,2); - } + } } void SetPosition(uint8 uiI) @@ -247,7 +247,7 @@ public: if (!pInstance || pInstance->GetData(DATA_UROM_PLATAFORM) < 2) return; - + if (uiTeleportTimer <= uiDiff) { me->InterruptNonMeleeSpells(false); @@ -291,7 +291,7 @@ public: if (uiFrostBombTimer <= uiDiff) { DoCastVictim(SPELL_FROSTBOMB); - uiFrostBombTimer = urand(5000,8000); + uiFrostBombTimer = urand(5000,8000); } else uiFrostBombTimer -= uiDiff; if (uiTimeBombTimer <= uiDiff) @@ -342,7 +342,7 @@ public: break; case SPELL_TELEPORT: me->AddUnitMovementFlag(MOVEMENTFLAG_CAN_FLY); // with out it the npc will fall down while is casting - bCanCast = true; + bCanCast = true; break; default: break; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index 8f023a98968..0417c7071c9 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -83,7 +83,7 @@ public: pGO->SetGoState(GO_STATE_ACTIVE); else pGO->SetGoState(GO_STATE_READY); - + GameObjectList.push_back(pGO->GetGUID()); } } @@ -141,7 +141,7 @@ public: return 0; } - + void OpenCageDoors() { if (GameObjectList.empty()) diff --git a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp index 6dc24313584..29a3bac2bdb 100644 --- a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp @@ -115,7 +115,7 @@ enum eEnums SPELL_FLAME_TSUNAMI_DMG_AURA = 57491, // periodic damage, npc has this aura SPELL_FLAME_TSUNAMI_BUFF = 60430, - + NPC_FLAME_TSUNAMI = 30616, // for the flame waves NPC_LAVA_BLAZE = 30643, // adds spawning from flame strike @@ -398,7 +398,7 @@ public: pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_DUO,H_ACHIEV_TWILIGHT_DUO)); pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ZONE,H_ACHIEV_TWILIGHT_ZONE)); } - + pInstance->SetData(TYPE_SARTHARION_EVENT, DONE); } } @@ -860,7 +860,7 @@ struct dummy_dragonAI : public ScriptedAI case NPC_TENEBRON: { iTextId = WHISPER_HATCH_EGGS; - if (pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) + if (pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) { for(uint32 i = 0; i < 6; ++i) me->SummonCreature(NPC_TWILIGHT_EGG, TwilightEggs[i].x, TwilightEggs[i].y, TwilightEggs[i].z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000); @@ -1273,7 +1273,7 @@ public: else { OpenPortal(); - DoCast(me->getVictim(), SPELL_TWILIGHT_TORMENT_VESP); + DoCast(me->getVictim(), SPELL_TWILIGHT_TORMENT_VESP); m_uiAcolyteVesperonTimer = urand(60000,70000); } } @@ -1324,7 +1324,7 @@ public: InstanceScript* pInstance; uint32 uiDespawnTimer; - + void Reset() { uiDespawnTimer = 28000; @@ -1361,7 +1361,7 @@ public: if (map->IsDungeon()) { Map::PlayerList const &PlayerList = map->GetPlayers(); - + if (PlayerList.isEmpty()) return; @@ -1437,14 +1437,14 @@ public: uiDespawnTimer = 28000; if (pInstance) { - me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER,me); + me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER,me); } DoCast(me, SPELL_TWILIGHT_TORMENT_VESP_ACO); } void JustDied(Unit* pKiller) { - me->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP_ACO); + me->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP_ACO); // remove twilight torment on Vesperon if (pInstance) @@ -1455,7 +1455,7 @@ public: if (pVesperon && pVesperon->isAlive() && pVesperon->HasAura(SPELL_TWILIGHT_TORMENT_VESP)) pVesperon->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP); - + Map *map = me->GetMap(); if (map->IsDungeon()) { @@ -1520,7 +1520,7 @@ public: struct mob_twilight_eggsAI : public Scripted_NoMovementAI { mob_twilight_eggsAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature) - { + { pInstance = pCreature->GetInstanceScript(); } @@ -1538,23 +1538,23 @@ public: m_uiFadeArmorTimer = 1000; m_uiHatchEggTimer = 20000; } - + void SpawnWhelps() { me->RemoveAllAuras(); if (!pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) me->SummonCreature(NPC_TWILIGHT_WHELP, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000); - else + else me->SummonCreature(NPC_SHARTHARION_TWILIGHT_WHELP, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000); me->DealDamage(me, me->GetHealth()); } - + void JustSummoned(Creature* pWho) { pWho->SetInCombatWithZone(); } - + void UpdateAI(const uint32 uiDiff) { if (m_uiHatchEggTimer <= uiDiff) @@ -1565,9 +1565,9 @@ public: SpawnWhelps(); } else - m_uiHatchEggTimer -= uiDiff; + m_uiHatchEggTimer -= uiDiff; } - + void AttackStart(Unit* pWho) {} void MoveInLineOfSight(Unit* pWho) {} @@ -1608,7 +1608,7 @@ public: TsunamiBuff_timer = 1000; entry = 0; } - + void UpdateAI(const uint32 diff) { if (Tsunami_Timer <= diff) @@ -1616,7 +1616,7 @@ public: DoCast(me,SPELL_FLAME_TSUNAMI_DMG_AURA); Tsunami_Timer = 500; }else Tsunami_Timer -= diff; - + if(TsunamiBuff_timer <= diff) { if (Unit* LavaBlaze = GetClosestCreatureWithEntry(me,NPC_LAVA_BLAZE, 10.0f, true)) diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp index c503f909d52..0278b8f9ca3 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp @@ -689,7 +689,7 @@ public: } void UpdateAI(const uint32 diff) - { + { } };
}; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp index d436d96d15f..0e8c1d40f2f 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp @@ -72,7 +72,7 @@ public: uint64 uiFreyaChestGUID; void Initialize() - { + { uiIgnisGUID = 0; uiRazorscaleGUID = 0; uiXT002GUID = 0; @@ -113,7 +113,7 @@ public: switch(pCreature->GetEntry()) { case NPC_LEVIATHAN: - uiLeviathanGUID = pCreature->GetGUID(); + uiLeviathanGUID = pCreature->GetGUID(); break; case NPC_IGNIS: uiIgnisGUID = pCreature->GetGUID(); @@ -194,10 +194,10 @@ public: if (flag == 7) flag =0; break; - case GO_LEVIATHAN_GATE: + case GO_LEVIATHAN_GATE: uiLeviathanGateGUID = add ? pGO->GetGUID() : NULL; - HandleGameObject(NULL, false, pGO); - break; + HandleGameObject(NULL, false, pGO); + break; } } @@ -211,7 +211,7 @@ public: { case EVENT_TOWER_OF_STORM_DESTROYED: //pGO->GetInstanceScript()->SetData(DATA_TOWER_STORMS,DESTROYED); - pFlameLeviathan->AI()->DoAction(1); + pFlameLeviathan->AI()->DoAction(1); break; case EVENT_TOWER_OF_FROST_DESTROYED: pFlameLeviathan->AI()->DoAction(2); @@ -277,9 +277,9 @@ public: if (Creature* pBoss = instance->GetCreature(uiLeviathanGUID)) pBoss->AI()->DoAction(10); if (GameObject* pGate = instance->GetGameObject(uiLeviathanGateGUID)) - pGate->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE); + pGate->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE); } - break; + break; default: break; } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h index a6d1271ce0e..df3f4375bc1 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h +++ b/src/server/scripts/Northrend/Ulduar/ulduar/ulduar.h @@ -42,7 +42,7 @@ enum eTypes DATA_MOLGEIM = 21, DATA_BRUNDIR = 22, DATA_RUNEMASTER_MOLGEIM = 23, - DATA_STORMCALLER_BRUNDIR = 24, + DATA_STORMCALLER_BRUNDIR = 24, NPC_LEVIATHAN = 33113, NPC_IGNIS = 33118, diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 368b769885f..33e1ff74381 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -268,7 +268,7 @@ public: Summons.Summon(pSummoned); } - void SummonedCreatureDespawn(Creature* pSummoned) + void SummonedCreatureDespawn(Creature* pSummoned) { if (pSummoned->GetEntry() == CREATURE_GRAUF) m_uiGraufGUID = 0; @@ -310,7 +310,7 @@ public: case FLYING: if (!UpdateVictim()) return; - + if (me->GetPositionX() >= 519) { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE); @@ -325,14 +325,14 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE); m_bSaidEmote = false; } - + if (m_uiMountTimer && m_uiMountTimer <= diff) { me->Mount(DATA_MOUNT); me->SetFlying(true); m_uiMountTimer = 0; } else m_uiMountTimer -= diff; - + if (m_uiSummonTimer <= diff) { SpawnMobs(); @@ -343,35 +343,35 @@ public: { switch(m_uiWaypointId) { - case 0: - me->GetMotionMaster()->MovePoint(0, Location[1].GetPositionX(), Location[1].GetPositionY(), Location[1].GetPositionZ()); + case 0: + me->GetMotionMaster()->MovePoint(0, Location[1].GetPositionX(), Location[1].GetPositionY(), Location[1].GetPositionZ()); m_uiMovementTimer = 5000; break; - case 1: + case 1: me->GetMotionMaster()->MovePoint(0, Location[2].GetPositionX(), Location[2].GetPositionY(), Location[2].GetPositionZ()); m_uiMovementTimer = 2000; break; - case 2: + case 2: me->GetMotionMaster()->MovePoint(0, Location[3].GetPositionX(), Location[3].GetPositionY(), Location[3].GetPositionZ()); m_uiMovementTimer = 15000; break; case 3: - me->GetMotionMaster()->MovePoint(0, Location[69].GetPositionX(), Location[69].GetPositionY(), Location[69].GetPositionZ()); + me->GetMotionMaster()->MovePoint(0, Location[69].GetPositionX(), Location[69].GetPositionY(), Location[69].GetPositionZ()); DoScriptText(RAND(SAY_DRAKE_BREATH_1,SAY_DRAKE_BREATH_2), me); DoScriptText(EMOTE_BREATH, me); m_uiMovementTimer = 2500; break; case 4: - me->GetMotionMaster()->MovePoint(0, Location[70].GetPositionX(), Location[70].GetPositionY(), Location[70].GetPositionZ()); + me->GetMotionMaster()->MovePoint(0, Location[70].GetPositionX(), Location[70].GetPositionY(), Location[70].GetPositionZ()); m_uiMovementTimer = 2000; SpawnTrigger(); break; case 5: - me->GetMotionMaster()->MovePoint(0, Location[71].GetPositionX(), Location[71].GetPositionY(), Location[71].GetPositionZ()); + me->GetMotionMaster()->MovePoint(0, Location[71].GetPositionX(), Location[71].GetPositionY(), Location[71].GetPositionZ()); m_uiMovementTimer = 3000; break; case 6: - me->GetMotionMaster()->MovePoint(0, Location[3].GetPositionX(), Location[3].GetPositionY(), Location[3].GetPositionZ()); + me->GetMotionMaster()->MovePoint(0, Location[3].GetPositionX(), Location[3].GetPositionY(), Location[3].GetPositionZ()); m_uiWaypointId = 2; m_uiMovementTimer = 15000; break; diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index c0e7cfdbb88..d54dded37c3 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -193,7 +193,7 @@ public: uiSaboteurPortal = 0; trashMobs.clear(); - + uiRemoveNpc = 0; uiDoorIntegrity = 100; diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index 59547c7ca5c..215a4f3d6d2 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -474,12 +474,12 @@ public: break; } } - + void UpdateAI(const uint32 diff) { if (pInstance && pInstance->GetData(DATA_MAIN_EVENT_PHASE != IN_PROGRESS)) me->CastStop(); - + npc_escortAI::UpdateAI(diff); if(!bHasGotMovingPoints) @@ -557,7 +557,7 @@ public: uint32 uiSpawnTimer; bool bPortalGuardianOrKeeperOrEliteSpawn; uint8 uiTypeOfMobsPortal; - + SummonList listOfMobs; InstanceScript *pInstance; @@ -569,14 +569,14 @@ public: } void EnterCombat(Unit * /*who*/) {} - + void MoveInLineOfSight(Unit * /*who*/) {} void UpdateAI(const uint32 diff) { if (!pInstance) //Massive usage of pInstance, global check return; - + if (pInstance->GetData(DATA_REMOVE_NPC) == 1) { me->ForcedDespawn(); diff --git a/src/server/scripts/Northrend/dragonblight.cpp b/src/server/scripts/Northrend/dragonblight.cpp index 2b849cc3d12..4cc68b4585c 100644 --- a/src/server/scripts/Northrend/dragonblight.cpp +++ b/src/server/scripts/Northrend/dragonblight.cpp @@ -74,7 +74,7 @@ public: enum eInquisitor -{ +{ NPC_GODFREY = 27577, SPELL_HOLY_FIRE = 39323, @@ -116,7 +116,7 @@ public: npc_inquisitor_hallard() : CreatureScript("npc_inquisitor_hallard") { } struct npc_inquisitor_hallardAI : public npc_escortAI - { + { npc_inquisitor_hallardAI(Creature* pCreature) : npc_escortAI(pCreature) { } bool Completed; @@ -128,22 +128,22 @@ public: return; Creature* Godfrey = me->FindNearestCreature(NPC_GODFREY, 50, true); if (!Godfrey) - return; + return; switch (i) { - case 1: + case 1: DoScriptText(SAY_WP_1, me, Godfrey); me->SetUInt64Value(UNIT_FIELD_TARGET, Godfrey->GetGUID()); me->HandleEmoteCommand(5); me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); - me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); + me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); break; case 2: Godfrey->HandleEmoteCommand(434); DoScriptText(SAY_WP_2, me, Godfrey); me->HandleEmoteCommand(15); break; - case 3: + case 3: DoScriptText(SAY_WP_3, me, Godfrey); me->HandleEmoteCommand(1); break; @@ -165,7 +165,7 @@ public: me->HandleEmoteCommand(16); break; case 9: - DoScriptText(SAY_WP_9, me, Godfrey); + DoScriptText(SAY_WP_9, me, Godfrey); me->HandleEmoteCommand(5); break; case 10: @@ -229,33 +229,33 @@ public: case 27: DoScriptText(SAY_WP_27, me, Godfrey); me->SetUInt64Value(UNIT_FIELD_TARGET, Godfrey->GetGUID()); - Completed = true; + Completed = true; if (pPlayer) pPlayer->GroupEventHappens(QUEST_A_RIGHTEOUS_SERMON, me); - break; + break; } } void Reset() - { + { Completed = false; - } + } void UpdateAI(const uint32 diff) - { - npc_escortAI::UpdateAI(diff); + { + npc_escortAI::UpdateAI(diff); } }; bool OnQuestAccept(Player* pPlayer, Creature* pCreature, Quest const* quest) { if (quest->GetQuestId() == QUEST_A_RIGHTEOUS_SERMON) - { + { DoScriptText(SAY_WP_0, pCreature, pPlayer); if (npc_escortAI* pEscortAI = CAST_AI(npc_inquisitor_hallard::npc_inquisitor_hallardAI, pCreature->AI())) { pEscortAI->Start(true, false, pPlayer->GetGUID(), 0, true); - pCreature->GetMotionMaster()->MovePoint(0, 3801.543, -679.350, 213.75); + pCreature->GetMotionMaster()->MovePoint(0, 3801.543, -679.350, 213.75); } } return true; diff --git a/src/server/scripts/Northrend/grizzly_hills.cpp b/src/server/scripts/Northrend/grizzly_hills.cpp index fcf0775f0c8..9d91f7c14c4 100644 --- a/src/server/scripts/Northrend/grizzly_hills.cpp +++ b/src/server/scripts/Northrend/grizzly_hills.cpp @@ -576,12 +576,12 @@ public: struct npc_wounded_skirmisherAI : public ScriptedAI { npc_wounded_skirmisherAI(Creature *c) : ScriptedAI(c) {} - + uint64 uiPlayerGUID; uint32 DespawnTimer; - void Reset () + void Reset () { DespawnTimer = 5000; uiPlayerGUID = 0; @@ -594,23 +594,23 @@ public: } void SpellHit(Unit *caster, const SpellEntry *spell) - { + { if (spell->Id == SPELL_RENEW_SKIRMISHER && caster->GetTypeId() == TYPEID_PLAYER && caster->ToPlayer()->GetQuestStatus(12288) == QUEST_STATUS_INCOMPLETE) - { + { caster->ToPlayer()->KilledMonsterCredit(CREDIT_NPC, 0); DoScriptText(RAND(RANDOM_SAY_1,RANDOM_SAY_2,RANDOM_SAY_3),caster); - if(me->IsStandState()) - me->GetMotionMaster()->MovePoint(1, me->GetPositionX()+7, me->GetPositionY()+7, me->GetPositionZ()); + if(me->IsStandState()) + me->GetMotionMaster()->MovePoint(1, me->GetPositionX()+7, me->GetPositionY()+7, me->GetPositionZ()); else { me->SetStandState(UNIT_STAND_STATE_STAND); - me->ForcedDespawn(DespawnTimer); + me->ForcedDespawn(DespawnTimer); } - + } } - + void UpdateAI(const uint32 /*diff*/) { if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp index cd175d20797..a77063669cc 100644 --- a/src/server/scripts/Northrend/sholazar_basin.cpp +++ b/src/server/scripts/Northrend/sholazar_basin.cpp @@ -329,8 +329,8 @@ public: enum eEnums { SPELL_EXPLODE_CRYSTAL = 62487, - SPELL_FLAMES = 64561, - + SPELL_FLAMES = 64561, + SAY_WP_7 = -1800047, SAY_WP_6 = -1800048, SAY_WP_5 = -1800049, @@ -350,38 +350,38 @@ public: struct npc_engineer_heliceAI : public npc_escortAI { npc_engineer_heliceAI(Creature* pCreature) : npc_escortAI(pCreature) { } - - uint32 m_uiChatTimer; + + uint32 m_uiChatTimer; void WaypointReached(uint32 i) - { + { Player* pPlayer = GetPlayerForEscort(); switch (i) { case 0: DoScriptText(SAY_WP_2, me); break; - case 1: + case 1: DoScriptText(SAY_WP_3, me); me->CastSpell(5918.33, 5372.91, -98.770, SPELL_EXPLODE_CRYSTAL, true); - me->SummonGameObject(184743, 5918.33, 5372.91, -98.770, 0, 0, 0, 0, 0, TEMPSUMMON_MANUAL_DESPAWN); //approx 3 to 4 seconds + me->SummonGameObject(184743, 5918.33, 5372.91, -98.770, 0, 0, 0, 0, 0, TEMPSUMMON_MANUAL_DESPAWN); //approx 3 to 4 seconds me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH); break; - case 2: + case 2: DoScriptText(SAY_WP_4, me); break; case 7: DoScriptText(SAY_WP_5, me); break; - case 8: + case 8: me->CastSpell(5887.37, 5379.39, -91.289, SPELL_EXPLODE_CRYSTAL, true); - me->SummonGameObject(184743, 5887.37, 5379.39, -91.289, 0, 0, 0, 0, 0, TEMPSUMMON_MANUAL_DESPAWN); //approx 3 to 4 seconds + me->SummonGameObject(184743, 5887.37, 5379.39, -91.289, 0, 0, 0, 0, 0, TEMPSUMMON_MANUAL_DESPAWN); //approx 3 to 4 seconds me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH); break; - case 9: + case 9: DoScriptText(SAY_WP_6, me); break; - case 13: + case 13: if (pPlayer) { pPlayer->GroupEventHappens(QUEST_DISASTER, me); @@ -389,20 +389,20 @@ public: } break; } - } + } void Reset() - { - m_uiChatTimer = 4000; + { + m_uiChatTimer = 4000; } void JustDied(Unit* /*pKiller*/) { Player* pPlayer = GetPlayerForEscort(); if (HasEscortState(STATE_ESCORT_ESCORTING)) { - if (pPlayer) - pPlayer->FailQuest(QUEST_DISASTER); - } + if (pPlayer) + pPlayer->FailQuest(QUEST_DISASTER); + } } void UpdateAI(const uint32 uiDiff) @@ -412,12 +412,12 @@ public: if (HasEscortState(STATE_ESCORT_ESCORTING)) { if (m_uiChatTimer <= uiDiff) - { + { m_uiChatTimer = 12000; } else m_uiChatTimer -= uiDiff; - } + } } }; @@ -428,10 +428,10 @@ public: bool OnQuestAccept(Player* pPlayer, Creature* pCreature, const Quest* pQuest) { - if (pQuest->GetQuestId() == QUEST_DISASTER) + if (pQuest->GetQuestId() == QUEST_DISASTER) { if (npc_engineer_heliceAI* pEscortAI = CAST_AI(npc_engineer_helice::npc_engineer_heliceAI, pCreature->AI())) - { + { pCreature->GetMotionMaster()->MoveJumpTo(0, 0.4, 0.4); pCreature->setFaction(113); diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp index 8d9cccd473c..9af209179a0 100644 --- a/src/server/scripts/Northrend/zuldrak.cpp +++ b/src/server/scripts/Northrend/zuldrak.cpp @@ -240,7 +240,7 @@ enum eGurgthock QUEST_AMPHITHEATER_ANGUISH_YGGDRAS_1 = 12932, QUEST_AMPHITHEATER_ANGUISH_MAGNATAUR = 12933, QUEST_AMPHITHEATER_ANGUISH_FROM_BEYOND = 12934, - + NPC_ORINOKO_TUSKBREAKER = 30020, NPC_KORRAK_BLOODRAGER = 30023, NPC_YGGDRAS = 30014, @@ -480,7 +480,7 @@ public: } break; case 10: - me->SummonCreature(NPC_YGGDRAS, SpawnPosition[1], TEMPSUMMON_CORPSE_DESPAWN, 1000); + me->SummonCreature(NPC_YGGDRAS, SpawnPosition[1], TEMPSUMMON_CORPSE_DESPAWN, 1000); DoScriptText(EMOTE_YGGDRAS_SPAWN,me); uiPhase = 0; break; @@ -511,7 +511,7 @@ public: pCreature->AI()->SetData(1,uiBossRandom); uiPhase = 0; break; - } + } }else uiTimer -= uiDiff; } } @@ -965,7 +965,7 @@ public: } } } - + if (bThunderClap && me->GetHealth()*100 / me->GetMaxHealth() <= 10) { DoCastAOE(SPELL_THUNDERCLAP); @@ -1057,7 +1057,7 @@ public: } void SummonAdds() - { + { if (!Boss[uiBossRandom].uiAdd) return; @@ -1071,7 +1071,7 @@ public: SummonList.push_back(pSummon->GetGUID()); } } - + } void EnterCombat(Unit* pUnit) @@ -1082,7 +1082,7 @@ public: if (Creature* pTemp = Unit::GetCreature(*me, *itr)) { pTemp->m_CombatDistance = 100.0f; // ugly hack? we are not in a instance sorry. :( - pTemp->AI()->AttackStart(pUnit); + pTemp->AI()->AttackStart(pUnit); } } } @@ -1109,7 +1109,7 @@ public: } } } - + if (uiElementalSpellTimer <= uiDiff) { DoCastVictim(Boss[uiBossRandom].uiSpell); @@ -1131,7 +1131,7 @@ public: pTemp->GetMotionMaster()->MoveChase(pTemp->getVictim()); } } - + bAddAttack = true; } @@ -1192,10 +1192,10 @@ public: { if (!pWho) return; - + AttackStartNoMove(pWho); } - + void SetData(uint32 uiData, uint32 uiValue) { if (uiData == 1) @@ -1207,7 +1207,7 @@ public: { if (!UpdateVictim()) return; - + if (me->GetPositionZ() >= 287.0f) if (uiMissleTimer <= uiDiff) { diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 3ce2571de4d..91b8f8758a9 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -722,10 +722,10 @@ public: void CastEyeBlast() { me->InterruptNonMeleeSpells(false); - + me->MonsterYell(SAY_EYE_BLAST, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_EYE_BLAST); - + float distx, disty, dist[2]; for (uint8 i = 0; i < 2; ++i) { @@ -741,17 +741,17 @@ public: dist[i] = distx * distx + disty * disty; } Locations final = GlaivePosition[dist[0] < dist[1] ? 0 : 1]; - + final.x = 2 * final.x - initial.x; final.y = 2 * final.y - initial.y; - + Creature* Trigger = me->SummonCreature(23069, initial.x, initial.y, initial.z, 0, TEMPSUMMON_TIMED_DESPAWN, 13000); if (!Trigger) return; - + Trigger->SetSpeed(MOVE_WALK, 3); Trigger->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); Trigger->GetMotionMaster()->MovePoint(0, final.x, final.y, final.z); - + //Trigger->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetUInt64Value(UNIT_FIELD_TARGET, Trigger->GetGUID()); DoCast(Trigger, SPELL_EYE_BLAST); @@ -760,7 +760,7 @@ public: { me->MonsterYell(SAY_SUMMONFLAMES, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, SOUND_SUMMONFLAMES); - + for (uint8 i = 0; i < 2; ++i) { if (GETUNIT(Glaive, GlaiveGUID[i])) diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index e97c9567f4d..8d86e318008 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -98,7 +98,7 @@ class boss_broggok : public CreatureScript { DoCast(me->getVictim(), SPELL_SLIME_SPRAY); AcidSpray_Timer = 4000+rand()%8000; - } + } else AcidSpray_Timer -=diff; @@ -106,16 +106,16 @@ class boss_broggok : public CreatureScript { DoCast(me->getVictim(), SPELL_POISON_BOLT); PoisonBolt_Timer = 4000+rand()%8000; - } - else + } + else PoisonBolt_Timer -=diff; if (PoisonSpawn_Timer <= diff) { DoCast(me, SPELL_POISON_CLOUD); PoisonSpawn_Timer = 20000; - } - else + } + else PoisonSpawn_Timer -=diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp index 13378233d61..73e2347fd70 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -228,8 +228,8 @@ class boss_kelidan_the_breaker : public CreatureScript { DoCast(me, SPELL_SHADOW_BOLT_VOLLEY); ShadowVolley_Timer = 5000+rand()%8000; - } - else + } + else ShadowVolley_Timer -=diff; if (Corruption_Timer <= diff) @@ -237,7 +237,7 @@ class boss_kelidan_the_breaker : public CreatureScript DoCast(me, SPELL_CORRUPTION); Corruption_Timer = 30000+rand()%20000; } - else + else Corruption_Timer -=diff; if (BurningNova_Timer <= diff) @@ -344,8 +344,8 @@ class mob_shadowmoon_channeler : public CreatureScript DoCast(channeled, SPELL_CHANNELING); } check_Timer = 5000; - } - else + } + else check_Timer -= diff; return; } @@ -355,16 +355,16 @@ class mob_shadowmoon_channeler : public CreatureScript if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_MARK_OF_SHADOW); MarkOfShadow_Timer = 15000+rand()%5000; - } - else + } + else MarkOfShadow_Timer -=diff; if (ShadowBolt_Timer <= diff) { DoCast(me->getVictim(), SPELL_SHADOW_BOLT); ShadowBolt_Timer = 5000+rand()%1000; - } - else + } + else ShadowBolt_Timer -=diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp index 0c8d2f48de9..fbb6d067b15 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -125,8 +125,8 @@ class boss_the_maker : public CreatureScript if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) DoCast(pTarget, SPELL_EXPLODING_BREAKER); ExplodingBreaker_Timer = 4000+rand()%8000; - } - else + } + else ExplodingBreaker_Timer -=diff; /* // Disabled until Core Support for mind control @@ -145,8 +145,8 @@ class boss_the_maker : public CreatureScript { DoCast(me->getVictim(), SPELL_KNOCKDOWN); Knockdown_Timer = 4000+rand()%8000; - } - else + } + else Knockdown_Timer -=diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp index a191d30a80f..3d01c985ffe 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp @@ -26,7 +26,7 @@ EndScriptData */ #include "ScriptPCH.h" enum eSays -{ +{ SAY_AGGRO_1 = -1543009, SAY_AGGRO_2 = -1543010, SAY_AGGRO_3 = -1543011, @@ -38,7 +38,7 @@ enum eSays }; enum eSpells -{ +{ SPELL_ORBITAL_STRIKE = 30637, SPELL_SHADOW_WHIP = 30638, SPELL_TREACHEROUS_AURA = 30695, @@ -131,8 +131,8 @@ class boss_omor_the_unscarred : public CreatureScript me->InterruptNonMeleeSpells(false); DoCast(me, SPELL_SUMMON_FIENDISH_HOUND); Summon_Timer = 15000+rand()%15000; - } - else + } + else Summon_Timer -= diff; } @@ -152,11 +152,11 @@ class boss_omor_the_unscarred : public CreatureScript PlayerGUID = 0; ShadowWhip_Timer = 2000; CanPullBack = false; - } + } else ShadowWhip_Timer -= diff; } - else + else if (OrbitalStrike_Timer <= diff) { Unit* temp = NULL; @@ -173,8 +173,8 @@ class boss_omor_the_unscarred : public CreatureScript if (PlayerGUID) CanPullBack = true; } - } - else + } + else OrbitalStrike_Timer -= diff; if ((me->GetHealth()*100) / me->GetMaxHealth() < 20) @@ -183,8 +183,8 @@ class boss_omor_the_unscarred : public CreatureScript { DoCast(me, SPELL_DEMONIC_SHIELD); DemonicShield_Timer = 15000; - } - else + } + else DemonicShield_Timer -= diff; } @@ -197,7 +197,7 @@ class boss_omor_the_unscarred : public CreatureScript DoCast(pTarget, SPELL_TREACHEROUS_AURA); Aura_Timer = 8000+rand()%8000; } - } + } else Aura_Timer -= diff; @@ -211,8 +211,8 @@ class boss_omor_the_unscarred : public CreatureScript DoCast(pTarget, SPELL_SHADOW_BOLT); Shadowbolt_Timer = 4000+rand()%2500; } - } - else + } + else Shadowbolt_Timer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index 77fd16edce2..bbf92447624 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -85,7 +85,7 @@ class boss_nazan : public CreatureScript boss_nazanAI(Creature* pCreature) : ScriptedAI(pCreature) { VazrudenGUID = 0; - flight = true; + flight = true; } uint32 Fireball_Timer; @@ -102,7 +102,7 @@ class boss_nazan : public CreatureScript Fireball_Timer = 4000; Fly_Timer = 45000; Turn_Timer = 0; - } + } void EnterCombat(Unit* /*who*/) {} @@ -133,8 +133,8 @@ class boss_nazan : public CreatureScript if (Unit* pVictim = SelectUnit(SELECT_TARGET_RANDOM,0)) DoCast(pVictim, DUNGEON_MODE(SPELL_FIREBALL, SPELL_FIREBALL_H), true); Fireball_Timer = urand(4000,7000); - } - else + } + else Fireball_Timer -= diff; if (flight) // phase 1 - the flight @@ -144,7 +144,7 @@ class boss_nazan : public CreatureScript { flight = false; BellowingRoar_Timer = 6000; - ConeOfFire_Timer = 12000; + ConeOfFire_Timer = 12000; me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING); me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); me->GetMotionMaster()->Clear(); @@ -174,8 +174,8 @@ class boss_nazan : public CreatureScript DoCast(me, DUNGEON_MODE(SPELL_CONE_OF_FIRE, SPELL_CONE_OF_FIRE_H)); ConeOfFire_Timer = 12000; Fireball_Timer = 4000; - } - else + } + else ConeOfFire_Timer -= diff; if (IsHeroic()) @@ -183,8 +183,8 @@ class boss_nazan : public CreatureScript { DoCast(me, SPELL_BELLOWING_ROAR); BellowingRoar_Timer = 45000; - } - else + } + else BellowingRoar_Timer -= diff; DoMeleeAttackIfReady(); @@ -252,8 +252,8 @@ class boss_vazruden : public CreatureScript WipeSaid = true; } me->DisappearAndDie(); - } - else + } + else UnsummonCheck -= diff; return; } @@ -263,8 +263,8 @@ class boss_vazruden : public CreatureScript if (Unit *victim = me->getVictim()) DoCast(victim, DUNGEON_MODE(SPELL_REVENGE,SPELL_REVENGE_H)); Revenge_Timer = 5000; - } - else + } + else Revenge_Timer -= diff; DoMeleeAttackIfReady(); @@ -308,7 +308,7 @@ class boss_vazruden_the_herald : public CreatureScript phase = 0; waypoint = 0; check = 0; - UnsummonAdds(); + UnsummonAdds(); } void UnsummonAdds() @@ -344,8 +344,8 @@ class boss_vazruden_the_herald : public CreatureScript { if (Creature* Vazruden = me->SummonCreature(ENTRY_VAZRUDEN,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,6000000)) VazrudenGUID = Vazruden->GetGUID(); - if (Creature* Nazan = me->SummonCreature(ENTRY_NAZAN,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,6000000)) - NazanGUID = Nazan->GetGUID(); + if (Creature* Nazan = me->SummonCreature(ENTRY_NAZAN,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,6000000)) + NazanGUID = Nazan->GetGUID(); summoned = true; me->SetVisibility(VISIBILITY_OFF); me->addUnitState(UNIT_STAT_ROOT); @@ -371,11 +371,11 @@ class boss_vazruden_the_herald : public CreatureScript { CAST_AI(boss_nazan::boss_nazanAI, pSummoned->AI())->VazrudenGUID = VazrudenGUID; pSummoned->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - pSummoned->SetSpeed(MOVE_FLIGHT, 2.5); + pSummoned->SetSpeed(MOVE_FLIGHT, 2.5); if (pVictim) AttackStartNoMove(pVictim); } - else + else if (pVictim) pSummoned->AI()->AttackStart(pVictim); } @@ -413,8 +413,8 @@ class boss_vazruden_the_herald : public CreatureScript phase = 2; return; } - } - else + } + else check -= diff; break; default: // adds do the job now @@ -440,8 +440,8 @@ class boss_vazruden_the_herald : public CreatureScript //me->Kill(me); } check = 2000; - } - else + } + else check -= diff; break; } @@ -491,8 +491,8 @@ class mob_hellfire_sentry : public CreatureScript if (Unit *victim = me->getVictim()) DoCast(victim, SPELL_KIDNEY_SHOT); KidneyShot_Timer = 20000; - } - else + } + else KidneyShot_Timer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp index 509650cd5c6..645a65bdee2 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -124,7 +124,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript DoCast(me->getVictim(), SPELL_MORTAL_WOUND); MortalWound_Timer = 5000+rand()%8000; } - else + else MortalWound_Timer -= diff; if (Surge_Timer <= diff) @@ -135,8 +135,8 @@ class boss_watchkeeper_gargolmar : public CreatureScript DoCast(pTarget, SPELL_SURGE); Surge_Timer = 5000+rand()%8000; - } - else + } + else Surge_Timer -= diff; if ((me->GetHealth()*100) / me->GetMaxHealth() < 20) @@ -146,7 +146,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript DoCast(me, SPELL_RETALIATION); Retaliation_Timer = 30000; } - else + else Retaliation_Timer -= diff; } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp index b9d8c7683e1..cea3716a1fb 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp @@ -32,7 +32,7 @@ class instance_ramparts : public InstanceMapScript instance_ramparts() : InstanceMapScript("instance_ramparts") { - } + } struct instance_ramparts_InstanceMapScript : public InstanceScript { @@ -54,11 +54,11 @@ class instance_ramparts : public InstanceMapScript { switch(pGo->GetEntry()) { - case 185168: - m_uiChestNGUID = pGo->GetGUID(); + case 185168: + m_uiChestNGUID = pGo->GetGUID(); break; - case 185169: - m_uiChestHGUID = pGo->GetGUID(); + case 185169: + m_uiChestHGUID = pGo->GetGUID(); break; } } diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index 0a1e11324d9..8a27461723b 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -147,11 +147,11 @@ class mob_abyssal : public CreatureScript } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) { DoZoneInCombat(); } - void AttackStart(Unit *who) + void AttackStart(Unit *who) { if (!trigger) ScriptedAI::AttackStart(who); @@ -181,7 +181,7 @@ class mob_abyssal : public CreatureScript if (Despawn_Timer <= diff) { me->ForcedDespawn(); - } + } else Despawn_Timer -= diff; if (!UpdateVictim()) @@ -191,7 +191,7 @@ class mob_abyssal : public CreatureScript { DoCast(me->getVictim(), SPELL_FIRE_BLAST); FireBlast_Timer = 5000+rand()%10000; - } + } else FireBlast_Timer -= diff; DoMeleeAttackIfReady(); @@ -312,7 +312,7 @@ class boss_magtheridon : public CreatureScript { DebuffClicker(clicker); (*i).second = 0; - } + } else ++ClickerNum; } @@ -323,11 +323,11 @@ class boss_magtheridon : public CreatureScript DoScriptText(SAY_BANISH, me); DoCast(me, SPELL_SHADOW_CAGE, true); } - else + else if (ClickerNum < CLICKERS_COUNT && me->HasAura(SPELL_SHADOW_CAGE)) me->RemoveAurasDueToSpell(SPELL_SHADOW_CAGE); - if (!ClickerNum) + if (!ClickerNum) NeedCheckCube = false; } @@ -372,8 +372,8 @@ class boss_magtheridon : public CreatureScript { DoScriptText(RandomTaunt[rand()%6].id, me); RandChat_Timer = 90000; - } - else + } + else RandChat_Timer -= diff; } @@ -387,15 +387,15 @@ class boss_magtheridon : public CreatureScript DoCast(me, SPELL_BERSERK, true); DoScriptText(EMOTE_BERSERK, me); Berserk_Timer = 60000; - } - else + } + else Berserk_Timer -= diff; if (Cleave_Timer <= diff) { DoCast(me->getVictim(), SPELL_CLEAVE); Cleave_Timer = 10000; - } + } else Cleave_Timer -= diff; @@ -409,7 +409,7 @@ class boss_magtheridon : public CreatureScript BlastNova_Timer = 60000; } } - else + else BlastNova_Timer -= diff; if (Quake_Timer <= diff) @@ -420,7 +420,7 @@ class boss_magtheridon : public CreatureScript DoCast(me, SPELL_QUAKE_TRIGGER, true); Quake_Timer = 50000; } - } + } else Quake_Timer -= diff; @@ -440,7 +440,7 @@ class boss_magtheridon : public CreatureScript } Blaze_Timer = 20000 + rand()%20000; } - else + else Blaze_Timer -= diff; if (!Phase3 && me->GetHealth()*10 < me->GetMaxHealth()*3 @@ -465,12 +465,12 @@ class boss_magtheridon : public CreatureScript float x, y, z; pTarget->GetPosition(x, y, z); Creature *summon = me->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); - if (summon) + if (summon) CAST_AI(mob_abyssal::mob_abyssalAI, summon->AI())->SetTrigger(1); } Debris_Timer = 10000; - } - else + } + else Debris_Timer -= diff; } @@ -562,7 +562,7 @@ class mob_hellfire_channeler : public CreatureScript { DoCast(me, SPELL_SHADOW_BOLT_VOLLEY); ShadowBoltVolley_Timer = 10000 + rand()%10000; - } + } else ShadowBoltVolley_Timer -= diff; @@ -580,8 +580,8 @@ class mob_hellfire_channeler : public CreatureScript if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1)) DoCast(pTarget, SPELL_FEAR); Fear_Timer = 25000 + rand()%15000; - } - else + } + else Fear_Timer -= diff; if (Infernal_Timer <= diff) @@ -589,8 +589,8 @@ class mob_hellfire_channeler : public CreatureScript if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_BURNING_ABYSSAL, true); Infernal_Timer = 30000 + rand()%10000; - } - else + } + else Infernal_Timer -= diff; DoMeleeAttackIfReady(); @@ -607,7 +607,7 @@ class mob_hellfire_channeler : public CreatureScript class go_manticron_cube : public GameObjectScript { public: - go_manticron_cube() : GameObjectScript("go_manticron_cube") + go_manticron_cube() : GameObjectScript("go_manticron_cube") { } @@ -617,13 +617,13 @@ public: if (!pInstance) return true; - - if (pInstance->GetData(DATA_MAGTHERIDON_EVENT) != IN_PROGRESS) + + if (pInstance->GetData(DATA_MAGTHERIDON_EVENT) != IN_PROGRESS) return true; Creature *Magtheridon =Unit::GetCreature(*pGO, pInstance->GetData64(DATA_MAGTHERIDON)); - if (!Magtheridon || !Magtheridon->isAlive()) + if (!Magtheridon || !Magtheridon->isAlive()) return true; - + // if exhausted or already channeling return if (pPlayer->HasAura(SPELL_MIND_EXHAUSTION) || pPlayer->HasAura(SPELL_SHADOW_GRASP)) return true; diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp index 5b73727bd78..fd48ece5a4d 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp @@ -29,7 +29,7 @@ EndScriptData */ enum eSpells { SPELL_SOUL_TRANSFER = 30531, // core bug, does not support target 7 - SPELL_BLAZE_TARGET = 30541, // core bug, does not support target 7 + SPELL_BLAZE_TARGET = 30541, // core bug, does not support target 7 }; #define CHAMBER_CENTER_X -15.14 diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index 9d773f6da55..ed1b60d6a1d 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -53,7 +53,7 @@ static Say PeonDies[]= }; enum eSays -{ +{ SAY_INTRO = -1540000, SAY_TAUNT_1 = -1540009, SAY_TAUNT_2 = -1540010, @@ -67,7 +67,7 @@ enum eSays }; enum eSpells -{ +{ SPELL_DEATH_COIL = 30500, SPELL_DARK_SPIN = 30502, // core bug spell attack caster :D SPELL_SHADOW_FISSURE = 30496, // Summon the ShadowFissure NPC @@ -269,8 +269,8 @@ class boss_grand_warlock_nethekurse : public CreatureScript { DoCast(me->getVictim(), SPELL_SHADOW_CLEAVE); Cleave_Timer = 6000+rand()%2500; - } - else + } + else Cleave_Timer -= diff; } else @@ -280,8 +280,8 @@ class boss_grand_warlock_nethekurse : public CreatureScript if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) DoCast(pTarget, SPELL_SHADOW_FISSURE); ShadowFissure_Timer = urand(7500,15000); - } - else + } + else ShadowFissure_Timer -= diff; if (DeathCoil_Timer <= diff) @@ -289,8 +289,8 @@ class boss_grand_warlock_nethekurse : public CreatureScript if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) DoCast(pTarget, SPELL_DEATH_COIL); DeathCoil_Timer = urand(15000,20000); - } - else + } + else DeathCoil_Timer -= diff; if ((me->GetHealth()*100) / me->GetMaxHealth() <= 20) diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp index a4971acbc9d..1573180e827 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -367,7 +367,7 @@ class boss_warbringer_omrogg : public CreatureScript if (BlastCount == 3) BlastCount = 0; } - else + else BlastWave_Timer -= diff; if (BurningMaul_Timer <= diff) @@ -377,8 +377,8 @@ class boss_warbringer_omrogg : public CreatureScript BurningMaul_Timer = 40000; BlastWave_Timer = 16000; BlastCount = 1; - } - else + } + else BurningMaul_Timer -= diff; if (ResetThreat_Timer <= diff) @@ -390,7 +390,7 @@ class boss_warbringer_omrogg : public CreatureScript me->AddThreat(pTarget, 0.0f); } ResetThreat_Timer = 25000+rand()%15000; - } + } else ResetThreat_Timer -= diff; @@ -398,7 +398,7 @@ class boss_warbringer_omrogg : public CreatureScript { DoCast(me, SPELL_FEAR); Fear_Timer = 15000+rand()%20000; - } + } else Fear_Timer -= diff; @@ -407,7 +407,7 @@ class boss_warbringer_omrogg : public CreatureScript DoCast(me, SPELL_THUNDERCLAP); ThunderClap_Timer = 15000+rand()%15000; } - else + else ThunderClap_Timer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp index c2d9c95e7f4..40567bbcc6f 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp @@ -30,7 +30,7 @@ EndContentData */ #include "ScriptPCH.h" enum eSays -{ +{ SAY_AGGRO1 = -1540042, SAY_AGGRO2 = -1540043, SAY_AGGRO3 = -1540044, @@ -208,7 +208,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript SpawnAssassin(); Assassins_Timer = 0; } - else + else Assassins_Timer -= diff; if (InBlade) @@ -239,7 +239,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript Wait_Timer = 0; } } - else + else Wait_Timer -= diff; } else @@ -253,8 +253,8 @@ class boss_warchief_kargath_bladefist : public CreatureScript Blade_Dance_Timer = 0; me->SetSpeed(MOVE_RUN,4); return; - } - else + } + else Blade_Dance_Timer -= diff; if (Charge_timer) @@ -263,7 +263,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), H_SPELL_CHARGE); Charge_timer = 0; } - else + else Charge_timer -= diff; if (Summon_Assistant_Timer <= diff) @@ -273,20 +273,20 @@ class boss_warchief_kargath_bladefist : public CreatureScript switch (urand(0,2)) { case 0: - me->SummonCreature(MOB_HEARTHEN_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); + me->SummonCreature(MOB_HEARTHEN_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); break; - case 1: - me->SummonCreature(MOB_SHARPSHOOTER_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); + case 1: + me->SummonCreature(MOB_SHARPSHOOTER_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); break; case 2: - me->SummonCreature(MOB_REAVER_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); + me->SummonCreature(MOB_REAVER_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); break; } } if (urand(0,9) < 2) ++summoned; Summon_Assistant_Timer = urand(25000,35000); - } + } else Summon_Assistant_Timer -= diff; @@ -304,8 +304,8 @@ class boss_warchief_kargath_bladefist : public CreatureScript return; } resetcheck_timer = 5000; - } - else + } + else resetcheck_timer -= diff; } }; diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp index 4754bea9315..91b05c0c227 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp @@ -57,8 +57,8 @@ class instance_shattered_halls : public InstanceMapScript { switch(pGo->GetEntry()) { - case DOOR_NETHEKURSE: - nethekurseDoorGUID = pGo->GetGUID(); + case DOOR_NETHEKURSE: + nethekurseDoorGUID = pGo->GetGUID(); break; } } @@ -67,8 +67,8 @@ class instance_shattered_halls : public InstanceMapScript { switch(pCreature->GetEntry()) { - case 16807: - nethekurseGUID = pCreature->GetGUID(); + case 16807: + nethekurseGUID = pCreature->GetGUID(); break; } } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index ac5732d4927..7b6fa319cec 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -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); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index 1326f11e187..b819b9304e8 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -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(); diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index c59dca949ca..2cefe09f750 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -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; } }; diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp index 0e9e81b3b24..1048fa95424 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -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(); diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp index 7e717b204c5..a10e864de54 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp @@ -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) diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp index 8402f220e62..22a0c6ca899 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp @@ -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(); diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp index 6f7855e069a..d7d5fd1c282 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp @@ -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() diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp index 083842fd638..ac7ced2b89b 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -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() { diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp index eae3b0ff1d9..a1da2ab0d03 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp @@ -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 { diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp index aa992098a67..3e2f9447fdb 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp @@ -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); } - + }; diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index 2220526111c..cb63286167b 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -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); diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp index 076d1223f1a..87113dfe706 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -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*/) { } }; diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp index 7a2d10db48d..006eb4625c2 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp @@ -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) diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp index 5be5e38e8a8..afeadadeb33 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp @@ -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(); diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp index 21239c265d9..3caf9c1bad0 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp @@ -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(); diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index 378d07857ca..ee07fed2ffd 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -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(); diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index 2bfb9863725..026dd45dd74 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -25,5 +25,5 @@ void AddSC_deathknight_spell_scripts() { - + } diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index 15bdcebd33c..c475e1619a7 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -25,5 +25,5 @@ void AddSC_druid_spell_scripts() { - + } diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 99eadf34371..1cca347003a 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -16,7 +16,7 @@ */ /* - * Scripts for spells with SPELLFAMILY_GENERIC which cannot be included in AI script file + * Scripts for spells with SPELLFAMILY_GENERIC which cannot be included in AI script file * of creature using it or can't be bound to any player class. * Ordered alphabetically using scriptname. * Scriptnames of files in this file should be prefixed with "spell_gen_" diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index b83a085f819..d379baa0dda 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -122,7 +122,7 @@ class spell_rog_preparation : public SpellHandlerScript for (SpellCooldowns::const_iterator itr = cm.begin(); itr != cm.end();) { SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first); - + if (spellInfo->SpellFamilyName == SPELLFAMILY_ROGUE) { if (spellInfo->SpellFamilyFlags[1] & SPELLFAMILYFLAG1_ROGUE_COLDB_SHADOWSTEP || // Cold Blood, Shadowstep diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index 3fe0a93229e..2f3c9843460 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -25,5 +25,5 @@ void AddSC_shaman_spell_scripts() { - + } diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index 0f7bb4fe15d..6053f0be138 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -25,5 +25,5 @@ void AddSC_warlock_spell_scripts() { - + } diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp index 7b50e27a163..668b0087f9c 100644 --- a/src/server/scripts/World/item_scripts.cpp +++ b/src/server/scripts/World/item_scripts.cpp @@ -458,7 +458,7 @@ public: }; enum TheEmissary -{ +{ QUEST_THE_EMISSARY = 11626, NPC_LEVIROTH = 26452 }; diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 94de4b9e0b2..b4fe99c734f 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -2202,9 +2202,9 @@ public: } }; -/*###### -## npc_pet_trainer -######*/ +/*###### +## npc_pet_trainer +######*/ enum ePetTrainer { @@ -2373,174 +2373,174 @@ public: } }; -/*###### -## npc_tabard_vendor -######*/ - -enum -{ - QUEST_TRUE_MASTERS_OF_LIGHT = 9737, - QUEST_THE_UNWRITTEN_PROPHECY = 9762, - QUEST_INTO_THE_BREACH = 10259, - QUEST_BATTLE_OF_THE_CRIMSON_WATCH = 10781, - QUEST_SHARDS_OF_AHUNE = 11972, - - ACHIEVEMENT_EXPLORE_NORTHREND = 45, - ACHIEVEMENT_TWENTYFIVE_TABARDS = 1021, - ACHIEVEMENT_THE_LOREMASTER_A = 1681, - ACHIEVEMENT_THE_LOREMASTER_H = 1682, - - ITEM_TABARD_OF_THE_HAND = 24344, - ITEM_TABARD_OF_THE_BLOOD_KNIGHT = 25549, - ITEM_TABARD_OF_THE_PROTECTOR = 28788, - ITEM_OFFERING_OF_THE_SHATAR = 31408, - ITEM_GREEN_TROPHY_TABARD_OF_THE_ILLIDARI = 31404, - ITEM_PURPLE_TROPHY_TABARD_OF_THE_ILLIDARI = 31405, - ITEM_TABARD_OF_THE_SUMMER_SKIES = 35279, - ITEM_TABARD_OF_THE_SUMMER_FLAMES = 35280, - ITEM_TABARD_OF_THE_ACHIEVER = 40643, - ITEM_LOREMASTERS_COLORS = 43300, - ITEM_TABARD_OF_THE_EXPLORER = 43348, - - SPELL_TABARD_OF_THE_BLOOD_KNIGHT = 54974, - SPELL_TABARD_OF_THE_HAND = 54976, - SPELL_GREEN_TROPHY_TABARD_OF_THE_ILLIDARI = 54977, - SPELL_PURPLE_TROPHY_TABARD_OF_THE_ILLIDARI = 54982, - SPELL_TABARD_OF_THE_ACHIEVER = 55006, - SPELL_TABARD_OF_THE_PROTECTOR = 55008, - SPELL_LOREMASTERS_COLORS = 58194, - SPELL_TABARD_OF_THE_EXPLORER = 58224, - SPELL_TABARD_OF_SUMMER_SKIES = 62768, - SPELL_TABARD_OF_SUMMER_FLAMES = 62769 -}; - -#define GOSSIP_LOST_TABARD_OF_BLOOD_KNIGHT "I've lost my Tabard of Blood Knight." -#define GOSSIP_LOST_TABARD_OF_THE_HAND "I've lost my Tabard of the Hand." -#define GOSSIP_LOST_TABARD_OF_THE_PROTECTOR "I've lost my Tabard of the Protector." -#define GOSSIP_LOST_GREEN_TROPHY_TABARD_OF_THE_ILLIDARI "I've lost my Green Trophy Tabard of the Illidari." -#define GOSSIP_LOST_PURPLE_TROPHY_TABARD_OF_THE_ILLIDARI "I've lost my Purple Trophy Tabard of the Illidari." -#define GOSSIP_LOST_TABARD_OF_SUMMER_SKIES "I've lost my Tabard of Summer Skies." -#define GOSSIP_LOST_TABARD_OF_SUMMER_FLAMES "I've lost my Tabard of Summer Flames." -#define GOSSIP_LOST_LOREMASTERS_COLORS "I've lost my Loremaster's Colors." -#define GOSSIP_LOST_TABARD_OF_THE_EXPLORER "I've lost my Tabard of the Explorer." -#define GOSSIP_LOST_TABARD_OF_THE_ACHIEVER "I've lost my Tabard of the Achiever." - +/*###### +## npc_tabard_vendor +######*/ + +enum +{ + QUEST_TRUE_MASTERS_OF_LIGHT = 9737, + QUEST_THE_UNWRITTEN_PROPHECY = 9762, + QUEST_INTO_THE_BREACH = 10259, + QUEST_BATTLE_OF_THE_CRIMSON_WATCH = 10781, + QUEST_SHARDS_OF_AHUNE = 11972, + + ACHIEVEMENT_EXPLORE_NORTHREND = 45, + ACHIEVEMENT_TWENTYFIVE_TABARDS = 1021, + ACHIEVEMENT_THE_LOREMASTER_A = 1681, + ACHIEVEMENT_THE_LOREMASTER_H = 1682, + + ITEM_TABARD_OF_THE_HAND = 24344, + ITEM_TABARD_OF_THE_BLOOD_KNIGHT = 25549, + ITEM_TABARD_OF_THE_PROTECTOR = 28788, + ITEM_OFFERING_OF_THE_SHATAR = 31408, + ITEM_GREEN_TROPHY_TABARD_OF_THE_ILLIDARI = 31404, + ITEM_PURPLE_TROPHY_TABARD_OF_THE_ILLIDARI = 31405, + ITEM_TABARD_OF_THE_SUMMER_SKIES = 35279, + ITEM_TABARD_OF_THE_SUMMER_FLAMES = 35280, + ITEM_TABARD_OF_THE_ACHIEVER = 40643, + ITEM_LOREMASTERS_COLORS = 43300, + ITEM_TABARD_OF_THE_EXPLORER = 43348, + + SPELL_TABARD_OF_THE_BLOOD_KNIGHT = 54974, + SPELL_TABARD_OF_THE_HAND = 54976, + SPELL_GREEN_TROPHY_TABARD_OF_THE_ILLIDARI = 54977, + SPELL_PURPLE_TROPHY_TABARD_OF_THE_ILLIDARI = 54982, + SPELL_TABARD_OF_THE_ACHIEVER = 55006, + SPELL_TABARD_OF_THE_PROTECTOR = 55008, + SPELL_LOREMASTERS_COLORS = 58194, + SPELL_TABARD_OF_THE_EXPLORER = 58224, + SPELL_TABARD_OF_SUMMER_SKIES = 62768, + SPELL_TABARD_OF_SUMMER_FLAMES = 62769 +}; + +#define GOSSIP_LOST_TABARD_OF_BLOOD_KNIGHT "I've lost my Tabard of Blood Knight." +#define GOSSIP_LOST_TABARD_OF_THE_HAND "I've lost my Tabard of the Hand." +#define GOSSIP_LOST_TABARD_OF_THE_PROTECTOR "I've lost my Tabard of the Protector." +#define GOSSIP_LOST_GREEN_TROPHY_TABARD_OF_THE_ILLIDARI "I've lost my Green Trophy Tabard of the Illidari." +#define GOSSIP_LOST_PURPLE_TROPHY_TABARD_OF_THE_ILLIDARI "I've lost my Purple Trophy Tabard of the Illidari." +#define GOSSIP_LOST_TABARD_OF_SUMMER_SKIES "I've lost my Tabard of Summer Skies." +#define GOSSIP_LOST_TABARD_OF_SUMMER_FLAMES "I've lost my Tabard of Summer Flames." +#define GOSSIP_LOST_LOREMASTERS_COLORS "I've lost my Loremaster's Colors." +#define GOSSIP_LOST_TABARD_OF_THE_EXPLORER "I've lost my Tabard of the Explorer." +#define GOSSIP_LOST_TABARD_OF_THE_ACHIEVER "I've lost my Tabard of the Achiever." + class npc_tabard_vendor : public CreatureScript { public: npc_tabard_vendor() : CreatureScript("npc_tabard_vendor") { } - bool OnGossipHello(Player* pPlayer, Creature* pCreature) + bool OnGossipHello(Player* pPlayer, Creature* pCreature) + { + bool m_bLostBloodKnight = false; + bool m_bLostHand = false; + bool m_bLostProtector = false; + bool m_bLostIllidari = false; + bool m_bLostSummer = false; + + //Tabard of the Blood Knight + if (pPlayer->GetQuestRewardStatus(QUEST_TRUE_MASTERS_OF_LIGHT) && !pPlayer->HasItemCount(ITEM_TABARD_OF_THE_BLOOD_KNIGHT, 1, true)) + m_bLostBloodKnight = true; + + //Tabard of the Hand + if (pPlayer->GetQuestRewardStatus(QUEST_THE_UNWRITTEN_PROPHECY) && !pPlayer->HasItemCount(ITEM_TABARD_OF_THE_HAND, 1, true)) + m_bLostHand = true; + + //Tabard of the Protector + if (pPlayer->GetQuestRewardStatus(QUEST_INTO_THE_BREACH) && !pPlayer->HasItemCount(ITEM_TABARD_OF_THE_PROTECTOR, 1, true)) + m_bLostProtector = true; + + //Green Trophy Tabard of the Illidari + //Purple Trophy Tabard of the Illidari + if (pPlayer->GetQuestRewardStatus(QUEST_BATTLE_OF_THE_CRIMSON_WATCH) && + (!pPlayer->HasItemCount(ITEM_GREEN_TROPHY_TABARD_OF_THE_ILLIDARI, 1, true) && + !pPlayer->HasItemCount(ITEM_PURPLE_TROPHY_TABARD_OF_THE_ILLIDARI, 1, true) && + !pPlayer->HasItemCount(ITEM_OFFERING_OF_THE_SHATAR, 1, true))) + m_bLostIllidari = true; + + //Tabard of Summer Skies + //Tabard of Summer Flames + if (pPlayer->GetQuestRewardStatus(QUEST_SHARDS_OF_AHUNE) && + !pPlayer->HasItemCount(ITEM_TABARD_OF_THE_SUMMER_SKIES, 1, true) && + !pPlayer->HasItemCount(ITEM_TABARD_OF_THE_SUMMER_FLAMES, 1, true)) + m_bLostSummer = true; + + if (m_bLostBloodKnight || m_bLostHand || m_bLostProtector || m_bLostIllidari || m_bLostSummer) + { + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); + + if (m_bLostBloodKnight) + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_TABARD_OF_BLOOD_KNIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF +1); + + if (m_bLostHand) + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_TABARD_OF_THE_HAND, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF +2); + + if (m_bLostProtector) + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_TABARD_OF_THE_PROTECTOR, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); + + if (m_bLostIllidari) + { + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_GREEN_TROPHY_TABARD_OF_THE_ILLIDARI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_PURPLE_TROPHY_TABARD_OF_THE_ILLIDARI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); + } + + if (m_bLostSummer) + { + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_TABARD_OF_SUMMER_SKIES, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_TABARD_OF_SUMMER_FLAMES, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7); + } + + pPlayer->SEND_GOSSIP_MENU(13583, pCreature->GetGUID()); + } + else + pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); + + return true; + } + + bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { - bool m_bLostBloodKnight = false; - bool m_bLostHand = false; - bool m_bLostProtector = false; - bool m_bLostIllidari = false; - bool m_bLostSummer = false; - - //Tabard of the Blood Knight - if (pPlayer->GetQuestRewardStatus(QUEST_TRUE_MASTERS_OF_LIGHT) && !pPlayer->HasItemCount(ITEM_TABARD_OF_THE_BLOOD_KNIGHT, 1, true)) - m_bLostBloodKnight = true; - - //Tabard of the Hand - if (pPlayer->GetQuestRewardStatus(QUEST_THE_UNWRITTEN_PROPHECY) && !pPlayer->HasItemCount(ITEM_TABARD_OF_THE_HAND, 1, true)) - m_bLostHand = true; - - //Tabard of the Protector - if (pPlayer->GetQuestRewardStatus(QUEST_INTO_THE_BREACH) && !pPlayer->HasItemCount(ITEM_TABARD_OF_THE_PROTECTOR, 1, true)) - m_bLostProtector = true; - - //Green Trophy Tabard of the Illidari - //Purple Trophy Tabard of the Illidari - if (pPlayer->GetQuestRewardStatus(QUEST_BATTLE_OF_THE_CRIMSON_WATCH) && - (!pPlayer->HasItemCount(ITEM_GREEN_TROPHY_TABARD_OF_THE_ILLIDARI, 1, true) && - !pPlayer->HasItemCount(ITEM_PURPLE_TROPHY_TABARD_OF_THE_ILLIDARI, 1, true) && - !pPlayer->HasItemCount(ITEM_OFFERING_OF_THE_SHATAR, 1, true))) - m_bLostIllidari = true; - - //Tabard of Summer Skies - //Tabard of Summer Flames - if (pPlayer->GetQuestRewardStatus(QUEST_SHARDS_OF_AHUNE) && - !pPlayer->HasItemCount(ITEM_TABARD_OF_THE_SUMMER_SKIES, 1, true) && - !pPlayer->HasItemCount(ITEM_TABARD_OF_THE_SUMMER_FLAMES, 1, true)) - m_bLostSummer = true; - - if (m_bLostBloodKnight || m_bLostHand || m_bLostProtector || m_bLostIllidari || m_bLostSummer) - { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); - - if (m_bLostBloodKnight) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_TABARD_OF_BLOOD_KNIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF +1); - - if (m_bLostHand) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_TABARD_OF_THE_HAND, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF +2); - - if (m_bLostProtector) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_TABARD_OF_THE_PROTECTOR, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); - - if (m_bLostIllidari) - { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_GREEN_TROPHY_TABARD_OF_THE_ILLIDARI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_PURPLE_TROPHY_TABARD_OF_THE_ILLIDARI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); - } - - if (m_bLostSummer) - { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_TABARD_OF_SUMMER_SKIES, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LOST_TABARD_OF_SUMMER_FLAMES, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7); - } - - pPlayer->SEND_GOSSIP_MENU(13583, pCreature->GetGUID()); - } - else - pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); - - return true; - } - - bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) - { - switch(uiAction) - { - case GOSSIP_ACTION_TRADE: - pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); - break; - case GOSSIP_ACTION_INFO_DEF+1: - pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer, SPELL_TABARD_OF_THE_BLOOD_KNIGHT, false); - break; - case GOSSIP_ACTION_INFO_DEF+2: - pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer, SPELL_TABARD_OF_THE_HAND, false); - break; - case GOSSIP_ACTION_INFO_DEF+3: - pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer, SPELL_TABARD_OF_THE_PROTECTOR, false); - break; - case GOSSIP_ACTION_INFO_DEF+4: - pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer, SPELL_GREEN_TROPHY_TABARD_OF_THE_ILLIDARI, false); - break; - case GOSSIP_ACTION_INFO_DEF+5: - pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer, SPELL_PURPLE_TROPHY_TABARD_OF_THE_ILLIDARI, false); - break; - case GOSSIP_ACTION_INFO_DEF+6: - pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer, SPELL_TABARD_OF_SUMMER_SKIES, false); - break; - case GOSSIP_ACTION_INFO_DEF+7: - pPlayer->CLOSE_GOSSIP_MENU(); - pPlayer->CastSpell(pPlayer, SPELL_TABARD_OF_SUMMER_FLAMES, false); - break; - } - return true; + switch(uiAction) + { + case GOSSIP_ACTION_TRADE: + pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); + break; + case GOSSIP_ACTION_INFO_DEF+1: + pPlayer->CLOSE_GOSSIP_MENU(); + pPlayer->CastSpell(pPlayer, SPELL_TABARD_OF_THE_BLOOD_KNIGHT, false); + break; + case GOSSIP_ACTION_INFO_DEF+2: + pPlayer->CLOSE_GOSSIP_MENU(); + pPlayer->CastSpell(pPlayer, SPELL_TABARD_OF_THE_HAND, false); + break; + case GOSSIP_ACTION_INFO_DEF+3: + pPlayer->CLOSE_GOSSIP_MENU(); + pPlayer->CastSpell(pPlayer, SPELL_TABARD_OF_THE_PROTECTOR, false); + break; + case GOSSIP_ACTION_INFO_DEF+4: + pPlayer->CLOSE_GOSSIP_MENU(); + pPlayer->CastSpell(pPlayer, SPELL_GREEN_TROPHY_TABARD_OF_THE_ILLIDARI, false); + break; + case GOSSIP_ACTION_INFO_DEF+5: + pPlayer->CLOSE_GOSSIP_MENU(); + pPlayer->CastSpell(pPlayer, SPELL_PURPLE_TROPHY_TABARD_OF_THE_ILLIDARI, false); + break; + case GOSSIP_ACTION_INFO_DEF+6: + pPlayer->CLOSE_GOSSIP_MENU(); + pPlayer->CastSpell(pPlayer, SPELL_TABARD_OF_SUMMER_SKIES, false); + break; + case GOSSIP_ACTION_INFO_DEF+7: + pPlayer->CLOSE_GOSSIP_MENU(); + pPlayer->CastSpell(pPlayer, SPELL_TABARD_OF_SUMMER_FLAMES, false); + break; + } + return true; } }; -/*###### -## npc_experience -######*/ +/*###### +## npc_experience +######*/ #define EXP_COST 100000//10 00 00 copper (10golds) #define GOSSIP_TEXT_EXP 14736 @@ -2628,7 +2628,7 @@ void AddSC_npcs_special() new npc_wormhole; new npc_pet_trainer; new npc_locksmith; - new npc_tabard_vendor; + new npc_tabard_vendor; new npc_experience; } |