diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp | 55 |
1 files changed, 28 insertions, 27 deletions
diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp index 0e436bd1b3c..3ea7cf0155c 100644 --- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp @@ -27,12 +27,13 @@ EndScriptData */ npc_webbed_creature EndContentData */ +#include "Player.h" #include "Group.h" -#include "ScriptedEscortAI.h" +#include "GridNotifiers.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" #include "PassiveAI.h" -#include "Player.h" /*###### ## npc_webbed_creature @@ -96,29 +97,29 @@ public: enum EndingTheirWorldMisc { - SAY_SIRONAS_1 = 0, + SAY_SIRONAS_1 = 0, - SAY_LEGOSO_1 = 0, - SAY_LEGOSO_2 = 1, - SAY_LEGOSO_3 = 2, - SAY_LEGOSO_4 = 3, + SAY_LEGOSO_1 = 0, + SAY_LEGOSO_2 = 1, + SAY_LEGOSO_3 = 2, + SAY_LEGOSO_4 = 3, SAY_LEGOSO_5 = 4, - SAY_LEGOSO_6 = 5, - SAY_LEGOSO_7 = 6, - SAY_LEGOSO_8 = 7, - SAY_LEGOSO_9 = 8, - SAY_LEGOSO_10 = 9, + SAY_LEGOSO_6 = 5, + SAY_LEGOSO_7 = 6, + SAY_LEGOSO_8 = 7, + SAY_LEGOSO_9 = 8, + SAY_LEGOSO_10 = 9, SAY_LEGOSO_11 = 10, - SAY_LEGOSO_12 = 11, - SAY_LEGOSO_13 = 12, + SAY_LEGOSO_12 = 11, + SAY_LEGOSO_13 = 12, SAY_LEGOSO_14 = 13, - SAY_LEGOSO_15 = 14, - SAY_LEGOSO_16 = 15, - SAY_LEGOSO_17 = 16, - SAY_LEGOSO_18 = 17, - SAY_LEGOSO_19 = 18, - SAY_LEGOSO_20 = 19, - SAY_LEGOSO_21 = 20, + SAY_LEGOSO_15 = 14, + SAY_LEGOSO_16 = 15, + SAY_LEGOSO_17 = 16, + SAY_LEGOSO_18 = 17, + SAY_LEGOSO_19 = 18, + SAY_LEGOSO_20 = 19, + SAY_LEGOSO_21 = 20, SPELL_BLOODMYST_TESLA = 31611, SPELL_SIRONAS_CHANNELING = 31612, @@ -128,7 +129,7 @@ enum EndingTheirWorldMisc SPELL_CURSE_OF_BLOOD = 8282, SPELL_FROST_SHOCK = 8056, - SPELL_HEALING_SURGE = 8004, + SPELL_HEALING_SURGE = 8004, SPELL_SEARING_TOTEM = 38116, SPELL_STRENGTH_OF_EARTH_TOTEM = 31633, @@ -321,7 +322,7 @@ public: _beamGuidList.push_back((*itr)->GetGUID()); (*itr)->CastSpell(*itr, SPELL_BLOODMYST_TESLA); } - break; + break; } case ACTION_SIRONAS_CHANNEL_STOP: { @@ -628,7 +629,7 @@ public: case PHASE_PLANT_SECOND_DETONATE: // second explosives detonate finish for (GuidList::iterator itr = _explosivesGuids.begin(); itr != _explosivesGuids.end(); ++itr) { - if (GameObject* explosive = sObjectAccessor->GetGameObject(*me, *itr)) + if (GameObject* explosive = sObjectAccessor->GetGameObject(*me, *itr)) me->RemoveGameObject(explosive, true); } _explosivesGuids.clear(); @@ -661,7 +662,7 @@ public: break; case PHASE_FIGHT_SIRONAS_START: // legoso exclamation at aggro if (Creature* sironas = me->FindNearestCreature(NPC_SIRONAS, SIZE_OF_GRIDS)) - { + { Unit* target = GetPlayerForEscort(); if (!target) target = me; @@ -734,9 +735,9 @@ public: _moveTimer = 1 * IN_MILLISECONDS; _phase = PHASE_PLANT_FIRST_TIMER_1; break; - case WP_DEBUG_1: + case WP_DEBUG_1: SetEscortPaused(true); - _moveTimer = 0.5 * IN_MILLISECONDS; + _moveTimer = 0.5 * IN_MILLISECONDS; _phase = PHASE_WP_26; break; case WP_SIRONAS_HILL: |