diff options
| author | Intel <chemicstry@gmail.com> | 2014-11-14 01:55:29 +0000 |
|---|---|---|
| committer | Nayd <dnpd.dd@gmail.com> | 2014-11-14 01:55:29 +0000 |
| commit | b08b54c8bba4644253bbc89559a36f4e8e8bfc88 (patch) | |
| tree | 6d5baed640850be255a3612149ec97fe259ed17a /src/server/scripts | |
| parent | 231207970bf9c28971def453d2622aa17fe36b43 (diff) | |
Core/Packets: CMSG_CREATURE_QUERY and SMSG_CREATURE_QUERY_RESPONSE handler
Diffstat (limited to 'src/server/scripts')
6 files changed, 15 insertions, 15 deletions
diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp index 2d522928fce..01baf54eef7 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp @@ -119,7 +119,7 @@ class boss_corborus : public CreatureScript events.ScheduleEvent(EVENT_CORBORUS_CHARGE, 1000); break; - } + } default: break; } @@ -192,7 +192,7 @@ class boss_corborus : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); DoCast(me, SPELL_CLEAR_ALL_DEBUFFS); me->AttackStop(); - + DoCast(me, SPELL_SUBMERGE); countTrashingCharge = 0; @@ -298,7 +298,7 @@ class npc_rock_borer : public CreatureScript break; } } - + DoMeleeAttackIfReady(); } diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp index 92c9bba4bc1..0b260de944a 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp @@ -102,7 +102,7 @@ class boss_ozruk : public CreatureScript void JustSummoned(Creature* summon) override { - if (summon->GetEntry() != NPC_RUPTURE_CONTROLLER) + if (summon->GetEntry() != NPC_RUPTURE_CONTROLLER) return; summon->SetReactState(REACT_PASSIVE); @@ -161,7 +161,7 @@ class boss_ozruk : public CreatureScript me->AttackStop(); DoCast(me, SPELL_SHATTER); events.ScheduleEvent(EVENT_START_ATTACK, 4600); - // Spells are cast in same order everytime after Shatter, so we schedule them here + // Spells are cast in same order everytime after Shatter, so we schedule them here events.ScheduleEvent(EVENT_ELEMENTIUM_BULWARK, urand(3000,4000)); events.ScheduleEvent(EVENT_GROUND_SLAM, urand(7000,9000)); events.ScheduleEvent(EVENT_ELEMENTIUM_SPIKE_SHIELD, urand(10000,12000)); @@ -178,7 +178,7 @@ class boss_ozruk : public CreatureScript } void RemoveBouncerSpikes() - { + { Vehicle* vehicle = me->GetVehicleKit(); if (!vehicle) return; diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp index 6827312deef..c5f0718e240 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp @@ -46,7 +46,7 @@ enum Spells }; enum Entries -{ +{ NPC_LAVA_FISSURE = 43242, NPC_STALACTITE_TRIGGER_GROUND = 43357, NPC_STALACTITE_TRIGGER = 43159, @@ -174,7 +174,7 @@ class boss_slabhide : public CreatureScript { if (type != POINT_MOTION_TYPE && type != EFFECT_MOTION_TYPE) return; - + switch (id) { case POINT_SLABHIDE_INTRO: @@ -295,7 +295,7 @@ class boss_slabhide : public CreatureScript for (std::list<GameObject*>::const_iterator itr = listStalactite.begin(); itr != listStalactite.end(); ++itr) (*itr)->Delete(); } - + EventMap events; }; @@ -570,7 +570,7 @@ public: caster->GetGameObjectListWithEntryInGrid(goList, GO_STALACTITE, 40.0f); if (goList.empty()) return; - + unitList.remove_if(BehindObjectCheck(caster, goList)); } @@ -595,5 +595,5 @@ void AddSC_boss_slabhide() new spell_s81028_s80650_stalactite(); new spell_stalactite_mod_dest_height(); new spell_s92306_crystal_storm(); - new spell_s92300_crystal_storm(); + new spell_s92300_crystal_storm(); } diff --git a/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp b/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp index ca5e40ab117..b2ac21a1edf 100644 --- a/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp @@ -246,7 +246,7 @@ class instance_stonecore : public InstanceMapScript ObjectGuid highPriestessAzilGUID; ObjectGuid stonecoreTeleporterGUID[2]; GuidVector slabhideRockWallGUIDs; - + EncounterState slabhideIntro; }; diff --git a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp index 4ed84732eff..dc2fdb62d19 100644 --- a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp @@ -49,7 +49,7 @@ enum Spells SPELL_TIGULE_AND_FORORS_SPECIAL_BLEND = 81220, SPELL_IMPENDING_DOOM = 86838, SPELL_IMPENDING_DOOM_CHANNEL = 86830, - + // SPELL_PORTAL_VISUAL = 79754, }; @@ -340,7 +340,7 @@ class spell_sc_twilight_documents : public SpellScriptLoader return false; return true; } - + void SetTarget(WorldObject*& target) { target = GetCaster()->FindNearestCreature(NPC_GENERIC_TRIGGER_LAB, 100.0f); diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index f8f788b0332..580549a3d99 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -2426,7 +2426,7 @@ public: void HandleDummyEffect() { Unit* caster = GetCaster(); - + if (Creature* injuredStormwindInfantry = caster->FindNearestCreature(NPC_INJURED_STORMWIND_INFANTRY, 5.0f, true)) { injuredStormwindInfantry->SetCreatorGUID(caster->GetGUID()); |
