aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTING.md50
-rw-r--r--README.md2
-rw-r--r--sql/updates/world/2014_09_06_10_world_spell_script_names.sql4
-rw-r--r--sql/updates/world/2014_09_07_00_world_sai.sql40
-rw-r--r--sql/updates/world/2014_09_07_01_world_sai.sql5
-rw-r--r--sql/updates/world/2014_09_07_02_world_npc_factions_335.sql249
-rw-r--r--sql/updates/world/2014_09_07_03_world_npc_misc.sql3193
-rw-r--r--sql/updates/world/2014_09_07_04_world_npc_classes.sql15
-rw-r--r--sql/updates/world/2014_09_07_05_world_sai.sql128
-rw-r--r--sql/updates/world/2014_09_07_06_world_sai.sql6
-rw-r--r--src/server/game/Entities/Player/Player.cpp6
-rw-r--r--src/server/game/Spells/Spell.cpp2
-rw-r--r--src/server/scripts/Commands/cs_ticket.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp213
-rw-r--r--src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp3
-rw-r--r--src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp3
-rw-r--r--src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp1
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp4
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp141
-rw-r--r--src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp201
-rw-r--r--src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp6
-rw-r--r--src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/Scholomance/scholomance.h3
-rw-r--r--src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp36
-rw-r--r--src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp1
-rw-r--r--src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp56
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp1
-rw-r--r--src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp10
-rw-r--r--src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp4
-rw-r--r--src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp14
-rw-r--r--src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp8
-rw-r--r--src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp8
-rw-r--r--src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp25
-rw-r--r--src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp1
-rw-r--r--src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp56
-rw-r--r--src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp52
-rw-r--r--src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp84
-rw-r--r--src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp2
-rw-r--r--src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp34
-rw-r--r--src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp36
-rw-r--r--src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp8
-rw-r--r--src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp36
-rw-r--r--src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp42
-rw-r--r--src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp25
-rw-r--r--src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp27
-rw-r--r--src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp27
-rw-r--r--src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp12
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp10
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp15
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp16
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp12
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp12
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp11
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp10
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp1
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp16
-rw-r--r--src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp18
-rw-r--r--src/server/scripts/Northrend/Gundrak/boss_eck.cpp18
-rw-r--r--src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp31
-rw-r--r--src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp16
-rw-r--r--src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp16
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp18
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp12
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp10
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp22
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp1
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp1
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp30
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp10
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp25
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp28
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp3
-rw-r--r--src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp12
-rw-r--r--src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp23
-rw-r--r--src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp17
-rw-r--r--src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp8
-rw-r--r--src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp18
-rw-r--r--src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp10
-rw-r--r--src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp8
-rw-r--r--src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp4
-rw-r--r--src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp10
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp8
-rw-r--r--src/server/scripts/World/boss_emerald_dragons.cpp2
-rw-r--r--src/server/scripts/World/go_scripts.cpp28
-rw-r--r--src/tools/vmap4_extractor/model.cpp2
87 files changed, 4773 insertions, 627 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000000..99fb588c1cf
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,50 @@
+# Contributing
+
+Want to contribute? Great!
+
+1. Fork it.
+2. Create a branch (`git checkout -b fixes`)
+3. Commit your changes (`git commit -am "Added Snarkdown"`)
+4. Push to the branch (`git push origin fixes`)
+5. Open a [Pull Request][1]
+
+
+When creating patches read:
+- [TrinityCore Development Standards](http://www.trinitycore.org/f/topic/6-trinitycore-developing-standards/)
+- [WDB Fields](http://www.trinitycore.org/f/topic/58-wdb-fields/)
+- [Git Squash](https://ariejan.net/2011/07/05/git-squash-your-latests-commits-into-one/)
+
+We suggest you to create one branch for each `C++` based fix: on that way you can continue creating more fixes without having to wait to get one pull request merged.
+For the `SQL` files of `C++` based fixes the naming schema is: `YYYY_MM_DD_i_database_description.sql`, where `YYYY_MM_DD` is the date of the fix, `i_database` is the *ith* sql created that day for `database`.
+When doing changes to `auth` or `characters` database remember to update the base files (`/sql/base/*`).
+For SQL only fixes [create a ticket](https://github.com/TrinityCore/TrinityCore/issues/new).
+
+Wiki
+====
+
+The wiki is located at [http://trinitycore.info](http://trinitycore.info).
+
+You are welcome to create an account and help us improve and extend the wiki.
+
+
+Issues
+======
+
+Read [this](http://www.trinitycore.org/f/topic/37-the-trinitycore-issuetracker-and-you/) before creating a ticket.
+If you have problems with TrinityCore instalation, read http://www.trinitycore.org/f/topic/1518-trouble-with-your-trinity-install-readme-1st-faqs/
+
+
+Requirements
+============
+
+Platform: Linux, Windows or Mac
+Processor with SSE2 support
+Boost ≥ 1.4.9
+MySQL ≥ 5.1.0
+CMake ≥ 2.8.11.2 / 2.8.9 (Windows / Linux)
+OpenSSL ≥ 1.0.0
+GCC ≥ 4.7.2 (Linux only)
+MS Visual Studio ≥ 12 (2013) (Windows only)
+
+In case you choose Linux, we recommend to use Debian 7, it's the Linux we use to test compilations.
+Remember 4.3.4 branch is alpha, only intended for development, we don't recomend this branch to run a server.
diff --git a/README.md b/README.md
index fdb05c81eb4..33fea30e36e 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ website at [TrinityCore.org](http://www.trinitycore.org).
+ Platform: Linux, Windows or Mac
+ Processor with SSE2 support
+ Boost ≥ 1.49
-+ MySQL ≥ 5.1.0 (included for Windows)
++ MySQL ≥ 5.1.0
+ CMake ≥ 2.8.11.2 / 2.8.9 (Windows / Linux)
+ OpenSSL ≥ 1.0.0
+ GCC ≥ 4.7.2 (Linux only)
diff --git a/sql/updates/world/2014_09_06_10_world_spell_script_names.sql b/sql/updates/world/2014_09_06_10_world_spell_script_names.sql
new file mode 100644
index 00000000000..c63a3372068
--- /dev/null
+++ b/sql/updates/world/2014_09_06_10_world_spell_script_names.sql
@@ -0,0 +1,4 @@
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (27695, 27687);
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(27695, 'spell_kormok_summon_bone_mages'),
+(27687, 'spell_kormok_summon_bone_minions');
diff --git a/sql/updates/world/2014_09_07_00_world_sai.sql b/sql/updates/world/2014_09_07_00_world_sai.sql
new file mode 100644
index 00000000000..394e7980958
--- /dev/null
+++ b/sql/updates/world/2014_09_07_00_world_sai.sql
@@ -0,0 +1,40 @@
+UPDATE `gameobject_template` SET `flags`=0 WHERE `entry`=184383;
+DELETE FROM `creature` WHERE `guid`=72505;
+
+DELETE FROM `gossip_menu` WHERE `entry`=8062;
+INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES
+(8062, 9958); -- 184073
+
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=8062;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `OptionBroadcastTextID`, `option_id`, `npc_option_npcflag`, `action_menu_id`, `action_poi_id`, `box_coded`, `box_money`, `box_text`, `BoxBroadcastTextID`) VALUES
+(8062, 0, 0, 'Attempt to contact Wind Trader Marid.', 17638, 1, 1, 0, 0, 0, 0, '', 0); -- 184073
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8062;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(15, 8062, 0, 0, 0,28, 0, 10270, 0, 0, 0, 0, 0, '', 'Ethereal Teleport Pad - Show Gossip option only if player has A Not-So-Modest Proposal complete in quest log'),
+(15, 8062, 0, 0, 0,9, 0, 10271, 0, 0, 1, 0, 0, '', 'Ethereal Teleport Pad - Show Gossip option only if player does not have Getting Down to Business taken'),
+(15, 8062, 0, 0, 0,8, 0, 10271, 0, 0, 1, 0, 0, '', 'Ethereal Teleport Pad - Show Gossip option only if player does not have Getting Down to Business rewarded'),
+(15, 8062, 0, 0, 0,28, 0, 10271, 0, 0, 1, 0, 0, '', 'Ethereal Teleport Pad - Show Gossip option only if player does not have Getting Down to Business complete'),
+(15, 8062, 0, 0, 0,29, 1, 20518, 200, 0, 1, 0, 0, '', 'Ethereal Teleport Pad - Show Gossip option only if Image of Wind Trader Marid is not already spawned');
+
+UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI',`ScriptName`='' WHERE `entry`IN(184073,184383);
+DELETE FROM `smart_scripts` WHERE `entryorguid`IN(184073,184383) AND `source_type`=1;
+
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(184073, 1, 0, 1, 62, 0, 100, 0, 8062, 0, 0, 0, 12, 20518, 1, 60000, 0, 0, 0, 8, 0, 0, 0, 4006.99, 1516.938, -114.63, 2.303835, 'Ethereal Teleport Pad - On Gossip Option 0 Selected - Summon Image of Wind Trader Marid'),
+(184073, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Ethereal Teleport Pad - On Gossip Option 0 Selected - Close Gossip'),
+(184383, 1, 0, 0, 70, 0, 100, 0, 2, 0, 0, 0, 12, 20482, 1, 180000, 0, 0, 0, 8, 0, 0, 0, 4017.968, 2315.796, 114.9459, 0.4363323, 'Ethereum Transponder Zeta - On State Changed - Summon Image of Commander Ameer <The Protectorate>');
+
+UPDATE `creature_template` SET `ainame`='SmartAI', `scriptname`='' WHERE `entry` IN(20518,20482);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN(20518,20482) AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(20518, 0, 0, 0, 1, 0, 100, 1, 50, 50, 0, 0, 11, 12980, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Image of Wind Trader Marid - On Just Summoned - Cast Simple Teleport'),
+(20482, 0, 0, 1, 4, 0, 100, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Image of Commander Ameer - On Agro - Say Line'),
+(20482, 0, 1, 2,61, 0, 100, 1, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 14, 25179, 184383, 0, 0, 0, 0, 0, 'Image of Commander Ameer - On Agro - Set Data 1 1 to Ethereum Transponder Zeta'),
+(20482, 0, 2, 0,61, 0, 100, 1, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Image of Commander Ameer - On Agro - Despawn'),
+(20482, 0, 3, 4,11, 0, 100, 1, 0, 0, 0, 0, 20, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Image of Commander Ameer - On Spawn - Disable Auto Attack'),
+(20482, 0, 4, 0,61, 0, 100, 1, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Image of Commander Ameer - On Spawn - Disable combat movement');
+
+DELETE FROM `creature_text` WHERE `entry`=20482;
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`,`BroadcastTextID`) VALUES
+(20482, 0, 0, 'Hostiles detected. Ending transmission.', 12, 0, 100, 15, 0, 0, 'Image of Commander Ameer',18190);
diff --git a/sql/updates/world/2014_09_07_01_world_sai.sql b/sql/updates/world/2014_09_07_01_world_sai.sql
new file mode 100644
index 00000000000..b264087cda6
--- /dev/null
+++ b/sql/updates/world/2014_09_07_01_world_sai.sql
@@ -0,0 +1,5 @@
+SET @ENTRY := 11136; -- Freed Soul
+UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = @ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ENTRY AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(@ENTRY, 0, 0, 0, 11, 0, 100, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Freed Soul - On Respawn - Say Line 0');
diff --git a/sql/updates/world/2014_09_07_02_world_npc_factions_335.sql b/sql/updates/world/2014_09_07_02_world_npc_factions_335.sql
new file mode 100644
index 00000000000..1451f39785b
--- /dev/null
+++ b/sql/updates/world/2014_09_07_02_world_npc_factions_335.sql
@@ -0,0 +1,249 @@
+UPDATE `creature_template` SET `faction`=107 WHERE `entry`=8127; -- Antu'sul <Overseer of Sul>
+UPDATE `creature_template` SET `faction`=1078 WHERE `entry`=23568; -- Captain Darill
+UPDATE `creature_template` SET `faction`=11 WHERE `entry`=2386; -- Southshore Guard
+UPDATE `creature_template` SET `faction`=1194 WHERE `entry`=19666; -- Shadow Lord Xiraxis
+UPDATE `creature_template` SET `faction`=12 WHERE `entry`=8856; -- Tyrion's Spybot
+UPDATE `creature_template` SET `faction`=120 WHERE `entry`=2487; -- Fleet Master Seahorn <Blackwater Raiders>
+UPDATE `creature_template` SET `faction`=123 WHERE `entry`=11616; -- Nathaniel Dumah
+UPDATE `creature_template` SET `faction`=123 WHERE `entry`=1892; -- Moonrage Watcher
+UPDATE `creature_template` SET `faction`=123 WHERE `entry`=1893; -- Moonrage Sentry
+UPDATE `creature_template` SET `faction`=123 WHERE `entry`=1896; -- Moonrage Elder
+UPDATE `creature_template` SET `faction`=123 WHERE `entry`=2269; -- Hillsbrad Miner
+UPDATE `creature_template` SET `faction`=123 WHERE `entry`=2270; -- Hillsbrad Sentry
+UPDATE `creature_template` SET `faction`=123 WHERE `entry`=2503; -- Hillsbrad Foreman
+UPDATE `creature_template` SET `faction`=123 WHERE `entry`=3529; -- Moonrage Armorer
+UPDATE `creature_template` SET `faction`=123 WHERE `entry`=3531; -- Moonrage Tailor
+UPDATE `creature_template` SET `faction`=125 WHERE `entry`=8582; -- Kadrak
+UPDATE `creature_template` SET `faction`=128 WHERE `entry`=8282; -- Highlord Mastrogonde
+UPDATE `creature_template` SET `faction`=1354 WHERE `entry`=11486; -- Prince Tortheldrin
+UPDATE `creature_template` SET `faction`=1354 WHERE `entry`=14358; -- Shen'dralar Ancient
+UPDATE `creature_template` SET `faction`=1354 WHERE `entry`=14361; -- Shen'dralar Wisp
+UPDATE `creature_template` SET `faction`=1355 WHERE `entry`=14368; -- Lorekeeper Lydros
+UPDATE `creature_template` SET `faction`=1355 WHERE `entry`=14369; -- Shen'dralar Zealot
+UPDATE `creature_template` SET `faction`=1355 WHERE `entry`=14371; -- Shen'dralar Provisioner
+UPDATE `creature_template` SET `faction`=1355 WHERE `entry`=14381; -- Lorekeeper Javon
+UPDATE `creature_template` SET `faction`=1355 WHERE `entry`=14382; -- Lorekeeper Mykos
+UPDATE `creature_template` SET `faction`=1355 WHERE `entry`=14383; -- Lorekeeper Kildrath
+UPDATE `creature_template` SET `faction`=14 WHERE `entry`=17429; -- Fel Orc Neophyte
+UPDATE `creature_template` SET `faction`=14 WHERE `entry`=2385; -- Feral Mountain Lion
+UPDATE `creature_template` SET `faction`=14 WHERE `entry`=24410; -- Vazruden the Herald Image
+UPDATE `creature_template` SET `faction`=14 WHERE `entry`=26943; -- Battered Drakkari Berserker
+UPDATE `creature_template` SET `faction`=14 WHERE `entry`=30012; -- Victorious Challenger
+UPDATE `creature_template` SET `faction`=14 WHERE `entry`=3245; -- Ornery Plainstrider
+UPDATE `creature_template` SET `faction`=14 WHERE `entry`=33564; -- Ironforge Valiant
+UPDATE `creature_template` SET `faction`=14 WHERE `entry`=33739; -- Exodar Champion
+UPDATE `creature_template` SET `faction`=14 WHERE `entry`=33749; -- Undercity Champion
+UPDATE `creature_template` SET `faction`=14 WHERE `entry`=40142; -- Halion <The Twilight Destroyer>
+UPDATE `creature_template` SET `faction`=14 WHERE `entry`=5089; -- Balos Jacken
+UPDATE `creature_template` SET `faction`=14 WHERE `entry`=5431; -- Surf Glider
+UPDATE `creature_template` SET `faction`=14 WHERE `entry`=5676; -- Summoned Voidwalker
+UPDATE `creature_template` SET `faction`=14 WHERE `entry`=5677; -- Summoned Succubus
+UPDATE `creature_template` SET `faction`=14 WHERE `entry`=7093; -- Vile Ooze
+UPDATE `creature_template` SET `faction`=14 WHERE `entry`=832; -- Dust Devil
+UPDATE `creature_template` SET `faction`=14 WHERE `entry`=8596; -- Plaguehound Runt
+UPDATE `creature_template` SET `faction`=14 WHERE `entry`=8600; -- Plaguebat
+UPDATE `creature_template` SET `faction`=149 WHERE `entry`=4834; -- Theramore Infiltrator
+UPDATE `creature_template` SET `faction`=1576 WHERE `entry`=8563; -- Woodsman
+UPDATE `creature_template` SET `faction`=1576 WHERE `entry`=8565; -- Pathstrider
+UPDATE `creature_template` SET `faction`=1577 WHERE `entry`=15107; -- Arathi Horse
+UPDATE `creature_template` SET `faction`=16 WHERE `entry`=15552; -- Doctor Weavil
+UPDATE `creature_template` SET `faction`=16 WHERE `entry`=24410; -- Vazruden the Herald Image
+UPDATE `creature_template` SET `faction`=16 WHERE `entry`=27655; -- Mage-Lord Urom
+UPDATE `creature_template` SET `faction`=16 WHERE `entry`=37068; -- Spiritual Reflection
+UPDATE `creature_template` SET `faction`=16 WHERE `entry`=37107; -- Spiritual Reflection
+UPDATE `creature_template` SET `faction`=16 WHERE `entry`=37230; -- Spire Frostwyrm
+UPDATE `creature_template` SET `faction`=16 WHERE `entry`=4067; -- Twilight Runner
+UPDATE `creature_template` SET `faction`=16 WHERE `entry`=5300; -- Frayfeather Hippogryph
+UPDATE `creature_template` SET `faction`=16 WHERE `entry`=5304; -- Frayfeather Stagwing
+UPDATE `creature_template` SET `faction`=1605 WHERE `entry`=8197; -- Chronalis
+UPDATE `creature_template` SET `faction`=1605 WHERE `entry`=8198; -- Tick
+UPDATE `creature_template` SET `faction`=1606 WHERE `entry`=10600; -- Thontek Rumblehoof
+UPDATE `creature_template` SET `faction`=1622 WHERE `entry`=4923; -- Guard Jarad
+UPDATE `creature_template` SET `faction`=1625 WHERE `entry`=11102; -- Argent Rider <The Argent Dawn>
+UPDATE `creature_template` SET `faction`=1630 WHERE `entry`=16300; -- Risen Creeper
+UPDATE `creature_template` SET `faction`=1630 WHERE `entry`=16301; -- Risen Hungerer
+UPDATE `creature_template` SET `faction`=1630 WHERE `entry`=16309; -- Gangled Cannibal
+UPDATE `creature_template` SET `faction`=1630 WHERE `entry`=16322; -- Gangled Flesheater
+UPDATE `creature_template` SET `faction`=1638 WHERE `entry`=17106; -- Vindicator Palanaar
+UPDATE `creature_template` SET `faction`=1639 WHERE `entry`=17587; -- Draenei Youngling
+UPDATE `creature_template` SET `faction`=1692 WHERE `entry`=24576; -- Riplash Myrmidon
+UPDATE `creature_template` SET `faction`=1692 WHERE `entry`=24901; -- Maddened Frosthorn
+UPDATE `creature_template` SET `faction`=1692 WHERE `entry`=29829; -- Drakkari Earthshaker
+UPDATE `creature_template` SET `faction`=1718 WHERE `entry`=19215; -- Infernal Relay (Hellfire)
+UPDATE `creature_template` SET `faction`=1732 WHERE `entry`=32712; -- The Amazing Zanzo
+UPDATE `creature_template` SET `faction`=1732 WHERE `entry`=40502; -- Zalazane
+UPDATE `creature_template` SET `faction`=1733 WHERE `entry`=16781; -- Midsummer Celebrant
+UPDATE `creature_template` SET `faction`=1735 WHERE `entry`=26221; -- Earthen Ring Elder <The Earthen Ring>
+UPDATE `creature_template` SET `faction`=1754 WHERE `entry`=18944; -- Fel Soldier
+UPDATE `creature_template` SET `faction`=1754 WHERE `entry`=19005; -- Wrath Master
+UPDATE `creature_template` SET `faction`=1756 WHERE `entry`=16831; -- Nethergarde Infantry
+UPDATE `creature_template` SET `faction`=1756 WHERE `entry`=16842; -- Honor Hold Defender
+UPDATE `creature_template` SET `faction`=1770 WHERE `entry`=29801; -- Bouldercrag the Rockshaper
+UPDATE `creature_template` SET `faction`=1770 WHERE `entry`=30152; -- Bruor Ironbane
+UPDATE `creature_template` SET `faction`=1770 WHERE `entry`=37577; -- Freed Horde Slave
+UPDATE `creature_template` SET `faction`=1770 WHERE `entry`=37579; -- Freed Horde Slave
+UPDATE `creature_template` SET `faction`=1770 WHERE `entry`=37580; -- Martin Victus
+UPDATE `creature_template` SET `faction`=1770 WHERE `entry`=37581; -- Gorkun Ironskull
+UPDATE `creature_template` SET `faction`=1771 WHERE `entry`=23750; -- Proto-Whelp Hatchling
+UPDATE `creature_template` SET `faction`=1771 WHERE `entry`=38487; -- Fallen Warrior
+UPDATE `creature_template` SET `faction`=1812 WHERE `entry`=29910; -- K3 Bruiser
+UPDATE `creature_template` SET `faction`=1814 WHERE `entry`=26623; -- Scourge Brute
+UPDATE `creature_template` SET `faction`=1814 WHERE `entry`=26635; -- Risen Drakkari Warrior
+UPDATE `creature_template` SET `faction`=1847 WHERE `entry`=31326; -- Death Knight Initiate <Host of Suffering>
+UPDATE `creature_template` SET `faction`=1847 WHERE `entry`=31327; -- Death Knight Initiate <Host of Suffering>
+UPDATE `creature_template` SET `faction`=1878 WHERE `entry`=20465; -- Underbog Frenzy
+UPDATE `creature_template` SET `faction`=189 WHERE `entry`=3816; -- Wild Buck
+UPDATE `creature_template` SET `faction`=1892 WHERE `entry`=26170; -- Thassarian
+UPDATE `creature_template` SET `faction`=1892 WHERE `entry`=582; -- Old Blanchy
+UPDATE `creature_template` SET `faction`=190 WHERE `entry`=2098; -- Ram
+UPDATE `creature_template` SET `faction`=190 WHERE `entry`=8883; -- Riding Horse
+UPDATE `creature_template` SET `faction`=1953 WHERE `entry`=24954; -- Aged Magnataur
+UPDATE `creature_template` SET `faction`=1965 WHERE `entry`=26639; -- Drakkari Shaman
+UPDATE `creature_template` SET `faction`=1965 WHERE `entry`=30922; -- Umbral Brute
+UPDATE `creature_template` SET `faction`=1965 WHERE `entry`=33139; -- Flame Leviathan Turret
+UPDATE `creature_template` SET `faction`=1981 WHERE `entry`=26488; -- Taunka Pack Kodo
+UPDATE `creature_template` SET `faction`=1991 WHERE `entry`=26126; -- Bone Warrior
+UPDATE `creature_template` SET `faction`=2004 WHERE `entry`=26448; -- Stars' Rest Sentinel
+UPDATE `creature_template` SET `faction`=2047 WHERE `entry`=25636; -- Captured Tuskarr Prisoner
+UPDATE `creature_template` SET `faction`=2050 WHERE `entry`=29194; -- Amal'thazad
+UPDATE `creature_template` SET `faction`=2050 WHERE `entry`=29195; -- Lady Alistra
+UPDATE `creature_template` SET `faction`=2050 WHERE `entry`=29246; -- Highlord Darion Mograine
+UPDATE `creature_template` SET `faction`=2070 WHERE `entry`=28028; -- Argent Shieldman
+UPDATE `creature_template` SET `faction`=2070 WHERE `entry`=28029; -- Argent Crusader
+UPDATE `creature_template` SET `faction`=2075 WHERE `entry`=28167; -- Stratholme Citizen
+UPDATE `creature_template` SET `faction`=2075 WHERE `entry`=28169; -- Stratholme Resident
+UPDATE `creature_template` SET `faction`=21 WHERE `entry`=1848; -- Lord Maldazzar
+UPDATE `creature_template` SET `faction`=2104 WHERE `entry`=28471; -- Lady Alistra
+UPDATE `creature_template` SET `faction`=2104 WHERE `entry`=28490; -- Disciple of Frost
+UPDATE `creature_template` SET `faction`=2131 WHERE `entry`=38493; -- Argent Crusader
+UPDATE `creature_template` SET `faction`=2209 WHERE `entry`=37011; -- The Damned
+UPDATE `creature_template` SET `faction`=230 WHERE `entry`=7855; -- Southsea Pirate
+UPDATE `creature_template` SET `faction`=230 WHERE `entry`=7856; -- Southsea Freebooter
+UPDATE `creature_template` SET `faction`=231 WHERE `entry`=11806; -- Sentinel Onaeya
+UPDATE `creature_template` SET `faction`=231 WHERE `entry`=17312; -- Magwin
+UPDATE `creature_template` SET `faction`=24 WHERE `entry`=3868; -- Blood Seeker
+UPDATE `creature_template` SET `faction`=24 WHERE `entry`=3873; -- Tormented Officer
+UPDATE `creature_template` SET `faction`=24 WHERE `entry`=3887; -- Baron Silverlaine
+UPDATE `creature_template` SET `faction`=24 WHERE `entry`=4278; -- Commander Springvale
+UPDATE `creature_template` SET `faction`=29 WHERE `entry`=10050; -- Seikwa <Stable Master>
+UPDATE `creature_template` SET `faction`=29 WHERE `entry`=13476; -- Balai Lok'Wein <Potions, Scrolls & Reagents>
+UPDATE `creature_template` SET `faction`=29 WHERE `entry`=30611; -- Greela "The Grunt" Crankchain <Arena Organizer>
+UPDATE `creature_template` SET `faction`=29 WHERE `entry`=3464; -- Gazrog
+UPDATE `creature_template` SET `faction`=29 WHERE `entry`=6747; -- Innkeeper Kauth <Innkeeper>
+UPDATE `creature_template` SET `faction`=290 WHERE `entry`=1706; -- Defias Prisoner
+UPDATE `creature_template` SET `faction`=31 WHERE `entry`=16927; -- Stonescythe Whelp
+UPDATE `creature_template` SET `faction`=35 WHERE `entry`=15694; -- Stormwind Reveler
+UPDATE `creature_template` SET `faction`=35 WHERE `entry`=15719; -- Thunder Bluff Reveler
+UPDATE `creature_template` SET `faction`=35 WHERE `entry`=15905; -- Darnassus Reveler
+UPDATE `creature_template` SET `faction`=35 WHERE `entry`=15906; -- Ironforge Reveler
+UPDATE `creature_template` SET `faction`=35 WHERE `entry`=15907; -- Undercity Reveler
+UPDATE `creature_template` SET `faction`=35 WHERE `entry`=15908; -- Orgrimmar Reveler
+UPDATE `creature_template` SET `faction`=35 WHERE `entry`=19912; -- Zeggon Botsnap <Arena Battlemaster>
+UPDATE `creature_template` SET `faction`=35 WHERE `entry`=23131; -- Blood Knight Honor Guard
+UPDATE `creature_template` SET `faction`=35 WHERE `entry`=26816; -- Focus Wizard
+UPDATE `creature_template` SET `faction`=35 WHERE `entry`=2768; -- Professor Phizzlethorpe <Blackwater Raiders>
+UPDATE `creature_template` SET `faction`=35 WHERE `entry`=29501; -- Scourge Gryphon
+UPDATE `creature_template` SET `faction`=35 WHERE `entry`=29; -- Kanrethad <Master of Death>
+UPDATE `creature_template` SET `faction`=35 WHERE `entry`=30352; -- Skybreaker Marine
+UPDATE `creature_template` SET `faction`=35 WHERE `entry`=30755; -- Kor'kron Reaver
+UPDATE `creature_template` SET `faction`=35 WHERE `entry`=31238; -- Hira Snowdawn <Cold Weather Flying Trainer>
+UPDATE `creature_template` SET `faction`=35 WHERE `entry`=34984; -- World Trigger (Not Floating)
+UPDATE `creature_template` SET `faction`=35 WHERE `entry`=35496; -- Rueben Lauren <Cloth Armor Merchant>
+UPDATE `creature_template` SET `faction`=35 WHERE `entry`=35498; -- Horace Hunderland <Plate Armor Merchant>
+UPDATE `creature_template` SET `faction`=35 WHERE `entry`=40199; -- Tiki Warrior
+UPDATE `creature_template` SET `faction`=35 WHERE `entry`=40274; -- Restless Zombie
+UPDATE `creature_template` SET `faction`=35 WHERE `entry`=7271; -- Witch Doctor Zum'rah
+UPDATE `creature_template` SET `faction`=35 WHERE `entry`=9034; -- Hate'rel
+UPDATE `creature_template` SET `faction`=35 WHERE `entry`=9035; -- Anger'rel
+UPDATE `creature_template` SET `faction`=35 WHERE `entry`=9036; -- Vile'rel
+UPDATE `creature_template` SET `faction`=35 WHERE `entry`=9037; -- Gloom'rel
+UPDATE `creature_template` SET `faction`=35 WHERE `entry`=9038; -- Seeth'rel
+UPDATE `creature_template` SET `faction`=35 WHERE `entry`=9039; -- Doom'rel
+UPDATE `creature_template` SET `faction`=35 WHERE `entry`=9040; -- Dope'rel
+UPDATE `creature_template` SET `faction`=38 WHERE `entry`=8211; -- Old Cliff Jumper
+UPDATE `creature_template` SET `faction`=40 WHERE `entry`=10299; -- Scarshield Infiltrator <Scarshield Legion>
+UPDATE `creature_template` SET `faction`=40 WHERE `entry`=334; -- Gath'Ilzogg <Warlord of the Blackrock Clan>
+UPDATE `creature_template` SET `faction`=412 WHERE `entry`=15108; -- Forsaken Horse
+UPDATE `creature_template` SET `faction`=413 WHERE `entry`=3251; -- Silithid Grub
+UPDATE `creature_template` SET `faction`=413 WHERE `entry`=3252; -- Silithid Swarmer
+UPDATE `creature_template` SET `faction`=416 WHERE `entry`=4857; -- Stone Keeper
+UPDATE `creature_template` SET `faction`=44 WHERE `entry`=2356; -- Elder Gray Bear
+UPDATE `creature_template` SET `faction`=45 WHERE `entry`=7034; -- Firegut Ogre Mage
+UPDATE `creature_template` SET `faction`=45 WHERE `entry`=7035; -- Firegut Brute
+UPDATE `creature_template` SET `faction`=475 WHERE `entry`=7407; -- Chief Engineer Bilgewhizzle <Gadgetzan Water Co.>
+UPDATE `creature_template` SET `faction`=48 WHERE `entry`=2560; -- Highland Thrasher
+UPDATE `creature_template` SET `faction`=48 WHERE `entry`=2561; -- Highland Fleshstalker
+UPDATE `creature_template` SET `faction`=534 WHERE `entry`=15351; -- Alliance Brigadier General
+UPDATE `creature_template` SET `faction`=534 WHERE `entry`=8436; -- Zamael Lunthistle
+UPDATE `creature_template` SET `faction`=54 WHERE `entry`=8929; -- Princess Moira Bronzebeard <Princess of Ironforge>
+UPDATE `creature_template` SET `faction`=55 WHERE `entry`=10301; -- Jaron Stoneshaper <Explorers' League>
+UPDATE `creature_template` SET `faction`=55 WHERE `entry`=12617; -- Khaelyn Steelwing <Gryphon Master>
+UPDATE `creature_template` SET `faction`=57 WHERE `entry`=1476; -- Hargin Mundar
+UPDATE `creature_template` SET `faction`=575 WHERE `entry`=5856; -- Glassweb Spider
+UPDATE `creature_template` SET `faction`=64 WHERE `entry`=39275; -- Gnomeregan Medic
+UPDATE `creature_template` SET `faction`=655 WHERE `entry`=9524; -- Kolkar Invader
+UPDATE `creature_template` SET `faction`=674 WHERE `entry`=5843; -- Slave Worker
+UPDATE `creature_template` SET `faction`=68 WHERE `entry`=12636; -- Georgia <Bat Handler>
+UPDATE `creature_template` SET `faction`=7 WHERE `entry`=32573; -- Valgarde Captive
+UPDATE `creature_template` SET `faction`=7 WHERE `entry`=946; -- Frostmane Novice
+UPDATE `creature_template` SET `faction`=714 WHERE `entry`=16580; -- Thrallmar Grunt
+UPDATE `creature_template` SET `faction`=714 WHERE `entry`=16582; -- Thrallmar Marksman
+UPDATE `creature_template` SET `faction`=735 WHERE `entry`=10043; -- Ribbly's Crony
+UPDATE `creature_template` SET `faction`=754 WHERE `entry`=14621; -- Overseer Maltorius
+UPDATE `creature_template` SET `faction`=775 WHERE `entry`=24484; -- Brewfest Reveler
+UPDATE `creature_template` SET `faction`=775 WHERE `entry`=27811; -- Brew Vendor <Brew of the Month Club>
+UPDATE `creature_template` SET `faction`=775 WHERE `entry`=27813; -- Brew Vendor <Brew of the Month Club>
+UPDATE `creature_template` SET `faction`=775 WHERE `entry`=27817; -- Brew Vendor <Brew of the Month Club>
+UPDATE `creature_template` SET `faction`=776 WHERE `entry`=15192; -- Anachronos
+UPDATE `creature_template` SET `faction`=79 WHERE `entry`=4054; -- Laughing Sister
+UPDATE `creature_template` SET `faction`=79 WHERE `entry`=7939; -- Feathermoon Sentinel
+UPDATE `creature_template` SET `faction`=794 WHERE `entry`=11034; -- Lord Maxwell Tyrosus <The Argent Dawn>
+UPDATE `creature_template` SET `faction`=794 WHERE `entry`=11036; -- Leonid Barthalomew the Revered <The Argent Dawn>
+UPDATE `creature_template` SET `faction`=794 WHERE `entry`=11039; -- Duke Nicholas Zverenhoff <The Argent Dawn>
+UPDATE `creature_template` SET `faction`=794 WHERE `entry`=11063; -- Carlin Redpath <The Argent Dawn>
+UPDATE `creature_template` SET `faction`=80 WHERE `entry`=10300; -- Ranshalla
+UPDATE `creature_template` SET `faction`=80 WHERE `entry`=11079; -- Wynd Nightchaser
+UPDATE `creature_template` SET `faction`=80 WHERE `entry`=2084; -- Natheril Raincaller <General Goods>
+UPDATE `creature_template` SET `faction`=80 WHERE `entry`=2303; -- Lyranne Feathersong <Food & Drink>
+UPDATE `creature_template` SET `faction`=80 WHERE `entry`=3779; -- Syurana <Trade Supplies>
+UPDATE `creature_template` SET `faction`=80 WHERE `entry`=3845; -- Shindrell Swiftfire
+UPDATE `creature_template` SET `faction`=80 WHERE `entry`=3847; -- Orendil Broadleaf
+UPDATE `creature_template` SET `faction`=814 WHERE `entry`=10839; -- Argent Officer Garush <The Argent Dawn>
+UPDATE `creature_template` SET `faction`=814 WHERE `entry`=10840; -- Argent Officer Pureheart <The Argent Dawn>
+UPDATE `creature_template` SET `faction`=814 WHERE `entry`=10857; -- Argent Quartermaster Lightspark <The Argent Dawn>
+UPDATE `creature_template` SET `faction`=814 WHERE `entry`=11536; -- Quartermaster Miranda Breechlock <The Argent Dawn>
+UPDATE `creature_template` SET `faction`=83 WHERE `entry`=1740; -- Deathguard Saltain
+UPDATE `creature_template` SET `faction`=83 WHERE `entry`=3084; -- Bluffwatcher
+UPDATE `creature_template` SET `faction`=83 WHERE `entry`=5724; -- Ageron Kargal
+UPDATE `creature_template` SET `faction`=84 WHERE `entry`=4961; -- Dashel Stonefist
+UPDATE `creature_template` SET `faction`=84 WHERE `entry`=6090; -- Bartleby <Drunk>
+UPDATE `creature_template` SET `faction`=875 WHERE `entry`=39715; -- Ejector Mechano-Tank
+UPDATE `creature_template` SET `faction`=89 WHERE `entry`=10418; -- Crimson Guardsman
+UPDATE `creature_template` SET `faction`=89 WHERE `entry`=10605; -- Scarlet Medic
+UPDATE `creature_template` SET `faction`=89 WHERE `entry`=1831; -- Scarlet Hunter
+UPDATE `creature_template` SET `faction`=89 WHERE `entry`=1835; -- Scarlet Invoker
+UPDATE `creature_template` SET `faction`=90 WHERE `entry`=9776; -- Flamekin Spitter
+UPDATE `creature_template` SET `faction`=90 WHERE `entry`=9778; -- Flamekin Torcher
+UPDATE `creature_template` SET `faction`=90 WHERE `entry`=9779; -- Flamekin Rager
+UPDATE `creature_template` SET `faction`=93 WHERE `entry`=4016; -- Fey Dragon
+UPDATE `creature_template` SET `faction`=974 WHERE `entry`=36830; -- Wrathbone Laborer
+
+-- diff entries update
+UPDATE `creature_template` SET `faction`=14 WHERE `entry`=18603;
+UPDATE `creature_template` SET `faction`=14 WHERE `entry`=40143;
+UPDATE `creature_template` SET `faction`=14 WHERE `entry`=40144;
+UPDATE `creature_template` SET `faction`=14 WHERE `entry`=40145;
+UPDATE `creature_template` SET `faction`=16 WHERE `entry`=31560;
+UPDATE `creature_template` SET `faction`=16 WHERE `entry`=38444;
+UPDATE `creature_template` SET `faction`=1692 WHERE `entry`=30926;
+UPDATE `creature_template` SET `faction`=1770 WHERE `entry`=37614;
+UPDATE `creature_template` SET `faction`=1770 WHERE `entry`=37618;
+UPDATE `creature_template` SET `faction`=1770 WHERE `entry`=37619;
+UPDATE `creature_template` SET `faction`=1770 WHERE `entry`=37620;
+UPDATE `creature_template` SET `faction`=1814 WHERE `entry`=31355;
+UPDATE `creature_template` SET `faction`=1814 WHERE `entry`=31357;
+UPDATE `creature_template` SET `faction`=1878 WHERE `entry`=21943;
+UPDATE `creature_template` SET `faction`=1965 WHERE `entry`=31345;
+UPDATE `creature_template` SET `faction`=1965 WHERE `entry`=34111;
+UPDATE `creature_template` SET `faction`=2209 WHERE `entry`=38061;
+UPDATE `creature_template` SET `faction`=974 WHERE `entry`=37638;
diff --git a/sql/updates/world/2014_09_07_03_world_npc_misc.sql b/sql/updates/world/2014_09_07_03_world_npc_misc.sql
new file mode 100644
index 00000000000..2fec86147c8
--- /dev/null
+++ b/sql/updates/world/2014_09_07_03_world_npc_misc.sql
@@ -0,0 +1,3193 @@
+-- unit_class
+UPDATE `creature_template` SET `unit_class`=1 WHERE `entry`=25705; -- Bixie Wrenchshanker
+UPDATE `creature_template` SET `unit_class`=1 WHERE `entry`=25806; -- Loot Crazed Poacher
+UPDATE `creature_template` SET `unit_class`=1 WHERE `entry`=2588; -- Syndicate Prowler
+UPDATE `creature_template` SET `unit_class`=1 WHERE `entry`=28341; -- Stratholme Resident
+UPDATE `creature_template` SET `unit_class`=1 WHERE `entry`=37666; -- Darkfallen Tactician <The San'layn>
+UPDATE `creature_template` SET `unit_class`=1 WHERE `entry`=38001; -- Light's Vengeance Bunny 2
+UPDATE `creature_template` SET `unit_class`=1 WHERE `entry`=4834; -- Theramore Infiltrator
+UPDATE `creature_template` SET `unit_class`=1 WHERE `entry`=5491; -- Arthur the Faithful <Paladin Trainer>
+UPDATE `creature_template` SET `unit_class`=1 WHERE `entry`=5492; -- Katherine the Pure <Paladin Trainer>
+UPDATE `creature_template` SET `unit_class`=1 WHERE `entry`=5615; -- Wastewander Rogue
+UPDATE `creature_template` SET `unit_class`=1 WHERE `entry`=5616; -- Wastewander Thief
+UPDATE `creature_template` SET `unit_class`=1 WHERE `entry`=5623; -- Wastewander Assassin
+UPDATE `creature_template` SET `unit_class`=1 WHERE `entry`=5645; -- Sandfury Hideskinner
+UPDATE `creature_template` SET `unit_class`=1 WHERE `entry`=5646; -- Sandfury Axe Thrower
+UPDATE `creature_template` SET `unit_class`=1 WHERE `entry`=8480; -- Kalaran the Deceiver
+UPDATE `creature_template` SET `unit_class`=1 WHERE `entry`=928; -- Lord Grayson Shadowbreaker <Paladin Trainer>
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=1179; -- Mo'grosh Enforcer
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=12791; -- Chieftain Earthbind
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=14026; -- Trigger Guse
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=14027; -- Trigger Mulverick
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=14028; -- Trigger Jeztor
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=14029; -- Trigger Ichman
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=14030; -- Trigger Slidore
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=14031; -- Trigger Vipore
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=23583; -- Evidence Marker
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=23705; -- Catlord Corpse
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=23716; -- Hexxer Corpse
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=24410; -- Vazruden the Herald Image
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=24411; -- Shattered Hand Centurion Image
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=25424; -- Vision of Farseer Grimwalker
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=25456; -- Vision of Kaganishu
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=25457; -- Vision of Magmoth Shaman
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=25458; -- Vision of Farseer Grimwalker's Spirit
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=25754; -- Earthen Ring Flamecaller <The Earthen Ring>
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=25955; -- Hand of the Deceiver Sunwell
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=26579; -- Anveena Replica
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=30677; -- Highlord Tirion Fordring
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=34281; -- [DND]Azeroth Children's Week Trigger
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=34461; -- Tyrius Duskblade <Death Knight>
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=34735; -- Black Knight's Grave
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=34810; -- CoD Eye Proxy
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=35079; -- Firehawk Mariner Female (Dead)
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=35083; -- Firehawk Mariner Male (Dead)
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=35089; -- Black Knight Spell Proxy
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=35104; -- Wavecrest Mariner Female (Dead)
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=35105; -- Wavecrest Mariner Male (Dead)
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=35106; -- Black Knight Caster
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=36551; -- Spiteful Apparition
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=36817; -- [DND] Love Boat Summoner
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=37181; -- The Lich King
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=37183; -- Highlord Bolvar Fordragon
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=37498; -- Coliseum Champion
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=37852; -- Quel'Delar Skull Target
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=38340; -- [DND] Holiday - Love - Bank Bunny
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=38341; -- [DND] Holiday - Love - AH Bunny
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=38342; -- [DND] Holiday - Love - Barber Bunny
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=38751; -- Black Knight Shield Proxy
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=39647; -- Zalazane
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=39654; -- Vol'jin
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=40182; -- Bwonsamdi
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=40192; -- Vanira
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=40196; -- Zen'tabra
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=40231; -- Hexed Troll
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=40405; -- Kieupid <Pet Trainer>
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=40413; -- Alenjon Sunblade <Battlemaster>
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=40425; -- Voodoo Troll
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=40481; -- Troll Celebrant
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=40502; -- Zalazane
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=6221; -- Addled Leper
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=8856; -- Tyrion's Spybot
+UPDATE `creature_template` SET `unit_class`=4 WHERE `entry`=29840; -- The Leaper
+UPDATE `creature_template` SET `unit_class`=4 WHERE `entry`=29859; -- The Leaper
+UPDATE `creature_template` SET `unit_class`=4 WHERE `entry`=30714; -- Crusade Engineer Spitzpatrick
+UPDATE `creature_template` SET `unit_class`=4 WHERE `entry`=34983; -- Deathstalker Fane <Battlemaster>
+UPDATE `creature_template` SET `unit_class`=4 WHERE `entry`=35579; -- Aspirant Forudir <Triumphant Armor Vendor>
+UPDATE `creature_template` SET `unit_class`=4 WHERE `entry`=35580; -- Aspirant Naradiel <Triumphant Armor Vendor>
+UPDATE `creature_template` SET `unit_class`=4 WHERE `entry`=36121; -- Maz'dinah
+UPDATE `creature_template` SET `unit_class`=4 WHERE `entry`=36517; -- Aleric Hawkins <The Deathstalkers>
+UPDATE `creature_template` SET `unit_class`=4 WHERE `entry`=37017; -- Skybreaker Assassin
+UPDATE `creature_template` SET `unit_class`=4 WHERE `entry`=38200; -- Silver Covenant Agent
+UPDATE `creature_template` SET `unit_class`=4 WHERE `entry`=38471; -- Infiltrator Minchar
+UPDATE `creature_template` SET `unit_class`=4 WHERE `entry`=39263; -- Disassembled Mechano-Tank
+UPDATE `creature_template` SET `unit_class`=4 WHERE `entry`=39715; -- Ejector Mechano-Tank
+UPDATE `creature_template` SET `unit_class`=4 WHERE `entry`=39716; -- Scuttling Mechano-Tank
+UPDATE `creature_template` SET `unit_class`=4 WHERE `entry`=39717; -- Shooting Mechano-Tank
+UPDATE `creature_template` SET `unit_class`=8 WHERE `entry`=12790; -- Advisor Willington
+UPDATE `creature_template` SET `unit_class`=8 WHERE `entry`=15607; -- Elder Farwhisper
+UPDATE `creature_template` SET `unit_class`=8 WHERE `entry`=19850; -- Councilor Arial D'Anastasis
+UPDATE `creature_template` SET `unit_class`=8 WHERE `entry`=32654; -- SOTA Alliance Gun 1
+UPDATE `creature_template` SET `unit_class`=8 WHERE `entry`=32655; -- SOTA Horde Gun 2
+UPDATE `creature_template` SET `unit_class`=8 WHERE `entry`=32656; -- SOTA Horde Gun 1
+UPDATE `creature_template` SET `unit_class`=8 WHERE `entry`=32661; -- SOTA Alliance Gun 2
+UPDATE `creature_template` SET `unit_class`=8 WHERE `entry`=32753; -- Lok <Death Knight Glyphs>
+UPDATE `creature_template` SET `unit_class`=8 WHERE `entry`=32754; -- Austeen <Druid Glyphs>
+UPDATE `creature_template` SET `unit_class`=8 WHERE `entry`=32755; -- Holloway Fjordhammer <Hunter Glyphs>
+UPDATE `creature_template` SET `unit_class`=8 WHERE `entry`=32756; -- Linus Galespin <Mage Glyphs>
+UPDATE `creature_template` SET `unit_class`=8 WHERE `entry`=32757; -- Harold Dawson <Paladin Glyphs>
+UPDATE `creature_template` SET `unit_class`=8 WHERE `entry`=32758; -- Charlotte Mader <Priest Glyphs>
+UPDATE `creature_template` SET `unit_class`=8 WHERE `entry`=32759; -- Libby Waterwheel <Rogue Glyphs>
+UPDATE `creature_template` SET `unit_class`=8 WHERE `entry`=32760; -- Juliet Stonehelm <Shaman Glyphs>
+UPDATE `creature_template` SET `unit_class`=8 WHERE `entry`=32761; -- Claire Littlesun <Warlock Glyphs>
+UPDATE `creature_template` SET `unit_class`=8 WHERE `entry`=32762; -- David Hume <Warrior Glyphs>
+UPDATE `creature_template` SET `unit_class`=8 WHERE `entry`=34043; -- Lady Palanseer <Jewelcrafting Quartermaster>
+UPDATE `creature_template` SET `unit_class`=8 WHERE `entry`=34060; -- Doris Volanthius <Veteran Armor Quartermaster>
+UPDATE `creature_template` SET `unit_class`=8 WHERE `entry`=37497; -- Coliseum Champion
+
+-- diff entry updates
+UPDATE `creature_template` SET `unit_class`=1 WHERE `entry`=38479;
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=22581;
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=22582;
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=22583;
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=22584;
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=22585;
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=22586;
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=35743;
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=37564;
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=37605;
+UPDATE `creature_template` SET `unit_class`=4 WHERE `entry`=38078;
+UPDATE `creature_template` SET `unit_class`=4 WHERE `entry`=38486;
+UPDATE `creature_template` SET `unit_class`=8 WHERE `entry`=37603;
+
+-- speeds
+UPDATE `creature_template` SET `speed_run`=0.1142857 WHERE `entry`=19871; -- World Trigger (Not Immune NPC)
+UPDATE `creature_template` SET `speed_run`=0.1428571 WHERE `entry`=37826; -- Light's Vengeance
+UPDATE `creature_template` SET `speed_run`=0.2857143 WHERE `entry`=12222; -- Creeping Sludge
+UPDATE `creature_template` SET `speed_run`=0.2857143 WHERE `entry`=16243; -- Plague Slime
+UPDATE `creature_template` SET `speed_run`=0.4285714 WHERE `entry`=10481; -- Reanimated Corpse
+UPDATE `creature_template` SET `speed_run`=0.4285714 WHERE `entry`=40502; -- Zalazane
+UPDATE `creature_template` SET `speed_run`=0.4571428 WHERE `entry`=32325; -- Gold Priest
+UPDATE `creature_template` SET `speed_run`=0.4571428 WHERE `entry`=32343; -- Green Priest
+UPDATE `creature_template` SET `speed_run`=0.4714286 WHERE `entry`=9083; -- Razal'blade <Kargath Expeditionary Force>
+UPDATE `creature_template` SET `speed_run`=0.4714286 WHERE `entry`=9084; -- Thunderheart <Kargath Expeditionary Force>
+UPDATE `creature_template` SET `speed_run`=0.4714286 WHERE `entry`=9085; -- Initiate Amakkar <Kargath Expeditionary Force>
+UPDATE `creature_template` SET `speed_run`=0.4714286 WHERE `entry`=9086; -- Grunt Gargal <Kargath Expeditionary Force>
+UPDATE `creature_template` SET `speed_run`=0.5714286 WHERE `entry`=10480; -- Unstable Corpse
+UPDATE `creature_template` SET `speed_run`=0.5714286 WHERE `entry`=12121; -- Drakan
+UPDATE `creature_template` SET `speed_run`=0.5714286 WHERE `entry`=24082; -- Proto-Drake Handler
+UPDATE `creature_template` SET `speed_run`=0.5714286 WHERE `entry`=27737; -- Risen Zombie
+UPDATE `creature_template` SET `speed_run`=0.5714286 WHERE `entry`=28167; -- Stratholme Citizen
+UPDATE `creature_template` SET `speed_run`=0.5714286 WHERE `entry`=28169; -- Stratholme Resident
+UPDATE `creature_template` SET `speed_run`=0.5714286 WHERE `entry`=37543; -- [DND] Shaker
+UPDATE `creature_template` SET `speed_run`=0.5714286 WHERE `entry`=37544; -- Spire Gargoyle
+UPDATE `creature_template` SET `speed_run`=0.5714286 WHERE `entry`=37574; -- [DND] Shaker - Small
+UPDATE `creature_template` SET `speed_run`=0.5952386 WHERE `entry`=30026; -- Az'Barin, Prince of the Gust
+UPDATE `creature_template` SET `speed_run`=0.5952386 WHERE `entry`=30045; -- Fiend of Air
+UPDATE `creature_template` SET `speed_run`=0.5952386 WHERE `entry`=30184; -- Scion of Storm
+UPDATE `creature_template` SET `speed_run`=0.5952386 WHERE `entry`=30550; -- Image of the North Wind
+UPDATE `creature_template` SET `speed_run`=0.6857142 WHERE `entry`=37148; -- Skybreaker Summoner
+UPDATE `creature_template` SET `speed_run`=0.6928571 WHERE `entry`=33564; -- Ironforge Valiant
+UPDATE `creature_template` SET `speed_run`=0.6928571 WHERE `entry`=33739; -- Exodar Champion
+UPDATE `creature_template` SET `speed_run`=0.7142857 WHERE `entry`=13338; -- Core Rat
+UPDATE `creature_template` SET `speed_run`=0.7142857 WHERE `entry`=16927; -- Stonescythe Whelp
+UPDATE `creature_template` SET `speed_run`=0.7142857 WHERE `entry`=22134; -- Shadowmoon Eye of Kilrogg
+UPDATE `creature_template` SET `speed_run`=0.7142857 WHERE `entry`=25377; -- Brittle Skeleton
+UPDATE `creature_template` SET `speed_run`=0.7142857 WHERE `entry`=25832; -- Max Blasto
+UPDATE `creature_template` SET `speed_run`=0.7142857 WHERE `entry`=30142; -- The Iron Watcher
+UPDATE `creature_template` SET `speed_run`=0.7142857 WHERE `entry`=37782; -- Flesh-eating Insect
+UPDATE `creature_template` SET `speed_run`=0.7142857 WHERE `entry`=38228; -- Plagued Insect
+UPDATE `creature_template` SET `speed_run`=0.7142857 WHERE `entry`=7784; -- Homing Robot OOX-17/TN
+UPDATE `creature_template` SET `speed_run`=0.7142857 WHERE `entry`=7789; -- Sandfury Cretin
+UPDATE `creature_template` SET `speed_run`=0.7142857 WHERE `entry`=7849; -- Mobile Alert System
+UPDATE `creature_template` SET `speed_run`=0.7857143 WHERE `entry`=28167; -- Stratholme Citizen
+UPDATE `creature_template` SET `speed_run`=0.7857143 WHERE `entry`=28169; -- Stratholme Resident
+UPDATE `creature_template` SET `speed_run`=0.8 WHERE `entry`=636; -- Defias Blackguard
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=11473; -- Eldreth Spectre
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=11625; -- Cork Gizelton
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=11626; -- Rigger Gizelton
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=14431; -- Fury Shelda
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=14894; -- Swarm of bees
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=1520; -- Rattlecage Soldier
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=1522; -- Darkeye Bonecaster
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=1523; -- Cracked Skull Soldier
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=1527; -- Hungering Dead
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=1528; -- Shambling Horror
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=1531; -- Lost Soul
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=1534; -- Wailing Ancestor
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=1535; -- Scarlet Warrior
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=15407; -- Chieftain Zul'Marosh
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=1544; -- Vile Fin Minor Oracle
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=1545; -- Vile Fin Muckdweller
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=15635; -- Eversong Tender
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=15636; -- Eversong Green Keeper
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=15637; -- Withered Green Keeper
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=15641; -- Amani Axe Thrower
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=15642; -- Amani Shadowpriest
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=15643; -- Amani Berserker
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=15645; -- Wretched Thug
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=15647; -- Mana Stalker
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=15648; -- Manawraith
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=15650; -- Crazed Dragonhawk
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=15654; -- Plaguebone Pillager
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=15655; -- Rotlimb Cannibal
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=15656; -- Angershade
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=15657; -- Darkwraith
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=15658; -- Rotlimb Marauder
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=15668; -- Grimscale Murloc
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=15669; -- Grimscale Oracle
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=15670; -- Grimscale Forager
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=15950; -- Grimscale Seer
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=15965; -- Duskwither Apprentice
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=16162; -- Wretched Hooligan
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=16519; -- Shadowy Executioner
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=1655; -- Nissa Agamand
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=1657; -- Devlin Agamand
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=1674; -- Rot Hide Gnoll
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=1675; -- Rot Hide Mongrel
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=16855; -- Tregla
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=16998; -- Mr. Bigglesworth
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=17186; -- Deranged Owlbeast
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=17187; -- Aberrant Owlbeast
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=17189; -- Crazed Wildkin
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=171; -- Murloc Warrior
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=18718; -- Shadowy Hunter
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=18720; -- Shadowmaster Grieve
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=1910; -- Muad
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=1934; -- Tirisfal Farmer
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=1935; -- Tirisfal Farmhand
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=1936; -- Farmer Solliden
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=2000; -- Webwood Silkspinner
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=2006; -- Gnarlpine Ursa
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=2007; -- Gnarlpine Gardener
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=2009; -- Gnarlpine Shaman
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=2010; -- Gnarlpine Defender
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=2011; -- Gnarlpine Augur
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=2012; -- Gnarlpine Pathfinder
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=2015; -- Bloodfeather Harpy
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=2017; -- Bloodfeather Rogue
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=2018; -- Bloodfeather Sorceress
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=2022; -- Timberling
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=2025; -- Timberling Bark Ripper
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=2027; -- Timberling Trampler
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=2029; -- Timberling Mire Beast
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=27523; -- Grizzlesnout
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=2961; -- Mountain Cougar
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=2968; -- Galak Outrunner
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=2969; -- Wiry Swoop
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=3103; -- Makrura Clacker
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=3104; -- Makrura Shellhide
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=3106; -- Pygmy Surf Crawler
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=3107; -- Surf Crawler
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=3113; -- Razormane Dustrunner
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=3114; -- Razormane Battleguard
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=3206; -- Voodoo Troll
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=3207; -- Hexed Troll
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=32258; -- Gold Beetle
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=327; -- Goldtooth
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=330; -- Princess
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=38232; -- Blood Spider
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=390; -- Porcine Entourage
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=39647; -- Zalazane
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=4075; -- Rat
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=4364; -- Strashaz Warrior
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=4366; -- Strashaz Serpent Guard
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=4368; -- Strashaz Myrmidon
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=4370; -- Strashaz Sorceress
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=4371; -- Strashaz Siren
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=4374; -- Strashaz Hydra
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=471; -- Mother Fang
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=473; -- Morgan the Collector
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=476; -- Kobold Geomancer
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=60; -- Ruklar the Trapper
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=6575; -- Scarlet Trainee
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=7883; -- Andre Firebeard
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=79; -- Narg the Taskmaster
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=880; -- Erlan Drudgemoor
+UPDATE `creature_template` SET `speed_run`=0.8571429 WHERE `entry`=881; -- Surena Caledon
+UPDATE `creature_template` SET `speed_run`=0.8857142 WHERE `entry`=12246; -- Super-Seller 680
+UPDATE `creature_template` SET `speed_run`=0.9126986 WHERE `entry`=25033; -- Eredar Sorcerer
+UPDATE `creature_template` SET `speed_run`=0.9523814 WHERE `entry`=24954; -- Aged Magnataur
+UPDATE `creature_template` SET `speed_run`=0.9523814 WHERE `entry`=25615; -- Plagued Magnataur
+UPDATE `creature_template` SET `speed_run`=0.9523814 WHERE `entry`=25789; -- Gammothra the Tormentor
+UPDATE `creature_template` SET `speed_run`=0.9523814 WHERE `entry`=26607; -- Anub'ar Blightbeast
+UPDATE `creature_template` SET `speed_run`=0.9523814 WHERE `entry`=28380; -- Shattertusk Bull
+UPDATE `creature_template` SET `speed_run`=0.9523814 WHERE `entry`=29445; -- Thorim
+UPDATE `creature_template` SET `speed_run`=0.9523814 WHERE `entry`=30295; -- Thorim
+UPDATE `creature_template` SET `speed_run`=0.9523814 WHERE `entry`=30390; -- Thorim
+UPDATE `creature_template` SET `speed_run`=0.9523814 WHERE `entry`=37864; -- Lord Marrowgar Image
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=10916; -- Winterfall Runner
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=11516; -- Timbermaw Warder
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=11552; -- Timbermaw Mystic
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=11553; -- Timbermaw Woodbender
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=11555; -- Gorn One Eye
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=11556; -- Salfa
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=11557; -- Meilosh
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=11558; -- Kernda
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=17556; -- Death Ravager
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=17816; -- Bogstrok
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=17817; -- Greater Bogstrok
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=17827; -- Claw <Swamplord Musel'ek's Pet>
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=18586; -- Coosh'coosh
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=21478; -- Rocknail Ripper
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=23326; -- Nethermine Ravager
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=25031; -- Pit Overlord
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=25601; -- Prince Valanar <The San'layn>
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=25833; -- The Grinder
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=26203; -- Image of the Lich King
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=26406; -- The Anvil <Furyhammer's Guardian>
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=26409; -- Rune-Smith Durar
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=26410; -- Rune-Smith Kathorn
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=26533; -- Mal'Ganis
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=26570; -- Famished Scourge Troll
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=27960; -- Dark Rune Warrior
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=27961; -- Dark Rune Worker
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=27962; -- Dark Rune Elementalist
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=27963; -- Dark Rune Theurgist
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=27964; -- Dark Rune Scholar
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=27965; -- Dark Rune Shaper
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=27966; -- Dark Rune Controller
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=27973; -- Crystalline Shardling
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=28103; -- Urgreth of the Thousand Tombs
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=28149; -- Earthen Protector
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=28409; -- Time Rift (CoT Stratholme)
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=28439; -- Time Rift (CoT Stratholme, Large)
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=28581; -- Stormforged Tactician
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=28582; -- Stormforged Mender
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=28836; -- Stormforged Runeshaper
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=28837; -- Stormforged Sentinel
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=29240; -- Stormforged Lieutenant
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=29368; -- Valduran the Stormborn
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=29370; -- Stormforged Champion
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=29374; -- Stormforged Magus
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=29556; -- Goblin Sapper Backpack
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=29722; -- Rabid Cannibal
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=29806; -- SCRAP-E
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=29832; -- Drakkari Golem
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=29840; -- The Leaper
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=30340; -- Jormuttar
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=30348; -- Elder Sardis
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=30357; -- Elder Beldak
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=30358; -- Elder Morthie
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=30359; -- Elder Fargal
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=30360; -- Elder Northal
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=30362; -- Elder Sandrene
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=30363; -- Elder Thoim
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=30364; -- Elder Arp
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=30375; -- Elder Stonebeard
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=30447; -- Romping Rhino
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=30533; -- Elder Nurgen
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=30697; -- Putrid Colossus
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=30899; -- Abedneum
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=30945; -- Vardmadra
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=31029; -- Possessed Vardmadra
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=31104; -- Ahn'kahar Watcher
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=32174; -- Teleportation Portal (Elite)
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=34460; -- Kavina Grovesong <Druid>
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=34568; -- Light Essence
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=35339; -- Boat Fire
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=35377; -- Door Fire
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=35379; -- Honorable Defender Trigger (Alliance)
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=35380; -- Honorable Defender Trigger (Horde)
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=36349; -- Honorable Defender Trigger, 25 yd (Alliance)
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=36350; -- Honorable Defender Trigger, 25 yd (Horde)
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=36724; -- Servant of the Throne
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=36725; -- Nerub'ar Broodkeeper
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=36817; -- [DND] Love Boat Summoner
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=36880; -- Decaying Colossus
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=37519; -- Safe Area (IGB)
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=37596; -- Lady Sylvanas Windrunner <Banshee Queen>
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=37846; -- Blood-Queen Lana'thel <The San'layn>
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=37857; -- The Lich King
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=37948; -- Deathwhisper Controller
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=4050; -- Cenarion Caretaker
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=7438; -- Winterfall Ursa
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=7439; -- Winterfall Shaman
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=7440; -- Winterfall Den Watcher
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=7441; -- Winterfall Totemic
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=7442; -- Winterfall Pathfinder
+UPDATE `creature_template` SET `speed_run`=0.9920629 WHERE `entry`=7726; -- Grimtotem Naturalist
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=10415; -- Ash'ari Crystal
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=14860; -- Flik
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=14872; -- Trok
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=14874; -- Karu
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=15652; -- Elder Springpaw
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=17361; -- Totem of Coo
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=17362; -- Totem of Tikti
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=17363; -- Totem of Yor
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=17364; -- Totem of Vark
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=17722; -- Coilfang Sorceress
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=17799; -- Dreghood Slave
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=17801; -- Coilfang Siren
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=17803; -- Coilfang Oracle
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=17826; -- Swamplord Musel'ek
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=17941; -- Mennu the Betrayer
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=17954; -- Naga Distiller
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=17960; -- Coilfang Soothsayer
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=17961; -- Coilfang Enchantress
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=17962; -- Coilfang Collaborator
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=17963; -- Wastewalker Slave
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=17964; -- Wastewalker Worker
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=18206; -- Wastewalker Captive
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=18678; -- Fulgorge
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=18681; -- Coilfang Emissary
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=19164; -- Refugee Child
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=19767; -- Coilskar Sorceress
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=19768; -- Coilskar Siren
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=20076; -- Naga Distiller (Coilskar Point)
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=20684; -- Lady Shav'rar
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=20812; -- Corki
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=21126; -- Coilfang Scale-Healer
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=21416; -- Lakaan <Corruptor of Water>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=21420; -- Corrupt Water Totem
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=21453; -- Ashtongue Shaman <Servant of Illidan>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=21454; -- Ashtongue Warrior <Servant of Illidan>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=21455; -- Ashtongue Worker <Servant of Illidan>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=21663; -- Oronu the Elder
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=21803; -- Ashtongue Handler <Servant of Illidan>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=21902; -- Cabal Spell-weaver
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=22314; -- Captive Child
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=23287; -- Murkblood Miner
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=23309; -- Murkblood Overseer
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=25073; -- Darkspine Siren
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=25391; -- En'kilah Focus Crystal
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=25422; -- Mystical Webbing
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=25534; -- En'kilah Blood Globe
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=25754; -- Earthen Ring Flamecaller <The Earthen Ring>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=25880; -- Minion of Kaw
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=25961; -- Earthen Ring Totem
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=26048; -- Storm Totem
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=26497; -- Lady Jaina Proudmoore
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=28083; -- Serfex the Reaver
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=28253; -- Mistwhisper Lightning Cloud
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=28476; -- Runebladed Sword
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=28656; -- Hourglass (CoT Stratholme)
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=28687; -- Amisi Azuregaze <Innkeeper>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=28704; -- Dorothy Egan <Grand Master Herbalism Trainer>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=28706; -- Olisarra the Kind <Grand Master First Aid Trainer>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=28708; -- Kizi Copperclip <Barber>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=28714; -- Ildine Sorrowspear <Enchanting Supplies>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=28716; -- Palja Amboss <Blacksmithing Supplies>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=28990; -- Anthony Durain <Shield Merchant>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=28995; -- Paldesse <Cloth Armor Merchant>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=28997; -- Griselda Hunderland <Plate Armor Merchant>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=29218; -- Portal to the Shadow Realm
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=29255; -- Sunreaver Guardian Mage
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=29478; -- Jepetto Joybuzz <Toymaker>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=29505; -- Imindril Spearsong <Weaponsmithing Trainer>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=29509; -- Namha Moonwater <Tribal Leatherworking Trainer>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=29511; -- Lalla Brightweave <Spellfire Tailoring Specialist>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=29513; -- Didi the Wrench <Goblin Engineering Trainer>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=29628; -- Angelique Butler <First Aid Supplies>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=29641; -- Theresa Wolf <Loremaster>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=29703; -- Sheddle Glossgleam <Cobbler>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=30095; -- Dalaran Sewer Turtle
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=30167; -- Gimorak
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=30831; -- High Priest Yath'amon
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=30891; -- Blessed Banner of the Crusade
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=31769; -- Stabled Hunter Pet
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=32172; -- Harold Winston <Jewelry Vendor>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=32329; -- Kanika Goldwell <Arena Organizer>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=32333; -- "Dapper" Danik Blackshaft <Arena Battlemaster>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=32515; -- Braeg Stoutbeard <Fur & Leather Trader>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=32602; -- Dalaran Visitor
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=32651; -- Wounded Dalaran Shield Guard
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=32653; -- Wounded Dalaran Serpent
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=32654; -- SOTA Alliance Gun 1
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=32661; -- SOTA Alliance Gun 2
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=32676; -- Grindle Firespark
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=32678; -- Emeline Fizzlefry
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=32680; -- Fabioso the Fabulous
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=32684; -- Mona Everspring
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=32689; -- Adorean Lew
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=32731; -- Metopious Loreseeker
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=32744; -- Bakor the Gangly <Arena Enthusiast>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=33224; -- Lake Frog
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=34567; -- Dark Essence
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=35320; -- Lady Jaina Proudmoore
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=35496; -- Rueben Lauren <Cloth Armor Merchant>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=35498; -- Horace Hunderland <Plate Armor Merchant>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=36955; -- Lady Jaina Proudmoore
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=36993; -- Lady Jaina Proudmoore
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=37107; -- Spiritual Reflection
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=37132; -- Ymirjar Battle-Maiden
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=37188; -- Lady Jaina Proudmoore
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=37880; -- Stormwind Portal
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=37887; -- Kwee Q. Peddlefeet <Crown Chemical Co.>
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=38188; -- Lady Jaina Proudmoore
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=40187; -- Vanira's Sentry Totem
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=7269; -- Scarab
+UPDATE `creature_template` SET `speed_run`=1.071429 WHERE `entry`=28242; -- Risen Reaver
+UPDATE `creature_template` SET `speed_run`=1.071429 WHERE `entry`=28443; -- Thalgran Blightbringer
+UPDATE `creature_template` SET `speed_run`=1.071429 WHERE `entry`=30471; -- Vargul Assailant
+UPDATE `creature_template` SET `speed_run`=1.071429 WHERE `entry`=30501; -- Val'kyr Arbiter
+UPDATE `creature_template` SET `speed_run`=1.071429 WHERE `entry`=30829; -- Salranax the Flesh Render
+UPDATE `creature_template` SET `speed_run`=1.071429 WHERE `entry`=32576; -- Orabus the Helmsman
+UPDATE `creature_template` SET `speed_run`=1.071429 WHERE `entry`=32577; -- Kvaldir Crewman
+UPDATE `creature_template` SET `speed_run`=1.071429 WHERE `entry`=32578; -- Kvaldir Crewman
+UPDATE `creature_template` SET `speed_run`=1.071429 WHERE `entry`=32579; -- Kvaldir Crewman
+UPDATE `creature_template` SET `speed_run`=1.071429 WHERE `entry`=32580; -- Kvaldir Crewman
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=11832; -- Keeper Remulos
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=16226; -- Guard Didier <Brotherhood of the Light>
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=16864; -- Stormwind Infantry
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=16912; -- Mag'har Hunter
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=20159; -- Magister Aledis
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=23308; -- Dragonmaw Peon Work Node
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=24410; -- Vazruden the Herald Image
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=25063; -- Dawnblade Hawkrider
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=25392; -- High Priest Andorath
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=26073; -- High Priest Talet-Kha
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=26448; -- Stars' Rest Sentinel
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=27272; -- Risen Villager
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=27499; -- Caged Prisoner
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=27768; -- Image of Razuvious
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=28636; -- Heb'Jin
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=29477; -- Earthen Defender
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=29546; -- K3 Snow Runner
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=30387; -- Seething Revenant
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=30696; -- Corpulent Horror
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=30864; -- Shandaral Hunter Spirit
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=31755; -- Stabled Hunter Pet
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=31773; -- Plague Cauldron Target
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=31900; -- Scourge Banner-Bearer
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=32181; -- Living Plague
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=32429; -- Seething Hate
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=32442; -- Plague Cauldron Target 02
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=32572; -- Dragonblight Mage Hunter
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=32598; -- Dalaran Visitor
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=3284; -- Venture Co. Drudger
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=33698; -- Argent Peacekeeper
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=36642; -- Myralion Sunblaze <Sunreavers>
+UPDATE `creature_template` SET `speed_run`=1.142857 WHERE `entry`=9543; -- Ribbly Screwspigot
+UPDATE `creature_template` SET `speed_run`=1.14286 WHERE `entry`=31045; -- Mirador
+UPDATE `creature_template` SET `speed_run`=1.190476 WHERE `entry`=1013; -- Mosshide Mystic
+UPDATE `creature_template` SET `speed_run`=1.190476 WHERE `entry`=10488; -- Risen Construct
+UPDATE `creature_template` SET `speed_run`=1.190476 WHERE `entry`=11622; -- Rattlegore
+UPDATE `creature_template` SET `speed_run`=1.190476 WHERE `entry`=125; -- Riverpaw Overseer
+UPDATE `creature_template` SET `speed_run`=1.190476 WHERE `entry`=16334; -- Blackpaw Gnoll
+UPDATE `creature_template` SET `speed_run`=1.190476 WHERE `entry`=1753; -- Maggot Eye
+UPDATE `creature_template` SET `speed_run`=1.190476 WHERE `entry`=1772; -- Rot Hide Gladerunner
+UPDATE `creature_template` SET `speed_run`=1.190476 WHERE `entry`=2372; -- Mudsnout Gnoll
+UPDATE `creature_template` SET `speed_run`=1.190476 WHERE `entry`=25456; -- Vision of Kaganishu
+UPDATE `creature_template` SET `speed_run`=1.190476 WHERE `entry`=25457; -- Vision of Magmoth Shaman
+UPDATE `creature_template` SET `speed_run`=1.190476 WHERE `entry`=28109; -- Mistwhisper Warrior
+UPDATE `creature_template` SET `speed_run`=1.190476 WHERE `entry`=28110; -- Mistwhisper Oracle
+UPDATE `creature_template` SET `speed_run`=1.190476 WHERE `entry`=29554; -- Snowblind Devotee
+UPDATE `creature_template` SET `speed_run`=1.190476 WHERE `entry`=29920; -- Ruins Dweller
+UPDATE `creature_template` SET `speed_run`=1.190476 WHERE `entry`=32163; -- Grimkor's Hound
+UPDATE `creature_template` SET `speed_run`=1.190476 WHERE `entry`=37011; -- The Damned
+UPDATE `creature_template` SET `speed_run`=1.190476 WHERE `entry`=506; -- Sergeant Brashclaw
+UPDATE `creature_template` SET `speed_run`=1.190476 WHERE `entry`=5843; -- Slave Worker
+UPDATE `creature_template` SET `speed_run`=1.2 WHERE `entry`=29802; -- Cosmetic Toy Plane
+UPDATE `creature_template` SET `speed_run`=1.214286 WHERE `entry`=9684; -- Lar'korwi
+UPDATE `creature_template` SET `speed_run`=1.285714 WHERE `entry`=14276; -- Scargil
+UPDATE `creature_template` SET `speed_run`=1.285714 WHERE `entry`=16168; -- Stoneskin Gargoyle
+UPDATE `creature_template` SET `speed_run`=1.285714 WHERE `entry`=2375; -- Torn Fin Coastrunner
+UPDATE `creature_template` SET `speed_run`=1.285714 WHERE `entry`=25387; -- En'kilah Gargoyle
+UPDATE `creature_template` SET `speed_run`=1.285714 WHERE `entry`=25964; -- Shaman Beam Bunny 000
+UPDATE `creature_template` SET `speed_run`=1.285714 WHERE `entry`=25971; -- Shaman Bonfire Bunny 000
+UPDATE `creature_template` SET `speed_run`=1.285714 WHERE `entry`=25972; -- Shaman Bonfire Bunny 001
+UPDATE `creature_template` SET `speed_run`=1.285714 WHERE `entry`=25973; -- Shaman Bonfire Bunny 002
+UPDATE `creature_template` SET `speed_run`=1.285714 WHERE `entry`=27911; -- Nell
+UPDATE `creature_template` SET `speed_run`=1.285714 WHERE `entry`=27912; -- Pepper
+UPDATE `creature_template` SET `speed_run`=1.285714 WHERE `entry`=28221; -- Trapdoor Crawler
+UPDATE `creature_template` SET `speed_run`=1.285714 WHERE `entry`=28578; -- Hardened Steel Reaver
+UPDATE `creature_template` SET `speed_run`=1.285714 WHERE `entry`=28579; -- Hardened Steel Berserker
+UPDATE `creature_template` SET `speed_run`=1.285714 WHERE `entry`=28580; -- Hardened Steel Skycaller
+UPDATE `creature_template` SET `speed_run`=1.285714 WHERE `entry`=28599; -- Plagueroach
+UPDATE `creature_template` SET `speed_run`=1.285714 WHERE `entry`=28838; -- Titanium Vanguard
+UPDATE `creature_template` SET `speed_run`=1.285714 WHERE `entry`=29481; -- Lok'lira the Crone
+UPDATE `creature_template` SET `speed_run`=1.285714 WHERE `entry`=29639; -- Brunnhildar Prisoner
+UPDATE `creature_template` SET `speed_run`=1.285714 WHERE `entry`=30187; -- Mirador
+UPDATE `creature_template` SET `speed_run`=1.285714 WHERE `entry`=30573; -- Duke
+UPDATE `creature_template` SET `speed_run`=1.285714 WHERE `entry`=30574; -- Arion
+UPDATE `creature_template` SET `speed_run`=1.285714 WHERE `entry`=30595; -- Highlord Tirion Fordring
+UPDATE `creature_template` SET `speed_run`=1.285714 WHERE `entry`=30677; -- Highlord Tirion Fordring
+UPDATE `creature_template` SET `speed_run`=1.285714 WHERE `entry`=3864; -- Fel Steed
+UPDATE `creature_template` SET `speed_run`=1.285714 WHERE `entry`=3865; -- Shadow Charger
+UPDATE `creature_template` SET `speed_run`=1.285714 WHERE `entry`=5914; -- Deviate Nightmare
+UPDATE `creature_template` SET `speed_run`=1.289683 WHERE `entry`=10404; -- Pustulating Horror
+UPDATE `creature_template` SET `speed_run`=1.289683 WHERE `entry`=13280; -- Hydrospawn
+UPDATE `creature_template` SET `speed_run`=1.289683 WHERE `entry`=13282; -- Noxxion
+UPDATE `creature_template` SET `speed_run`=1.289683 WHERE `entry`=15553; -- Doctor Weavil's Flying Machine
+UPDATE `creature_template` SET `speed_run`=1.289683 WHERE `entry`=16232; -- Caravan Mule
+UPDATE `creature_template` SET `speed_run`=1.289683 WHERE `entry`=17076; -- Lady Liadrin <Blood Knight Matriarch>
+UPDATE `creature_template` SET `speed_run`=1.289683 WHERE `entry`=17181; -- Spirit of Water
+UPDATE `creature_template` SET `speed_run`=1.289683 WHERE `entry`=21059; -- Enraged Water Spirit
+UPDATE `creature_template` SET `speed_run`=1.289683 WHERE `entry`=25476; -- Waltor of Pal'ea
+UPDATE `creature_template` SET `speed_run`=1.289683 WHERE `entry`=26103; -- Darkfallen Deathblade <The San'layn>
+UPDATE `creature_template` SET `speed_run`=1.289683 WHERE `entry`=28612; -- Knight of the Silver Hand
+UPDATE `creature_template` SET `speed_run`=1.289683 WHERE `entry`=29830; -- Living Mojo
+UPDATE `creature_template` SET `speed_run`=1.289683 WHERE `entry`=30987; -- Hideous Plaguebringer
+UPDATE `creature_template` SET `speed_run`=1.289683 WHERE `entry`=33643; -- Silver Covenant Guardian
+UPDATE `creature_template` SET `speed_run`=1.289683 WHERE `entry`=6220; -- Irradiated Horror
+UPDATE `creature_template` SET `speed_run`=1.289683 WHERE `entry`=6233; -- Mechanized Sentry
+UPDATE `creature_template` SET `speed_run`=1.289683 WHERE `entry`=6234; -- Mechanized Guardian
+UPDATE `creature_template` SET `speed_run`=1.289683 WHERE `entry`=7079; -- Viscous Fallout
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=11701; -- Mor'vek <Ravasaur Trainers>
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=12150; -- Riding Kodo (Purple)
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=12337; -- Crimson Courier
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=14566; -- Ancient Equine Spirit
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=15541; -- Twilight Marauder Morna <Twilight's Hammer>
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=18146; -- Champion Vranesh
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=19280; -- Red Hawkstrider
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=19281; -- Swift Pink Hawkstrider
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=19795; -- Eclipsion Blood Knight
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=19910; -- Gargok <Warsong Gulch Battlemaster>
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=20217; -- Purple Hawkstrider
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=20220; -- Blue Hawkstrider
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=20222; -- Black Hawkstrider
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=20223; -- Swift Purple Hawkstrider
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=20224; -- Swift Green Hawkstrider
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=21719; -- Dragonmaw Drake-Rider
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=21979; -- Val'zareq the Conqueror <The Crimson Sigil>
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=22274; -- Dragonmaw Skybreaker
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=23188; -- Dragonmaw Transporter
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=25440; -- Scout Tungok
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=27365; -- Stabled Horse
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=27553; -- Kor'kron Vanguard
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=28611; -- Scarlet Captain
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=28824; -- Brann Flying Machine
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=29958; -- Tundra Ram
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=30224; -- Crusader Lord Dalfors
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=31003; -- Crusader Lord Dalfors
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=31033; -- Crusader of Virtue
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=32597; -- Dalaran Visitor
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=32601; -- Dalaran Visitor
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=35314; -- Orgrimmar Champion
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=35323; -- Sen'jin Champion
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=35325; -- Thunder Bluff Champion
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=35326; -- Silvermoon Champion
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=35327; -- Undercity Champion
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=35328; -- Stormwind Champion
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=35329; -- Ironforge Champion
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=35332; -- Darnassus Champion
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=36167; -- [DND] Bor'gorok Wolf
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=37586; -- Fury
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=39654; -- Vol'jin
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=40192; -- Vanira
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=40217; -- Echo Isle Animal
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=40391; -- Vol'jin
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=4779; -- Brown Ram
+UPDATE `creature_template` SET `speed_run`=1.385714 WHERE `entry`=5198; -- Arctic Riding Wolf
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=10038; -- Night Watch Guard <The Night Watch>
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=1010; -- Mosshide Fenrunner
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=1025; -- Bluegill Puddlejumper
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=10408; -- Rockwing Gargoyle
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=11190; -- Everlook Bruiser
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=11261; -- Doctor Theolen Krastinov <The Butcher>
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=11492; -- Alzzin the Wildshaper
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=15974; -- Dread Creeper
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=15975; -- Carrion Spinner
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=15976; -- Venom Stalker
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=15977; -- Poisonous Skitterer
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=16017; -- Patchwork Golem
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=16018; -- Bile Retcher
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=16034; -- Plague Beast
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=16145; -- Death Knight Captain
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=16146; -- Death Knight
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=16156; -- Dark Touched Warrior
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=16164; -- Shade of Naxxramas
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=16165; -- Necro Knight
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=16167; -- Bony Construct
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=16193; -- Skeletal Smith
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=16244; -- Infectious Ghoul
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=16348; -- Ghostclaw Lynx
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=16349; -- Ghostclaw Ravager
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=17798; -- Warlord Kalithresh
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=17917; -- Coilfang Water Elemental
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=19412; -- D'ore
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=1997; -- Strigid Hunter
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=21695; -- Tidal Surger
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=21696; -- Steam Surger
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=21901; -- Netherskate
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=22331; -- Dragonmaw Elite
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=23264; -- Overmine Flayer
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=23501; -- Netherwing Ray
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=23542; -- Amani'shi Axe Thrower
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=23580; -- Amani'shi Warbringer
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=23581; -- Amani'shi Medicine Man
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=23582; -- Amani'shi Tribesman
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=23636; -- Mudsprocket Bruiser
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=23878; -- Amani Bear Spirit
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=23880; -- Amani Eagle Spirit
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=23889; -- Amani'shi Savage
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=24001; -- Ashli
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=24240; -- Alyson Antille
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=24241; -- Thurg
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=24242; -- Slither
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=24243; -- Lord Raadan
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=24244; -- Gazakroth
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=24245; -- Fenstalker
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=24247; -- Koragg
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=24374; -- Amani'shi Berserker
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=24549; -- Amani'shi Tempest
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=24858; -- Soaring Eagle
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=25145; -- Budd's Bodyguard
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=25396; -- Naxxanar Skeletal Mage
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=25451; -- Nerub'ar Sky Darkener
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=26532; -- Chrono-Lord Epoch
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=26796; -- Commander Stoutbeard
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=27175; -- Transitus Shield Warmage
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=2734; -- Ridge Stalker Patriarch
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=27949; -- Alliance Commander
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=28546; -- Ionar
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=28547; -- Storming Vortex
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=28586; -- General Bjarngrim
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=28826; -- Stormfury Revenant
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=28961; -- Titanium Siegebreaker
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=28965; -- Titanium Thunderer
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=29305; -- Moorabi <High Prophet of Mam'toth>
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=29307; -- Drakkari Colossus
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=29553; -- Garm Watcher
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=29859; -- The Leaper
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=29928; -- Gymer Lock Dummy
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=29932; -- Eck the Ferocious
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=30258; -- Amanitar
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=31016; -- Overthane Balargarde <Master of Jotunheim>
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=32176; -- Plague Drenched Ghoul
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=32178; -- Rampaging Ghoul
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=32273; -- Infinite Corruptor
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=33543; -- Sunreaver Guardian
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=34928; -- Argent Confessor Paletress
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=36166; -- 7th Legion Marine
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=37023; -- Plague Scientist
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=37038; -- Vengeful Fleshreaper
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=37127; -- Ymirjar Frostbinder
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=37190; -- Alliance Commander
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=37575; -- Freed Alliance Slave
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=37879; -- King Varian Wrynn <King of Stormwind>
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=37902; -- Alliance Mason
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=37920; -- Kor'kron Reaver
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=37935; -- Apothecary Candith Tomas <General Goods>
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=37936; -- Morgan Dayblaze <Blacksmith>
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=38125; -- Ymirjar Deathbringer
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=3862; -- Slavering Worg
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=39371; -- King Varian Wrynn <King of Stormwind>
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=3975; -- Herod <The Scarlet Champion>
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=4107; -- Highperch Wyvern
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=4109; -- Highperch Consort
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=4362; -- Mirefin Coastrunner
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=5056; -- Deviate Dreadfang
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=521; -- Lupos
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=5466; -- Coast Strider
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=68; -- Stormwind City Guard
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=7273; -- Gahz'rilla
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=7430; -- Frostsaber Cub
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=7431; -- Frostsaber
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=7432; -- Frostsaber Stalker
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=7433; -- Frostsaber Huntress
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=7447; -- Fledgling Chillwind
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=7448; -- Chillwind Chimaera
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=8155; -- Kargath Grunt
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=976; -- Kurzen War Tiger
+UPDATE `creature_template` SET `speed_run`=1.428571 WHERE `entry`=977; -- Kurzen War Panther
+UPDATE `creature_template` SET `speed_run`=1.571429 WHERE `entry`=28208; -- Hailscorn
+UPDATE `creature_template` SET `speed_run`=1.5873 WHERE `entry`=27969; -- Dark Rune Giant
+UPDATE `creature_template` SET `speed_run`=1.5873 WHERE `entry`=28920; -- Stormforged Giant
+UPDATE `creature_template` SET `speed_run`=1.5873 WHERE `entry`=29375; -- Stormforged Iron Giant
+UPDATE `creature_template` SET `speed_run`=1.5873 WHERE `entry`=29503; -- Fjorn
+UPDATE `creature_template` SET `speed_run`=1.5873 WHERE `entry`=29914; -- Dead Iron Giant
+UPDATE `creature_template` SET `speed_run`=1.5873 WHERE `entry`=29974; -- Niffelem Forefather
+UPDATE `creature_template` SET `speed_run`=1.5873 WHERE `entry`=30500; -- Argent Skytalon
+UPDATE `creature_template` SET `speed_run`=1.5873 WHERE `entry`=37230; -- Spire Frostwyrm
+UPDATE `creature_template` SET `speed_run`=1.6 WHERE `entry`=26725; -- Wind Tamer Oril
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=10478; -- Splintered Skeleton
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=10485; -- Risen Aberration
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=11658; -- Molten Giant
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=11659; -- Molten Destroyer
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=11661; -- Flamewaker
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=11662; -- Flamewaker Priest
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=11663; -- Flamewaker Healer
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=11664; -- Flamewaker Elite
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=11666; -- Firewalker
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=11667; -- Flameguard
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=11668; -- Firelord
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=11669; -- Flame Imp
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=11671; -- Core Hound
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=11673; -- Ancient Core Hound
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=12018; -- Majordomo Executus
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=12057; -- Garr
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=12076; -- Lava Elemental
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=12098; -- Sulfuron Harbinger
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=12099; -- Firesworn
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=12100; -- Lava Reaver
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=12118; -- Lucifron
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=12119; -- Flamewaker Protector
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=12259; -- Gehennas
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=12264; -- Shazzrah
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=15461; -- Shrieker Scarab
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=15961; -- Lunar Festival Sentinel
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=16163; -- Death Knight Cavalier
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=21315; -- Ruul the Darkener
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=23559; -- Budd Nedreck
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=25965; -- Shaman Beam Bunny 001
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=26232; -- Saragosa
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=26299; -- Corpse of Saragosa
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=26363; -- Tallhorn Stag
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=27975; -- Maiden of Grief
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=30017; -- Stinkbeard
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=30023; -- Korrak the Bloodrager <Champion of the Winterax>
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=30099; -- Njormeld
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=30121; -- Frost Giant Stormherald
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=30123; -- Snorri
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=30432; -- Grimmr Hound
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=30593; -- Forgotten Depths Slayer
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=33785; -- The Black Knight
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=34014; -- Sanctum Sentry
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=35877; -- The Lich King
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=37184; -- Zafod Boombox
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=38248; -- Impaling Spear
+UPDATE `creature_template` SET `speed_run`=1.714286 WHERE `entry`=7897; -- Alarm-a-bomb 2600
+UPDATE `creature_template` SET `speed_run`=1.828571 WHERE `entry`=6225; -- Mechano-Tank
+UPDATE `creature_template` SET `speed_run`=1.828571 WHERE `entry`=6226; -- Mechano-Flamewalker
+UPDATE `creature_template` SET `speed_run`=1.828571 WHERE `entry`=6227; -- Mechano-Frostwalker
+UPDATE `creature_template` SET `speed_run`=1.857143 WHERE `entry`=28923; -- Loken
+UPDATE `creature_template` SET `speed_run`=1.857143 WHERE `entry`=30396; -- Loken
+UPDATE `creature_template` SET `speed_run`=2 WHERE `entry`=24059; -- Amani'shi Beast Tamer
+UPDATE `creature_template` SET `speed_run`=2 WHERE `entry`=24138; -- Tamed Amani Crocolisk
+UPDATE `creature_template` SET `speed_run`=2 WHERE `entry`=24530; -- Amani Elder Lynx
+UPDATE `creature_template` SET `speed_run`=2 WHERE `entry`=25390; -- En'kilah Hatchling
+UPDATE `creature_template` SET `speed_run`=2 WHERE `entry`=26838; -- Dreadtalon
+UPDATE `creature_template` SET `speed_run`=2 WHERE `entry`=28587; -- Volkhan
+UPDATE `creature_template` SET `speed_run`=2 WHERE `entry`=29664; -- Ragemane
+UPDATE `creature_template` SET `speed_run`=2 WHERE `entry`=29804; -- Baron Sliver
+UPDATE `creature_template` SET `speed_run`=2 WHERE `entry`=30022; -- Vladof the Butcher
+UPDATE `creature_template` SET `speed_run`=2 WHERE `entry`=30989; -- Halof the Deathbringer
+UPDATE `creature_template` SET `speed_run`=2 WHERE `entry`=34127; -- Boneguard Commander
+UPDATE `creature_template` SET `speed_run`=2.142857 WHERE `entry`=11460; -- Alzzin's Minion
+UPDATE `creature_template` SET `speed_run`=2.142857 WHERE `entry`=23576; -- Nalorakk <Bear Avatar>
+UPDATE `creature_template` SET `speed_run`=2.142857 WHERE `entry`=23577; -- Halazzi <Lynx Avatar>
+UPDATE `creature_template` SET `speed_run`=2.142857 WHERE `entry`=25966; -- Shaman Beam Bunny 002
+UPDATE `creature_template` SET `speed_run`=2.142857 WHERE `entry`=27123; -- Icefist Forager
+UPDATE `creature_template` SET `speed_run`=2.142857 WHERE `entry`=27766; -- Image of Kel'Thuzad
+UPDATE `creature_template` SET `speed_run`=2.142857 WHERE `entry`=30443; -- The Lich King
+UPDATE `creature_template` SET `speed_run`=2.142857 WHERE `entry`=30575; -- Frostbrood Destroyer
+UPDATE `creature_template` SET `speed_run`=2.142857 WHERE `entry`=31083; -- The Lich King
+UPDATE `creature_template` SET `speed_run`=2.142857 WHERE `entry`=5831; -- Swiftmane
+UPDATE `creature_template` SET `speed_run`=2.142857 WHERE `entry`=6907; -- Eric "The Swift"
+UPDATE `creature_template` SET `speed_run`=2.285714 WHERE `entry`=11665; -- Lava Annihilator
+UPDATE `creature_template` SET `speed_run`=2.285714 WHERE `entry`=11672; -- Core Rager
+UPDATE `creature_template` SET `speed_run`=2.285714 WHERE `entry`=11982; -- Magmadar
+UPDATE `creature_template` SET `speed_run`=2.285714 WHERE `entry`=11988; -- Golemagg the Incinerator
+UPDATE `creature_template` SET `speed_run`=2.285714 WHERE `entry`=12056; -- Baron Geddon
+UPDATE `creature_template` SET `speed_run`=2.285714 WHERE `entry`=12101; -- Lava Surger
+UPDATE `creature_template` SET `speed_run`=2.285714 WHERE `entry`=22332; -- Brood of Neltharaku
+UPDATE `creature_template` SET `speed_run`=2.285714 WHERE `entry`=23267; -- Arvoar the Rapacious
+UPDATE `creature_template` SET `speed_run`=2.428571 WHERE `entry`=24765; -- Spirit of Issliruk
+UPDATE `creature_template` SET `speed_run`=2.571429 WHERE `entry`=14354; -- Pusillin
+UPDATE `creature_template` SET `speed_run`=2.571429 WHERE `entry`=14864; -- Khaz Modan Ram
+UPDATE `creature_template` SET `speed_run`=2.571429 WHERE `entry`=23340; -- Murg "Oldie" Muckjaw
+UPDATE `creature_template` SET `speed_run`=2.571429 WHERE `entry`=27656; -- Ley-Guardian Eregos
+UPDATE `creature_template` SET `speed_run`=2.857143 WHERE `entry`=13876; -- Mekgineer Trigger
+UPDATE `creature_template` SET `speed_run`=2.857143 WHERE `entry`=22112; -- Karynaku <Mate of Neltharaku>
+UPDATE `creature_template` SET `speed_run`=2.857143 WHERE `entry`=23342; -- Trope the Filth-Belcher
+UPDATE `creature_template` SET `speed_run`=2.857143 WHERE `entry`=26231; -- Saragosa <Consort of Malygos>
+UPDATE `creature_template` SET `speed_run`=2.857143 WHERE `entry`=26237; -- Keristrasza
+UPDATE `creature_template` SET `speed_run`=3.142857 WHERE `entry`=23344; -- Corlok the Vet
+UPDATE `creature_template` SET `speed_run`=3.142857 WHERE `entry`=30399; -- Thorim
+UPDATE `creature_template` SET `speed_run`=3.142857 WHERE `entry`=30462; -- Thorim
+UPDATE `creature_template` SET `speed_run`=3.428571 WHERE `entry`=23345; -- Wing Commander Ichman
+UPDATE `creature_template` SET `speed_run`=3.714286 WHERE `entry`=23346; -- Wing Commander Mulverick
+UPDATE `creature_template` SET `speed_run`=4.285714 WHERE `entry`=22317; -- Netherwing Drake Escape Dummy
+UPDATE `creature_template` SET `speed_run`=4.285714 WHERE `entry`=23348; -- Captain Skyshatter
+UPDATE `creature_template` SET `speed_run`=4.285714 WHERE `entry`=32608; -- Hodir's Spear Event Bunny
+UPDATE `creature_template` SET `speed_run`=4.285714 WHERE `entry`=37755; -- Sindragosa <Queen of the Frostbrood>
+UPDATE `creature_template` SET `speed_run`=4.285714 WHERE `entry`=4945; -- Goblin Drag Car
+UPDATE `creature_template` SET `speed_run`=4.285714 WHERE `entry`=4946; -- Gnome Drag Car
+UPDATE `creature_template` SET `speed_run`=4.714286 WHERE `entry`=26310; -- Malygos
+UPDATE `creature_template` SET `speed_run`=5.714286 WHERE `entry`=25849; -- Fezzix Geartwist
+UPDATE `creature_template` SET `speed_walk`=0.09999999 WHERE `entry`=19871; -- World Trigger (Not Immune NPC)
+UPDATE `creature_template` SET `speed_walk`=0.4 WHERE `entry`=16217; -- Lieutenant Tomathren <Farstriders>
+UPDATE `creature_template` SET `speed_walk`=0.4 WHERE `entry`=32325; -- Gold Priest
+UPDATE `creature_template` SET `speed_walk`=0.4 WHERE `entry`=32343; -- Green Priest
+UPDATE `creature_template` SET `speed_walk`=0.4 WHERE `entry`=37782; -- Flesh-eating Insect
+UPDATE `creature_template` SET `speed_walk`=0.4 WHERE `entry`=37826; -- Light's Vengeance
+UPDATE `creature_template` SET `speed_walk`=0.4 WHERE `entry`=38228; -- Plagued Insect
+UPDATE `creature_template` SET `speed_walk`=0.5 WHERE `entry`=12121; -- Drakan
+UPDATE `creature_template` SET `speed_walk`=0.5 WHERE `entry`=24082; -- Proto-Drake Handler
+UPDATE `creature_template` SET `speed_walk`=0.5 WHERE `entry`=37544; -- Spire Gargoyle
+UPDATE `creature_template` SET `speed_walk`=0.5 WHERE `entry`=40502; -- Zalazane
+UPDATE `creature_template` SET `speed_walk`=0.6 WHERE `entry`=16197; -- Arcanist Vandril
+UPDATE `creature_template` SET `speed_walk`=0.6 WHERE `entry`=33564; -- Ironforge Valiant
+UPDATE `creature_template` SET `speed_walk`=0.6 WHERE `entry`=33739; -- Exodar Champion
+UPDATE `creature_template` SET `speed_walk`=0.6 WHERE `entry`=37148; -- Skybreaker Summoner
+UPDATE `creature_template` SET `speed_walk`=0.64 WHERE `entry`=28167; -- Stratholme Citizen
+UPDATE `creature_template` SET `speed_walk`=0.64 WHERE `entry`=28169; -- Stratholme Resident
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=10916; -- Winterfall Runner
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=11328; -- Eastvale Peasant
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=11516; -- Timbermaw Warder
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=11552; -- Timbermaw Mystic
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=11553; -- Timbermaw Woodbender
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=11555; -- Gorn One Eye
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=11556; -- Salfa
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=11557; -- Meilosh
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=11558; -- Kernda
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=12223; -- Cavern Lurker
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=12224; -- Cavern Shambler
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=12242; -- Spirit of Maraudos <The Fourth Kahn>
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=12243; -- Spirit of Veng <The Fifth Kahn>
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=13396; -- Irondeep Miner
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=15407; -- Chieftain Zul'Marosh
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=1812; -- Rotting Behemoth
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=18282; -- Lord Klaq
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=2006; -- Gnarlpine Ursa
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=2007; -- Gnarlpine Gardener
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=2009; -- Gnarlpine Shaman
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=2010; -- Gnarlpine Defender
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=2011; -- Gnarlpine Augur
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=2012; -- Gnarlpine Pathfinder
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=2025; -- Timberling Bark Ripper
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=2027; -- Timberling Trampler
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=2029; -- Timberling Mire Beast
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=21722; -- Enslaved Netherwing Drake
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=22332; -- Brood of Neltharaku
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=23550; -- Valgarde Yeoman
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=24245; -- Fenstalker
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=24374; -- Amani'shi Berserker
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=26458; -- Drakkari Plaguebringer
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=29019; -- Dockhand
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=2968; -- Galak Outrunner
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=29829; -- Drakkari Earthshaker
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=30023; -- Korrak the Bloodrager <Champion of the Winterax>
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=30685; -- Argent Mason
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=30900; -- Argent Mason
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=31755; -- Stabled Hunter Pet
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=32163; -- Grimkor's Hound
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=37902; -- Alliance Mason
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=5397; -- Uthek the Wise
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=5481; -- Thistleshrub Dew Collector
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=5485; -- Thistleshrub Rootshaper
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=5490; -- Gnarled Thistleshrub
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=5761; -- Deviate Shambler
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=5775; -- Verdan the Everliving
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=7404; -- Galak Flame Guard
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=7438; -- Winterfall Ursa
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=7439; -- Winterfall Shaman
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=7440; -- Winterfall Den Watcher
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=7441; -- Winterfall Totemic
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=7442; -- Winterfall Pathfinder
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=8580; -- Atal'alarion <Guardian of the Idol>
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=9028; -- Grizzle
+UPDATE `creature_template` SET `speed_walk`=0.666668 WHERE `entry`=9524; -- Kolkar Invader
+UPDATE `creature_template` SET `speed_walk`=0.7 WHERE `entry`=636; -- Defias Blackguard
+UPDATE `creature_template` SET `speed_walk`=0.777776 WHERE `entry`=10405; -- Plague Ghoul
+UPDATE `creature_template` SET `speed_walk`=0.777776 WHERE `entry`=10406; -- Ghoul Ravener
+UPDATE `creature_template` SET `speed_walk`=0.777776 WHERE `entry`=10407; -- Fleshflayer Ghoul
+UPDATE `creature_template` SET `speed_walk`=0.777776 WHERE `entry`=10495; -- Diseased Ghoul
+UPDATE `creature_template` SET `speed_walk`=0.777776 WHERE `entry`=10808; -- Timmy the Cruel
+UPDATE `creature_template` SET `speed_walk`=0.777776 WHERE `entry`=11030; -- Mindless Undead
+UPDATE `creature_template` SET `speed_walk`=0.777776 WHERE `entry`=11658; -- Molten Giant
+UPDATE `creature_template` SET `speed_walk`=0.777776 WHERE `entry`=11659; -- Molten Destroyer
+UPDATE `creature_template` SET `speed_walk`=0.777776 WHERE `entry`=11988; -- Golemagg the Incinerator
+UPDATE `creature_template` SET `speed_walk`=0.777776 WHERE `entry`=12203; -- Landslide
+UPDATE `creature_template` SET `speed_walk`=0.777776 WHERE `entry`=12206; -- Primordial Behemoth
+UPDATE `creature_template` SET `speed_walk`=0.777776 WHERE `entry`=15655; -- Rotlimb Cannibal
+UPDATE `creature_template` SET `speed_walk`=0.777776 WHERE `entry`=15658; -- Rotlimb Marauder
+UPDATE `creature_template` SET `speed_walk`=0.777776 WHERE `entry`=16309; -- Gangled Cannibal
+UPDATE `creature_template` SET `speed_walk`=0.777776 WHERE `entry`=16322; -- Gangled Flesheater
+UPDATE `creature_template` SET `speed_walk`=0.777776 WHERE `entry`=1793; -- Rotting Ghoul
+UPDATE `creature_template` SET `speed_walk`=0.777776 WHERE `entry`=1796; -- Freezing Ghoul
+UPDATE `creature_template` SET `speed_walk`=0.777776 WHERE `entry`=1971; -- Ivar the Foul
+UPDATE `creature_template` SET `speed_walk`=0.777776 WHERE `entry`=25031; -- Pit Overlord
+UPDATE `creature_template` SET `speed_walk`=0.777776 WHERE `entry`=27272; -- Risen Villager
+UPDATE `creature_template` SET `speed_walk`=0.777776 WHERE `entry`=30984; -- Scourge Drudge
+UPDATE `creature_template` SET `speed_walk`=0.777776 WHERE `entry`=39639; -- Restless Zombie
+UPDATE `creature_template` SET `speed_walk`=0.777776 WHERE `entry`=40274; -- Restless Zombie
+UPDATE `creature_template` SET `speed_walk`=0.777776 WHERE `entry`=511; -- Insane Ghoul
+UPDATE `creature_template` SET `speed_walk`=0.777776 WHERE `entry`=5469; -- Dune Smasher
+UPDATE `creature_template` SET `speed_walk`=0.777776 WHERE `entry`=5470; -- Raging Dune Smasher
+UPDATE `creature_template` SET `speed_walk`=0.777776 WHERE `entry`=7347; -- Boneflayer Ghoul
+UPDATE `creature_template` SET `speed_walk`=0.777776 WHERE `entry`=7348; -- Thorn Eater Ghoul
+UPDATE `creature_template` SET `speed_walk`=0.8 WHERE `entry`=10435; -- Magistrate Barthilas
+UPDATE `creature_template` SET `speed_walk`=0.8 WHERE `entry`=10507; -- The Ravenian
+UPDATE `creature_template` SET `speed_walk`=0.8 WHERE `entry`=12222; -- Creeping Sludge
+UPDATE `creature_template` SET `speed_walk`=0.8 WHERE `entry`=16927; -- Stonescythe Whelp
+UPDATE `creature_template` SET `speed_walk`=0.8 WHERE `entry`=18682; -- Bog Lurker
+UPDATE `creature_template` SET `speed_walk`=0.8 WHERE `entry`=24247; -- Koragg
+UPDATE `creature_template` SET `speed_walk`=0.8 WHERE `entry`=25740; -- Ahune <The Frost Lord>
+UPDATE `creature_template` SET `speed_walk`=0.8 WHERE `entry`=25865; -- Frozen Core
+UPDATE `creature_template` SET `speed_walk`=0.8 WHERE `entry`=26239; -- Ghost of Ahune
+UPDATE `creature_template` SET `speed_walk`=0.8 WHERE `entry`=28253; -- Mistwhisper Lightning Cloud
+UPDATE `creature_template` SET `speed_walk`=0.8 WHERE `entry`=29048; -- Ulduar Monitor
+UPDATE `creature_template` SET `speed_walk`=0.8 WHERE `entry`=29722; -- Rabid Cannibal
+UPDATE `creature_template` SET `speed_walk`=0.8 WHERE `entry`=7269; -- Scarab
+UPDATE `creature_template` SET `speed_walk`=0.833334 WHERE `entry`=11473; -- Eldreth Spectre
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=10394; -- Black Guard Sentry
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=10486; -- Risen Warrior
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=10487; -- Risen Protector
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=10489; -- Risen Guard
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=1110; -- Skeletal Raider
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=1520; -- Rattlecage Soldier
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=1523; -- Cracked Skull Soldier
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=16305; -- Dreadbone Sentinel
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=1658; -- Captain Dargol
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=17878; -- Scourge Siege Engineer
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=24243; -- Lord Raadan
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=25033; -- Eredar Sorcerer
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=27969; -- Dark Rune Giant
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=28587; -- Volkhan
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=28920; -- Stormforged Giant
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=31079; -- Azure Saboteur
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=37596; -- Lady Sylvanas Windrunner <Banshee Queen>
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=4328; -- Firemane Scalebane
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=4329; -- Firemane Scout
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=4331; -- Firemane Ash Tail
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=4334; -- Firemane Flamecaller
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=48; -- Skeletal Warrior
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=522; -- Mor'Ladim
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=7344; -- Splinterbone Warrior
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=7345; -- Splinterbone Captain
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=7346; -- Splinterbone Centurion
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=771; -- Commander Felstrom
+UPDATE `creature_template` SET `speed_walk`=0.888888 WHERE `entry`=8527; -- Scourge Guard
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10000; -- Arugal
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10058; -- Greth <Stable Master>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10082; -- Zerillis
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10096; -- High Justice Grimstone
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10120; -- Vault Warder
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10300; -- Ranshalla
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10301; -- Jaron Stoneshaper <Explorers' League>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10303; -- Storm Shadowhoof
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10305; -- Umi Rumplesnicker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10307; -- Witch Doctor Mau'ari
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10356; -- Bayne
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10381; -- Ravaged Cadaver
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10382; -- Mangled Cadaver
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10390; -- Skeletal Guardian
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10391; -- Skeletal Berserker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10393; -- Skul
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10398; -- Thuzadin Shadowcaster
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10400; -- Thuzadin Necromancer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10408; -- Rockwing Gargoyle
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10409; -- Rockwing Screecher
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10411; -- Eye of Naxxramas
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10412; -- Crypt Crawler
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10413; -- Crypt Beast
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10414; -- Patchwork Horror
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10415; -- Ash'ari Crystal
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10416; -- Bile Spewer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10417; -- Venom Belcher
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10418; -- Crimson Guardsman
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10419; -- Crimson Conjuror
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10420; -- Crimson Initiate
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10421; -- Crimson Defender
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10422; -- Crimson Sorcerer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10423; -- Crimson Priest
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10424; -- Crimson Gallant
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10425; -- Crimson Battle Mage
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10426; -- Crimson Inquisitor
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10427; -- Pao'ka Swiftmountain
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10431; -- Gregor Greystone <The Argent Dawn>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10432; -- Vectus
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10433; -- Marduk Blackpool
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10436; -- Baroness Anastari
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10437; -- Nerub'enkan
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10438; -- Maleki the Pallid
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10439; -- Ramstein the Gorger
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10440; -- Baron Rivendare
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10441; -- Plagued Rat
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10445; -- Selina Dourman <Darkmoon Faire Information>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10461; -- Plagued Insect
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10463; -- Shrieking Banshee
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10464; -- Wailing Banshee
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10468; -- Felnok Steelspring
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10469; -- Scholomance Adept
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10470; -- Scholomance Neophyte
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10471; -- Scholomance Acolyte
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10472; -- Scholomance Occultist
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10475; -- Scholomance Student
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10477; -- Scholomance Necromancer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10478; -- Splintered Skeleton
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10480; -- Unstable Corpse
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10481; -- Reanimated Corpse
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10485; -- Risen Aberration
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10488; -- Risen Construct
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10491; -- Risen Bonewarder
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10502; -- Lady Illucia Barov
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10503; -- Jandice Barov
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10504; -- Lord Alexei Barov
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10505; -- Instructor Malicia
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10508; -- Ras Frostwhisper
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1051; -- Dark Iron Dwarf
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1052; -- Dark Iron Saboteur
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10558; -- Hearthsinger Forresten
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10580; -- Fetid Zombie
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10637; -- Malyfous Darkhammer <The Thorium Brotherhood>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1065; -- Riverpaw Shaman
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1068; -- Gorn
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1071; -- Longbraid the Grim
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1072; -- Roggo Harlbarrow
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1073; -- Ashlan Stonesmirk
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1074; -- Motley Garmason
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1075; -- Rhag Garmason
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10811; -- Archivist Galford
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10812; -- Grand Crusader Dathrohan
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10828; -- High General Abbendis
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10897; -- Sindrayl <Hippogryph Master>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10901; -- Lorekeeper Polkelt
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10917; -- Aurius
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10919; -- Shatterspear Troll
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10978; -- Legacki
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=10997; -- Cannon Master Willey
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11032; -- Malor the Zealous
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1103; -- Eldrin <Tailoring Trainer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11043; -- Crimson Monk
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11058; -- Fras Siabi
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11072; -- Kitta Firewind <Enchanting Trainer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11079; -- Wynd Nightchaser
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11082; -- Stratholme Courier
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11103; -- Innkeeper Lyshaerya <Innkeeper>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11118; -- Innkeeper Vizzie <Innkeeper>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11119; -- Azzleby <Stable Master>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11138; -- Maethrya <Hippogryph Master>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11139; -- Yugrek <Wind Rider Master>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11140; -- Egan
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11142; -- Undead Postman
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11182; -- Nixxrak <Heavy Armor Merchant>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11183; -- Blixxrak <Light Armor Merchant>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11184; -- Wixxrak <Weaponsmith & Gunsmith>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11185; -- Xizzer Fizzbolt <Engineering Supplies>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11186; -- Lunnix Sprocketslip <Mining Supplies>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11187; -- Himmik <Food & Drink>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11188; -- Evie Whirlbrew <Alchemy Supplies>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11189; -- Qia <Trade Supplies>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11190; -- Everlook Bruiser
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11191; -- Lilith the Lithe
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11192; -- Kilram
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11193; -- Seril Scourgebane
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11196; -- Shatterspear Drummer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11257; -- Scholomance Handler
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11261; -- Doctor Theolen Krastinov <The Butcher>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11438; -- Bibbly F'utzbuckle
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11451; -- Wildspawn Satyr
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11452; -- Wildspawn Rogue
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11453; -- Wildspawn Trickster
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11454; -- Wildspawn Betrayer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11455; -- Wildspawn Felsworn
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11456; -- Wildspawn Shadowstalker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11457; -- Wildspawn Hellcaller
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11458; -- Petrified Treant
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11460; -- Alzzin's Minion
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11461; -- Warpwood Guardian
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11462; -- Warpwood Treant
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11464; -- Warpwood Tangler
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11465; -- Warpwood Stomper
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11469; -- Eldreth Seether
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11470; -- Eldreth Sorcerer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11472; -- Eldreth Spirit
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11476; -- Skeletal Highborne
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11477; -- Rotting Highborne
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11480; -- Arcane Aberration
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11483; -- Mana Remnant
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11486; -- Prince Tortheldrin
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11487; -- Magister Kalendris
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11488; -- Illyanna Ravenoak
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11489; -- Tendris Warpwood
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11490; -- Zevrim Thornhoof
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11491; -- Old Ironbark
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11492; -- Alzzin the Wildshaper
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11546; -- Jack Sterling
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11551; -- Necrofiend
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11598; -- Risen Guardian
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11622; -- Rattlegore
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11625; -- Cork Gizelton
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11626; -- Rigger Gizelton
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11629; -- Jessica Redpath
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1165; -- Stonesplinter Geomancer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11661; -- Flamewaker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11662; -- Flamewaker Priest
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11663; -- Flamewaker Healer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11664; -- Flamewaker Elite
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11666; -- Firewalker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11667; -- Flameguard
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11668; -- Firelord
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11669; -- Flame Imp
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11671; -- Core Hound
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11672; -- Core Rager
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1167; -- Stonesplinter Digger
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11701; -- Mor'vek <Ravasaur Trainers>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11706; -- Adon
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11715; -- Talendria
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11718; -- Sar Browneye
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11751; -- Rilan Howard
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11753; -- Gogo
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11754; -- Meggi Peppinrocker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11755; -- Harlo Wigglesworth
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11757; -- Umaron Stragarelm
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11789; -- Deep Borer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1178; -- Mo'grosh Ogre
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11790; -- Putridus Satyr
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11791; -- Putridus Trickster
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11792; -- Putridus Shadowstalker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11793; -- Celebrian Dryad
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11794; -- Sister of Celebras
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1179; -- Mo'grosh Enforcer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11804; -- Twilight Keeper Havunth <Twilight's Hammer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11808; -- Grum Redbeard
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11811; -- Narain Soothfancy
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11817; -- Krah'ranik
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11819; -- Jory Zaga
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11868; -- Sayoc <Weapon Master>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11871; -- Grinning Dog
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11896; -- Borelgore
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11897; -- Duskwing
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11899; -- Shardi <Wind Rider Master>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1192; -- Elder Mountain Boar
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1194; -- Mountain Buzzard
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=11982; -- Magmadar
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12018; -- Majordomo Executus
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12056; -- Baron Geddon
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1206; -- Gnasher
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1207; -- Brawler
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12098; -- Sulfuron Harbinger
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12118; -- Lucifron
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12119; -- Flamewaker Protector
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12150; -- Riding Kodo (Purple)
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12198; -- Martin Lindsey <Arathi Basin Battlemaster>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12201; -- Princess Theradras
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12207; -- Thessala Hydra
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12216; -- Poison Sprite
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12217; -- Corruptor
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12218; -- Vile Larva
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12219; -- Barbed Lasher
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12220; -- Constrictor Vine
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12221; -- Noxious Slime
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12236; -- Lord Vyletongue
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12244; -- Mark of Detonation (NW)
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12246; -- Super-Seller 680
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12258; -- Razorlash
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12259; -- Gehennas
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12264; -- Shazzrah
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12337; -- Crimson Courier
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12384; -- Augustus the Touched
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12430; -- Grunt Kor'ja
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1250; -- Drake Lindgren <General & Trade Supplies>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=125; -- Riverpaw Overseer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12740; -- Faustron <Wind Rider Master>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12865; -- Ambassador Malcin
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12866; -- Myriam Moonsinger
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=12960; -- Christi Galvanis <General Goods>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13022; -- Whip Lasher
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13078; -- Umi Thorson
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13079; -- Keetar
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13080; -- Irondeep Guard
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13081; -- Irondeep Raider
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13099; -- Irondeep Explorer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13118; -- Crimson Bodyguard
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13141; -- Deeprot Stomper
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13142; -- Deeprot Tangler
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13159; -- James Clark
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13196; -- Phase Lasher
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13197; -- Fel Lash
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13276; -- Wildspawn Imp
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13280; -- Hydrospawn
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13282; -- Noxxion
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13285; -- Death Lash
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13323; -- Subterranean Diemetradon
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13338; -- Core Rat
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13397; -- Irondeep Peon
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13476; -- Balai Lok'Wein <Potions, Scrolls & Reagents>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13533; -- Spewed Larva
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13596; -- Rotgrip
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13599; -- Stolid Snapjaw
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13601; -- Tinkerer Gizlock
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13656; -- Willow <Twilight's Hammer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13743; -- Corrupt Force of Nature
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13777; -- Sergeant Durgen Stormpike
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13916; -- Dire Maul Crystal Totem
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=13917; -- Izzy Coppergrab <Banker>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1393; -- Berserk Trogg
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1398; -- Boss Galgosh <Stonesplinter Chieftain>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14028; -- Trigger Jeztor
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1407; -- Sranda <Light Armor & Weapons Merchant>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1410; -- Firewing Bloodwarder
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14232; -- Dart
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14235; -- The Rot
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14236; -- Lord Angler
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14237; -- Oozeworm
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14266; -- Shanda the Spinner
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14267; -- Emogg the Crusher
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14276; -- Scargil
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14277; -- Lady Zephris
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14279; -- Creepthess
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14280; -- Big Samras
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14303; -- Petrified Guardian
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14327; -- Lethtendris
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14347; -- Highlord Demitrian
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14349; -- Pimgib
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14354; -- Pusillin
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14355; -- Azj'Tordin
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14357; -- Lake Thresher
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14358; -- Shen'dralar Ancient
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14361; -- Shen'dralar Wisp
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14368; -- Lorekeeper Lydros
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14369; -- Shen'dralar Zealot
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14371; -- Shen'dralar Provisioner
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14381; -- Lorekeeper Javon
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14382; -- Lorekeeper Mykos
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14383; -- Lorekeeper Kildrath
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14398; -- Eldreth Darter
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14400; -- Arcane Feedback
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14430; -- Duskstalker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1449; -- Witch Doctor Unbagwa
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14531; -- Artorius the Amiable
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14566; -- Ancient Equine Spirit
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14635; -- Sleepy Dark Iron Worker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14636; -- Chambermaid Pillaclencher
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14646; -- Stratholme Trigger
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14717; -- Horde Elite
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14718; -- Horde Laborer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14742; -- Zap Farflinger <Unbalanced Engineer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14754; -- Kelm Hargunth <Warsong Supply Officer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14781; -- Captain Shatterskull
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14822; -- Sayge
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14823; -- Silas Darkmoon
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14827; -- Burth
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14828; -- Gelvas Grimegate <Darkmoon Faire Ticket Redemption>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14829; -- Yebb Neblegear
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14832; -- Kerri Hicks <The Strongest Woman Alive!>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14833; -- Chronos <He Who Never Forgets!>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14841; -- Rinling
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14844; -- Sylannia <Darkmoon Faire Drink Vendor>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14845; -- Stamp Thunderhorn <Darkmoon Faire Food Vendor>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14846; -- Lhara <Darkmoon Faire Exotic Goods>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14847; -- Professor Thaddeus Paleo <Darkmoon Faire Cards & Exotic Goods>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14849; -- Darkmoon Faire Carnie
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14860; -- Flik
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14861; -- Blood Steward of Kirtonos
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14864; -- Khaz Modan Ram
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14865; -- Felinni
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14866; -- Flik's Frog
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14867; -- Jubjub
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14868; -- Hornsley
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14869; -- Pygmy Cockatrice
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14871; -- Morja
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14872; -- Trok
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14874; -- Karu
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14894; -- Swarm of bees
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14909; -- Pooka
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14961; -- Mirvyna Jinglepocket <Smokywood Pastures>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=14964; -- Hecht Copperpinch <Smokywood Pastures>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1497; -- Gunther Arcanus
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15006; -- Deze Snowbane <Arathi Basin Battlemaster>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1511; -- Enraged Silverback Gorilla
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15136; -- Hammerfall Elite
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1514; -- Mokk the Savage
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15162; -- Scarlet Inquisitor
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1516; -- Konda
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1522; -- Darkeye Bonecaster
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1527; -- Hungering Dead
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1528; -- Shambling Horror
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15301; -- Outrunner Alarion
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1530; -- Rotting Ancestor
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1531; -- Lost Soul
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1532; -- Wandering Spirit
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1534; -- Wailing Ancestor
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1535; -- Scarlet Warrior
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15397; -- Marniel Amberlight <Innkeeper>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15398; -- Larianna Riverwind
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15399; -- Lieutenant Dawnrunner <Farstriders>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15400; -- Arathel Sunforge <Blacksmithing Trainer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15401; -- Ley-Keeper Velania
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15402; -- Apprentice Mirveda
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15405; -- Ley-Keeper Caidanis
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15409; -- Old Whitebark
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15416; -- Ranger Jaela
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15417; -- Velan Brightoak
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15420; -- Prospector Anvilward
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1543; -- Vile Fin Puddlejumper
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1544; -- Vile Fin Minor Oracle
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1545; -- Vile Fin Muckdweller
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15461; -- Shrieker Scarab
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15466; -- Minion of Omen
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15520; -- O'Reily
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15549; -- Elder Morndeep
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15562; -- Elder Hammershout
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15565; -- Elder Stormbrow
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15567; -- Elder Ironband
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15568; -- Elder Graveborn
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15570; -- Elder Primestone
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15573; -- Elder Ragetotem
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15578; -- Elder Wildmane
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15581; -- Elder Grimtotem
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15582; -- Elder Windtotem
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15583; -- Elder Thunderhorn
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15584; -- Elder Skyseer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15586; -- Elder Dreamseer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15595; -- Elder Bladeleaf
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15597; -- Elder Moonwarden
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15599; -- Elder Bladesing
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15601; -- Elder Starweave
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15604; -- Elder Morningdew
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15605; -- Elder Riversong
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15607; -- Elder Farwhisper
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15624; -- Forest Wisp
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15635; -- Eversong Tender
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15636; -- Eversong Green Keeper
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15637; -- Withered Green Keeper
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15638; -- Arcane Patroller
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15645; -- Wretched Thug
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15647; -- Mana Stalker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15648; -- Manawraith
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15650; -- Crazed Dragonhawk
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15652; -- Elder Springpaw
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15654; -- Plaguebone Pillager
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15656; -- Angershade
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15657; -- Darkwraith
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15668; -- Grimscale Murloc
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15669; -- Grimscale Oracle
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15670; -- Grimscale Forager
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15719; -- Thunder Bluff Reveler
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15871; -- Elder Bronzebeard
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15905; -- Darnassus Reveler
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15907; -- Undercity Reveler
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15908; -- Orgrimmar Reveler
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15920; -- Hathvelion Sungaze
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15924; -- Apprentice Loralthalis
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15937; -- Mmmrrrggglll <Grimscale Chieftain>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15938; -- Eversong Ranger
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15939; -- Ranger Degolien
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15940; -- Ranger Selron
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15941; -- Apprentice Ralen
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15942; -- Ranger Sareyn
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15945; -- Apprentice Meledor
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15946; -- Apprentice Veya
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15949; -- Thaelis the Hungerer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15950; -- Grimscale Seer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15951; -- Magister Duskwither
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15961; -- Lunar Festival Sentinel
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15966; -- Mana Serpent
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15967; -- Ether Fiend
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15968; -- Darnassian Scout
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=15969; -- Groundskeeper Wyllithen
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16031; -- Ysida Harmon
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16032; -- Falrin Treeshaper
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16045; -- Isalien Trigger
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16046; -- Jarien and Sothos Trigger
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16047; -- Kormok Trigger
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16090; -- Rousch
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16117; -- Plagued Swine
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16144; -- Lord Saltheril
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16147; -- Elisara Sunstriker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16160; -- Magistrix Eredania <Enchanting Trainer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16161; -- Arcanist Sheynathren <Alchemy Trainer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16162; -- Wretched Hooligan
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16183; -- Courier Dawnstrider
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16187; -- Quartermaster Lymel <General Goods>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16189; -- Skymaster Sunwing <Dragonhawk Master>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16196; -- Apothecary Thedra
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16198; -- Apothecary Renzithen
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16199; -- Magister Darenis
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16200; -- Deathstalker Rathiel
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16201; -- Geranis Whitemorn
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16202; -- Farstrider Sedina <Farstriders>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16203; -- Ranger Vynna <Farstriders>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16205; -- Magistrix Aminel
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16210; -- Magistrix Landra Dawnstrider
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16213; -- Ranger Lethvalin <Farstriders>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16219; -- Ranger Valanna <Farstriders>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16220; -- Captain Helios <Farstriders>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16224; -- Rathis Tomber <Trade Supplies>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16226; -- Guard Didier <Brotherhood of the Light>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16231; -- Dame Auriferous
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16232; -- Caravan Mule
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16245; -- Luzran
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16251; -- Deathstalker Maltendis
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16252; -- High Executor Mavren
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16253; -- Master Chef Mouldier <Cooking Trainer & Supplies>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16260; -- Areyn <General Goods>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16261; -- Sathiel <Trade Supplies>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16263; -- Paelarin <Bowyer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16264; -- Winaestra <Hawkstrider Breeder>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16268; -- Eralan <Poison Supplies>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16274; -- Narina <Bowyer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16280; -- Perascamin <Riding Trainer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16288; -- Advisor Sorrelon
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16289; -- Advisor Valwyn
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16293; -- Apprentice Shatharia
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16301; -- Risen Hungerer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16302; -- Risen Stalker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16304; -- Arcane Devourer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16307; -- Deathcage Scryer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16308; -- Deathcage Sorcerer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16310; -- Mana Shifter
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16311; -- Phantasmal Watcher
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16313; -- Nerubis Guard
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16314; -- Fallen Ranger
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16315; -- Deatholme Acolyte
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16316; -- Stonewing Tracker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16317; -- Deatholme Necromancer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16318; -- Deatholme Darkmage
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16319; -- Nerubis Centurion
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16320; -- Eye of Dar'Khan
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16321; -- Wailer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16323; -- Phantasmal Seeker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16324; -- Stonewing Slayer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16325; -- Quel'dorei Ghost
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16326; -- Quel'dorei Wraith
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16330; -- Sentinel Spy
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16333; -- Sentinel Infiltrator
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16334; -- Blackpaw Gnoll
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16337; -- Blackpaw Shaman
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16341; -- Shadowpine Witch
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16343; -- Shadowpine Oracle
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16345; -- Shadowpine Catlord
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16346; -- Shadowpine Hexxer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16348; -- Ghostclaw Lynx
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16349; -- Ghostclaw Ravager
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16350; -- Spindleweb Spider
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16351; -- Spindleweb Lurker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16352; -- Greater Spindleweb
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16354; -- Vampiric Mistbat
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16355; -- Lesser Scourgebat
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16357; -- Anok'suten
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16362; -- Runewarden Deryan
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16366; -- Sempstress Ambershine <Tailoring Trainer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16367; -- Botanist Tyniarrel <Herbalism Trainer & Supplies>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16397; -- Ardeyn Riverwind
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16402; -- Zombified Grimscale
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16403; -- Withered Grimscale
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16416; -- Bronn Fitzwrench
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16443; -- Zalene Firstlight <Food & Drink>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16444; -- Halis Dawnstrider <General Goods>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16462; -- Ranger Krenn'an <Farstriders>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16463; -- Farstrider Solanna <Farstriders>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16464; -- Apothecary Venustus <Royal Apothecary Society>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16465; -- Raw Meat Rack Trigger
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16466; -- Smoked Meat Rack Trigger
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16480; -- Apprentice Vor'el
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1650; -- Terry Palin <Lumberjack>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16519; -- Shadowy Executioner
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16528; -- Provisioner Vredigar
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16541; -- Ghostlands Guardian
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16542; -- Innkeeper Kalarin <Innkeeper>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16550; -- Image of Technician Dyvuun
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1655; -- Nissa Agamand
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1657; -- Devlin Agamand
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16588; -- Apothecary Antonivich <Master Alchemy Trainer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16601; -- Dying Blood Elf
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16603; -- Farstrider Dusking <Farstriders>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16665; -- Paniar <Stable Master>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16694; -- Karen Wentworth <Arathi Basin Battlemaster>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1675; -- Rot Hide Mongrel
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16769; -- Firewing Warlock
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16818; -- Festival Talespinner
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16854; -- Eldinarcus
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16855; -- Tregla
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16860; -- Jilanne
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=16862; -- Silanna
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1696; -- Targorr the Dread
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17000; -- Aggonis
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17002; -- Angela "The Claw" Kestrel
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17004; -- Jir'see <Angela's Pet>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1700; -- Paxton Ganter <Fishing Trainer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17047; -- Wretched Crate Trigger
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17056; -- Eversong Partygoer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17088; -- Shadowy Summoner
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17095; -- Balandar Brightstar
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17097; -- Advisor Sarophas
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17138; -- Warmaul Reaver
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17180; -- Spirit of Air
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17181; -- Spirit of Water
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17182; -- Spirit of Fire
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17186; -- Deranged Owlbeast
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17187; -- Aberrant Owlbeast
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17188; -- Raving Owlbeast
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17189; -- Crazed Wildkin
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=171; -- Murloc Warrior
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17210; -- Sentinel Leader
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17218; -- Huraan
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17233; -- Ghost of Uther Lightbringer <Knights of the Silver Hand>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17253; -- Defile Uther's Tomb Trigger
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1729; -- Defias Evoker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17311; -- Cowlen
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17312; -- Magwin
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1732; -- Defias Squallshaper
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17361; -- Totem of Coo
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17362; -- Totem of Tikti
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17363; -- Totem of Yor
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17364; -- Totem of Vark
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17405; -- Krun Spinebreaker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17417; -- Mag'har Escort
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17418; -- Laughing Skull Ambusher
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1753; -- Maggot Eye
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17556; -- Death Ravager
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17587; -- Draenei Youngling
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17624; -- Laughing Skull Warden
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1763; -- Gilnid <The Smelter>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17655; -- Blacksmith Frances <Blacksmithing Supplies>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17656; -- Heron Skygaze <Food & Drink>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17690; -- <TXT>Eastwall Capture Quest Doodad
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17721; -- Coilfang Engineer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17722; -- Coilfang Sorceress
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1772; -- Rot Hide Gladerunner
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1773; -- Rot Hide Mystic
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17796; -- Mekgineer Steamrigger
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17797; -- Hydromancer Thespia
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17798; -- Warlord Kalithresh
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17799; -- Dreghood Slave
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17800; -- Coilfang Myrmidon
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17801; -- Coilfang Siren
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17802; -- Coilfang Warrior
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17803; -- Coilfang Oracle
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17805; -- Coilfang Slavemaster
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17816; -- Bogstrok
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17817; -- Greater Bogstrok
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17822; -- Landen Stilwell
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17826; -- Swamplord Musel'ek
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17827; -- Claw <Swamplord Musel'ek's Pet>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17849; -- Slain Outrunner
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17882; -- The Black Stalker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17885; -- Earthbinder Rayge
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17890; -- Weeder Greenthumb
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17893; -- Naturalist Bite
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17915; -- [PH] Invis Paladin Quest Credit <Nothing to See Here>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17917; -- Coilfang Water Elemental
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17938; -- Coilfang Observer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17940; -- Coilfang Technician
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17941; -- Mennu the Betrayer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17942; -- Quagmirran
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17951; -- Steamrigger Mechanic
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17954; -- Naga Distiller
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17957; -- Coilfang Champion
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17958; -- Coilfang Defender
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17959; -- Coilfang Slavehandler
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17960; -- Coilfang Soothsayer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17961; -- Coilfang Enchantress
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17962; -- Coilfang Collaborator
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17963; -- Wastewalker Slave
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17964; -- Wastewalker Worker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17984; -- Power Source Invisible Bunny
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=17992; -- Coilfang Invisible Vacuum Dummy
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18035; -- Scout Jyoba
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18064; -- Warmaul Shaman
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1806; -- Vile Slime
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18117; -- Ango'rosh Ogre
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18118; -- Ango'rosh Shaman
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18134; -- Fen Strider
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18135; -- Marsh Walker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18159; -- Boss Grog'ak
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18206; -- Wastewalker Captive
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18283; -- Blacksting
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18286; -- Mragesh
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18393; -- Warmaul Ogre Credit Marker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18395; -- Warmaul Pyre Credit Marker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18426; -- Terellia <Trade Supplies>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18452; -- Skithian Dreadhawk
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1853; -- Darkmaster Gandling
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18541; -- Urdak
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18548; -- Firewing Courier
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1854; -- High Priest Thel'danis
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18586; -- Coosh'coosh
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18670; -- Ironjaw
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18678; -- Fulgorge
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18681; -- Coilfang Emissary
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18684; -- Bro'Gaz the Clanless
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18716; -- Shadowy Initiate
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18717; -- Shadowy Laborer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18718; -- Shadowy Hunter
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18719; -- Shadowy Advisor
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18720; -- Shadowmaster Grieve
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18748; -- Ruak Stronghorn <Master Herbalism Trainer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18753; -- Felannia <Master Enchanting Trainer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18759; -- Zangarmarsh PvP Beam (Blue)
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18841; -- Laughing Skull Clan Ruins Credit Marker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1892; -- Moonrage Watcher
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18947; -- Solanin <Bag Vendor>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1894; -- Pyrewood Sentry
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1910; -- Muad
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19273; -- Forward Commander To'arch
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19280; -- Red Hawkstrider
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19281; -- Swift Pink Hawkstrider
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19315; -- Supply Officer Isabel <General Goods & Repairs>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19333; -- Grokom Deatheye <Weaponsmith>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19339; -- Korthul <Bowyer & Gunsmith>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19342; -- Krek Cragcrush <Blacksmithing Supplies>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1934; -- Tirisfal Farmer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1935; -- Tirisfal Farmhand
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1936; -- Farmer Solliden
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1937; -- Apothecary Renferrel <Royal Apothecary Society>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1938; -- Dalar Dawnweaver
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19412; -- D'ore
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19416; -- Ancient Draenei Spirit
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1950; -- Rane Yorick <Deathstalker>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1951; -- Quinn Yorick <Deathstalker>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19526; -- Dunaman <Weapons Vendor>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19528; -- Nanomah <Provisions Merchant>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1952; -- High Executor Hadrec
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19530; -- Darmend <Blacksmithing Supplies>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19532; -- Dearny <Leatherworking Merchant>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19581; -- Maddix <Flight Master>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1960; -- Pilot Hammerfoot
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19629; -- Denath
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19631; -- Harram
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19648; -- Maranem
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19649; -- Dorni <General Goods>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19698; -- Greatfather Aldrimus
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1975; -- Eastvale Lumberjack
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19762; -- Coilskar Defender
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19765; -- Coilskar Myrmidon
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19767; -- Coilskar Sorceress
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19768; -- Coilskar Siren
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19769; -- Coilskar Screamer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19784; -- Coilskar Cobra
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19788; -- Coilskar Muckwatcher
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19789; -- Coilskar Waterkeeper
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19795; -- Eclipsion Blood Knight
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19826; -- Dark Conclave Shadowmancer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19827; -- Dark Conclave Ravenguard
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1983; -- Nightlash
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19879; -- Horvon the Armorer <Armorsmith>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=19910; -- Gargok <Warsong Gulch Battlemaster>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=1997; -- Strigid Hunter
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2000; -- Webwood Silkspinner
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=20076; -- Naga Distiller (Coilskar Point)
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=20217; -- Purple Hawkstrider
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=20220; -- Blue Hawkstrider
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=20222; -- Black Hawkstrider
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=20223; -- Swift Purple Hawkstrider
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=20224; -- Swift Green Hawkstrider
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=20324; -- Parched Hydra
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2033; -- Elder Nightsaber
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2044; -- Forlorn Spirit
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=20684; -- Lady Shav'rar
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=20767; -- Mana Bomb Explosion Trigger
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=20797; -- Deviate Coiler Hatchling
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=20812; -- Corki
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2084; -- Natheril Raincaller <General Goods>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2090; -- Ma'ruk Wyrmscale <Dragonmaw Warlord>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=20926; -- Coilfang Door Controller
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2102; -- Dragonmaw Grunt
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21039; -- Mana Bomb Kill Credit Trigger
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2103; -- Dragonmaw Scout
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21059; -- Enraged Water Spirit
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21060; -- Enraged Air Spirit
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21095; -- Credit Marker: Water
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21096; -- Credit Marker: Air
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21126; -- Coilfang Scale-Healer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21127; -- Coilfang Tempest
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21128; -- Coilfang Ray <Observer's Pet>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2121; -- Shadow Priest Allister
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21284; -- Auchenai Initiate
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21338; -- Coilfang Leper
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21386; -- Dark Conclave Hawkeye
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21402; -- Anchorite Ceyla
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2140; -- Edwin Harly <General Supplies>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21416; -- Lakaan <Corruptor of Water>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21420; -- Corrupt Water Totem
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21453; -- Ashtongue Shaman <Servant of Illidan>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21454; -- Ashtongue Warrior <Servant of Illidan>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21455; -- Ashtongue Worker <Servant of Illidan>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21477; -- Rocknail Flayer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21478; -- Rocknail Ripper
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21515; -- Trachela
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=215; -- Defias Night Runner
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21638; -- Vengeful Harbinger
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21656; -- Illidari Satyr <Servant of Illidan>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21663; -- Oronu the Elder
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21694; -- Bog Overlord
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21695; -- Tidal Surger
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21696; -- Steam Surger
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21717; -- Dragonmaw Wrangler
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21718; -- Dragonmaw Subjugator
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21719; -- Dragonmaw Drake-Rider
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21720; -- Dragonmaw Shaman
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21721; -- Enslaved Netherwing Whelp
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21746; -- Caretaker Aluuro <Innkeeper>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21802; -- Elekk Demolisher
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21803; -- Ashtongue Handler <Servant of Illidan>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21808; -- Illidari Overseer <Servant of Illidan>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2181; -- Stormscale Myrmidon
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21822; -- Vindicator Aluumen
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2182; -- Stormscale Sorceress
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2183; -- Stormscale Warrior
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21860; -- Exarch Onaala
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21898; -- Mana Bomb Lightning Trigger
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21899; -- Mana Bomb Lightning Target
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2189; -- Vile Sprite
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=218; -- Grave Robber
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2190; -- Wild Grell
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21979; -- Val'zareq the Conqueror <The Crimson Sigil>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=21986; -- Altar of Sha'tar Vindicator
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=22054; -- Behemothon, King of the Colossi
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=22062; -- Dr. Whitherlimb
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=22079; -- Air Force Guard Post (Aldor - Gryphon)
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=22080; -- Air Force Trip Wire - Rooftop (Aldor)
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=22081; -- Shadowmoon Darkweaver <Servant of Illidan>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=22082; -- Shadowmoon Slayer <Servant of Illidan>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=22112; -- Karynaku <Mate of Neltharaku>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=22113; -- Mordenai
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2212; -- Deth'ryll Satyr
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=22134; -- Shadowmoon Eye of Kilrogg
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2214; -- Deathstalker Lesh
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=22214; -- Harbinger Saronen
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=22252; -- Dragonmaw Peon
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2226; -- Karos Razok <Bat Handler>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=22288; -- Terokkar Quest Target
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2228; -- Lieutenant Farren Orinelle
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=22314; -- Captive Child
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=22331; -- Dragonmaw Elite
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2242; -- Syndicate Spy
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2263; -- Marshal Redpath
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2264; -- Hillsbrad Tailor
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2265; -- Hillsbrad Apprentice Blacksmith
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2266; -- Hillsbrad Farmer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2268; -- Hillsbrad Footman
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2269; -- Hillsbrad Miner
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2270; -- Hillsbrad Sentry
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2271; -- Dalaran Shield Guard
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2272; -- Dalaran Theurgist
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2276; -- Magistrate Henry Maleb
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2277; -- Loremaster Dibbs
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=22835; -- Cenarion Dreamwarden
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23020; -- Shadow Serpent
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2303; -- Lyranne Feathersong <Food & Drink>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2305; -- Foreman Bonds
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23094; -- Minion of Sar'this
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2316; -- Gol'dir
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23188; -- Dragonmaw Transporter
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2319; -- Syndicate Wizard
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23326; -- Nethermine Ravager
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23340; -- Murg "Oldie" Muckjaw
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23342; -- Trope the Filth-Belcher
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23344; -- Corlok the Vet
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23346; -- Wing Commander Mulverick
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23348; -- Captain Skyshatter
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2335; -- Magistrate Burnside
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23452; -- Commander Arcus
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23454; -- Dragonmaw Raid Credit Marker (Aldor)
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2348; -- Elder Moss Creeper
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2352; -- Innkeeper Anderson <Innkeeper>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23542; -- Amani'shi Axe Thrower
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23559; -- Budd Nedreck
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23560; -- Provisioner Ameenah <Reagents>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23569; -- Renn McGill <SI:7 Salvage Diver>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23570; -- Gizzix Grimegurgle
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23571; -- Razbo Rustgear <Weapon & Armor Merchant>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23572; -- Drazzit Dripvalve
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23573; -- Krixil Slogswitch <Food & Drink>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23579; -- Brogg <Stonemaul Survivor>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2357; -- Merideth Carlson <Horse Breeder>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23580; -- Amani'shi Warbringer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23581; -- Amani'shi Medicine Man
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23582; -- Amani'shi Tribesman
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23600; -- Apprentice Morlann <Tabetha's Apprentice>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23601; -- Apprentice Garion <Tabetha's Apprentice>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2360; -- Hillsbrad Farmhand
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23612; -- Dyslix Silvergrub <Flight Master>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2361; -- Tamara Armstrong
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2362; -- Hemmit Armstrong
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2363; -- Apprentice Honeywell
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2364; -- Neema <Waitress>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2365; -- Bront Coldcleave <Butcher>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2366; -- Barkeep Kelly <Bartender>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2367; -- Donald Rabonne <Fishing Trainer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2368; -- Daggerspine Shorestalker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2369; -- Daggerspine Shorehunter
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23705; -- Catlord Corpse
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2370; -- Daggerspine Screamer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23716; -- Hexxer Corpse
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23718; -- Mack
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2371; -- Daggerspine Siren
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23724; -- Samir
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2372; -- Mudsnout Gnoll
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23748; -- Kurzel <Food & Drink>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2374; -- Torn Fin Muckdweller
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2375; -- Torn Fin Coastrunner
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23761; -- Prigmon
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2377; -- Torn Fin Tidehunter
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2378; -- Kundric Zanden <Town Historian>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2379; -- Caretaker Smithers
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=237; -- Farmer Furlbrow
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23807; -- Zul'Aman - Bear God Invisman
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2380; -- Nandar Branson <Alchemy Supplies>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23813; -- Zul'Aman - Dragonhawk God Invisman
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23814; -- Zul'Aman - Eagle God Invisman
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2381; -- Micha Yance <Trade Goods>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2382; -- Darren Malvew <Stablehand>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2383; -- Lindea Rabonne <Fishing Supplies>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23858; -- Donna Brascoe
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23872; -- Coren Direbrew
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2387; -- Hillsbrad Councilman
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23889; -- Amani'shi Savage
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23897; -- Zungam
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=238; -- Verna Furlbrow
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23942; -- Andello Porter <SI:7>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=23995; -- Axle <Innkeeper>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=24059; -- Amani'shi Beast Tamer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2411; -- Ricter
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2412; -- Alina
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2414; -- Kegan Darkmar
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2415; -- Warden Belamoore
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=24208; -- "Little" Logok <Innkeeper>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2430; -- Chef Jessen
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2431; -- Jailor Borhuin
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=24325; -- Eagle Troll Spawn Target
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2432; -- Darla Harris <Gryphon Master>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=24358; -- Harrison Jones
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2436; -- Farmer Kent
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2438; -- Bartolo Ginsetti
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=24396; -- Forest Frog
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=24410; -- Vazruden the Herald Image
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2448; -- Clerk Horrace Whitesteed
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2450; -- Miner Hackett
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2451; -- Farmer Kalaba
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=24530; -- Amani Elder Lynx
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2466; -- Mountaineer Grugelm
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2476; -- Large Loch Crocolisk
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2477; -- Gradok <Horde Runner>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2478; -- Haren Swifthoof <Horde Runner>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=247; -- Billy Maclure
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=24851; -- Kiz Coilspanner <Flight Master>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2503; -- Hillsbrad Foreman
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=25060; -- Darkspine Myrmidon
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=25073; -- Darkspine Siren
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=25084; -- Greengill Slave
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=250; -- Pa Maclure
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=25145; -- Budd's Bodyguard
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=25154; -- Sunwell - Quest Bunny - Shrine
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=25173; -- Zul'Aman Door Trigger
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2529; -- Son of Arugal
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2543; -- Archmage Ansirem Runeweaver <Kirin Tor>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2545; -- "Pretty Boy" Duncan
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2546; -- Fleet Master Firallon
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=25492; -- Central En'kilah Cauldron
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2557; -- Witherbark Shadow Hunter
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=255; -- Gerard Tiller
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=25697; -- Luma Skymother <The Earthen Ring>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2572; -- Drywhisker Kobold
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2577; -- Dark Iron Shadowcaster
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=258; -- Joshua Maclure <Vintner>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2596; -- Daggerspine Sorceress
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2603; -- Kovork
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2610; -- Shakes O'Breen <Blackwater Raiders>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=26113; -- Master Flame Eater
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2636; -- Blackwater Deckhand
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=26477; -- Dead Mage Hunter
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2672; -- Cowardly Crosby <Tailoring Supplies>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2687; -- Gnaz Blunderflame <Engineering Supplies>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2696; -- Foggy MacKreel
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2704; -- Hanashi <Weapon Master>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2705; -- Brewmeister Bilger
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2711; -- Phin Odelic
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2727; -- Crag Coyote
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2729; -- Elder Crag Coyote
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2732; -- Ridge Huntress
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2734; -- Ridge Stalker Patriarch
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2742; -- Shadowforge Chanter
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2743; -- Shadowforge Warrior
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=27499; -- Caged Prisoner
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=27537; -- Fordragon Lumberjack
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2764; -- Sleeby
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2765; -- Znort
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2766; -- Lolo the Lookout <Blackwater Raiders>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2767; -- First Mate Nilzlix <Blackwater Raiders>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2768; -- Professor Phizzlethorpe <Blackwater Raiders>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2769; -- Captain Steelgut <Blackwater Raiders>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2774; -- Doctor Draxlegauge <Blackwater Raiders>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2778; -- Deckhand Moishe <Blackwater Raiders>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=278; -- Sara Timberlain
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2804; -- Kurden Bloodclaw <Warsong Gulch Battlemaster>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2829; -- Starving Buzzard
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2831; -- Giant Buzzard
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=28506; -- Mindless Laborer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2861; -- Gorrik <Wind Rider Master>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2908; -- Grawl <General Goods>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2909; -- Hammertoe Grez
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2920; -- Lucien Tosselwrench
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2921; -- Lotwil Veriatus
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2922; -- Servo
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=294; -- Marshal Haggard
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2961; -- Mountain Cougar
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2969; -- Wiry Swoop
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=2986; -- Dorn Plainstalker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=29917; -- Field Corpse (Type B)
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=29; -- Kanrethad <Master of Death>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=30387; -- Seething Revenant
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3053; -- Synge <Gun Merchant>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=30696; -- Corpulent Horror
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3096; -- Captured Servant of Azora <Specialist Tailoring Supplies>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3103; -- Makrura Clacker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3104; -- Makrura Shellhide
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3106; -- Pygmy Surf Crawler
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3107; -- Surf Crawler
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3113; -- Razormane Dustrunner
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3121; -- Durotar Tiger
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=313; -- Theocritus <Mage of Tower Azora>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3140; -- Lar Prowltusk
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=31773; -- Plague Cauldron Target
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3206; -- Voodoo Troll
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3207; -- Hexed Troll
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=32181; -- Living Plague
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=32429; -- Seething Hate
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=32442; -- Plague Cauldron Target 02
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=32572; -- Dragonblight Mage Hunter
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3263; -- Bristleback Geomancer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3271; -- Razormane Mystic
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=327; -- Goldtooth
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=330; -- Princess
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3337; -- Kargal Battlescar
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3360; -- Koru <Mace & Staves Vendor>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3361; -- Shoma <Weapon Vendor>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3380; -- Burning Blade Acolyte
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3385; -- Theramore Marine
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3386; -- Theramore Preserver
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3388; -- Mahren Skyseer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3392; -- Prospector Khazgorm <Explorers' League>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3409; -- Zendo'jian <Weapon Vendor>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3414; -- General Twinbraid
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3421; -- Feegly the Exiled
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3470; -- Rathorian
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3476; -- Isha Awak
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3519; -- Sentinel Arynia Cloudsbreak
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3521; -- Ak'Zeloth
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3529; -- Moonrage Armorer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3531; -- Moonrage Tailor
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3540; -- Hal McAllister <Fish Merchant>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3541; -- Sarah Raycroft <General Goods>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3542; -- Jaysin Lanyda <Poisons & Reagents>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3543; -- Robert Aebischer <Superior Armorsmith>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3550; -- Martine Tramblay <Fishing Supplies>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3552; -- Alexandre Lefevre <Leather Armor Merchant>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3553; -- Sebastian Meloche <Armorer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3554; -- Andrea Boynton <Clothier>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3555; -- Johan Focht <Mining Trainer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3557; -- Guillaume Sorouy <Blacksmithing Trainer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3581; -- Sewer Beast
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3606; -- Alanna Raveneye <Enchanting Trainer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3634; -- Deviate Stalker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3636; -- Deviate Ravager
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3637; -- Deviate Guardian
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3640; -- Evolving Ectoplasm
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3650; -- Asterion
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3652; -- Trigore the Lasher
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3653; -- Kresh
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3654; -- Mutanus the Devourer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3661; -- Balthule Shadowstrike
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3669; -- Lord Cobrahn <Fanglord>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3670; -- Lord Pythas <Fanglord>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3671; -- Lady Anacondra <Fanglord>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3673; -- Lord Serpentis <Fanglord>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3674; -- Skum
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3678; -- Disciple of Naralex
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3679; -- Naralex
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3682; -- Vrang Wildgore <Weaponsmith & Armorcrafter>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3737; -- Saltspittle Puddlejumper
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3739; -- Saltspittle Warrior
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3740; -- Saltspittle Muckdweller
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3742; -- Saltspittle Oracle
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3779; -- Syurana <Trade Supplies>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3840; -- Druid of the Fang
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3849; -- Deathstalker Adamant
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=384; -- Katie Hunter <Horse Breeder>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3850; -- Sorcerer Ashcrombe
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3851; -- Shadowfang Whitescalp
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3853; -- Shadowfang Moonwalker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3854; -- Shadowfang Wolfguard
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3855; -- Shadowfang Darksoul
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3857; -- Shadowfang Glutton
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3859; -- Shadowfang Ragetooth
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3861; -- Bleak Worg
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3862; -- Slavering Worg
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3863; -- Lupine Horror
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3864; -- Fel Steed
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3865; -- Shadow Charger
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3866; -- Vile Bat
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3868; -- Blood Seeker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3873; -- Tormented Officer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3875; -- Haunted Servitor
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3877; -- Wailing Guardsman
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3886; -- Razorclaw the Butcher
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3887; -- Baron Silverlaine
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3891; -- Teronis' Corpse
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=390; -- Porcine Entourage
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3914; -- Rethilgore <The Cell Keeper>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3927; -- Wolf Master Nandos
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3947; -- Goblin Shipbuilder
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3974; -- Houndmaster Loksey
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3975; -- Herod <The Scarlet Champion>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3976; -- Scarlet Commander Mograine
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3977; -- High Inquisitor Whitemane
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3980; -- Raleigh the Devout
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3981; -- Vorrel Sengutz
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3983; -- Interrogator Vishas
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=3986; -- Sarilus Foulborne
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4043; -- Galthuk <Two-Handed Weapons Merchant>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4063; -- Feeboz
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4113; -- Gravelsnout Digger
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4274; -- Fenrus the Devourer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4275; -- Archmage Arugal
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4278; -- Commander Springvale
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4279; -- Odo the Blindwatcher
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4286; -- Scarlet Soldier
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4287; -- Scarlet Gallant
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4288; -- Scarlet Beastmaster
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4289; -- Scarlet Evoker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4290; -- Scarlet Guardsman
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4291; -- Scarlet Diviner
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4292; -- Scarlet Protector
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4293; -- Scarlet Scryer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4294; -- Scarlet Sorcerer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4295; -- Scarlet Myrmidon
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4296; -- Scarlet Adept
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4297; -- Scarlet Conjuror
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4298; -- Scarlet Defender
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4299; -- Scarlet Chaplain
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4300; -- Scarlet Wizard
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4301; -- Scarlet Centurion
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4302; -- Scarlet Champion
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4303; -- Scarlet Abbot
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4304; -- Scarlet Tracking Hound
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4306; -- Scarlet Torturer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4419; -- Race Master Kronkrider
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4429; -- Goblin Pit Crewman
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4430; -- Gnome Pit Crewman
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4444; -- Deathstalker Vincent
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4452; -- Kravel Koalbeard
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4453; -- Wizzle Brassbolts
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4454; -- Fizzle Brassbolts
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4495; -- Gnome Pit Boss
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4496; -- Goblin Pit Boss
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4500; -- Overlord Mok'Morokk
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4501; -- Draz'Zilb
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4502; -- Tharg
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4503; -- Mudcrush Durtfeet
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4540; -- Scarlet Monk
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4542; -- High Inquisitor Fairbanks
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4543; -- Bloodmage Thalnos
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4627; -- Arugal's Voidwalker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4630; -- Pozzik
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4706; -- Razzeric
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4709; -- Zamek
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=471; -- Mother Fang
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4732; -- Randal Hunter <Riding Trainer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=473; -- Morgan the Collector
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=476; -- Kobold Geomancer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4779; -- Brown Ram
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4791; -- Nazeer Bloodpike
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=481; -- Defias Footpad
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4847; -- Shadowforge Relic Hunter
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4848; -- Shadowforge Darkcaster
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4849; -- Shadowforge Archaeologist
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4850; -- Stonevault Cave Lurker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4852; -- Stonevault Oracle
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4853; -- Stonevault Geomancer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4854; -- Grimlok <Stonevault Chieftain>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4855; -- Stonevault Brawler
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4857; -- Stone Keeper
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4860; -- Stone Steward
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4861; -- Shrike Bat
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4872; -- Obsidian Golem
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4879; -- Ogg'marr <Butcher>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4883; -- Krak <Armorer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4884; -- Zulrg <Weaponsmith>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4926; -- Krog
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=4969; -- Old Town Thug
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=502; -- Benny Blaanco
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5048; -- Deviate Adder
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5053; -- Deviate Crocolisk
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5055; -- Deviate Lasher
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5056; -- Deviate Dreadfang
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5058; -- Wolfguard Worg
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=506; -- Sergeant Brashclaw
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=507; -- Fenros
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5087; -- Do'gol
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5088; -- Falgran Hastil
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5089; -- Balos Jacken
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=515; -- Murloc Raider
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5198; -- Arctic Riding Wolf
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=519; -- Slark
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=521; -- Lupos
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5229; -- Gordunni Ogre
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5237; -- Gordunni Ogre Mage
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5355; -- Firewing Defender
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5356; -- Snarler
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5389; -- Prospector Gunstan <Explorers' League>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5394; -- Neeka Bloodscar
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5431; -- Surf Glider
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5456; -- Centipaar Stinger
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5458; -- Centipaar Worker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5460; -- Centipaar Sandreaver
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5615; -- Wastewander Rogue
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5616; -- Wastewander Thief
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5617; -- Wastewander Shadow Mage
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5618; -- Wastewander Bandit
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5623; -- Wastewander Assassin
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5649; -- Sandfury Blood Drinker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5650; -- Sandfury Witch Doctor
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5676; -- Summoned Voidwalker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5683; -- Comar Villard
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=574; -- Naraxis
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5755; -- Deviate Viper
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5756; -- Deviate Venomwing
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5762; -- Deviate Moccasin
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5763; -- Nightmare Ectoplasm
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5767; -- Nalpak <Disciple of Naralex>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5768; -- Ebru <Disciple of Naralex>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5783; -- Kalldan Felmoon <Specialist Leatherworking Supplies>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5784; -- Waldor <Leatherworking Trainer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5829; -- Snort the Heckler
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5831; -- Swiftmane
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5851; -- Captain Gerogg Hammertoe <Bael'dun Captain of the Guard>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5886; -- Gwyn Farrow <Mushroom Merchant>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5901; -- Islen Waterseer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5907; -- Kranal Fiss
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5914; -- Deviate Nightmare
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5916; -- Sentinel Amarassan
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6004; -- Shadowsworn Cultist
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6005; -- Shadowsworn Thug
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6007; -- Shadowsworn Enforcer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6008; -- Shadowsworn Warlock
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6009; -- Shadowsworn Dreadweaver
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6015; -- Torta
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=60; -- Ruklar the Trapper
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6172; -- Henze Faulk
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6177; -- Narm Faulk
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6206; -- Caverndeep Burrower
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6207; -- Caverndeep Ambusher
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6208; -- Caverndeep Invader
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6210; -- Caverndeep Pillager
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6211; -- Caverndeep Reaver
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6212; -- Dark Iron Agent
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6213; -- Irradiated Invader
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6218; -- Irradiated Slime
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6219; -- Corrosive Lurker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6220; -- Irradiated Horror
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6222; -- Leprous Technician
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6223; -- Leprous Defender
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6224; -- Leprous Machinesmith
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6225; -- Mechano-Tank
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6226; -- Mechano-Flamewalker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6227; -- Mechano-Frostwalker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6228; -- Dark Iron Ambassador
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6229; -- Crowd Pummeler 9-60
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6230; -- Peacekeeper Security Suit
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6232; -- Arcane Nullifier X-21
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6233; -- Mechanized Sentry
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6234; -- Mechanized Guardian
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6235; -- Electrocutioner 6000
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6329; -- Irradiated Pillager
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6389; -- Deathguard Podrig
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6392; -- Holdout Medic
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=639; -- Edwin VanCleef <Defias Kingpin>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6426; -- Anguished Dead
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6427; -- Haunting Phantasm
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=642; -- Sneed's Shredder <Lumbermaster>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=644; -- Rhahk'Zor <The Foreman>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=645; -- Cookie <The Ship's Cook>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=646; -- Mr. Smite <The Ship's First Mate>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=647; -- Captain Greenskin
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6487; -- Arcanist Doan
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6494; -- Tazan
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6496; -- Brivelthwerp <Ice Cream Vendor>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6523; -- Dark Iron Rifleman
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6546; -- Tabetha
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6547; -- Suffering Victim
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6548; -- Magus Tirth
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6567; -- Ghok'kah <Tailoring Supplies>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6575; -- Scarlet Trainee
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=657; -- Defias Pirate
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6669; -- The Threshwackonator 4100 <The First Mate>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6730; -- Jinky Twizzlefixxit <Engineering Supplies>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6739; -- Innkeeper Bates <Innkeeper>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6775; -- Antur Fallow
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6786; -- Ukor
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6868; -- Jarkal Mossmeld
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6906; -- Baelog
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6907; -- Eric "The Swift"
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6908; -- Olaf
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6910; -- Revelosh
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=6912; -- Remains of a Paladin
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7011; -- Earthen Rocksmasher
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7012; -- Earthen Sculptor
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7022; -- Venomlash Scorpid
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7030; -- Shadowforge Geologist
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7050; -- Defias Drone
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7051; -- Malformed Defias Drone
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7052; -- Defias Tower Patroller
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7053; -- Klaven Mortwake
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7056; -- Defias Tower Sentry
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7068; -- Condemned Acolyte
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7071; -- Cursed Paladin
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7076; -- Earthen Guardian
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7077; -- Earthen Hallshaper
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7078; -- Cleft Scorpid
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7079; -- Viscous Fallout
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7126; -- Jaedenar Hunter
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7135; -- Infernal Bodyguard
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7137; -- Immolatus
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7170; -- Thragomm <Horde Runner>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7175; -- Stonevault Ambusher
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7206; -- Ancient Stone Keeper
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7231; -- Kelgruk Bloodaxe <Weaponsmith Trainer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7246; -- Sandfury Shadowhunter
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7247; -- Sandfury Soul Eater
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7267; -- Chief Ukorz Sandscalp
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7268; -- Sandfury Guardian
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7271; -- Witch Doctor Zum'rah
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7272; -- Theka the Martyr
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7274; -- Sandfury Executioner
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7275; -- Shadowpriest Sezz'ziz
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7290; -- Shadowforge Sharpshooter
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7291; -- Galgann Firehammer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7309; -- Earthen Custodian
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7318; -- Rageclaw
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7320; -- Stonevault Mauler
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7321; -- Stonevault Flameweaver
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7327; -- Withered Warrior
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7328; -- Withered Reaver
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7329; -- Withered Quilguard
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7332; -- Withered Spearhide
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7333; -- Withered Battle Boar
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7334; -- Battle Boar Horror
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7335; -- Death's Head Geomancer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7337; -- Death's Head Necromancer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7341; -- Skeletal Frostweaver
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7342; -- Skeletal Summoner
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7343; -- Splinterbone Skeleton
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7349; -- Tomb Fiend
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7351; -- Tomb Reaver
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7354; -- Ragglesnout
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7355; -- Tuten'kash
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7357; -- Mordresh Fire Eye
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7358; -- Amnennar the Coldbringer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7361; -- Grubbis
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7396; -- Earthen Stonebreaker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7397; -- Earthen Stonecarver
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7405; -- Deadly Cleft Scorpid
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7430; -- Frostsaber Cub
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7431; -- Frostsaber
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7432; -- Frostsaber Stalker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7433; -- Frostsaber Huntress
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7443; -- Shardtooth Mauler
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7444; -- Shardtooth Bear
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7450; -- Ragged Owlbeast
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7451; -- Raging Owlbeast
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7455; -- Winterspring Owl
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7457; -- Rogue Ice Thistle
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7458; -- Ice Thistle Yeti
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7603; -- Leprous Assistant
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7604; -- Sergeant Bly
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7605; -- Raven
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7606; -- Oro Eyegouge
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7607; -- Weegli Blastfuse
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7608; -- Murta Grimgut
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7670; -- Servant of Allistarj
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7671; -- Servant of Sevine
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7787; -- Sandfury Slave
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7788; -- Sandfury Drudge
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7795; -- Hydromancer Velratha
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7796; -- Nekrum Gutchewer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7797; -- Ruuzlu
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7800; -- Mekgineer Thermaplugg
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7802; -- Galvan the Ancient <Artisan Blacksmith of the Mithril Order>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7808; -- Marauding Owlbeast
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7847; -- Caliph Scorpidsting
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7850; -- Kernobee
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7855; -- Southsea Pirate
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7856; -- Southsea Freebooter
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7857; -- Southsea Dock Worker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7858; -- Southsea Swashbuckler
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7883; -- Andre Firebeard
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7897; -- Alarm-a-bomb 2600
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=7975; -- Mulgore Protector
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=798; -- Solomon
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=799; -- Kevin
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=79; -- Narg the Taskmaster
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=800; -- Kyle
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8017; -- Sen'jin Guardian
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=801; -- Eric
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=802; -- Jay
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8118; -- Lillian Singh <Holiday Fireworks Vendor>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8127; -- Antu'sul <Overseer of Sul>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8150; -- Janet Hommers <Food & Drink>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8155; -- Kargath Grunt
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=815; -- Bookie Herod
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8211; -- Old Cliff Jumper
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8218; -- Witherheart the Stalker
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8219; -- Zul'arek Hatefowler
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8277; -- Rekk'tilac
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8281; -- Scald
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=831; -- Sea Crawler
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8320; -- Sprok <Away Team>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8338; -- Dark Iron Marksman
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8442; -- Shadowsilk Poacher <The Undermarket>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8480; -- Kalaran the Deceiver
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8516; -- Belnistrasz
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8539; -- Eyeless Watcher
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8546; -- Dark Adept <Cult of the Damned>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8560; -- Mossflayer Scout
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8561; -- Mossflayer Shadowhunter
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8562; -- Mossflayer Cannibal
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8567; -- Glutton
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8611; -- Idol Room Spawner
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8617; -- Zalashji
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8662; -- Idol Oven Fire Target
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8679; -- Knaz Blunderflame <Engineering Supplies>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8696; -- Henry Stern
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8767; -- Sah'rhee
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=880; -- Erlan Drudgemoor
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=881; -- Surena Caledon
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8876; -- Sandfury Acolyte
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8877; -- Sandfury Zealot
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8886; -- Deviate Python
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8923; -- Panzor the Invincible
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8925; -- Dredge Worm
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8926; -- Deep Stinger
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8927; -- Dark Screecher
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=8928; -- Burrowing Thundersnout
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=896; -- Veldan Lightfoot <Leather Armor Merchant>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=9029; -- Eviscerator
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=9031; -- Anub'shiah
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=9077; -- Warlord Goretooth <Kargath Expeditionary Force>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=9078; -- Shadowmage Vivian Lagrave <Kargath Expeditionary Force>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=9079; -- Hierophant Theodora Mulvadania <Kargath Expeditionary Force>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=907; -- Keras Wolfheart <Arathi Basin Battlemaster>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=9080; -- Lexlort <Kargath Expeditionary Force>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=9081; -- Galamav the Marksman <Kargath Expeditionary Force>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=9238; -- Quentin
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=9298; -- Donova Snowden
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=9316; -- Wenikee Boltbucket
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=9356; -- Innkeeper Shul'kar <Innkeeper>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=9376; -- Blazerunner
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=9448; -- Scarlet Praetorian
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=9450; -- Scarlet Curate
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=9537; -- Hurley Blackbreath
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=9541; -- Blackbreath Crony
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=9543; -- Ribbly Screwspigot
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=9552; -- Zanara <Bowyer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=9553; -- Nadia Vernon <Bowyer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=955; -- Sergeant De Vries <Morale Officer>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=958; -- Dawn Brightstar <Arcane Goods>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=959; -- Morley Eberlein <Clothier>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=9619; -- Torwa Pathfinder
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=9622; -- U'cha
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=963; -- Deputy Rainer
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=9676; -- Tink Sprocketwhistle <Engineering Supplies>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=9857; -- Auctioneer Grizzlin
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=9978; -- Wesley <Stable Master>
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=9979; -- Sarah Goode <Stable Master>
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=10358; -- Fellicent's Shade
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=10387; -- Vengeful Phantom
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=10498; -- Spectral Tutor
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=10499; -- Spectral Researcher
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=10500; -- Spectral Teacher
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=10516; -- The Unforgiven
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=10678; -- Plagued Hatchling
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=11459; -- Ironbark Protector
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=11471; -- Eldreth Apparition
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=11475; -- Eldreth Phantasm
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=12225; -- Celebras the Cursed
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=12238; -- Zaetar's Spirit
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=13021; -- Warpwood Crusher
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=13716; -- Celebras the Redeemed
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=14272; -- Snarlflare
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=1552; -- Scale Belly
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=16327; -- Ravening Apparition
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=16328; -- Vengeful Apparition
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=23193; -- Lordaeron Citizen (Jesse)
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=4308; -- Unfettered Spirit
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=4323; -- Searing Hatchling
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=4324; -- Searing Whelp
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=4863; -- Jadespine Basilisk
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=5979; -- Wretched Lost One
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=6215; -- Chomper
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=7149; -- Withered Protector
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=7352; -- Frozen Soul
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=7353; -- Freezing Spirit
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=8095; -- Sul'lithuz Sandcrawler
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=8120; -- Sul'lithuz Abomination
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=8130; -- Sul'lithuz Hatchling
+UPDATE `creature_template` SET `speed_walk`=1.111112 WHERE `entry`=8138; -- Sul'lithuz Broodling
+UPDATE `creature_template` SET `speed_walk`=1.2 WHERE `entry`=100; -- Gruff Swiftbite
+UPDATE `creature_template` SET `speed_walk`=1.2 WHERE `entry`=11673; -- Ancient Core Hound
+UPDATE `creature_template` SET `speed_walk`=1.2 WHERE `entry`=14271; -- Ribchaser
+UPDATE `creature_template` SET `speed_walk`=1.2 WHERE `entry`=16335; -- Blackpaw Scavenger
+UPDATE `creature_template` SET `speed_walk`=1.2 WHERE `entry`=1674; -- Rot Hide Gnoll
+UPDATE `creature_template` SET `speed_walk`=1.2 WHERE `entry`=23264; -- Overmine Flayer
+UPDATE `creature_template` SET `speed_walk`=1.2 WHERE `entry`=2373; -- Mudsnout Shaman
+UPDATE `creature_template` SET `speed_walk`=1.2 WHERE `entry`=27523; -- Grizzlesnout
+UPDATE `creature_template` SET `speed_walk`=1.2 WHERE `entry`=27766; -- Image of Kel'Thuzad
+UPDATE `creature_template` SET `speed_walk`=1.2 WHERE `entry`=28208; -- Hailscorn
+UPDATE `creature_template` SET `speed_walk`=1.2 WHERE `entry`=28586; -- General Bjarngrim
+UPDATE `creature_template` SET `speed_walk`=1.2 WHERE `entry`=28824; -- Brann Flying Machine
+UPDATE `creature_template` SET `speed_walk`=1.2 WHERE `entry`=29240; -- Stormforged Lieutenant
+UPDATE `creature_template` SET `speed_walk`=1.2 WHERE `entry`=30167; -- Gimorak
+UPDATE `creature_template` SET `speed_walk`=1.2 WHERE `entry`=472; -- Fedfennel
+UPDATE `creature_template` SET `speed_walk`=1.32 WHERE `entry`=9082; -- Thal'trak Proudtusk <Kargath Expeditionary Force>
+UPDATE `creature_template` SET `speed_walk`=1.32 WHERE `entry`=9083; -- Razal'blade <Kargath Expeditionary Force>
+UPDATE `creature_template` SET `speed_walk`=1.32 WHERE `entry`=9084; -- Thunderheart <Kargath Expeditionary Force>
+UPDATE `creature_template` SET `speed_walk`=1.32 WHERE `entry`=9085; -- Initiate Amakkar <Kargath Expeditionary Force>
+UPDATE `creature_template` SET `speed_walk`=1.32 WHERE `entry`=9086; -- Grunt Gargal <Kargath Expeditionary Force>
+UPDATE `creature_template` SET `speed_walk`=1.388888 WHERE `entry`=14431; -- Fury Shelda
+UPDATE `creature_template` SET `speed_walk`=1.388888 WHERE `entry`=2015; -- Bloodfeather Harpy
+UPDATE `creature_template` SET `speed_walk`=1.388888 WHERE `entry`=2017; -- Bloodfeather Rogue
+UPDATE `creature_template` SET `speed_walk`=1.388888 WHERE `entry`=2018; -- Bloodfeather Sorceress
+UPDATE `creature_template` SET `speed_walk`=1.388888 WHERE `entry`=3276; -- Witchwing Harpy
+UPDATE `creature_template` SET `speed_walk`=1.388888 WHERE `entry`=3277; -- Witchwing Roguefeather
+UPDATE `creature_template` SET `speed_walk`=1.388888 WHERE `entry`=3278; -- Witchwing Slayer
+UPDATE `creature_template` SET `speed_walk`=1.388888 WHERE `entry`=3279; -- Witchwing Ambusher
+UPDATE `creature_template` SET `speed_walk`=1.388888 WHERE `entry`=3280; -- Witchwing Windcaller
+UPDATE `creature_template` SET `speed_walk`=1.388888 WHERE `entry`=3452; -- Serena Bloodfeather
+UPDATE `creature_template` SET `speed_walk`=1.388888 WHERE `entry`=4024; -- Bloodfury Slayer
+UPDATE `creature_template` SET `speed_walk`=1.388888 WHERE `entry`=4100; -- Screeching Harpy
+UPDATE `creature_template` SET `speed_walk`=1.388888 WHERE `entry`=4101; -- Screeching Roguefeather
+UPDATE `creature_template` SET `speed_walk`=1.388888 WHERE `entry`=4104; -- Screeching Windcaller
+UPDATE `creature_template` SET `speed_walk`=1.388888 WHERE `entry`=5830; -- Sister Rathtalon
+UPDATE `creature_template` SET `speed_walk`=1.4 WHERE `entry`=21901; -- Netherskate
+UPDATE `creature_template` SET `speed_walk`=1.4 WHERE `entry`=23501; -- Netherwing Ray
+UPDATE `creature_template` SET `speed_walk`=1.4 WHERE `entry`=30142; -- The Iron Watcher
+UPDATE `creature_template` SET `speed_walk`=1.4 WHERE `entry`=5466; -- Coast Strider
+UPDATE `creature_template` SET `speed_walk`=1.4 WHERE `entry`=7447; -- Fledgling Chillwind
+UPDATE `creature_template` SET `speed_walk`=1.4 WHERE `entry`=7448; -- Chillwind Chimaera
+UPDATE `creature_template` SET `speed_walk`=1.5 WHERE `entry`=2748; -- Archaedas <Ancient Stone Watcher>
+UPDATE `creature_template` SET `speed_walk`=1.5 WHERE `entry`=7172; -- Lore Keeper of Norgannon
+UPDATE `creature_template` SET `speed_walk`=1.555556 WHERE `entry`=11665; -- Lava Annihilator
+UPDATE `creature_template` SET `speed_walk`=1.555556 WHERE `entry`=11783; -- Theradrim Shardling
+UPDATE `creature_template` SET `speed_walk`=1.555556 WHERE `entry`=11784; -- Theradrim Guardian
+UPDATE `creature_template` SET `speed_walk`=1.555556 WHERE `entry`=12057; -- Garr
+UPDATE `creature_template` SET `speed_walk`=1.555556 WHERE `entry`=12076; -- Lava Elemental
+UPDATE `creature_template` SET `speed_walk`=1.555556 WHERE `entry`=12099; -- Firesworn
+UPDATE `creature_template` SET `speed_walk`=1.555556 WHERE `entry`=12100; -- Lava Reaver
+UPDATE `creature_template` SET `speed_walk`=1.555556 WHERE `entry`=12101; -- Lava Surger
+UPDATE `creature_template` SET `speed_walk`=1.555556 WHERE `entry`=17087; -- Spirit of the Vale
+UPDATE `creature_template` SET `speed_walk`=1.555556 WHERE `entry`=17179; -- Restless Spirit of Earth
+UPDATE `creature_template` SET `speed_walk`=1.555556 WHERE `entry`=2735; -- Lesser Rock Elemental
+UPDATE `creature_template` SET `speed_walk`=1.555556 WHERE `entry`=28585; -- Slag
+UPDATE `creature_template` SET `speed_walk`=1.555556 WHERE `entry`=4499; -- Rok'Alim the Pounder
+UPDATE `creature_template` SET `speed_walk`=1.555556 WHERE `entry`=8278; -- Smoldar
+UPDATE `creature_template` SET `speed_walk`=1.6 WHERE `entry`=11440; -- Gordok Enforcer
+UPDATE `creature_template` SET `speed_walk`=1.6 WHERE `entry`=12046; -- Gor'marok the Ravager
+UPDATE `creature_template` SET `speed_walk`=1.6 WHERE `entry`=14308; -- Ferra
+UPDATE `creature_template` SET `speed_walk`=1.6 WHERE `entry`=17991; -- Rokmar the Crackler
+UPDATE `creature_template` SET `speed_walk`=1.6 WHERE `entry`=23093; -- Sar'this
+UPDATE `creature_template` SET `speed_walk`=1.6 WHERE `entry`=25451; -- Nerub'ar Sky Darkener
+UPDATE `creature_template` SET `speed_walk`=1.6 WHERE `entry`=2720; -- Dustbelcher Ogre Mage
+UPDATE `creature_template` SET `speed_walk`=1.6 WHERE `entry`=27975; -- Maiden of Grief
+UPDATE `creature_template` SET `speed_walk`=1.6 WHERE `entry`=28923; -- Loken
+UPDATE `creature_template` SET `speed_walk`=1.6 WHERE `entry`=29553; -- Garm Watcher
+UPDATE `creature_template` SET `speed_walk`=1.6 WHERE `entry`=29932; -- Eck the Ferocious
+UPDATE `creature_template` SET `speed_walk`=1.6 WHERE `entry`=30258; -- Amanitar
+UPDATE `creature_template` SET `speed_walk`=1.6 WHERE `entry`=30396; -- Loken
+UPDATE `creature_template` SET `speed_walk`=1.6 WHERE `entry`=33224; -- Lake Frog
+UPDATE `creature_template` SET `speed_walk`=1.6 WHERE `entry`=37215; -- Orgrim's Hammer
+UPDATE `creature_template` SET `speed_walk`=1.6 WHERE `entry`=37540; -- The Skybreaker
+UPDATE `creature_template` SET `speed_walk`=1.6 WHERE `entry`=37543; -- [DND] Shaker
+UPDATE `creature_template` SET `speed_walk`=1.6 WHERE `entry`=37574; -- [DND] Shaker - Small
+UPDATE `creature_template` SET `speed_walk`=1.6 WHERE `entry`=40217; -- Echo Isle Animal
+UPDATE `creature_template` SET `speed_walk`=1.6 WHERE `entry`=5472; -- Dunemaul Enforcer
+UPDATE `creature_template` SET `speed_walk`=1.6 WHERE `entry`=5473; -- Dunemaul Ogre Mage
+UPDATE `creature_template` SET `speed_walk`=1.6 WHERE `entry`=5475; -- Dunemaul Warlock
+UPDATE `creature_template` SET `speed_walk`=1.6 WHERE `entry`=5978; -- Dreadmaul Warlock
+UPDATE `creature_template` SET `speed_walk`=1.6 WHERE `entry`=7273; -- Gahz'rilla
+UPDATE `creature_template` SET `speed_walk`=1.6 WHERE `entry`=7789; -- Sandfury Cretin
+UPDATE `creature_template` SET `speed_walk`=1.6 WHERE `entry`=9030; -- Ok'thor the Breaker
+UPDATE `creature_template` SET `speed_walk`=1.6 WHERE `entry`=9604; -- Gorgon'och
+UPDATE `creature_template` SET `speed_walk`=1.6 WHERE `entry`=9684; -- Lar'korwi
+UPDATE `creature_template` SET `speed_walk`=1.666668 WHERE `entry`=7228; -- Ironaya
+UPDATE `creature_template` SET `speed_walk`=12 WHERE `entry`=22317; -- Netherwing Drake Escape Dummy
+UPDATE `creature_template` SET `speed_walk`=12 WHERE `entry`=25964; -- Shaman Beam Bunny 000
+UPDATE `creature_template` SET `speed_walk`=12 WHERE `entry`=25965; -- Shaman Beam Bunny 001
+UPDATE `creature_template` SET `speed_walk`=12 WHERE `entry`=25966; -- Shaman Beam Bunny 002
+UPDATE `creature_template` SET `speed_walk`=2 WHERE `entry`=23576; -- Nalorakk <Bear Avatar>
+UPDATE `creature_template` SET `speed_walk`=2 WHERE `entry`=26231; -- Saragosa <Consort of Malygos>
+UPDATE `creature_template` SET `speed_walk`=2 WHERE `entry`=26232; -- Saragosa
+UPDATE `creature_template` SET `speed_walk`=2 WHERE `entry`=26299; -- Corpse of Saragosa
+UPDATE `creature_template` SET `speed_walk`=2 WHERE `entry`=30017; -- Stinkbeard
+UPDATE `creature_template` SET `speed_walk`=2 WHERE `entry`=30593; -- Forgotten Depths Slayer
+UPDATE `creature_template` SET `speed_walk`=2 WHERE `entry`=34928; -- Argent Confessor Paletress
+UPDATE `creature_template` SET `speed_walk`=2 WHERE `entry`=35877; -- The Lich King
+UPDATE `creature_template` SET `speed_walk`=2 WHERE `entry`=37038; -- Vengeful Fleshreaper
+UPDATE `creature_template` SET `speed_walk`=2 WHERE `entry`=37230; -- Spire Frostwyrm
+UPDATE `creature_template` SET `speed_walk`=2 WHERE `entry`=7784; -- Homing Robot OOX-17/TN
+UPDATE `creature_template` SET `speed_walk`=2 WHERE `entry`=7849; -- Mobile Alert System
+UPDATE `creature_template` SET `speed_walk`=2 WHERE `entry`=9623; -- A-Me 01
+UPDATE `creature_template` SET `speed_walk`=2.4 WHERE `entry`=21315; -- Ruul the Darkener
+UPDATE `creature_template` SET `speed_walk`=2.4 WHERE `entry`=23267; -- Arvoar the Rapacious
+UPDATE `creature_template` SET `speed_walk`=2.4 WHERE `entry`=26838; -- Dreadtalon
+UPDATE `creature_template` SET `speed_walk`=2.4 WHERE `entry`=28599; -- Plagueroach
+UPDATE `creature_template` SET `speed_walk`=2.4 WHERE `entry`=29664; -- Ragemane
+UPDATE `creature_template` SET `speed_walk`=2.4 WHERE `entry`=30443; -- The Lich King
+UPDATE `creature_template` SET `speed_walk`=2.4 WHERE `entry`=30501; -- Val'kyr Arbiter
+UPDATE `creature_template` SET `speed_walk`=2.4 WHERE `entry`=30575; -- Frostbrood Destroyer
+UPDATE `creature_template` SET `speed_walk`=2.4 WHERE `entry`=30945; -- Vardmadra
+UPDATE `creature_template` SET `speed_walk`=2.4 WHERE `entry`=30989; -- Halof the Deathbringer
+UPDATE `creature_template` SET `speed_walk`=2.4 WHERE `entry`=31029; -- Possessed Vardmadra
+UPDATE `creature_template` SET `speed_walk`=2.4 WHERE `entry`=31083; -- The Lich King
+UPDATE `creature_template` SET `speed_walk`=2.8 WHERE `entry`=11832; -- Keeper Remulos
+UPDATE `creature_template` SET `speed_walk`=2.8 WHERE `entry`=26933; -- Wyrmrest Guardian
+UPDATE `creature_template` SET `speed_walk`=2.8 WHERE `entry`=27608; -- Azure Dragon
+UPDATE `creature_template` SET `speed_walk`=2.8 WHERE `entry`=29375; -- Stormforged Iron Giant
+UPDATE `creature_template` SET `speed_walk`=2.8 WHERE `entry`=29503; -- Fjorn
+UPDATE `creature_template` SET `speed_walk`=2.8 WHERE `entry`=29914; -- Dead Iron Giant
+UPDATE `creature_template` SET `speed_walk`=2.8 WHERE `entry`=30099; -- Njormeld
+UPDATE `creature_template` SET `speed_walk`=2.8 WHERE `entry`=30121; -- Frost Giant Stormherald
+UPDATE `creature_template` SET `speed_walk`=3.2 WHERE `entry`=14399; -- Arcane Torrent
+UPDATE `creature_template` SET `speed_walk`=3.2 WHERE `entry`=23969; -- Firemane Drake
+UPDATE `creature_template` SET `speed_walk`=3.2 WHERE `entry`=28546; -- Ionar
+UPDATE `creature_template` SET `speed_walk`=3.2 WHERE `entry`=28547; -- Storming Vortex
+UPDATE `creature_template` SET `speed_walk`=3.2 WHERE `entry`=28826; -- Stormfury Revenant
+UPDATE `creature_template` SET `speed_walk`=3.6 WHERE `entry`=26237; -- Keristrasza
+UPDATE `creature_template` SET `speed_walk`=3.6 WHERE `entry`=26925; -- Wyrmrest Temple Drake
+UPDATE `creature_template` SET `speed_walk`=4 WHERE `entry`=23577; -- Halazzi <Lynx Avatar>
+UPDATE `creature_template` SET `speed_walk`=4 WHERE `entry`=32176; -- Plague Drenched Ghoul
+UPDATE `creature_template` SET `speed_walk`=4 WHERE `entry`=32178; -- Rampaging Ghoul
+UPDATE `creature_template` SET `speed_walk`=4 WHERE `entry`=4945; -- Goblin Drag Car
+UPDATE `creature_template` SET `speed_walk`=4 WHERE `entry`=4946; -- Gnome Drag Car
+UPDATE `creature_template` SET `speed_walk`=4.8 WHERE `entry`=30399; -- Thorim
+UPDATE `creature_template` SET `speed_walk`=4.8 WHERE `entry`=30462; -- Thorim
+UPDATE `creature_template` SET `speed_walk`=4.8 WHERE `entry`=37755; -- Sindragosa <Queen of the Frostbrood>
+UPDATE `creature_template` SET `speed_walk`=8 WHERE `entry`=13876; -- Mekgineer Trigger
+UPDATE `creature_template` SET `speed_walk`=8 WHERE `entry`=26310; -- Malygos
+
+-- attack times
+UPDATE `creature_template` SET `BaseAttackTime`=1000 WHERE `entry`=26630; -- Trollgore
+UPDATE `creature_template` SET `BaseAttackTime`=1000 WHERE `entry`=28419; -- Frenzied Geist
+UPDATE `creature_template` SET `BaseAttackTime`=1000 WHERE `entry`=29722; -- Rabid Cannibal
+UPDATE `creature_template` SET `BaseAttackTime`=1000 WHERE `entry`=29735; -- Savage Worg
+UPDATE `creature_template` SET `BaseAttackTime`=1000 WHERE `entry`=36612; -- Lord Marrowgar
+UPDATE `creature_template` SET `BaseAttackTime`=1000 WHERE `entry`=37011; -- The Damned
+UPDATE `creature_template` SET `BaseAttackTime`=1000 WHERE `entry`=40274; -- Restless Zombie
+UPDATE `creature_template` SET `BaseAttackTime`=1000 WHERE `entry`=5713; -- Gasher
+UPDATE `creature_template` SET `BaseAttackTime`=1140 WHERE `entry`=37546; -- Frenzied Abomination
+UPDATE `creature_template` SET `BaseAttackTime`=1200 WHERE `entry`=15369; -- Ayamiss the Hunter
+UPDATE `creature_template` SET `BaseAttackTime`=1200 WHERE `entry`=23877; -- Amani Lynx Spirit
+UPDATE `creature_template` SET `BaseAttackTime`=1200 WHERE `entry`=23878; -- Amani Bear Spirit
+UPDATE `creature_template` SET `BaseAttackTime`=1200 WHERE `entry`=23879; -- Amani Dragonhawk Spirit
+UPDATE `creature_template` SET `BaseAttackTime`=1200 WHERE `entry`=23880; -- Amani Eagle Spirit
+UPDATE `creature_template` SET `BaseAttackTime`=1250 WHERE `entry`=18950; -- Orgrimmar Grunt
+UPDATE `creature_template` SET `BaseAttackTime`=1300 WHERE `entry`=1061; -- Gan'zulah <Bloodscalp Chief>
+UPDATE `creature_template` SET `BaseAttackTime`=1300 WHERE `entry`=15344; -- Swarmguard Needler
+UPDATE `creature_template` SET `BaseAttackTime`=1300 WHERE `entry`=9029; -- Eviscerator
+UPDATE `creature_template` SET `BaseAttackTime`=1333 WHERE `entry`=6225; -- Mechano-Tank
+UPDATE `creature_template` SET `BaseAttackTime`=1333 WHERE `entry`=6226; -- Mechano-Flamewalker
+UPDATE `creature_template` SET `BaseAttackTime`=1333 WHERE `entry`=6227; -- Mechano-Frostwalker
+UPDATE `creature_template` SET `BaseAttackTime`=1400 WHERE `entry`=18257; -- Gutripper
+UPDATE `creature_template` SET `BaseAttackTime`=1400 WHERE `entry`=9265; -- Smolderthorn Shadow Hunter
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=11486; -- Prince Tortheldrin
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=11946; -- Drek'Thar <Frostwolf General>
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=222; -- Nillen Andemar <Macecrafter>
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=24552; -- Sliver <Garaxxas' Pet>
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=26212; -- Captain Gryan Stoutmantle <Commander of the Westfall Brigade>
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=27467; -- Amberpine Hunter
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=28042; -- Captain Brandon
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=28044; -- Captain Rupert
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=28125; -- Dr. Rogers
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=29050; -- Har'koa
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=33996; -- William Saldean <Grain & Feed Vendor>
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=34158; -- Young Venomhide Ravasaur
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=34496; -- Eydis Darkbane
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=34497; -- Fjola Lightbane
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=34564; -- Anub'arak
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=36626; -- Festergut
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=36627; -- Rotface
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=37688; -- Crusader Grimtong <Warrior Armor>
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=37689; -- Commander Kunz
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=37696; -- Crusader Halford <Paladin Armor>
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=37967; -- Ebon Blade Commander
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=38493; -- Argent Crusader
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=38505; -- Knight of the Ebon Blade
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=40142; -- Halion <The Twilight Destroyer>
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=40405; -- Kieupid <Pet Trainer>
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=8257; -- Oozeling
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=8666; -- Lil Timmy <Boy with kittens>
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=9683; -- Lar'korwi Mate
+UPDATE `creature_template` SET `BaseAttackTime`=1500 WHERE `entry`=9684; -- Lar'korwi
+UPDATE `creature_template` SET `BaseAttackTime`=1538 WHERE `entry`=18827; -- Gan'arg Sapper
+UPDATE `creature_template` SET `BaseAttackTime`=1538 WHERE `entry`=26943; -- Battered Drakkari Berserker
+UPDATE `creature_template` SET `BaseAttackTime`=1538 WHERE `entry`=27340; -- Bloodpaw Marauder
+UPDATE `creature_template` SET `BaseAttackTime`=1538 WHERE `entry`=29438; -- Rageclaw Primalist
+UPDATE `creature_template` SET `BaseAttackTime`=1600 WHERE `entry`=11469; -- Eldreth Seether
+UPDATE `creature_template` SET `BaseAttackTime`=1700 WHERE `entry`=7268; -- Sandfury Guardian
+UPDATE `creature_template` SET `BaseAttackTime`=1750 WHERE `entry`=34797; -- Icehowl
+UPDATE `creature_template` SET `BaseAttackTime`=1750 WHERE `entry`=35470; -- Icehowl
+UPDATE `creature_template` SET `BaseAttackTime`=1800 WHERE `entry`=15339; -- Ossirian the Unscarred
+UPDATE `creature_template` SET `BaseAttackTime`=1800 WHERE `entry`=24043; -- Amani Lynx
+UPDATE `creature_template` SET `BaseAttackTime`=1800 WHERE `entry`=9031; -- Anub'shiah
+UPDATE `creature_template` SET `BaseAttackTime`=1818 WHERE `entry`=28034; -- Drakkari Snake Handler
+UPDATE `creature_template` SET `BaseAttackTime`=1818 WHERE `entry`=28035; -- Priest of Sseratus
+UPDATE `creature_template` SET `BaseAttackTime`=1818 WHERE `entry`=34127; -- Boneguard Commander
+UPDATE `creature_template` SET `BaseAttackTime`=1846 WHERE `entry`=12121; -- Drakan
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=10082; -- Zerillis
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=10096; -- High Justice Grimstone
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=10177; -- Spire Scarab
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=10393; -- Skul
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=10919; -- Shatterspear Troll
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1091; -- Mountaineer Gravelgaw
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1095; -- Venture Co. Workboss
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1098; -- Watcher Merant <The Night Watch>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1099; -- Watcher Gelwin <The Night Watch>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1100; -- Watcher Selkin <The Night Watch>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1101; -- Watcher Thayer <The Night Watch>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=11196; -- Shatterspear Drummer
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=11458; -- Petrified Treant
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=11459; -- Ironbark Protector
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=11470; -- Eldreth Sorcerer
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=11471; -- Eldreth Apparition
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=11472; -- Eldreth Spirit
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=11473; -- Eldreth Spectre
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=11475; -- Eldreth Phantasm
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=11476; -- Skeletal Highborne
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=11477; -- Rotting Highborne
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=11480; -- Arcane Aberration
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=11483; -- Mana Remnant
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=11487; -- Magister Kalendris
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=11488; -- Illyanna Ravenoak
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=11489; -- Tendris Warpwood
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1165; -- Stonesplinter Geomancer
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=11663; -- Flamewaker Healer
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1167; -- Stonesplinter Digger
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1176; -- Tunnel Rat Forager
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1178; -- Mo'grosh Ogre
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=11792; -- Putridus Shadowstalker
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1179; -- Mo'grosh Enforcer
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1181; -- Mo'grosh Shaman
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1183; -- Mo'grosh Mystic
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1184; -- Cliff Lurker
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1185; -- Wood Lurker
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1189; -- Black Bear Patriarch
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1192; -- Elder Mountain Boar
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1194; -- Mountain Buzzard
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=11980; -- Zuluhed the Whacked <Chieftain of the Dragonmaw Clan>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=12018; -- Majordomo Executus
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1202; -- Tunnel Rat Kobold
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1205; -- Grawmug
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1206; -- Gnasher
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1207; -- Brawler
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1210; -- Chok'sul
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1214; -- Aldren Cordon <Clothier>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=12238; -- Zaetar's Spirit
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1271; -- Old Icebeard
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1283; -- Mountaineer Kalmir
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=13079; -- Keetar
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=13081; -- Irondeep Raider
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=13099; -- Irondeep Explorer
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=13257; -- Murgot Deepforge
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1329; -- Mountaineer Naarh
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=13326; -- Seasoned Defender
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=13397; -- Irondeep Peon
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1342; -- Mountaineer Rockgar
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1344; -- Prospector Ironband
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1345; -- Magmar Fellhew
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=13716; -- Celebras the Redeemed
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=13916; -- Dire Maul Crystal Totem
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1393; -- Berserk Trogg
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1398; -- Boss Galgosh <Stonesplinter Chieftain>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=14235; -- The Rot
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=14236; -- Lord Angler
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=14237; -- Oozeworm
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=14266; -- Shanda the Spinner
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=14267; -- Emogg the Crusher
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=14279; -- Creepthess
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=14303; -- Petrified Guardian
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=14308; -- Ferra
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=14358; -- Shen'dralar Ancient
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=14368; -- Lorekeeper Lydros
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=14369; -- Shen'dralar Zealot
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=14371; -- Shen'dralar Provisioner
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=14381; -- Lorekeeper Javon
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=14382; -- Lorekeeper Mykos
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=14383; -- Lorekeeper Kildrath
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=14398; -- Eldreth Darter
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=14399; -- Arcane Torrent
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=14400; -- Arcane Feedback
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=14480; -- Alowicious Czervik <Sweet Treats>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=14481; -- Emmithue Smails <Sweet Treats>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=14566; -- Ancient Equine Spirit
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=14843; -- Kruban Darkblade <Darkmoon Faire Barker>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15011; -- Wagner Hammerstrike
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15012; -- Javnir Nashak
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15113; -- Honored Hero
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15115; -- Honored Ancestor
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1511; -- Enraged Silverback Gorilla
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15136; -- Hammerfall Elite
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1514; -- Mokk the Savage
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1516; -- Konda
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15318; -- Hive'Zara Drone
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15319; -- Hive'Zara Collector
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15320; -- Hive'Zara Soldier
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15333; -- Silicate Feeder
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15335; -- Flesh Hunter
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15336; -- Hive'Zara Tail Lasher
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15338; -- Obsidian Destroyer
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15341; -- General Rajaxx
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15348; -- Kurinnaxx
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15355; -- Anubisath Guardian
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15385; -- Colonel Zerran
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15386; -- Major Yeggeth
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15387; -- Qiraji Warrior
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15388; -- Major Pakkon
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15389; -- Captain Drenn
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15390; -- Captain Xurrem
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15391; -- Captain Qeez
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15392; -- Captain Tuubid
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15461; -- Shrieker Scarab
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15471; -- Lieutenant General Andorov
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15549; -- Elder Morndeep
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15565; -- Elder Stormbrow
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15567; -- Elder Ironband
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15568; -- Elder Graveborn
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15570; -- Elder Primestone
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15573; -- Elder Ragetotem
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15578; -- Elder Wildmane
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15583; -- Elder Thunderhorn
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15584; -- Elder Skyseer
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15604; -- Elder Morningdew
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=15954; -- Noth the Plaguebringer
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=16032; -- Falrin Treeshaper
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=16226; -- Guard Didier <Brotherhood of the Light>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=16232; -- Caravan Mule
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=16550; -- Image of Technician Dyvuun
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=16980; -- The Lich King
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=17129; -- Greater Windroc
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=17233; -- Ghost of Uther Lightbringer <Knights of the Silver Hand>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=17431; -- Velaada
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=18183; -- Arechron
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=18192; -- Horde Halaani Guard
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=18233; -- Elementalist Ioki <The Earthen Ring>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=18282; -- Lord Klaq
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1848; -- Lord Maldazzar
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=18506; -- Raging Soul
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=18678; -- Fulgorge
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=18816; -- Chief Researcher Amereldine
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=18821; -- Quartermaster Jaffrey Noreliqe
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1892; -- Moonrage Watcher
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1893; -- Moonrage Sentry
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=1896; -- Moonrage Elder
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=19339; -- Korthul <Bowyer & Gunsmith>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=19342; -- Krek Cragcrush <Blacksmithing Supplies>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=19412; -- D'ore
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=19416; -- Ancient Draenei Spirit
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=19666; -- Shadow Lord Xiraxis
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=19698; -- Greatfather Aldrimus
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=19879; -- Horvon the Armorer <Armorsmith>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=2044; -- Forlorn Spirit
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=20812; -- Corki
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=21095; -- Credit Marker: Water
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=2110; -- Black Rat
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=21474; -- Coreiel <Blade Merchant>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=21483; -- Tasaldan <Ammunition>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=21484; -- Embelar <Food & Drink>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=21638; -- Vengeful Harbinger
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=22331; -- Dragonmaw Elite
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=22332; -- Brood of Neltharaku
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=23326; -- Nethermine Ravager
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=23651; -- Dragonflayer Tribesman
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=23652; -- Dragonflayer Vrykul
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=23660; -- Dragonflayer Thane
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=23801; -- Turkey
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=23931; -- Oluf the Violent
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=23953; -- Prince Keleseth <The San'layn>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=23954; -- Ingvar the Plunderer
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=23956; -- Dragonflayer Strategist
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=23960; -- Dragonflayer Runecaster
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=23961; -- Dragonflayer Ironhelm
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=23970; -- Vrykul Skeleton
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=24063; -- Dragonflayer Worg
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=24069; -- Dragonflayer Bonecrusher
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=24071; -- Dragonflayer Heartsplitter
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=24078; -- Dragonflayer Metalworker
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=24079; -- Dragonflayer Forge Master
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=24080; -- Dragonflayer Weaponsmith
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=24082; -- Proto-Drake Handler
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=24084; -- Tunneling Ghoul
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=24085; -- Dragonflayer Overseer
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=24200; -- Skarvald the Constructor
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=24201; -- Dalronn the Controller
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=24214; -- Yorus the Flesh Harvester
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=24215; -- Jlarborn the Strategist
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=24249; -- Dragonflayer Soulreaver
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=24250; -- Dragonflayer Fleshripper
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=24676; -- Crazed Northsea Slaver
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=2476; -- Large Loch Crocolisk
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=2477; -- Gradok <Horde Runner>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=2478; -- Haren Swifthoof <Horde Runner>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=24849; -- Proto-Drake Rider
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=24975; -- Mar'nah <Alchemist>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=2524; -- Mountaineer Haggis
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=2541; -- Lord Sakrasis
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=25950; -- Shaani <Jewelcrafting Supplies>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=2602; -- Ruul Onestone
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=2603; -- Kovork
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26550; -- Dragonflayer Deathseeker
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26553; -- Dragonflayer Fanatic
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26554; -- Dragonflayer Seer
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26620; -- Drakkari Guardian
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26621; -- Ghoul Tormentor
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26624; -- Wretched Belcher
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26625; -- Darkweb Recluse
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26627; -- Crystal Handler
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26628; -- Drakkari Scytheclaw
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26632; -- The Prophet Tharon'ja
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26635; -- Risen Drakkari Warrior
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26636; -- Risen Drakkari Soulmage
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26637; -- Risen Drakkari Handler
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26638; -- Risen Drakkari Bat Rider
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26639; -- Drakkari Shaman
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26641; -- Drakkari Gutripper
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26668; -- Svala Sorrowgrave
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26669; -- Ymirjar Savage
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26670; -- Ymirjar Flesh Hunter
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26672; -- Bloodthirsty Tundra Wolf
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26683; -- Frenzied Worgen
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26684; -- Ravenous Furbolg
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26685; -- Massive Jormungar
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26686; -- Ferocious Rhino
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26687; -- Gortok Palehoof
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26690; -- Ymirjar Warrior
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26693; -- Skadi the Ruthless
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26728; -- Mage Hunter Initiate
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26729; -- Steward
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26735; -- Azure Scale-Binder
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26737; -- Crazed Mana-Surge
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26746; -- Crazed Mana-Wraith
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26763; -- Anomalus
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26782; -- Crystalline Keeper
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26793; -- Crystalline Frayer
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26830; -- Risen Drakkari Death Knight
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=26918; -- Chaotic Rift
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=27431; -- Drakkari Commander
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=27447; -- Varos Cloudstrider <Azure-Lord of the Blue Dragonflight>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=27483; -- King Dred
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=27631; -- Angrathar Aberration
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=27633; -- Azure Inquisitor
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=27635; -- Azure Spellbinder
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=27636; -- Azure Ley-Whelp
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=27638; -- Azure Ring Guardian
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=27639; -- Ring-Lord Sorceress
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=27640; -- Ring-Lord Conjurer
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=27641; -- Centrifuge Construct
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=27642; -- Phantasmal Mammoth
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=27645; -- Phantasmal Cloudscraper
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=27648; -- Phantasmal Naga
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=27650; -- Phantasmal Air
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=27651; -- Phantasmal Fire
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=27653; -- Phantasmal Water
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=27654; -- Drakos the Interrogator
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=27655; -- Mage-Lord Urom
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=27871; -- Flesheating Ghoul
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=27947; -- Horde Commander
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=27972; -- Lightning Construct
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=28231; -- Crystalline Tender
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=28368; -- Ymirjar Necromancer
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=28410; -- Dragonflayer Spiritualist
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=28684; -- Krik'thir the Gatewatcher
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=28729; -- Watcher Narjil
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=28730; -- Watcher Gashra
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=28731; -- Watcher Silthik
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=28732; -- Anub'ar Warrior
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=28733; -- Anub'ar Shadowcaster
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=28921; -- Hadronox
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=28922; -- Anub'ar Crusher
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=29120; -- Anub'arak
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=29128; -- Anub'ar Prime Guard
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=29308; -- Prince Taldaram
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=29309; -- Elder Nadox
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=29310; -- Jedoga Shadowseeker
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=29311; -- Herald Volazj
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=30111; -- Twilight Worshipper
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=30179; -- Twilight Apostle
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=30276; -- Ahn'kahar Web Winder
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=30277; -- Ahn'kahar Slasher
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=30278; -- Ahn'kahar Spell Flinger
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=30279; -- Deep Crawler
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=30284; -- Bonegrinder
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=30285; -- Eye of Taldaram
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=30286; -- Frostbringer
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=30287; -- Plundering Geist
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=30319; -- Twilight Darkcaster
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=30338; -- Ahn'kahar Swarmer
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=30385; -- Twilight Volunteer
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=30414; -- Forgotten One
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=30416; -- Bound Fire Elemental
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=30418; -- Bound Air Elemental
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=30419; -- Bound Water Elemental
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=31266; -- Shadow Vault Assaulter
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=32545; -- Initiate's Training Dummy
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=33255; -- Titanium Stormlord
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=35119; -- Eadric the Pure <Grand Champion of the Argent Crusade>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=3529; -- Moonrage Armorer
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=3531; -- Moonrage Tailor
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=35570; -- Zul'tore <Grand Champion of Sen'jin>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=35571; -- Runok Wildmane <Grand Champion of the Thunder Bluff>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=3581; -- Sewer Beast
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=3652; -- Trigore the Lasher
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=38112; -- Falric
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=3854; -- Shadowfang Wolfguard
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=3865; -- Shadow Charger
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=4257; -- Lana Thunderbrew <Blacksmithing Supplies>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=4293; -- Scarlet Scryer
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=4848; -- Shadowforge Darkcaster
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=4849; -- Shadowforge Archaeologist
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=4853; -- Stonevault Geomancer
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=4854; -- Grimlok <Stonevault Chieftain>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=4855; -- Stonevault Brawler
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=4860; -- Stone Steward
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=4861; -- Shrike Bat
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=521; -- Lupos
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5226; -- Murk Worm
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5228; -- Saturated Ooze
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5256; -- Atal'ai Warrior
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5259; -- Atal'ai Witch Doctor
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5267; -- Unliving Atal'ai
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5270; -- Atal'ai Corpse Eater
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5271; -- Atal'ai Deathwalker
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5273; -- Atal'ai High Priest
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5277; -- Nightmare Scalebane
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5280; -- Nightmare Wyrmkin
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5283; -- Nightmare Wanderer
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5286; -- Longtooth Runner
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5291; -- Hakkari Frostwing
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5434; -- Coral Shark
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5470; -- Raging Dune Smasher
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5676; -- Summoned Voidwalker
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5708; -- Spawn of Hakkar
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5709; -- Shade of Eranikus
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5710; -- Jammal'an the Prophet
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5711; -- Ogom the Wretched
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5712; -- Zolo
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5714; -- Loro
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5715; -- Hukku
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5716; -- Zul'Lor
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5717; -- Mijan
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5719; -- Morphaz
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5720; -- Weaver
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5721; -- Dreamscythe
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5722; -- Hazzas
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5728; -- Jezelle's Succubus
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5832; -- Thunderstomp
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5834; -- Azzere the Skyblade
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5851; -- Captain Gerogg Hammertoe <Bael'dun Captain of the Guard>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5916; -- Sentinel Amarassan
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=5937; -- Vile Sting
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=6177; -- Narm Faulk
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=6215; -- Chomper
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=6228; -- Dark Iron Ambassador
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=646; -- Mr. Smite <The Ship's First Mate>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=6577; -- Bingles Blastenheimer
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=7012; -- Earthen Sculptor
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=7015; -- Flagglemurk the Cruel
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=7077; -- Earthen Hallshaper
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=7135; -- Infernal Bodyguard
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=7170; -- Thragomm <Horde Runner>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=7172; -- Lore Keeper of Norgannon
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=7267; -- Chief Ukorz Sandscalp
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=7273; -- Gahz'rilla
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=7275; -- Shadowpriest Sezz'ziz
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=7290; -- Shadowforge Sharpshooter
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=7291; -- Galgann Firehammer
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=7309; -- Earthen Custodian
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=7320; -- Stonevault Mauler
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=7321; -- Stonevault Flameweaver
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=7349; -- Tomb Fiend
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=7351; -- Tomb Reaver
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=7354; -- Ragglesnout
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=7355; -- Tuten'kash
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=7361; -- Grubbis
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=7397; -- Earthen Stonecarver
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=7405; -- Deadly Cleft Scorpid
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=7787; -- Sandfury Slave
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=7788; -- Sandfury Drudge
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=7789; -- Sandfury Cretin
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=7803; -- Scorpid Duneburrower
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=7808; -- Marauding Owlbeast
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=8017; -- Sen'jin Guardian
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=8118; -- Lillian Singh <Holiday Fireworks Vendor>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=8138; -- Sul'lithuz Broodling
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=815; -- Bookie Herod
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=8199; -- Warleader Krazzilak
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=8211; -- Old Cliff Jumper
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=8218; -- Witherheart the Stalker
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=8219; -- Zul'arek Hatefowler
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=8279; -- Faulty War Golem
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=8281; -- Scald
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=8311; -- Slime Maggot
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=8318; -- Atal'ai Slave
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=8319; -- Nightmare Whelp
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=8320; -- Sprok <Away Team>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=8336; -- Hakkari Sapper
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=8338; -- Dark Iron Marksman
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=8384; -- Deep Lurker
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=8480; -- Kalaran the Deceiver
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=8876; -- Sandfury Acolyte
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=8923; -- Panzor the Invincible
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=8925; -- Dredge Worm
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=8926; -- Deep Stinger
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=8927; -- Dark Screecher
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=8928; -- Burrowing Thundersnout
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=9028; -- Grizzle
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=9030; -- Ok'thor the Breaker
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=9178; -- Burning Spirit
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=9237; -- War Master Voone
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=9239; -- Smolderthorn Mystic
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=9240; -- Smolderthorn Shadow Priest
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=9261; -- Firebrand Darkweaver <Firebrand Legion>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=9262; -- Firebrand Invoker <Firebrand Legion>
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=9267; -- Smolderthorn Axe Thrower
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=9268; -- Smolderthorn Berserker
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=9269; -- Smolderthorn Seer
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=9476; -- Watchman Doomgrip
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=9537; -- Hurley Blackbreath
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=9541; -- Blackbreath Crony
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=9604; -- Gorgon'och
+UPDATE `creature_template` SET `BaseAttackTime`=2000 WHERE `entry`=9701; -- Spire Scorpid
+UPDATE `creature_template` SET `BaseAttackTime`=2143 WHERE `entry`=30338; -- Ahn'kahar Swarmer
+UPDATE `creature_template` SET `BaseAttackTime`=2200 WHERE `entry`=30283; -- Plague Walker
+UPDATE `creature_template` SET `BaseAttackTime`=2200 WHERE `entry`=31144; -- Grandmaster's Training Dummy
+UPDATE `creature_template` SET `BaseAttackTime`=2280 WHERE `entry`=37003; -- Skybreaker Vindicator
+UPDATE `creature_template` SET `BaseAttackTime`=2280 WHERE `entry`=37017; -- Skybreaker Assassin
+UPDATE `creature_template` SET `BaseAttackTime`=2280 WHERE `entry`=37148; -- Skybreaker Summoner
+UPDATE `creature_template` SET `BaseAttackTime`=2280 WHERE `entry`=37544; -- Spire Gargoyle
+UPDATE `creature_template` SET `BaseAttackTime`=2300 WHERE `entry`=31438; -- Shadow Vault Abomination
+UPDATE `creature_template` SET `BaseAttackTime`=2300 WHERE `entry`=7076; -- Earthen Guardian
+UPDATE `creature_template` SET `BaseAttackTime`=2308 WHERE `entry`=30338; -- Ahn'kahar Swarmer
+UPDATE `creature_template` SET `BaseAttackTime`=2400 WHERE `entry`=11664; -- Flamewaker Elite
+UPDATE `creature_template` SET `BaseAttackTime`=2400 WHERE `entry`=11949; -- Captain Balinda Stonehearth <Stormpike Captain>
+UPDATE `creature_template` SET `BaseAttackTime`=2400 WHERE `entry`=2502; -- "Shaky" Phillipe
+UPDATE `creature_template` SET `BaseAttackTime`=2400 WHERE `entry`=26734; -- Azure Enforcer
+UPDATE `creature_template` SET `BaseAttackTime`=2400 WHERE `entry`=26792; -- Crystalline Protector
+UPDATE `creature_template` SET `BaseAttackTime`=2400 WHERE `entry`=26794; -- Ormorok the Tree-Shaper
+UPDATE `creature_template` SET `BaseAttackTime`=2400 WHERE `entry`=30688; -- Disciple of Shadron
+UPDATE `creature_template` SET `BaseAttackTime`=2400 WHERE `entry`=36880; -- Decaying Colossus
+UPDATE `creature_template` SET `BaseAttackTime`=2400 WHERE `entry`=40502; -- Zalazane
+UPDATE `creature_template` SET `BaseAttackTime`=2400 WHERE `entry`=8877; -- Sandfury Zealot
+UPDATE `creature_template` SET `BaseAttackTime`=2500 WHERE `entry`=10120; -- Vault Warder
+UPDATE `creature_template` SET `BaseAttackTime`=2500 WHERE `entry`=15370; -- Buru the Gorger
+UPDATE `creature_template` SET `BaseAttackTime`=2500 WHERE `entry`=24018; -- Necro Overlord Mezhen
+UPDATE `creature_template` SET `BaseAttackTime`=2500 WHERE `entry`=24241; -- Thurg
+UPDATE `creature_template` SET `BaseAttackTime`=2500 WHERE `entry`=26626; -- Scourge Reanimator
+UPDATE `creature_template` SET `BaseAttackTime`=2500 WHERE `entry`=7796; -- Nekrum Gutchewer
+UPDATE `creature_template` SET `BaseAttackTime`=2600 WHERE `entry`=2748; -- Archaedas <Ancient Stone Watcher>
+UPDATE `creature_template` SET `BaseAttackTime`=2600 WHERE `entry`=7797; -- Ruuzlu
+UPDATE `creature_template` SET `BaseAttackTime`=2700 WHERE `entry`=15473; -- Kaldorei Elite
+UPDATE `creature_template` SET `BaseAttackTime`=2700 WHERE `entry`=7011; -- Earthen Rocksmasher
+UPDATE `creature_template` SET `BaseAttackTime`=2700 WHERE `entry`=7396; -- Earthen Stonebreaker
+UPDATE `creature_template` SET `BaseAttackTime`=2700 WHERE `entry`=9259; -- Firebrand Grunt <Firebrand Legion>
+UPDATE `creature_template` SET `BaseAttackTime`=2800 WHERE `entry`=11502; -- Ragnaros
+UPDATE `creature_template` SET `BaseAttackTime`=2800 WHERE `entry`=4857; -- Stone Keeper
+UPDATE `creature_template` SET `BaseAttackTime`=2800 WHERE `entry`=7206; -- Ancient Stone Keeper
+UPDATE `creature_template` SET `BaseAttackTime`=2900 WHERE `entry`=7228; -- Ironaya
+UPDATE `creature_template` SET `BaseAttackTime`=3000 WHERE `entry`=1180; -- Mo'grosh Brute
+UPDATE `creature_template` SET `BaseAttackTime`=3000 WHERE `entry`=30023; -- Korrak the Bloodrager <Champion of the Winterax>
+UPDATE `creature_template` SET `BaseAttackTime`=3000 WHERE `entry`=35763; -- Skittering Scarab
+UPDATE `creature_template` SET `BaseAttackTime`=3000 WHERE `entry`=412; -- Stitches <Gift from the Embalmer>
+UPDATE `creature_template` SET `BaseAttackTime`=3000 WHERE `entry`=8580; -- Atal'alarion <Guardian of the Idol>
+UPDATE `creature_template` SET `BaseAttackTime`=3300 WHERE `entry`=17185; -- Bristlelimb Ursa
+UPDATE `creature_template` SET `BaseAttackTime`=3600 WHERE `entry`=24559; -- Warlord Salaris
+UPDATE `creature_template` SET `BaseAttackTime`=4000 WHERE `entry`=15428; -- Sand Vortex
+UPDATE `creature_template` SET `BaseAttackTime`=5000 WHERE `entry`=36551; -- Spiteful Apparition
+UPDATE `creature_template` SET `BaseAttackTime`=800 WHERE `entry`=15323; -- Hive'Zara Sandstalker
+
+-- hover heights
+UPDATE `creature_template` SET `HoverHeight`=1.2 WHERE `entry`=29349; -- Anub'ar Darter
+UPDATE `creature_template` SET `HoverHeight`=1.2 WHERE `entry`=29755; -- Stormpeak Hatchling
+UPDATE `creature_template` SET `HoverHeight`=1.2 WHERE `entry`=30500; -- Argent Skytalon
+UPDATE `creature_template` SET `HoverHeight`=1.2 WHERE `entry`=37858; -- Razorscale Image
+UPDATE `creature_template` SET `HoverHeight`=1.5 WHERE `entry`=26607; -- Anub'ar Blightbeast
+UPDATE `creature_template` SET `HoverHeight`=10 WHERE `entry`=24770; -- Nexus Watcher
+UPDATE `creature_template` SET `HoverHeight`=10 WHERE `entry`=26949; -- Torastrasza <Majordomo to the Ruling Council>
+UPDATE `creature_template` SET `HoverHeight`=10 WHERE `entry`=29066; -- Titan Sentry
+UPDATE `creature_template` SET `HoverHeight`=10 WHERE `entry`=30575; -- Frostbrood Destroyer
+UPDATE `creature_template` SET `HoverHeight`=10 WHERE `entry`=30674; -- Frostbrood Destroyer
+UPDATE `creature_template` SET `HoverHeight`=10 WHERE `entry`=32857; -- Stormcaller Brundir
+UPDATE `creature_template` SET `HoverHeight`=12.5 WHERE `entry`=26276; -- Nexus Guardian
+UPDATE `creature_template` SET `HoverHeight`=15 WHERE `entry`=26276; -- Nexus Guardian
+UPDATE `creature_template` SET `HoverHeight`=15 WHERE `entry`=27608; -- Azure Dragon
+UPDATE `creature_template` SET `HoverHeight`=15 WHERE `entry`=31393; -- Crystal Wyrm
+UPDATE `creature_template` SET `HoverHeight`=2 WHERE `entry`=24563; -- Nerub'ar Venomspitter
+UPDATE `creature_template` SET `HoverHeight`=2 WHERE `entry`=25582; -- Scourged Flamespitter
+UPDATE `creature_template` SET `HoverHeight`=2 WHERE `entry`=25711; -- Spirit of the North
+UPDATE `creature_template` SET `HoverHeight`=2 WHERE `entry`=29488; -- Scourge Gryphon
+UPDATE `creature_template` SET `HoverHeight`=2 WHERE `entry`=29501; -- Scourge Gryphon
+UPDATE `creature_template` SET `HoverHeight`=2 WHERE `entry`=33721; -- Lore Keeper Projection Unit
+UPDATE `creature_template` SET `HoverHeight`=2.25 WHERE `entry`=29798; -- Hyldsmeet Proto-Drake
+UPDATE `creature_template` SET `HoverHeight`=2.25 WHERE `entry`=30235; -- Glory
+UPDATE `creature_template` SET `HoverHeight`=3 WHERE `entry`=23680; -- Plagued Proto-Dragon
+UPDATE `creature_template` SET `HoverHeight`=3 WHERE `entry`=23935; -- Val'kyr Watcher
+UPDATE `creature_template` SET `HoverHeight`=3 WHERE `entry`=24258; -- Val'kyr Overseer
+UPDATE `creature_template` SET `HoverHeight`=3 WHERE `entry`=28824; -- Brann Flying Machine
+UPDATE `creature_template` SET `HoverHeight`=3 WHERE `entry`=29545; -- Proto-Drake Corpse
+UPDATE `creature_template` SET `HoverHeight`=3 WHERE `entry`=31721; -- Frostbrood Sentry
+UPDATE `creature_template` SET `HoverHeight`=3 WHERE `entry`=32767; -- Frostbrood Sentry
+UPDATE `creature_template` SET `HoverHeight`=3.75 WHERE `entry`=26841; -- Reanimated Frost Wyrm
+UPDATE `creature_template` SET `HoverHeight`=35 WHERE `entry`=27925; -- Nozdormu <The Lord of Time>
+UPDATE `creature_template` SET `HoverHeight`=4 WHERE `entry`=23689; -- Proto-Drake
+UPDATE `creature_template` SET `HoverHeight`=4 WHERE `entry`=24327; -- Val'kyr Soulclaimer
+UPDATE `creature_template` SET `HoverHeight`=4 WHERE `entry`=28487; -- Val'kyr Battle-maiden
+UPDATE `creature_template` SET `HoverHeight`=4 WHERE `entry`=29590; -- Blighted Proto-Drake
+UPDATE `creature_template` SET `HoverHeight`=4 WHERE `entry`=31029; -- Possessed Vardmadra
+UPDATE `creature_template` SET `HoverHeight`=4 WHERE `entry`=31265; -- Savage Proto-Drake
+UPDATE `creature_template` SET `HoverHeight`=4 WHERE `entry`=31396; -- Val'kyr Taskmistress
+UPDATE `creature_template` SET `HoverHeight`=5 WHERE `entry`=28208; -- Hailscorn
+UPDATE `creature_template` SET `HoverHeight`=5 WHERE `entry`=29746; -- Databank
+UPDATE `creature_template` SET `HoverHeight`=5.85 WHERE `entry`=27638; -- Azure Ring Guardian
+UPDATE `creature_template` SET `HoverHeight`=6 WHERE `entry`=31135; -- Geirrvif
+UPDATE `creature_template` SET `HoverHeight`=6 WHERE `entry`=36065; -- Fjola Lightbane
+UPDATE `creature_template` SET `HoverHeight`=6 WHERE `entry`=36066; -- Eydis Darkbane
+UPDATE `creature_template` SET `HoverHeight`=7.5 WHERE `entry`=26858; -- Sarathstra
+UPDATE `creature_template` SET `HoverHeight`=7.5 WHERE `entry`=30486; -- Frostbrood Destroyer
+UPDATE `creature_template` SET `HoverHeight`=8 WHERE `entry`=30997; -- Chromie
+UPDATE `creature_template` SET `HoverHeight`=9 WHERE `entry`=32492; -- Frostbrood Matriarch
+UPDATE `creature_template` SET `HoverHeight`=9 WHERE `entry`=37533; -- Rimefang
+UPDATE `creature_template` SET `HoverHeight`=9 WHERE `entry`=37534; -- Spinestalker
diff --git a/sql/updates/world/2014_09_07_04_world_npc_classes.sql b/sql/updates/world/2014_09_07_04_world_npc_classes.sql
new file mode 100644
index 00000000000..c95d4b3ee41
--- /dev/null
+++ b/sql/updates/world/2014_09_07_04_world_npc_classes.sql
@@ -0,0 +1,15 @@
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=32113;
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=32116;
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=32115;
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=32114;
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=32117;
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=32118;
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=35744;
+
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=37436;
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=37439;
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=37438;
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=37437;
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=37440;
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=37441;
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=35745;
diff --git a/sql/updates/world/2014_09_07_05_world_sai.sql b/sql/updates/world/2014_09_07_05_world_sai.sql
new file mode 100644
index 00000000000..104e9d3d015
--- /dev/null
+++ b/sql/updates/world/2014_09_07_05_world_sai.sql
@@ -0,0 +1,128 @@
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN(19546,19579,19545,19580,19543,19544,-70107,-70108,-70109,-70110,-70111) AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN(1954600,1954500,1954400,1954300) AND `source_type`=9;
+
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(19546, 0, 0, 1, 54, 0, 100, 0, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Abjurist Belmara - On Just Summoned - Store Targetlist'),
+(19546, 0, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 2, 7, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Abjurist Belmara - On Just Summoned - Set Faction 7'),
+(19546, 0, 2, 3, 61, 0, 100, 0, 0, 0, 0, 0, 18, 768, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Abjurist Belmara - On Just Summoned - Set Flags Immune to NPC/PC'),
+(19546, 0, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 53, 0, 19546, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Abjurist Belmara - On Just Summoned - Start WP'),
+(19546, 0, 4, 0, 40, 0, 100, 0, 5, 19546, 0, 0, 80, 1954600, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Abjurist Belmara - On Reached WP5 - Run Script'),
+(19546, 0, 5, 0, 4, 0, 100, 0, 0, 0, 0, 0, 11, 12544, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Abjurist Belmara - On Aggro - Cast \'Frost Armor\''),
+(19546, 0, 6, 0, 0, 0, 100, 0, 2000, 5000, 12000, 22000, 11, 17740, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Abjurist Belmara - In Combat - Cast \'Mana Shield\''),
+(19546, 0, 7, 0, 0, 0, 100, 0, 0, 6000, 2500, 8000, 11, 34447, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Abjurist Belmara - In Combat - Cast \'Arcane Missiles\''),
+(19546, 0, 8, 0, 25, 0, 100, 0, 0, 0, 0, 0, 28, 12544, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Abjurist Belmara - On Reset - Remove Aura \'Frost Armor\''),
+(19545, 0, 0, 1, 54, 0, 100, 0, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Cohlien Frostweaver - On Just Summoned - Store Targetlist'),
+(19545, 0, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 2, 7, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cohlien Frostweaver - On Just Summoned - Set Faction 7'),
+(19545, 0, 2, 3, 61, 0, 100, 0, 0, 0, 0, 0, 18, 768, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cohlien Frostweaver - On Just Summoned - Set Flags Immune to NPC/PC'),
+(19545, 0, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 53, 0, 19545, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cohlien Frostweaver - On Just Summoned - Start WP'),
+(19545, 0, 4, 0, 40, 0, 100, 0, 6, 19545, 0, 0, 80, 1954500, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cohlien Frostweaver - On Reached WP6 - Run Script'),
+(19545, 0, 5, 0, 0, 0, 100, 0, 0, 1000, 25000, 30000, 11, 33245, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cohlien Frostweaver - In Combat - Cast \'Ice Barrier\''),
+(19545, 0, 6, 0, 0, 0, 100, 0, 0, 10000, 2500, 9500, 11, 11831, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Cohlien Frostweaver - In Combat - Cast \'Frost Nova\''),
+(19545, 0, 7, 0, 0, 0, 100, 0, 0, 2500, 2500, 11000, 11, 9672, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Cohlien Frostweaver - In Combat - Cast \'Frostbolt\''),
+(19544, 0, 0, 1, 54, 0, 100, 0, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Conjurer Luminrath - On Just Summoned - Store Targetlist'),
+(19544, 0, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 2, 7, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Conjurer Luminrath - On Just Summoned - Set Faction 7'),
+(19544, 0, 2, 3, 61, 0, 100, 0, 0, 0, 0, 0, 18, 768, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Conjurer Luminrath - On Just Summoned - Set Flags Immune to NPC/PC'),
+(19544, 0, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 53, 0, 19544, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Conjurer Luminrath - On Just Summoned - Start WP'),
+(19544, 0, 4, 0, 40, 0, 100, 0, 3, 19544, 0, 0, 80, 1954400, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Conjurer Luminrath - On Reached WP3 - Run Script'),
+(19544, 0, 5, 0, 0, 0, 100, 0, 0, 2500, 1000, 7500, 11, 9532, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Conjurer Luminrath - In Combat - Cast \'Lightning Bolt\''),
+(19544, 0, 6, 0, 0, 0, 100, 0, 0, 5000, 15000, 30000, 11, 36110, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Conjurer Luminrath - In Combat - Cast \'Summon Dancing Sword\''),
+(19544, 0, 7, 0, 0, 0, 100, 0, 0, 10000, 5000, 15000, 11, 36109, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Conjurer Luminrath - In Combat - Cast \'Blink\''),
+(19543, 0, 0, 1, 54, 0, 100, 0, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Battle-Mage Dathric - On Just Summoned - Store Targetlist'),
+(19543, 0, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 71, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Battle-Mage Dathric - On Just Summoned - Remove Weapon'),
+(19543, 0, 2, 3, 61, 0, 100, 0, 0, 0, 0, 0, 2, 7, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Battle-Mage Dathric - On Just Summoned - Set Faction 7'),
+(19543, 0, 3, 4, 61, 0, 100, 0, 0, 0, 0, 0, 18, 768, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Battle-Mage Dathric - On Just Summoned - Set Flags Immune to NPC/PC'),
+(19543, 0, 4, 0, 61, 0, 100, 0, 0, 0, 0, 0, 53, 0, 19543, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Battle-Mage Dathric - On Just Summoned - Start WP'),
+(19543, 0, 5, 0, 40, 0, 100, 0, 5, 19543, 0, 0, 80, 1954300, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Battle-Mage Dathric - On Reached WP5 - Run Script'),
+(19543, 0, 6, 0, 0, 0, 100, 0, 0, 3000, 3000, 8000, 11, 36104, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Battle-Mage Dathric - In Combat - Cast \'Torrent of Flames\''),
+(19543, 0, 7, 0, 0, 0, 100, 0, 0, 2500, 8500, 12000, 11, 17273, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Battle-Mage Dathric - In Combat - Cast \'Pyroblast\''),
+(-70109, 0, 0, 0, 1, 0, 100, 0, 0, 0, 5000, 5000, 11, 34212, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Invisible Location Trigger - OOC - Cast Blue beam'),
+(-70107, 0, 0, 0, 1, 0, 100, 0, 0, 0, 5000, 5000, 11, 34211, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Invisible Location Trigger - OOC - Cast Blue beam'),
+(-70110, 0, 0, 0, 1, 0, 100, 0, 0, 0, 5000, 5000, 11, 34209, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Invisible Location Trigger - OOC - Cast Blue beam'),
+(-70108, 0, 0, 0, 1, 0, 100, 0, 0, 0, 5000, 5000, 11, 34212, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Invisible Location Trigger - OOC - Cast Blue beam'),
+(-70111, 0, 0, 0, 1, 0, 100, 0, 0, 0, 5000, 5000, 11, 34211, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Invisible Location Trigger - OOC - Cast Blue beam'),
+(1954600, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 4.014257, 'Abjurist Belmara - Script - Set Orientation'),
+(1954600, 9, 1, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 5, 69, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Abjurist Belmara - Script - Play Emote Use_standing'),
+(1954600, 9, 2, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 5, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Abjurist Belmara - Script - Play Emote none'),
+(1954600, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 71, 0, 0, 12742, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Abjurist Belmara - Script - Equip Item'),
+(1954600, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Abjurist Belmara - Script - Say Line'),
+(1954600, 9, 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, 33, 19547, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 'Abjurist Belmara - Script - Give Kill Credit'),
+(1954500, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1.902409, 'Cohlien Frostweaver - Script - Set Orientation'),
+(1954500, 9, 1, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 5, 69, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cohlien Frostweaver - Script - Play Emote Use_standing'),
+(1954500, 9, 2, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cohlien Frostweaver - Script - Say Line'),
+(1954500, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cohlien Frostweaver - Script - Play Emote none'),
+(1954500, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 36, 19579, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cohlien Frostweaver - Script - Change Entry to Cohlien Frostweaver with Hat'),
+(1954500, 9, 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, 2, 7, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cohlien Frostweaver - Script - Set Faction'),
+(1954500, 9, 6, 0, 0, 0, 100, 0, 0, 0, 0, 0, 33, 19550, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 'Cohlien Frostweaver - Script - Give Kill Credit'),
+(1954400, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 3.961897, 'Conjurer Luminrath - Script - Set Orientation'),
+(1954400, 9, 1, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Conjurer Luminrath - Script - Say Line'),
+(1954400, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 5, 69, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Conjurer Luminrath - Script - Play Emote Use_standing'),
+(1954400, 9, 3, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 5, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Conjurer Luminrath - Script - Play Emote none'),
+(1954400, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Conjurer Luminrath - Script - Say Line 2'),
+(1954400, 9, 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, 36, 19580, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Conjurer Luminrath - Script - Change Entry to Luminrath with Cape'),
+(1954400, 9, 6, 0, 0, 0, 100, 0, 0, 0, 0, 0, 2, 7, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Conjurer Luminrath - Script - Set Faction'),
+(1954400, 9, 7, 0, 0, 0, 100, 0, 0, 0, 0, 0, 33, 19548, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 'Conjurer Luminrath - Script - Give Kill Credit'),
+(1954300, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 4.537856, 'Battle-Mage Dathric - Script - Set Orientation'),
+(1954300, 9, 1, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 5, 69, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Battle-Mage Dathric - Script - Play Emote Use_standing'),
+(1954300, 9, 2, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 5, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Battle-Mage Dathric - Script - Play Emote none'),
+(1954300, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 71, 0, 0, 18983, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Battle-Mage Dathric - Script - Equip Item'),
+(1954300, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Battle-Mage Dathric - Script - Say Line'),
+(1954300, 9, 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, 33, 19549, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 'Battle-Mage Dathric - Script - Give Kill Credit');
+
+DELETE FROM `creature_text` WHERE `entry` IN(19545,19544,19543,19546);
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`, `BroadcastTextID`) VALUES
+(19545, 0, 0, 'Phew! There''s my lucky hat. I''ve been looking for it everywhere.', 12, 0, 100, 0, 0, 0, 'Cohlien Frostweaver',16926),
+(19544, 0, 0, 'I can''t possibly go out without my cloak. I hope it''s in here...', 12, 0, 100, 0, 0, 0, 'Conjurer Luminrath',16927),
+(19544, 1, 0, 'There it is! I could''ve sworn it wasn''t here last time I checked...', 12, 0, 100, 0, 0, 0, 'Conjurer Luminrath',16929),
+(19543, 0, 0, 'I don''t know what I was thinking, going out without my sword. I would''ve put it on if I''d seen it here...', 12, 0, 100, 0, 0, 0, 'Battle-Mage Dathric',16931),
+(19546, 0, 0, 'I can''t sleep without a good bedtime story. Now I''m certain to rest well.', 12, 0, 100, 0, 0, 0, 'Abjurist Belmara',16932);
+
+DELETE FROM `waypoints` WHERE `entry` IN(19546,19545,19544,19543);
+
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(19546, 1,2237.667, 2393.5, 112.7383, 'Abjurist Belmara'),
+(19546, 2,2238.667, 2393.75, 112.9883, 'Abjurist Belmara'),
+(19546, 3,2239.417, 2393.25, 112.9883, 'Abjurist Belmara'),
+(19546, 4,2239.917, 2392.5, 112.9883, 'Abjurist Belmara'),
+(19546, 5,2240.365, 2390.882, 112.6025, 'Abjurist Belmara'),
+(19545, 1,2214.206, 2400.794, 108.8995, 'Cohlien Frostweaver'),
+(19545, 2,2213.218, 2400.951, 108.8995, 'Cohlien Frostweaver'),
+(19545, 3,2204.71, 2408.806, 108.6094, 'Cohlien Frostweaver'),
+(19545, 4,2204.71, 2408.806, 108.6094, 'Cohlien Frostweaver'),
+(19545, 5,2204.652, 2408.992, 108.6537, 'Cohlien Frostweaver'),
+(19545, 6,2202.912, 2411.269, 108.6577, 'Cohlien Frostweaver'),
+(19544, 1,2198.386, 2334.958, 89.4724, 'Conjurer Luminrath'),
+(19544, 2,2197.577, 2334.37, 89.4724, 'Conjurer Luminrath'),
+(19544, 3,2193.663, 2339.085, 90.02818, 'Conjurer Luminrath'),
+(19543, 1,2235.705, 2320.857, 92.30136, 'Battle-Mage Dathric'),
+(19543, 2,2235.67, 2319.858, 92.30136, 'Battle-Mage Dathric'),
+(19543, 3,2233.228, 2317.592, 91.34792, 'Battle-Mage Dathric'),
+(19543, 4,2230.454, 2316.294, 90.59956, 'Battle-Mage Dathric'),
+(19543, 5,2228.403, 2313.777, 89.63835, 'Battle-Mage Dathric');
+
+DELETE FROM `event_scripts` WHERE `id` IN(12607,12610,12609,12608);
+INSERT INTO `event_scripts` (`id`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o`) VALUES
+(12607, 0, 10, 19546, 25000, 0, 2236.969, 2393.117, 112.374, 5.811946),
+(12610, 0, 10, 19545, 25000, 0, 2212.535, 2401.582, 108.8762, 2.396056),
+(12609, 0, 10, 19544, 25000, 0, 2197.269, 2334.741, 89.5162, 2.263612),
+(12608, 0, 10, 19543, 25000, 0, 2235.094, 2319.323, 92.07642, 3.889618);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN(34209,34211,34212);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13, 1, 34209, 0, 0, 31, 0, 3, 19656, 0, 0, 0, 0, '', 'Blue Beam Targets Invisible Location trigger'),
+(13, 1, 34211, 0, 0, 31, 0, 3, 19656, 0, 0, 0, 0, '', 'Blue Beam Targets Invisible Location trigger'),
+(13, 1, 34212, 0, 0, 31, 0, 3, 19656, 0, 0, 0, 0, '', 'Blue Beam Targets Invisible Location trigger');
+
+UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=28503 AND `source_type`=0 AND `id`=7 AND `link`=8;
+UPDATE `smart_scripts` SET `event_flags`=0 WHERE `entryorguid`=9098 AND `source_type`=0 AND `id`=0 AND `link`=0;
+UPDATE `smart_scripts` SET `event_flags`=0 WHERE `entryorguid`=14389 AND `source_type`=0 AND `id`=0 AND `link`=0;
+
+DELETE FROM `spell_area` WHERE `spell`=34102;
+INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `aura_spell`, `racemask`, `gender`, `autocast`, `quest_start_status`, `quest_end_status`) VALUES
+(34102, 3733, 0, 0, 0, 0, 2, 1, 64, 11); -- Curse of the Violet Tower
+
+DELETE FROM `disables` WHERE `sourceType`=0 AND `entry` IN(34209,34211,34212);
+INSERT INTO `disables` (`sourceType`, `entry`, `flags`, `params_0`, `params_1`, `comment`) VALUES
+(0, 34209, 64, '', '', 'Ignore LOS on Blue Beam'),
+(0, 34211, 64, '', '', 'Ignore LOS on Blue Beam'),
+(0, 34212, 64, '', '', 'Ignore LOS on Blue Beam');
diff --git a/sql/updates/world/2014_09_07_06_world_sai.sql b/sql/updates/world/2014_09_07_06_world_sai.sql
new file mode 100644
index 00000000000..b668a881591
--- /dev/null
+++ b/sql/updates/world/2014_09_07_06_world_sai.sql
@@ -0,0 +1,6 @@
+SET @ENTRY := 25040; -- Greater Water Elemental
+UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = @ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ENTRY AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(@ENTRY, 0, 1, 0, 0, 0, 100, 0, 3000, 3000, 5000, 5000, 11, 46983, 64, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 'Greater Water Elemental - In Combat CMC - Cast Waterbolt');
+
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index bfd3a1bbcb9..ee8fee198bf 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -5850,7 +5850,7 @@ void Player::ApplyRatingMod(CombatRating combatRating, int32 value, bool apply)
{
float oldRating = m_baseRatingValue[combatRating];
m_baseRatingValue[combatRating] += (apply ? value : -value);
-
+
// explicit affected values
float const multiplier = GetRatingMultiplier(combatRating);
float const oldVal = oldRating * multiplier;
@@ -27219,13 +27219,13 @@ void Player::SendItemRetrievalMail(uint32 itemEntry, uint32 count)
MailSender sender(MAIL_CREATURE, 34337 /* The Postmaster */);
MailDraft draft("Recovered Item", "We recovered a lost item in the twisting nether and noted that it was yours.$B$BPlease find said object enclosed."); // This is the text used in Cataclysm, it probably wasn't changed.
SQLTransaction trans = CharacterDatabase.BeginTransaction();
-
+
if (Item* item = Item::CreateItem(itemEntry, count, 0))
{
item->SaveToDB(trans);
draft.AddItem(item);
}
-
+
draft.SendMailTo(trans, MailReceiver(this, GetGUIDLow()), sender);
CharacterDatabase.CommitTransaction(trans);
}
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 47556478465..9ff644a7616 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -6485,7 +6485,7 @@ bool Spell::CheckEffectTarget(Unit const* target, uint32 eff, Position const* lo
// check for ignore LOS on the effect itself
if (m_spellInfo->AttributesEx2 & SPELL_ATTR2_CAN_TARGET_NOT_IN_LOS || DisableMgr::IsDisabledFor(DISABLE_TYPE_SPELL, m_spellInfo->Id, NULL, SPELL_DISABLE_LOS))
return true;
-
+
// if spell is triggered, need to check for LOS disable on the aura triggering it and inherit that behaviour
if (IsTriggered() && m_triggeredByAuraSpell && (m_triggeredByAuraSpell->AttributesEx2 & SPELL_ATTR2_CAN_TARGET_NOT_IN_LOS || DisableMgr::IsDisabledFor(DISABLE_TYPE_SPELL, m_triggeredByAuraSpell->Id, NULL, SPELL_DISABLE_LOS)))
return true;
diff --git a/src/server/scripts/Commands/cs_ticket.cpp b/src/server/scripts/Commands/cs_ticket.cpp
index 364b698743a..cbf0ae51a82 100644
--- a/src/server/scripts/Commands/cs_ticket.cpp
+++ b/src/server/scripts/Commands/cs_ticket.cpp
@@ -239,7 +239,7 @@ public:
ticket->SetCompleted();
ticket->SaveToDB(trans);
- std::string msg = ticket->FormatMessageString(*handler, NULL, NULL,
+ std::string msg = ticket->FormatMessageString(*handler, NULL, NULL,
NULL, NULL, handler->GetSession() ? handler->GetSession()->GetPlayer()->GetName().c_str() : "Console");
handler->SendGlobalGMSysMessage(msg.c_str());
sTicketMgr->UpdateLastChange();
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
index 8bc969e9020..87272037755 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
@@ -23,19 +23,16 @@ enum Spells
SPELL_ARCANE_EXPLOSION = 46608,
SPELL_CONE_OF_COLD = 38384,
SPELL_FIREBALL = 46988,
- SPELL_FROSTBOLT = 46987
+ SPELL_FROSTBOLT = 46987,
+ SPELL_SUMMON_WATER_ELEMENTAL = 45067,
+ SPELL_ICEBLOCK = 46604
};
-enum Yells
+enum Texts
{
- YELL_AGGRO = 0,
- YELL_EVADE = 1,
- YELL_SALVATION = 2,
-};
-
-enum Creatures
-{
- NPC_WATER_ELEMENTAL = 25040
+ SAY_AGGRO = 0,
+ SAY_EVADE = 1,
+ SAY_SALVATION = 2,
};
enum Action
@@ -43,64 +40,15 @@ enum Action
ACTION_BUFF_YELL = -30001 // shared from Battleground
};
-enum WaterElementalSpells
+enum Events
{
- SPELL_WATERBOLT = 46983
-};
-
-class npc_water_elemental : public CreatureScript
-{
-public:
- npc_water_elemental() : CreatureScript("npc_water_elemental") { }
-
- struct npc_water_elementalAI : public ScriptedAI
- {
- npc_water_elementalAI(Creature* creature) : ScriptedAI(creature)
- {
- waterBoltTimer = 3 * IN_MILLISECONDS;
- resetTimer = 5 * IN_MILLISECONDS;
- balindaGUID = 0;
- }
-
- uint32 waterBoltTimer;
- uint64 balindaGUID;
- uint32 resetTimer;
-
- void Reset() override
- {
- waterBoltTimer = 3 * IN_MILLISECONDS;
- resetTimer = 5 * IN_MILLISECONDS;
- balindaGUID = 0;
- }
-
- void UpdateAI(uint32 diff) override
- {
- if (!UpdateVictim())
- return;
-
- if (waterBoltTimer < diff)
- {
- DoCastVictim(SPELL_WATERBOLT);
- waterBoltTimer = 5 * IN_MILLISECONDS;
- } else waterBoltTimer -= diff;
-
- // check if creature is not outside of building
- if (resetTimer < diff)
- {
- if (Creature* pBalinda = ObjectAccessor::GetCreature(*me, balindaGUID))
- if (me->GetDistance2d(pBalinda->GetHomePosition().GetPositionX(), pBalinda->GetHomePosition().GetPositionY()) > 50)
- EnterEvadeMode();
- resetTimer = 5 * IN_MILLISECONDS;
- } else resetTimer -= diff;
-
- DoMeleeAttackIfReady();
- }
- };
-
- CreatureAI* GetAI(Creature* creature) const override
- {
- return new npc_water_elementalAI(creature);
- }
+ // Balinda
+ EVENT_ARCANE_EXPLOSION = 1,
+ EVENT_CONE_OF_COLD,
+ EVENT_FIREBOLT,
+ EVENT_FROSTBOLT,
+ EVENT_SUMMON_WATER_ELEMENTAL,
+ EVENT_CHECK_RESET, // Checks if Balinda or the Water Elemental are outside of building.
};
class boss_balinda : public CreatureScript
@@ -117,23 +65,10 @@ public:
void Initialize()
{
- arcaneExplosionTimer = urand(5 * IN_MILLISECONDS, 15 * IN_MILLISECONDS);
- coneOfColdTimer = 8 * IN_MILLISECONDS;
- fireBoltTimer = 1 * IN_MILLISECONDS;
- frostboltTimer = 4 * IN_MILLISECONDS;
- resetTimer = 5 * IN_MILLISECONDS;
- waterElementalTimer = 0;
+ WaterElementalGUID = 0;
+ HasCastIceblock = false;
}
- uint32 arcaneExplosionTimer;
- uint32 coneOfColdTimer;
- uint32 fireBoltTimer;
- uint32 frostboltTimer;
- uint32 resetTimer;
- uint32 waterElementalTimer;
-
- SummonList summons;
-
void Reset() override
{
Initialize();
@@ -143,22 +78,28 @@ public:
void EnterCombat(Unit* /*who*/) override
{
- Talk(YELL_AGGRO);
- }
-
- void JustRespawned() override
- {
- Reset();
+ Talk(SAY_AGGRO);
+ events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, urand(5 * IN_MILLISECONDS, 15 * IN_MILLISECONDS));
+ events.ScheduleEvent(EVENT_CONE_OF_COLD, 8 * IN_MILLISECONDS);
+ events.ScheduleEvent(EVENT_FIREBOLT, 1 * IN_MILLISECONDS);
+ events.ScheduleEvent(EVENT_FROSTBOLT, 4 * IN_MILLISECONDS);
+ events.ScheduleEvent(EVENT_SUMMON_WATER_ELEMENTAL, 3 * IN_MILLISECONDS);
+ events.ScheduleEvent(EVENT_CHECK_RESET, 5 * IN_MILLISECONDS);
}
void JustSummoned(Creature* summoned) override
{
- ENSURE_AI(npc_water_elemental::npc_water_elementalAI, summoned->AI())->balindaGUID = me->GetGUID();
summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true));
summoned->setFaction(me->getFaction());
+ WaterElementalGUID = summoned->GetGUID();
summons.Summon(summoned);
}
+ void SummonedCreatureDespawn(Creature* summoned) override
+ {
+ summons.Despawn(summoned);
+ }
+
void JustDied(Unit* /*killer*/) override
{
summons.DespawnAll();
@@ -167,7 +108,16 @@ public:
void DoAction(int32 actionId) override
{
if (actionId == ACTION_BUFF_YELL)
- Talk(YELL_AGGRO);
+ Talk(SAY_AGGRO);
+ }
+
+ void DamageTaken(Unit* /*attacker*/, uint32& damage) override
+ {
+ if (me->HealthBelowPctDamaged(40, damage) && !HasCastIceblock)
+ {
+ DoCast(SPELL_ICEBLOCK);
+ HasCastIceblock = true;
+ }
}
void UpdateAI(uint32 diff) override
@@ -175,50 +125,60 @@ public:
if (!UpdateVictim())
return;
- if (waterElementalTimer < diff)
- {
- if (summons.empty())
- me->SummonCreature(NPC_WATER_ELEMENTAL, 0, 0, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 45 * IN_MILLISECONDS);
- waterElementalTimer = 50 * IN_MILLISECONDS;
- } else waterElementalTimer -= diff;
-
- if (arcaneExplosionTimer < diff)
- {
- DoCastVictim(SPELL_ARCANE_EXPLOSION);
- arcaneExplosionTimer = urand(5 * IN_MILLISECONDS, 15 * IN_MILLISECONDS);
- } else arcaneExplosionTimer -= diff;
-
- if (coneOfColdTimer < diff)
- {
- DoCastVictim(SPELL_CONE_OF_COLD);
- coneOfColdTimer = urand(10 * IN_MILLISECONDS, 20 * IN_MILLISECONDS);
- } else coneOfColdTimer -= diff;
-
- if (fireBoltTimer < diff)
- {
- DoCastVictim(SPELL_FIREBALL);
- fireBoltTimer = urand(5 * IN_MILLISECONDS, 9 * IN_MILLISECONDS);
- } else fireBoltTimer -= diff;
+ events.Update(diff);
- if (frostboltTimer < diff)
- {
- DoCastVictim(SPELL_FROSTBOLT);
- frostboltTimer = urand(4 * IN_MILLISECONDS, 12 * IN_MILLISECONDS);
- } else frostboltTimer -= diff;
+ if (me->HasUnitState(UNIT_STATE_CASTING))
+ return;
- // check if creature is not outside of building
- if (resetTimer < diff)
+ while (uint32 eventId = events.ExecuteEvent())
{
- if (me->GetDistance2d(me->GetHomePosition().GetPositionX(), me->GetHomePosition().GetPositionY()) > 50)
+ switch (eventId)
{
- EnterEvadeMode();
- Talk(YELL_EVADE);
+ case EVENT_ARCANE_EXPLOSION:
+ DoCastVictim(SPELL_ARCANE_EXPLOSION);
+ events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, urand(5 * IN_MILLISECONDS, 15 * IN_MILLISECONDS));
+ break;
+ case EVENT_CONE_OF_COLD:
+ DoCastVictim(SPELL_CONE_OF_COLD);
+ events.ScheduleEvent(EVENT_CONE_OF_COLD, urand(10 * IN_MILLISECONDS, 20 * IN_MILLISECONDS));
+ break;
+ case EVENT_FIREBOLT:
+ DoCastVictim(SPELL_FIREBALL);
+ events.ScheduleEvent(EVENT_FIREBOLT, urand(5 * IN_MILLISECONDS, 9 * IN_MILLISECONDS));
+ break;
+ case EVENT_FROSTBOLT:
+ DoCastVictim(SPELL_FROSTBOLT);
+ events.ScheduleEvent(EVENT_FROSTBOLT, urand(4 * IN_MILLISECONDS, 12 * IN_MILLISECONDS));
+ break;
+ case EVENT_SUMMON_WATER_ELEMENTAL:
+ if (summons.empty())
+ DoCast(SPELL_SUMMON_WATER_ELEMENTAL);
+ events.ScheduleEvent(EVENT_SUMMON_WATER_ELEMENTAL, 50 * IN_MILLISECONDS);
+ break;
+ case EVENT_CHECK_RESET:
+ if (me->GetDistance2d(me->GetHomePosition().GetPositionX(), me->GetHomePosition().GetPositionY()) > 50)
+ {
+ EnterEvadeMode();
+ Talk(SAY_EVADE);
+ }
+ if (Creature* elemental = ObjectAccessor::GetCreature(*me, WaterElementalGUID))
+ if (elemental->GetDistance2d(me->GetHomePosition().GetPositionX(), me->GetHomePosition().GetPositionY()) > 50)
+ elemental->AI()->EnterEvadeMode();
+ events.ScheduleEvent(EVENT_CHECK_RESET, 5 * IN_MILLISECONDS);
+ break;
+ default:
+ break;
}
- resetTimer = 5 * IN_MILLISECONDS;
- } else resetTimer -= diff;
+ }
DoMeleeAttackIfReady();
}
+
+ private:
+ EventMap events;
+ SummonList summons;
+ uint64 WaterElementalGUID;
+ bool HasCastIceblock;
};
CreatureAI* GetAI(Creature* creature) const override
@@ -230,5 +190,4 @@ public:
void AddSC_boss_balinda()
{
new boss_balinda;
- new npc_water_elemental;
}
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
index 1a97f668558..9a6d0e9c224 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
@@ -75,6 +75,9 @@ public:
{
Initialize();
+ Breath1_Spell = 0;
+ Breath2_Spell = 0;
+
// Select the 2 breaths that we are going to use until despawned
// 5 possiblities for the first breath, 4 for the second, 20 total possiblites
// This way we don't end up casting 2 of the same breath
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
index 9084a6b0371..7ce11653567 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
@@ -81,6 +81,9 @@ public:
Initialize();
instance = creature->GetInstanceScript();
Intro = true;
+ RainBones = false;
+ Skeletons = false;
+ FlyTimer = 0;
}
void Initialize()
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
index ce8223c90cf..7b51b61ba0a 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
@@ -1068,6 +1068,7 @@ public:
EntryYellTimer = 1000;
AggroYellTimer = 10000;
IsFakingDeath = false;
+ ResurrectTimer = 0;
}
void Initialize()
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
index 03ca73fed1f..6c48ee7f348 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
@@ -412,7 +412,7 @@ class npc_eye_of_acherus : public CreatureScript
{
if (movementType == WAYPOINT_MOTION_TYPE && pointId == POINT_EYE_MOVE_END - 1)
{
- me->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE);
+ me->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE);
me->RemoveAllAuras();
if (Player* owner = me->GetCharmerOrOwner()->ToPlayer())
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
index 307bcd5add6..0733640f4c3 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
@@ -391,6 +391,10 @@ public:
Initialize();
instance = creature->GetInstanceScript();
headGUID = 0;
+ PlayerGUID = 0;
+ id = 0;
+ whirlwind = 0;
+ wp_reached = false;
}
void Initialize()
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
index c05de1bb800..3e752858e63 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
@@ -1,6 +1,5 @@
/*
* Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/>
- * Copyright (C) 2006-2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -16,13 +15,6 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/* ScriptData
-SDName: Boss_Interrogator_Vishas
-SD%Complete: 100
-SDComment:
-SDCategory: Scarlet Monastery
-EndScriptData */
-
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
#include "scarlet_monastery.h"
@@ -38,94 +30,93 @@ enum Says
enum Spells
{
- SPELL_SHADOWWORDPAIN = 2767
+ SPELL_SHADOW_WORD_PAIN = 2767
};
-class boss_interrogator_vishas : public CreatureScript
+enum Events
{
-public:
- boss_interrogator_vishas() : CreatureScript("boss_interrogator_vishas") { }
-
- CreatureAI* GetAI(Creature* creature) const override
- {
- return GetInstanceAI<boss_interrogator_vishasAI>(creature);
- }
-
- struct boss_interrogator_vishasAI : public ScriptedAI
- {
- boss_interrogator_vishasAI(Creature* creature) : ScriptedAI(creature)
- {
- Initialize();
- instance = me->GetInstanceScript();
- }
-
- void Initialize()
- {
- ShadowWordPain_Timer = 5000;
- Yell60 = false;
- Yell30 = false;
- }
-
- InstanceScript* instance;
+ EVENT_SHADOW_WORD_PAIN = 1
+};
- bool Yell30;
- bool Yell60;
- uint32 ShadowWordPain_Timer;
+class boss_interrogator_vishas : public CreatureScript
+{
+ public:
+ boss_interrogator_vishas() : CreatureScript("boss_interrogator_vishas") { }
- void Reset() override
+ struct boss_interrogator_vishasAI : public BossAI
{
- Initialize();
- instance->SetBossState(DATA_INTERROGATOR_VISHAS, NOT_STARTED);
- }
+ boss_interrogator_vishasAI(Creature* creature) : BossAI(creature, DATA_INTERROGATOR_VISHAS)
+ {
+ Initialize();
+ }
- void EnterCombat(Unit* /*who*/) override
- {
- Talk(SAY_AGGRO);
- instance->SetBossState(DATA_INTERROGATOR_VISHAS, IN_PROGRESS);
- }
+ void Initialize()
+ {
+ _yellCount = 0;
+ }
- void KilledUnit(Unit* /*Victim*/) override
- {
- Talk(SAY_KILL);
- }
+ void Reset() override
+ {
+ Initialize();
+ _Reset();
+ }
- void JustDied(Unit* /*killer*/) override
- {
- //Any other Actions to do with vorrel? setStandState?
- if (Creature* vorrel = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_VORREL)))
- vorrel->AI()->Talk(SAY_TRIGGER_VORREL);
- instance->SetBossState(DATA_INTERROGATOR_VISHAS, DONE);
- }
+ void EnterCombat(Unit* /*who*/) override
+ {
+ Talk(SAY_AGGRO);
+ _EnterCombat();
+ events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 5000);
+ }
- void UpdateAI(uint32 diff) override
- {
- if (!UpdateVictim())
- return;
+ void KilledUnit(Unit* victim) override
+ {
+ if (victim->GetTypeId() == TYPEID_PLAYER)
+ Talk(SAY_KILL);
+ }
- //If we are low on hp Do sayings
- if (!Yell60 && !HealthAbovePct(60))
+ void JustDied(Unit* /*killer*/) override
{
- Talk(SAY_HEALTH1);
- Yell60 = true;
+ _JustDied();
+ if (Creature* vorrel = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_VORREL)))
+ vorrel->AI()->Talk(SAY_TRIGGER_VORREL);
}
- if (!Yell30 && !HealthAbovePct(30))
+ void DamageTaken(Unit* /*attacker*/, uint32 &damage) override
{
- Talk(SAY_HEALTH2);
- Yell30 = true;
+ if (me->HealthBelowPctDamaged(60, damage) && _yellCount < 1)
+ {
+ Talk(SAY_HEALTH1);
+ ++_yellCount;
+ }
+
+ if (me->HealthBelowPctDamaged(30, damage) && _yellCount < 2)
+ {
+ Talk(SAY_HEALTH2);
+ ++_yellCount;
+ }
}
- //ShadowWordPain_Timer
- if (ShadowWordPain_Timer <= diff)
+ void ExecuteEvent(uint32 eventId) override
{
- DoCastVictim(SPELL_SHADOWWORDPAIN);
- ShadowWordPain_Timer = urand(5000, 15000);
+ switch (eventId)
+ {
+ case EVENT_SHADOW_WORD_PAIN:
+ DoCastVictim(SPELL_SHADOW_WORD_PAIN);
+ events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, urand(5000, 15000));
+ break;
+ default:
+ break;
+ }
}
- else ShadowWordPain_Timer -= diff;
- DoMeleeAttackIfReady();
+ private:
+ uint8 _yellCount;
+ };
+
+ CreatureAI* GetAI(Creature* creature) const override
+ {
+ return GetInstanceAI<boss_interrogator_vishasAI>(creature);
}
- };
};
void AddSC_boss_interrogator_vishas()
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
index 44885a01270..b218e3f2978 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
@@ -105,7 +105,7 @@ public:
DoMeleeAttackIfReady();
}
-
+
private:
EventMap events;
SummonList Summons;
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
index 3864c598459..099a69782b8 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
@@ -1,6 +1,5 @@
/*
* Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/>
- * Copyright (C) 2006-2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -16,20 +15,31 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/* ScriptData
-SDName: Boss_Kormok
-SD%Complete: 100
-SDComment:
-SDCategory: Scholomance
-EndScriptData */
-
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
+#include "SpellScript.h"
+#include "scholomance.h"
enum Spells
{
- SPELL_SHADOWBOLTVOLLEY = 20741,
- SPELL_BONESHIELD = 27688
+ SPELL_SHADOWBOLT_VOLLEY = 20741,
+ SPELL_BONE_SHIELD = 27688,
+
+ SPELL_SUMMON_BONE_MAGES = 27695,
+
+ SPELL_SUMMON_BONE_MAGE_FRONT_LEFT = 27696,
+ SPELL_SUMMON_BONE_MAGE_FRONT_RIGHT = 27697,
+ SPELL_SUMMON_BONE_MAGE_BACK_RIGHT = 27698,
+ SPELL_SUMMON_BONE_MAGE_BACK_LEFT = 27699,
+
+ SPELL_SUMMON_BONE_MINIONS = 27687
+};
+
+enum Events
+{
+ EVENT_SHADOWBOLT_VOLLEY = 1,
+ EVENT_BONE_SHIELD,
+ EVENT_SUMMON_MINIONS
};
class boss_kormok : public CreatureScript
@@ -37,11 +47,6 @@ class boss_kormok : public CreatureScript
public:
boss_kormok() : CreatureScript("boss_kormok") { }
- CreatureAI* GetAI(Creature* creature) const override
- {
- return new boss_kormokAI(creature);
- }
-
struct boss_kormokAI : public ScriptedAI
{
boss_kormokAI(Creature* creature) : ScriptedAI(creature)
@@ -51,38 +56,34 @@ public:
void Initialize()
{
- ShadowVolley_Timer = 10000;
- BoneShield_Timer = 2000;
- Minion_Timer = 15000;
- Mage_Timer = 0;
Mages = false;
}
- uint32 ShadowVolley_Timer;
- uint32 BoneShield_Timer;
- uint32 Minion_Timer;
- uint32 Mage_Timer;
- bool Mages;
-
void Reset() override
{
Initialize();
+ events.Reset();
}
void EnterCombat(Unit* /*who*/) override
{
+ events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 10000);
+ events.ScheduleEvent(EVENT_BONE_SHIELD, 2000);
+ events.ScheduleEvent(EVENT_SUMMON_MINIONS, 15000);
}
- void SummonMinions(Unit* victim)
+ void JustSummoned(Creature* summoned) override
{
- if (Creature* SummonedMinion = DoSpawnCreature(16119, float(irand(-7, 7)), float(irand(-7, 7)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000))
- SummonedMinion->AI()->AttackStart(victim);
+ summoned->AI()->AttackStart(me->GetVictim());
}
- void SummonMages(Unit* victim)
+ void DamageTaken(Unit* /*attacker*/, uint32& damage) override
{
- if (Creature* SummonedMage = DoSpawnCreature(16120, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000))
- SummonedMage->AI()->AttackStart(victim);
+ if (me->HealthBelowPctDamaged(25, damage) && !Mages)
+ {
+ DoCast(SPELL_SUMMON_BONE_MAGES);
+ Mages = true;
+ }
}
void UpdateAI(uint32 diff) override
@@ -90,48 +91,132 @@ public:
if (!UpdateVictim())
return;
- //ShadowVolley_Timer
- if (ShadowVolley_Timer <= diff)
- {
- DoCastVictim(SPELL_SHADOWBOLTVOLLEY);
- ShadowVolley_Timer = 15000;
- } else ShadowVolley_Timer -= diff;
+ events.Update(diff);
+
+ if (me->HasUnitState(UNIT_STATE_CASTING))
+ return;
- //BoneShield_Timer
- if (BoneShield_Timer <= diff)
+ while (uint32 eventId = events.ExecuteEvent())
{
- DoCastVictim(SPELL_BONESHIELD);
- BoneShield_Timer = 45000;
- } else BoneShield_Timer -= diff;
+ switch (eventId)
+ {
+ case EVENT_SHADOWBOLT_VOLLEY:
+ DoCastVictim(SPELL_SHADOWBOLT_VOLLEY);
+ events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 15000);
+ break;
+ case EVENT_BONE_SHIELD:
+ DoCastVictim(SPELL_BONE_SHIELD);
+ events.ScheduleEvent(EVENT_BONE_SHIELD, 45000);
+ break;
+ case EVENT_SUMMON_MINIONS:
+ DoCast(SPELL_SUMMON_BONE_MINIONS);
+ events.ScheduleEvent(EVENT_SUMMON_MINIONS, 12000);
+ break;
+ default:
+ break;
+ }
+ }
+
+ DoMeleeAttackIfReady();
+ }
+
+ private:
+ EventMap events;
+ bool Mages;
+ };
+
+ CreatureAI* GetAI(Creature* creature) const override
+ {
+ return new boss_kormokAI(creature);
+ }
+};
- //Minion_Timer
- if (Minion_Timer <= diff)
+uint32 const SummonMageSpells[4] =
+{
+ SPELL_SUMMON_BONE_MAGE_FRONT_LEFT,
+ SPELL_SUMMON_BONE_MAGE_FRONT_RIGHT,
+ SPELL_SUMMON_BONE_MAGE_BACK_RIGHT,
+ SPELL_SUMMON_BONE_MAGE_BACK_LEFT,
+};
+
+// 27695 - Summon Bone Mages
+class spell_kormok_summon_bone_mages : SpellScriptLoader
+{
+ public:
+ spell_kormok_summon_bone_mages() : SpellScriptLoader("spell_kormok_summon_bone_mages") { }
+
+ class spell_kormok_summon_bone_magesSpellScript : public SpellScript
+ {
+ PrepareSpellScript(spell_kormok_summon_bone_magesSpellScript);
+
+ bool Validate(SpellInfo const* /*spell*/) override
{
- //Cast
- SummonMinions(me->GetVictim());
- SummonMinions(me->GetVictim());
- SummonMinions(me->GetVictim());
- SummonMinions(me->GetVictim());
+ for (uint32 i = 0; i < 4; ++i)
+ if (!sSpellMgr->GetSpellInfo(SummonMageSpells[i]))
+ return false;
+ return true;
+ }
- Minion_Timer = 12000;
- } else Minion_Timer -= diff;
+ void HandleScript(SpellEffIndex effIndex)
+ {
+ PreventHitDefaultEffect(effIndex);
+ for (uint32 i = 0; i < 2; ++i)
+ GetCaster()->CastSpell(GetCaster(), SummonMageSpells[urand(0, 3)], true);
+ }
- //Summon 2 Bone Mages
- if (!Mages && HealthBelowPct(26))
+ void Register() override
{
- //Cast
- SummonMages(me->GetVictim());
- SummonMages(me->GetVictim());
- Mages = true;
+ OnEffectHitTarget += SpellEffectFn(spell_kormok_summon_bone_magesSpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
+ };
- DoMeleeAttackIfReady();
+ SpellScript* GetSpellScript() const override
+ {
+ return new spell_kormok_summon_bone_magesSpellScript();
+ }
+};
+
+// 27687 - Summon Bone Minions
+class spell_kormok_summon_bone_minions : SpellScriptLoader
+{
+ public:
+ spell_kormok_summon_bone_minions() : SpellScriptLoader("spell_kormok_summon_bone_minions") { }
+
+ class spell_kormok_summon_bone_minionsSpellScript : public SpellScript
+ {
+ PrepareSpellScript(spell_kormok_summon_bone_minionsSpellScript);
+
+ bool Validate(SpellInfo const* /*spell*/) override
+ {
+ if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_BONE_MINIONS))
+ return false;
+ return true;
+ }
+
+ void HandleScript(SpellEffIndex effIndex)
+ {
+ PreventHitDefaultEffect(effIndex);
+
+ // Possible spells to handle this not found.
+ for (uint32 i = 0; i < 4; ++i)
+ GetCaster()->SummonCreature(NPC_BONE_MINION, GetCaster()->GetPositionX() + float(irand(-7, 7)), GetCaster()->GetPositionY() + float(irand(-7, 7)), GetCaster()->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000);
+ }
+
+ void Register() override
+ {
+ OnEffectHitTarget += SpellEffectFn(spell_kormok_summon_bone_minionsSpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
+ SpellScript* GetSpellScript() const override
+ {
+ return new spell_kormok_summon_bone_minionsSpellScript();
+ }
};
void AddSC_boss_kormok()
{
new boss_kormok();
+ new spell_kormok_summon_bone_mages();
+ new spell_kormok_summon_bone_minions();
}
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
index 41873d778ca..897799a708c 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
@@ -53,8 +53,8 @@ public:
DoCast(me, SPELL_ICE_ARMOR);
}
- void EnterCombat(Unit* /*who*/) override
- {
+ void EnterCombat(Unit* /*who*/) override
+ {
events.ScheduleEvent(EVENT_ICE_ARMOR, 2000);
events.ScheduleEvent(EVENT_FROSTBOLT, 8000);
events.ScheduleEvent(EVENT_CHILL_NOVA, 12000);
@@ -108,7 +108,7 @@ public:
DoMeleeAttackIfReady();
}
-
+
private:
EventMap events;
};
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
index 654f06ad3ed..792649f2998 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
@@ -101,7 +101,7 @@ public:
DoMeleeAttackIfReady();
}
-
+
private:
EventMap events;
};
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h b/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h
index 4b587bb6dde..30d0e978145 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h
+++ b/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h
@@ -36,7 +36,8 @@ enum DataTypes
enum CreatureIds
{
- NPC_DARKMASTER_GANDLING = 1853
+ NPC_DARKMASTER_GANDLING = 1853,
+ NPC_BONE_MINION = 16119
};
enum GameobjectIds
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
index 01ee7139ae5..889fbe8fdc9 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
@@ -81,38 +81,6 @@ public:
};
/*######
-## npc_freed_soul
-######*/
-enum FreedSoul
-{
- SAY_ZAPPED = 0
-};
-
-class npc_freed_soul : public CreatureScript
-{
-public:
- npc_freed_soul() : CreatureScript("npc_freed_soul") { }
-
- CreatureAI* GetAI(Creature* creature) const override
- {
- return new npc_freed_soulAI(creature);
- }
-
- struct npc_freed_soulAI : public ScriptedAI
- {
- npc_freed_soulAI(Creature* creature) : ScriptedAI(creature) { }
-
- void Reset() override
- {
- Talk(SAY_ZAPPED);
- }
-
- void EnterCombat(Unit* /*who*/) override { }
- };
-
-};
-
-/*######
## npc_restless_soul
######*/
@@ -181,6 +149,9 @@ public:
void JustSummoned(Creature* summoned) override
{
summoned->CastSpell(summoned, SPELL_SOUL_FREED, false);
+
+ if (Player* player = ObjectAccessor::GetPlayer(*me, Tagger))
+ summoned->GetMotionMaster()->MoveFollow(player, 0.0f, 0.0f);
}
void JustDied(Unit* /*killer*/) override
@@ -318,7 +289,6 @@ public:
void AddSC_stratholme()
{
new go_gauntlet_gate();
- new npc_freed_soul();
new npc_restless_soul();
new npc_spectral_ghostly_citizen();
}
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
index 5df2d683e21..79ebfa7b62b 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
@@ -503,6 +503,7 @@ public:
{
Initialize();
instance = creature->GetInstanceScript();
+ speechPhaseEnd = 0;
SetCombatMovement(false);
}
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
index ec0bae0f27f..823423fc3a8 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
@@ -301,10 +301,19 @@ public:
{
npc_muru_portalAI(Creature* creature) : ScriptedAI(creature), Summons(creature)
{
+ Initialize();
SetCombatMovement(false);
instance = creature->GetInstanceScript();
}
+ void Initialize()
+ {
+ SummonTimer = 5000;
+
+ InAction = false;
+ SummonSentinel = false;
+ }
+
InstanceScript* instance;
SummonList Summons;
@@ -316,10 +325,7 @@ public:
void Reset() override
{
- SummonTimer = 5000;
-
- InAction = false;
- SummonSentinel = false;
+ Initialize();
me->AddUnitState(UNIT_STATE_STUNNED);
@@ -383,15 +389,23 @@ public:
struct npc_dark_fiendAI : public ScriptedAI
{
- npc_dark_fiendAI(Creature* creature) : ScriptedAI(creature) { }
+ npc_dark_fiendAI(Creature* creature) : ScriptedAI(creature)
+ {
+ Initialize();
+ }
+
+ void Initialize()
+ {
+ WaitTimer = 2000;
+ InAction = false;
+ }
uint32 WaitTimer;
bool InAction;
void Reset() override
{
- WaitTimer = 2000;
- InAction = false;
+ Initialize();
me->AddUnitState(UNIT_STATE_STUNNED);
}
@@ -444,15 +458,23 @@ public:
struct npc_void_sentinelAI : public ScriptedAI
{
- npc_void_sentinelAI(Creature* creature) : ScriptedAI(creature) { }
+ npc_void_sentinelAI(Creature* creature) : ScriptedAI(creature)
+ {
+ Initialize();
+ }
+
+ void Initialize()
+ {
+ PulseTimer = 3000;
+ VoidBlastTimer = 45000; //is this a correct timer?
+ }
uint32 PulseTimer;
uint32 VoidBlastTimer;
void Reset() override
{
- PulseTimer = 3000;
- VoidBlastTimer = 45000; //is this a correct timer?
+ Initialize();
float x, y, z, o;
me->GetHomePosition(x, y, z, o);
@@ -502,9 +524,18 @@ public:
{
npc_blackholeAI(Creature* creature) : ScriptedAI(creature)
{
+ Initialize();
instance = creature->GetInstanceScript();
}
+ void Initialize()
+ {
+ DespawnTimer = 15000;
+ SpellTimer = 5000;
+ Phase = 0;
+ NeedForAHack = 0;
+ }
+
InstanceScript* instance;
uint32 DespawnTimer;
@@ -514,10 +545,7 @@ public:
void Reset() override
{
- DespawnTimer = 15000;
- SpellTimer = 5000;
- Phase = 0;
- NeedForAHack = 0;
+ Initialize();
me->AddUnitState(UNIT_STATE_STUNNED);
DoCastAOE(SPELL_BLACKHOLE_SPAWN, true);
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
index 34b55da72de..a7fa54b12e1 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
@@ -335,6 +335,7 @@ hyjalAI::hyjalAI(Creature* creature) : npc_escortAI(creature), Summons(me)
DoRespawn = false;
MassTeleportTimer = 0;
DoMassTeleport = false;
+ DummyGuid = 0;
}
void hyjalAI::Initialize()
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
index a98f3843d97..b916f93aef7 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
@@ -69,9 +69,6 @@ public:
uint32 SpawnHatchlings_Timer;
uint32 SpawnSpawns_Timer;
- Creature* Hatchling;
- Creature* Spawn;
-
void Reset() override
{
Initialize();
@@ -99,7 +96,7 @@ public:
case 1: RandY = 0.0f + Rand; break;
}
Rand = 0;
- Spawn = DoSpawnCreature(15630, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
+ Creature* Spawn = DoSpawnCreature(15630, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
if (Spawn)
Spawn->AI()->AttackStart(victim);
}
@@ -155,6 +152,7 @@ public:
if (DoGetThreat(target))
DoModifyThreatPercent(target, -100);
+ Creature* Hatchling = nullptr;
switch (urand(0, 2))
{
case 0:
@@ -174,7 +172,7 @@ public:
break;
case 1:
DoTeleportPlayer(target, -7990.135354f, 1155.1907f, -78.849319f, 2.608f);
- Hatchling = me->SummonCreature(15962, target->GetPositionX()-3, target->GetPositionY()-3, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
+ Hatchling = me->SummonCreature(15962, target->GetPositionX() - 3, target->GetPositionY() - 3, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
if (Hatchling)
Hatchling->AI()->AttackStart(target);
Hatchling = me->SummonCreature(15962, target->GetPositionX()-3, target->GetPositionY()+3, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
@@ -189,7 +187,7 @@ public:
break;
case 2:
DoTeleportPlayer(target, -8159.7753f, 1127.9064f, -76.868660f, 0.675f);
- Hatchling = me->SummonCreature(15962, target->GetPositionX()-3, target->GetPositionY()-3, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
+ Hatchling = me->SummonCreature(15962, target->GetPositionX() - 3, target->GetPositionY() - 3, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
if (Hatchling)
Hatchling->AI()->AttackStart(target);
Hatchling = me->SummonCreature(15962, target->GetPositionX()-3, target->GetPositionY()+3, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
index cd250a50fb7..e65dbacc1f2 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
@@ -417,8 +417,6 @@ public:
uint32 UnbalancingStrike_Timer;
uint32 Scarabs_Timer;
- Creature* Summoned;
-
void Reset() override
{
TwinReset();
@@ -509,8 +507,6 @@ public:
uint32 ArcaneBurst_Timer;
uint32 Scorpions_Timer;
- Creature* Summoned;
-
void Reset() override
{
TwinReset();
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp
index 0a712b69771..58d7c6141b4 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp
@@ -161,19 +161,25 @@ struct dummy_dragonAI : public ScriptedAI
{
dummy_dragonAI(Creature* creature) : ScriptedAI(creature)
{
+ Initialize();
instance = creature->GetInstanceScript();
}
+ void Initialize()
+ {
+ waypointId = 0;
+ portalRespawnTime = 30000;
+ _canMoveFree = false;
+ _canLoot = true;
+ }
+
void Reset() override
{
if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
events.Reset();
- waypointId = 0;
- portalRespawnTime = 30000;
- _canMoveFree = false;
- _canLoot = true;
+ Initialize();
}
void EnterCombat(Unit* /*who*/) override
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
index 0c96a982997..4e02b3ad2e8 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
@@ -73,15 +73,21 @@ class boss_baltharus_the_warborn : public CreatureScript
{
boss_baltharus_the_warbornAI(Creature* creature) : BossAI(creature, DATA_BALTHARUS_THE_WARBORN)
{
+ Initialize();
_introDone = false;
}
+ void Initialize()
+ {
+ _cloneCount = RAID_MODE<uint8>(1, 2, 2, 2);
+ }
+
void Reset() override
{
_Reset();
events.SetPhase(PHASE_INTRO);
events.ScheduleEvent(EVENT_OOC_CHANNEL, 0, 0, PHASE_INTRO);
- _cloneCount = RAID_MODE<uint8>(1, 2, 2, 2);
+ Initialize();
instance->SetData(DATA_BALTHARUS_SHARED_HEALTH, me->GetMaxHealth());
}
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
index b5c20e95278..e41ea8de38b 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
@@ -204,12 +204,18 @@ class npc_onyx_flamecaller : public CreatureScript
{
npc_onyx_flamecallerAI(Creature* creature) : npc_escortAI(creature), _instance(creature->GetInstanceScript())
{
+ Initialize();
npc_escortAI::SetDespawnAtEnd(false);
}
- void Reset() override
+ void Initialize()
{
_lavaGoutCount = 0;
+ }
+
+ void Reset() override
+ {
+ Initialize();
me->setActive(true);
AddWaypoints();
Start(true, true);
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
index a6743811b34..833e3e23fe1 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
@@ -595,16 +595,22 @@ class npc_halion_controller : public CreatureScript
npc_halion_controllerAI(Creature* creature) : ScriptedAI(creature),
_instance(creature->GetInstanceScript()), _summons(me)
{
+ Initialize();
me->SetPhaseMask(me->GetPhaseMask() | 0x20, true);
}
- void Reset() override
+ void Initialize()
{
- _summons.DespawnAll();
- _events.Reset();
_materialCorporealityValue = 5;
_materialDamageTaken = 0;
_twilightDamageTaken = 0;
+ }
+
+ void Reset() override
+ {
+ _summons.DespawnAll();
+ _events.Reset();
+ Initialize();
DoCast(me, SPELL_CLEAR_DEBUFFS);
}
@@ -1207,13 +1213,22 @@ class npc_living_ember : public CreatureScript
struct npc_living_emberAI : public ScriptedAI
{
- npc_living_emberAI(Creature* creature) : ScriptedAI(creature) { }
+ npc_living_emberAI(Creature* creature) : ScriptedAI(creature)
+ {
+ Initialize();
+ _enrageTimer = 0;
+ }
- void Reset() override
+ void Initialize()
{
_hasEnraged = false;
}
+ void Reset() override
+ {
+ Initialize();
+ }
+
void EnterCombat(Unit* /*who*/) override
{
_enrageTimer = 20000;
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
index 28bf3a3d531..be756a8ab36 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
@@ -54,6 +54,7 @@ class instance_ruby_sanctum : public InstanceMapScript
BaltharusSharedHealth = 0;
FlameWallsGUID = 0;
FlameRingGUID = 0;
+ TwilightFlameRingGUID = 0;
memset(ZarithrianSpawnStalkerGUID, 0, 2 * sizeof(uint64));
memset(BurningTreeGUID, 0, 4 * sizeof(uint64));
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
index 7e9e351ae9c..f2d2c3e3d5b 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
@@ -156,11 +156,22 @@ public:
{
boss_eadricAI(Creature* creature) : ScriptedAI(creature)
{
+ Initialize();
instance = creature->GetInstanceScript();
creature->SetReactState(REACT_PASSIVE);
creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
}
+ void Initialize()
+ {
+ uiVenganceTimer = 10000;
+ uiRadianceTimer = 16000;
+ uiHammerJusticeTimer = 25000;
+ uiResetTimer = 5000;
+
+ bDone = false;
+ }
+
InstanceScript* instance;
uint32 uiVenganceTimer;
@@ -172,12 +183,7 @@ public:
void Reset() override
{
- uiVenganceTimer = 10000;
- uiRadianceTimer = 16000;
- uiHammerJusticeTimer = 25000;
- uiResetTimer = 5000;
-
- bDone = false;
+ Initialize();
}
void DamageTaken(Unit* /*done_by*/, uint32 &damage) override
@@ -260,6 +266,7 @@ public:
{
boss_paletressAI(Creature* creature) : ScriptedAI(creature)
{
+ Initialize();
instance = creature->GetInstanceScript();
MemoryGUID = 0;
@@ -268,6 +275,18 @@ public:
creature->RestoreFaction();
}
+ void Initialize()
+ {
+ uiHolyFireTimer = urand(9000, 12000);
+ uiHolySmiteTimer = urand(5000, 7000);
+ uiRenewTimer = urand(2000, 5000);
+
+ uiResetTimer = 7000;
+
+ bHealth = false;
+ bDone = false;
+ }
+
InstanceScript* instance;
uint64 MemoryGUID;
@@ -283,14 +302,7 @@ public:
{
me->RemoveAllAuras();
- uiHolyFireTimer = urand(9000, 12000);
- uiHolySmiteTimer = urand(5000, 7000);
- uiRenewTimer = urand(2000, 5000);
-
- uiResetTimer = 7000;
-
- bHealth = false;
- bDone = false;
+ Initialize();
if (Creature* pMemory = ObjectAccessor::GetCreature(*me, MemoryGUID))
if (pMemory->IsAlive())
@@ -415,7 +427,17 @@ public:
struct npc_memoryAI : public ScriptedAI
{
- npc_memoryAI(Creature* creature) : ScriptedAI(creature) { }
+ npc_memoryAI(Creature* creature) : ScriptedAI(creature)
+ {
+ Initialize();
+ }
+
+ void Initialize()
+ {
+ uiOldWoundsTimer = 12000;
+ uiShadowPastTimer = 5000;
+ uiWakingNightmare = 7000;
+ }
uint32 uiOldWoundsTimer;
uint32 uiShadowPastTimer;
@@ -423,9 +445,7 @@ public:
void Reset() override
{
- uiOldWoundsTimer = 12000;
- uiShadowPastTimer = 5000;
- uiWakingNightmare = 7000;
+ Initialize();
}
void UpdateAI(uint32 uiDiff) override
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
index a8aff70b034..e342b3bbfb1 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
@@ -83,9 +83,31 @@ public:
{
boss_black_knightAI(Creature* creature) : ScriptedAI(creature)
{
+ Initialize();
instance = creature->GetInstanceScript();
}
+ void Initialize()
+ {
+ bEventInProgress = false;
+ bEvent = false;
+ bSummonArmy = false;
+ bDeathArmyDone = false;
+
+ uiPhase = PHASE_UNDEAD;
+
+ uiIcyTouchTimer = urand(5000, 9000);
+ uiPlagueStrikeTimer = urand(10000, 13000);
+ uiDeathRespiteTimer = urand(15000, 16000);
+ uiObliterateTimer = urand(17000, 19000);
+ uiDesecration = urand(15000, 16000);
+ uiDeathArmyCheckTimer = 7000;
+ uiResurrectTimer = 4000;
+ uiGhoulExplodeTimer = 8000;
+ uiDeathBiteTimer = urand(2000, 4000);
+ uiMarkedDeathTimer = urand(5000, 7000);
+ }
+
InstanceScript* instance;
std::list<uint64> SummonList;
@@ -114,23 +136,7 @@ public:
me->SetDisplayId(me->GetNativeDisplayId());
me->ClearUnitState(UNIT_STATE_ROOT | UNIT_STATE_STUNNED);
- bEventInProgress = false;
- bEvent = false;
- bSummonArmy = false;
- bDeathArmyDone = false;
-
- uiPhase = PHASE_UNDEAD;
-
- uiIcyTouchTimer = urand(5000, 9000);
- uiPlagueStrikeTimer = urand(10000, 13000);
- uiDeathRespiteTimer = urand(15000, 16000);
- uiObliterateTimer = urand(17000, 19000);
- uiDesecration = urand(15000, 16000);
- uiDeathArmyCheckTimer = 7000;
- uiResurrectTimer = 4000;
- uiGhoulExplodeTimer = 8000;
- uiDeathBiteTimer = urand(2000, 4000);
- uiMarkedDeathTimer = urand(5000, 7000);
+ Initialize();
}
void RemoveSummons()
@@ -310,13 +316,21 @@ public:
struct npc_risen_ghoulAI : public ScriptedAI
{
- npc_risen_ghoulAI(Creature* creature) : ScriptedAI(creature) { }
+ npc_risen_ghoulAI(Creature* creature) : ScriptedAI(creature)
+ {
+ Initialize();
+ }
+
+ void Initialize()
+ {
+ uiAttackTimer = 3500;
+ }
uint32 uiAttackTimer;
void Reset() override
{
- uiAttackTimer = 3500;
+ Initialize();
}
void UpdateAI(uint32 uiDiff) override
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
index 23753278e27..a0cb4ca6d6f 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
@@ -155,12 +155,20 @@ public:
{
generic_vehicleAI_toc5AI(Creature* creature) : npc_escortAI(creature)
{
+ Initialize();
SetDespawnAtEnd(false);
uiWaypointPath = 0;
instance = creature->GetInstanceScript();
}
+ void Initialize()
+ {
+ uiChargeTimer = 5000;
+ uiShieldBreakerTimer = 8000;
+ uiBuffTimer = urand(30000, 60000);
+ }
+
InstanceScript* instance;
uint32 uiChargeTimer;
@@ -171,9 +179,7 @@ public:
void Reset() override
{
- uiChargeTimer = 5000;
- uiShieldBreakerTimer = 8000;
- uiBuffTimer = urand(30000, 60000);
+ Initialize();
}
void SetData(uint32 uiType, uint32 /*uiData*/) override
@@ -311,6 +317,7 @@ public:
{
boss_warrior_toc5AI(Creature* creature) : ScriptedAI(creature)
{
+ Initialize();
instance = creature->GetInstanceScript();
bDone = false;
@@ -324,6 +331,13 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_IMMUNE_TO_PC);
}
+ void Initialize()
+ {
+ uiBladeStormTimer = urand(15000, 20000);
+ uiInterceptTimer = 7000;
+ uiMortalStrikeTimer = urand(8000, 12000);
+ }
+
InstanceScript* instance;
uint8 uiPhase;
@@ -339,9 +353,7 @@ public:
void Reset() override
{
- uiBladeStormTimer = urand(15000, 20000);
- uiInterceptTimer = 7000;
- uiMortalStrikeTimer = urand(8000, 12000);
+ Initialize();
}
void JustReachedHome() override
@@ -443,6 +455,7 @@ public:
{
boss_mage_toc5AI(Creature* creature) : ScriptedAI(creature)
{
+ Initialize();
instance = creature->GetInstanceScript();
bDone = false;
@@ -456,6 +469,14 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_IMMUNE_TO_PC);
}
+ void Initialize()
+ {
+ uiFireBallTimer = 5000;
+ uiPolymorphTimer = 8000;
+ uiBlastWaveTimer = 12000;
+ uiHasteTimer = 22000;
+ }
+
InstanceScript* instance;
uint8 uiPhase;
@@ -471,10 +492,7 @@ public:
void Reset() override
{
- uiFireBallTimer = 5000;
- uiPolymorphTimer = 8000;
- uiBlastWaveTimer = 12000;
- uiHasteTimer = 22000;
+ Initialize();
}
void JustReachedHome() override
@@ -580,6 +598,7 @@ public:
{
boss_shaman_toc5AI(Creature* creature) : ScriptedAI(creature)
{
+ Initialize();
instance = creature->GetInstanceScript();
bDone = false;
@@ -593,6 +612,14 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_IMMUNE_TO_PC);
}
+ void Initialize()
+ {
+ uiChainLightningTimer = 16000;
+ uiHealingWaveTimer = 12000;
+ uiEartShieldTimer = urand(30000, 35000);
+ uiHexMendingTimer = urand(20000, 25000);
+ }
+
InstanceScript* instance;
uint8 uiPhase;
@@ -608,10 +635,7 @@ public:
void Reset() override
{
- uiChainLightningTimer = 16000;
- uiHealingWaveTimer = 12000;
- uiEartShieldTimer = urand(30000, 35000);
- uiHexMendingTimer = urand(20000, 25000);
+ Initialize();
}
void EnterCombat(Unit* who) override
@@ -725,6 +749,7 @@ public:
{
boss_hunter_toc5AI(Creature* creature) : ScriptedAI(creature)
{
+ Initialize();
instance = creature->GetInstanceScript();
bDone = false;
@@ -738,6 +763,17 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_IMMUNE_TO_PC);
}
+ void Initialize()
+ {
+ uiShootTimer = 12000;
+ uiMultiShotTimer = 0;
+ uiLightningArrowsTimer = 7000;
+
+ uiTargetGUID = 0;
+
+ bShoot = false;
+ }
+
InstanceScript* instance;
uint8 uiPhase;
@@ -755,13 +791,7 @@ public:
void Reset() override
{
- uiShootTimer = 12000;
- uiMultiShotTimer = 0;
- uiLightningArrowsTimer = 7000;
-
- uiTargetGUID = 0;
-
- bShoot = false;
+ Initialize();
}
void JustReachedHome() override
@@ -879,6 +909,7 @@ public:
{
boss_rouge_toc5AI(Creature* creature) : ScriptedAI(creature)
{
+ Initialize();
instance = creature->GetInstanceScript();
bDone = false;
@@ -892,6 +923,13 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_IMMUNE_TO_PC);
}
+ void Initialize()
+ {
+ uiEviscerateTimer = 8000;
+ uiFanKivesTimer = 14000;
+ uiPosionBottleTimer = 19000;
+ }
+
InstanceScript* instance;
uint8 uiPhase;
@@ -905,9 +943,7 @@ public:
void Reset() override
{
- uiEviscerateTimer = 8000;
- uiFanKivesTimer = 14000;
- uiPosionBottleTimer = 19000;
+ Initialize();
}
void JustReachedHome() override
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
index e0930a1ae2e..e073d08ef1d 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
@@ -115,8 +115,6 @@ public:
uint64 uiVehicle2GUID;
uint64 uiVehicle3GUID;
- uint64 uiGrandChampionBoss1;
-
std::list<uint64> Champion1List;
std::list<uint64> Champion2List;
std::list<uint64> Champion3List;
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
index 7af55ec37ea..2f29e03a2f2 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
@@ -166,6 +166,13 @@ class boss_anubarak_trial : public CreatureScript
{
boss_anubarak_trialAI(Creature* creature) : BossAI(creature, BOSS_ANUBARAK)
{
+ Initialize();
+ }
+
+ void Initialize()
+ {
+ _intro = true;
+ _reachedPhase3 = false;
}
void Reset() override
@@ -183,8 +190,7 @@ class boss_anubarak_trial : public CreatureScript
if (!IsHeroic())
events.ScheduleEvent(EVENT_SUMMON_FROST_SPHERE, 20*IN_MILLISECONDS);
- _intro = true;
- _reachedPhase3 = false;
+ Initialize();
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
// clean up spawned Frost Spheres
std::list<Creature*> FrostSphereList;
@@ -436,13 +442,19 @@ class npc_swarm_scarab : public CreatureScript
{
npc_swarm_scarabAI(Creature* creature) : ScriptedAI(creature)
{
+ Initialize();
_instance = creature->GetInstanceScript();
}
+ void Initialize()
+ {
+ _determinationTimer = urand(5 * IN_MILLISECONDS, 60 * IN_MILLISECONDS);
+ }
+
void Reset() override
{
me->SetCorpseDelay(0);
- _determinationTimer = urand(5*IN_MILLISECONDS, 60*IN_MILLISECONDS);
+ Initialize();
DoCast(me, SPELL_ACID_MANDIBLE);
me->SetInCombatWithZone();
if (me->IsInCombat())
@@ -508,13 +520,19 @@ class npc_nerubian_burrower : public CreatureScript
{
npc_nerubian_burrowerAI(Creature* creature) : ScriptedAI(creature)
{
+ Initialize();
_instance = creature->GetInstanceScript();
}
+ void Initialize()
+ {
+ _submergeTimer = 30 * IN_MILLISECONDS;
+ }
+
void Reset() override
{
me->SetCorpseDelay(10);
- _submergeTimer = 30*IN_MILLISECONDS;
+ Initialize();
DoCast(me, SPELL_EXPOSE_WEAKNESS);
DoCast(me, SPELL_SPIDER_FRENZY);
DoCast(me, SPELL_AWAKENED);
@@ -669,12 +687,18 @@ class npc_anubarak_spike : public CreatureScript
{
npc_anubarak_spikeAI(Creature* creature) : ScriptedAI(creature)
{
+ Initialize();
}
- void Reset() override
+ void Initialize()
{
_phase = PHASE_NO_MOVEMENT;
_phaseSwitchTimer = 1;
+ }
+
+ void Reset() override
+ {
+ Initialize();
// make sure the spike has everyone on threat list
me->SetInCombatWithZone();
}
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
index 0a43c01081f..3d59f24b6dd 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
@@ -348,10 +348,11 @@ class boss_toc_champion_controller : public CreatureScript
{
boss_toc_champion_controllerAI(Creature* creature) : ScriptedAI(creature), _summons(me)
{
+ Initialize();
_instance = creature->GetInstanceScript();
}
- void Reset() override
+ void Initialize()
{
_championsNotStarted = 0;
_championsFailed = 0;
@@ -359,6 +360,11 @@ class boss_toc_champion_controller : public CreatureScript
_inProgress = false;
}
+ void Reset() override
+ {
+ Initialize();
+ }
+
std::vector<uint32> SelectChampions(Team playerTeam)
{
std::vector<uint32> vHealersEntries;
@@ -1908,7 +1914,17 @@ class npc_toc_enh_shaman : public CreatureScript
struct npc_toc_enh_shamanAI : public boss_faction_championsAI
{
- npc_toc_enh_shamanAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) { }
+ npc_toc_enh_shamanAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE)
+ {
+ Initialize();
+ }
+
+ void Initialize()
+ {
+ _totemCount = 0;
+ _totemOldCenterX = me->GetPositionX();
+ _totemOldCenterY = me->GetPositionY();
+ }
void Reset() override
{
@@ -1920,9 +1936,7 @@ class npc_toc_enh_shaman : public CreatureScript
events.ScheduleEvent(EVENT_DEPLOY_TOTEM, 1*IN_MILLISECONDS);
events.ScheduleEvent(EVENT_WINDFURY, urand(20*IN_MILLISECONDS, 50*IN_MILLISECONDS));
- _totemCount = 0;
- _totemOldCenterX = me->GetPositionX();
- _totemOldCenterY = me->GetPositionY();
+ Initialize();
SetEquipmentSlots(false, 51803, 48013, EQUIP_NO_CHANGE);
summons.DespawnAll();
}
@@ -2192,12 +2206,20 @@ class npc_toc_pet_hunter : public CreatureScript
struct npc_toc_pet_hunterAI : public boss_faction_championsAI
{
- npc_toc_pet_hunterAI(Creature* creature) : boss_faction_championsAI(creature, AI_PET) { }
+ npc_toc_pet_hunterAI(Creature* creature) : boss_faction_championsAI(creature, AI_PET)
+ {
+ Initialize();
+ }
+
+ void Initialize()
+ {
+ _clawTimer = urand(5 * IN_MILLISECONDS, 10 * IN_MILLISECONDS);
+ }
void Reset() override
{
boss_faction_championsAI::Reset();
- _clawTimer = urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS);
+ Initialize();
}
void UpdateAI(uint32 diff) override
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
index c0f7b2f1856..a8a370076a8 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
@@ -315,12 +315,18 @@ class npc_fel_infernal : public CreatureScript
{
npc_fel_infernalAI(Creature* creature) : ScriptedAI(creature)
{
+ Initialize();
_instance = creature->GetInstanceScript();
}
+ void Initialize()
+ {
+ _felStreakTimer = 30 * IN_MILLISECONDS;
+ }
+
void Reset() override
{
- _felStreakTimer = 30*IN_MILLISECONDS;
+ Initialize();
me->SetInCombatWithZone();
}
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
index 9e75bef9735..f4112b7a43b 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
@@ -492,6 +492,18 @@ struct boss_jormungarAI : public BossAI
{
boss_jormungarAI(Creature* creature) : BossAI(creature, BOSS_BEASTS)
{
+ OtherWormEntry = 0;
+ ModelStationary = 0;
+ ModelMobile = 0;
+
+ BiteSpell = 0;
+ SpewSpell = 0;
+ SpitSpell = 0;
+ SpraySpell = 0;
+
+ Phase = PHASE_MOBILE;
+ Enraged = false;
+ WasMobile = false;
}
void Reset() override
@@ -780,12 +792,18 @@ class npc_slime_pool : public CreatureScript
{
npc_slime_poolAI(Creature* creature) : ScriptedAI(creature)
{
+ Initialize();
_instance = creature->GetInstanceScript();
}
- void Reset() override
+ void Initialize()
{
_cast = false;
+ }
+
+ void Reset() override
+ {
+ Initialize();
me->SetReactState(REACT_PASSIVE);
}
@@ -851,14 +869,11 @@ class boss_icehowl : public CreatureScript
{
boss_icehowlAI(Creature* creature) : BossAI(creature, BOSS_BEASTS)
{
+ Initialize();
}
- void Reset() override
+ void Initialize()
{
- events.ScheduleEvent(EVENT_FEROCIOUS_BUTT, urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS));
- events.ScheduleEvent(EVENT_ARCTIC_BREATH, urand(15*IN_MILLISECONDS, 25*IN_MILLISECONDS));
- events.ScheduleEvent(EVENT_WHIRL, urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS));
- events.ScheduleEvent(EVENT_MASSIVE_CRASH, 30*IN_MILLISECONDS);
_movementStarted = false;
_movementFinish = false;
_trampleCast = false;
@@ -869,6 +884,15 @@ class boss_icehowl : public CreatureScript
_stage = 0;
}
+ void Reset() override
+ {
+ events.ScheduleEvent(EVENT_FEROCIOUS_BUTT, urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS));
+ events.ScheduleEvent(EVENT_ARCTIC_BREATH, urand(15*IN_MILLISECONDS, 25*IN_MILLISECONDS));
+ events.ScheduleEvent(EVENT_WHIRL, urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS));
+ events.ScheduleEvent(EVENT_MASSIVE_CRASH, 30*IN_MILLISECONDS);
+ Initialize();
+ }
+
void JustDied(Unit* /*killer*/) override
{
_JustDied();
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
index 68de65f9f7b..1118c1ec27b 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
@@ -143,6 +143,33 @@ struct boss_twin_baseAI : public BossAI
{
boss_twin_baseAI(Creature* creature) : BossAI(creature, BOSS_VALKIRIES)
{
+ Initialize();
+ AuraState = AURA_STATE_NONE;
+
+ Stage = 0;
+
+ Weapon = 0;
+
+ VortexEmote = 0;
+ SisterNpcId = 0;
+ MyEmphatySpellId = 0;
+ OtherEssenceSpellId = 0;
+ SurgeSpellId = 0;
+ VortexSpellId = 0;
+ ShieldSpellId = 0;
+ TwinPactSpellId = 0;
+ SpikeSpellId = 0;
+ TouchSpellId = 0;
+ }
+
+ void Initialize()
+ {
+ IsBerserk = false;
+
+ SpecialAbilityTimer = 1 * MINUTE*IN_MILLISECONDS;
+ SpikeTimer = 20 * IN_MILLISECONDS;
+ TouchTimer = urand(10 * IN_MILLISECONDS, 15 * IN_MILLISECONDS);
+ BerserkTimer = IsHeroic() ? 6 * MINUTE*IN_MILLISECONDS : 10 * MINUTE*IN_MILLISECONDS;
}
void Reset() override
@@ -153,12 +180,7 @@ struct boss_twin_baseAI : public BossAI
/* Uncomment this once that they are floating above the ground
me->SetLevitate(true);
me->SetFlying(true); */
- IsBerserk = false;
-
- SpecialAbilityTimer = 1*MINUTE*IN_MILLISECONDS;
- SpikeTimer = 20*IN_MILLISECONDS;
- TouchTimer = urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS);
- BerserkTimer = IsHeroic() ? 6*MINUTE*IN_MILLISECONDS : 10*MINUTE*IN_MILLISECONDS;
+ Initialize();
summons.DespawnAll();
}
@@ -524,6 +546,12 @@ struct npc_unleashed_ballAI : public ScriptedAI
{
npc_unleashed_ballAI(Creature* creature) : ScriptedAI(creature)
{
+ Initialize();
+ }
+
+ void Initialize()
+ {
+ RangeCheckTimer = 0.5*IN_MILLISECONDS;
}
void MoveToNextPoint()
@@ -548,7 +576,7 @@ struct npc_unleashed_ballAI : public ScriptedAI
me->SetCanFly(true);
SetCombatMovement(false);
MoveToNextPoint();
- RangeCheckTimer = 0.5*IN_MILLISECONDS;
+ Initialize();
}
void MovementInform(uint32 uiType, uint32 uiId) override
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
index 11548ba4b1c..7829d1be627 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
@@ -240,7 +240,6 @@ class boss_lich_king_toc : public CreatureScript
void Reset() override
{
- _updateTimer = 0;
me->SetReactState(REACT_PASSIVE);
if (Creature* summoned = me->SummonCreature(NPC_TRIGGER, ToCCommonLoc[2].GetPositionX(), ToCCommonLoc[2].GetPositionY(), ToCCommonLoc[2].GetPositionZ(), 5, TEMPSUMMON_TIMED_DESPAWN, 1*MINUTE*IN_MILLISECONDS))
{
@@ -278,7 +277,7 @@ class boss_lich_king_toc : public CreatureScript
if (_instance->GetData(TYPE_EVENT_NPC) != NPC_LICH_KING)
return;
- _updateTimer = _instance->GetData(TYPE_EVENT_TIMER);
+ uint32 _updateTimer = _instance->GetData(TYPE_EVENT_TIMER);
if (_updateTimer <= uiDiff)
{
switch (_instance->GetData(TYPE_EVENT))
@@ -352,7 +351,6 @@ class boss_lich_king_toc : public CreatureScript
private:
InstanceScript* _instance;
- uint32 _updateTimer;
};
CreatureAI* GetAI(Creature* creature) const override
@@ -370,7 +368,14 @@ class npc_fizzlebang_toc : public CreatureScript
{
npc_fizzlebang_tocAI(Creature* creature) : ScriptedAI(creature), _summons(me)
{
+ Initialize();
_instance = me->GetInstanceScript();
+ _triggerGUID = 0;
+ }
+
+ void Initialize()
+ {
+ _portalGUID = 0;
}
void JustDied(Unit* killer) override
@@ -388,7 +393,7 @@ class npc_fizzlebang_toc : public CreatureScript
void Reset() override
{
me->SetWalk(true);
- _portalGUID = 0;
+ Initialize();
me->GetMotionMaster()->MovePoint(1, ToCCommonLoc[10].GetPositionX(), ToCCommonLoc[10].GetPositionY()-60, ToCCommonLoc[10].GetPositionZ());
}
@@ -423,7 +428,7 @@ class npc_fizzlebang_toc : public CreatureScript
if (_instance->GetData(TYPE_EVENT_NPC) != NPC_FIZZLEBANG)
return;
- _updateTimer = _instance->GetData(TYPE_EVENT_TIMER);
+ uint32 _updateTimer = _instance->GetData(TYPE_EVENT_TIMER);
if (_updateTimer <= uiDiff)
{
switch (_instance->GetData(TYPE_EVENT))
@@ -521,7 +526,6 @@ class npc_fizzlebang_toc : public CreatureScript
private:
InstanceScript* _instance;
SummonList _summons;
- uint32 _updateTimer;
uint64 _portalGUID;
uint64 _triggerGUID;
};
@@ -556,7 +560,7 @@ class npc_tirion_toc : public CreatureScript
if (_instance->GetData(TYPE_EVENT_NPC) != NPC_TIRION)
return;
- _updateTimer = _instance->GetData(TYPE_EVENT_TIMER);
+ uint32 _updateTimer = _instance->GetData(TYPE_EVENT_TIMER);
if (_updateTimer <= uiDiff)
{
switch (_instance->GetData(TYPE_EVENT))
@@ -811,7 +815,6 @@ class npc_tirion_toc : public CreatureScript
}
private:
InstanceScript* _instance;
- uint32 _updateTimer;
};
CreatureAI* GetAI(Creature* creature) const override
@@ -844,7 +847,7 @@ class npc_garrosh_toc : public CreatureScript
if (_instance->GetData(TYPE_EVENT_NPC) != NPC_GARROSH)
return;
- _updateTimer = _instance->GetData(TYPE_EVENT_TIMER);
+ uint32 _updateTimer = _instance->GetData(TYPE_EVENT_TIMER);
if (_updateTimer <= uiDiff)
{
switch (_instance->GetData(TYPE_EVENT))
@@ -895,7 +898,6 @@ class npc_garrosh_toc : public CreatureScript
}
private:
InstanceScript* _instance;
- uint32 _updateTimer;
};
CreatureAI* GetAI(Creature* creature) const override
@@ -928,7 +930,7 @@ class npc_varian_toc : public CreatureScript
if (_instance->GetData(TYPE_EVENT_NPC) != NPC_VARIAN)
return;
- _updateTimer = _instance->GetData(TYPE_EVENT_TIMER);
+ uint32 _updateTimer = _instance->GetData(TYPE_EVENT_TIMER);
if (_updateTimer <= uiDiff)
{
switch (_instance->GetData(TYPE_EVENT))
@@ -979,7 +981,6 @@ class npc_varian_toc : public CreatureScript
}
private:
InstanceScript* _instance;
- uint32 _updateTimer;
};
CreatureAI* GetAI(Creature* creature) const override
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp
index a1690598532..694e502e508 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp
@@ -58,10 +58,19 @@ class boss_king_dred : public CreatureScript
struct boss_king_dredAI : public BossAI
{
- boss_king_dredAI(Creature* creature) : BossAI(creature, DATA_KING_DRED) { }
+ boss_king_dredAI(Creature* creature) : BossAI(creature, DATA_KING_DRED)
+ {
+ Initialize();
+ }
+
+ void Initialize()
+ {
+ raptorsKilled = 0;
+ }
void Reset() override
{
+ Initialize();
_Reset();
}
@@ -166,16 +175,22 @@ class npc_drakkari_gutripper : public CreatureScript
{
npc_drakkari_gutripperAI(Creature* creature) : ScriptedAI(creature)
{
+ Initialize();
instance = me->GetInstanceScript();
}
+ void Initialize()
+ {
+ GutRipTimer = urand(10000, 15000);
+ }
+
InstanceScript* instance;
uint32 GutRipTimer;
void Reset() override
{
- GutRipTimer = urand(10000, 15000);
+ Initialize();
}
void UpdateAI(uint32 diff) override
@@ -216,16 +231,22 @@ class npc_drakkari_scytheclaw : public CreatureScript
{
npc_drakkari_scytheclawAI(Creature* creature) : ScriptedAI(creature)
{
+ Initialize();
instance = me->GetInstanceScript();
}
+ void Initialize()
+ {
+ uiRendTimer = urand(10000, 15000);
+ }
+
InstanceScript* instance;
uint32 uiRendTimer;
void Reset() override
{
- uiRendTimer = urand(10000, 15000);
+ Initialize();
}
void UpdateAI(uint32 diff) override
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
index 4e9462a447f..6b26143745b 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
@@ -80,14 +80,23 @@ public:
struct boss_novosAI : public BossAI
{
- boss_novosAI(Creature* creature) : BossAI(creature, DATA_NOVOS) { }
+ boss_novosAI(Creature* creature) : BossAI(creature, DATA_NOVOS)
+ {
+ Initialize();
+ _bubbled = false;
+ }
+
+ void Initialize()
+ {
+ _ohNovos = true;
+ _crystalHandlerCount = 0;
+ }
void Reset() override
{
_Reset();
- _ohNovos = true;
- _crystalHandlerCount = 0;
+ Initialize();
SetCrystalsStatus(false);
SetSummonerStatus(false);
SetBubbled(false);
@@ -280,15 +289,23 @@ public:
struct npc_crystal_channel_targetAI : public ScriptedAI
{
- npc_crystal_channel_targetAI(Creature* creature) : ScriptedAI(creature) { }
+ npc_crystal_channel_targetAI(Creature* creature) : ScriptedAI(creature)
+ {
+ Initialize();
+ }
- void Reset() override
+ void Initialize()
{
_spell = 0;
_timer = 0;
_temp = 0;
}
+ void Reset() override
+ {
+ Initialize();
+ }
+
void UpdateAI(uint32 diff) override
{
if (_spell)
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
index 13d968d9e06..a8f083c97ee 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
@@ -73,12 +73,20 @@ class boss_trollgore : public CreatureScript
struct boss_trollgoreAI : public BossAI
{
- boss_trollgoreAI(Creature* creature) : BossAI(creature, DATA_TROLLGORE) { }
+ boss_trollgoreAI(Creature* creature) : BossAI(creature, DATA_TROLLGORE)
+ {
+ Initialize();
+ }
+
+ void Initialize()
+ {
+ _consumptionJunction = true;
+ }
void Reset() override
{
_Reset();
- _consumptionJunction = true;
+ Initialize();
}
void EnterCombat(Unit* /*who*/) override
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
index fe98f005bca..670591a058c 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
@@ -71,14 +71,6 @@ class boss_bronjahm : public CreatureScript
DoCast(me, SPELL_SOULSTORM_CHANNEL, true);
}
- void InitializeAI() override
- {
- if (!instance || static_cast<InstanceMap*>(me->GetMap())->GetScriptId() != sObjectMgr->GetScriptId(FoSScriptName))
- me->IsAIEnabled = false;
- else if (!me->isDead())
- Reset();
- }
-
void Reset() override
{
events.Reset();
@@ -188,7 +180,7 @@ class boss_bronjahm : public CreatureScript
CreatureAI* GetAI(Creature* creature) const override
{
- return GetInstanceAI<boss_bronjahmAI>(creature);
+ return GetInstanceAI<boss_bronjahmAI>(creature, FoSScriptName);
}
};
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
index a048abd6554..4b4fd398e72 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
@@ -130,14 +130,15 @@ class boss_devourer_of_souls : public CreatureScript
{
boss_devourer_of_soulsAI(Creature* creature) : BossAI(creature, DATA_DEVOURER_EVENT)
{
+ Initialize();
+ beamAngle = 0.f;
+ beamAngleDiff = 0.f;
+ wailingSoulTick = 0;
}
- void InitializeAI() override
+ void Initialize()
{
- if (!instance || static_cast<InstanceMap*>(me->GetMap())->GetScriptId() != sObjectMgr->GetScriptId(FoSScriptName))
- me->IsAIEnabled = false;
- else if (!me->isDead())
- Reset();
+ threeFaced = true;
}
void Reset() override
@@ -149,7 +150,7 @@ class boss_devourer_of_souls : public CreatureScript
events.Reset();
summons.DespawnAll();
- threeFaced = true;
+ Initialize();
instance->SetData(DATA_DEVOURER_EVENT, NOT_STARTED);
}
@@ -345,7 +346,7 @@ class boss_devourer_of_souls : public CreatureScript
CreatureAI* GetAI(Creature* creature) const override
{
- return GetInstanceAI<boss_devourer_of_soulsAI>(creature);
+ return GetInstanceAI<boss_devourer_of_soulsAI>(creature, FoSScriptName);
}
};
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
index fc9a786aab9..7a36dfe7fae 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
@@ -80,10 +80,16 @@ public:
{
npc_sylvanas_fosAI(Creature* creature) : ScriptedAI(creature)
{
+ Initialize();
instance = me->GetInstanceScript();
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
}
+ void Initialize()
+ {
+ phase = PHASE_NORMAL;
+ }
+
InstanceScript* instance;
EventMap events;
@@ -92,7 +98,7 @@ public:
void Reset() override
{
events.Reset();
- phase = PHASE_NORMAL;
+ Initialize();
}
void DoAction(int32 actionId) override
@@ -203,10 +209,16 @@ public:
{
npc_jaina_fosAI(Creature* creature) : ScriptedAI(creature)
{
+ Initialize();
instance = me->GetInstanceScript();
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
}
+ void Initialize()
+ {
+ phase = PHASE_NORMAL;
+ }
+
InstanceScript* instance;
EventMap events;
@@ -215,7 +227,7 @@ public:
void Reset() override
{
events.Reset();
- phase = PHASE_NORMAL;
+ Initialize();
}
void DoAction(int32 actionId) override
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
index a5577b6a0ea..a014be4369e 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
@@ -55,12 +55,20 @@ class boss_falric : public CreatureScript
struct boss_falricAI : public boss_horAI
{
- boss_falricAI(Creature* creature) : boss_horAI(creature, DATA_FALRIC) { }
+ boss_falricAI(Creature* creature) : boss_horAI(creature, DATA_FALRIC)
+ {
+ Initialize();
+ }
+
+ void Initialize()
+ {
+ _hopelessnessCount = 0;
+ }
void Reset() override
{
boss_horAI::Reset();
- _hopelessnessCount = 0;
+ Initialize();
}
void EnterCombat(Unit* /*who*/) override
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
index 783f9e245c8..62a6ac41074 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
@@ -82,14 +82,22 @@ class boss_garfrost : public CreatureScript
struct boss_garfrostAI : public BossAI
{
- boss_garfrostAI(Creature* creature) : BossAI(creature, DATA_GARFROST) { }
+ boss_garfrostAI(Creature* creature) : BossAI(creature, DATA_GARFROST)
+ {
+ Initialize();
+ }
+
+ void Initialize()
+ {
+ _permafrostStack = 0;
+ }
void Reset() override
{
_Reset();
events.SetPhase(PHASE_ONE);
SetEquipmentSlots(true);
- _permafrostStack = 0;
+ Initialize();
}
void EnterCombat(Unit* /*who*/) override
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
index 3f8e1cc6ee0..5b147344a59 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
@@ -140,6 +140,7 @@ class boss_ick : public CreatureScript
boss_ickAI(Creature* creature) : BossAI(creature, DATA_ICK), _vehicle(creature->GetVehicleKit())
{
ASSERT(_vehicle);
+ _tempThreat = 0;
}
void Reset() override
@@ -286,14 +287,20 @@ class boss_krick : public CreatureScript
{
boss_krickAI(Creature* creature) : ScriptedAI(creature), _instanceScript(creature->GetInstanceScript()), _summons(creature)
{
+ Initialize();
}
- void Reset() override
+ void Initialize()
{
- _events.Reset();
_phase = PHASE_COMBAT;
_outroNpcGUID = 0;
_tyrannusGUID = 0;
+ }
+
+ void Reset() override
+ {
+ _events.Reset();
+ Initialize();
me->SetReactState(REACT_PASSIVE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
index c4f46136bd9..f392b21b173 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
@@ -293,14 +293,20 @@ class boss_rimefang : public CreatureScript
boss_rimefangAI(Creature* creature) : ScriptedAI(creature), _vehicle(creature->GetVehicleKit())
{
ASSERT(_vehicle);
+ Initialize();
+ }
+
+ void Initialize()
+ {
+ _currentWaypoint = 0;
+ _hoarfrostTargetGUID = 0;
}
void Reset() override
{
_events.Reset();
_events.SetPhase(PHASE_NONE);
- _currentWaypoint = 0;
- _hoarfrostTargetGUID = 0;
+ Initialize();
me->SetCanFly(true);
me->SetReactState(REACT_PASSIVE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
index 9b9376c34f2..d829b98f926 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
@@ -52,6 +52,7 @@ class instance_pit_of_saron : public InstanceMapScript
_jainaOrSylvanas1GUID = 0;
_jainaOrSylvanas2GUID = 0;
_teamInInstance = 0;
+ _tyrannusEventGUID = 0;
}
void OnPlayerEnter(Player* player) override
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
index 7bd9325dd97..4d2ebd44db8 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
@@ -113,13 +113,19 @@ class npc_iceborn_protodrake : public CreatureScript
npc_iceborn_protodrakeAI(Creature* creature) : ScriptedAI(creature), _vehicle(creature->GetVehicleKit())
{
ASSERT(_vehicle);
+ Initialize();
}
- void Reset() override
+ void Initialize()
{
_frostBreathCooldown = 5000;
}
+ void Reset() override
+ {
+ Initialize();
+ }
+
void EnterCombat(Unit* /*who*/) override
{
_vehicle->RemoveAllPassengers();
@@ -161,13 +167,19 @@ class npc_geist_ambusher : public CreatureScript
{
npc_geist_ambusherAI(Creature* creature) : ScriptedAI(creature)
{
+ Initialize();
}
- void Reset() override
+ void Initialize()
{
_leapingFaceMaulCooldown = 9000;
}
+ void Reset() override
+ {
+ Initialize();
+ }
+
void EnterCombat(Unit* who) override
{
if (who->GetTypeId() != TYPEID_PLAYER)
diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
index 68929d2aa01..001f19679c4 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
@@ -82,14 +82,14 @@ class boss_drakkari_colossus : public CreatureScript
{
boss_drakkari_colossusAI(Creature* creature) : BossAI(creature, DATA_DRAKKARI_COLOSSUS_EVENT)
{
+ Initialize();
me->SetReactState(REACT_PASSIVE);
introDone = false;
}
- void InitializeAI() override
+ void Initialize()
{
- if (!me->isDead())
- Reset();
+ phase = COLOSSUS_PHASE_NORMAL;
}
void Reset() override
@@ -106,7 +106,7 @@ class boss_drakkari_colossus : public CreatureScript
//events.Reset(); -> done in _Reset();
events.ScheduleEvent(EVENT_MIGHTY_BLOW, urand(10000, 30000));
- phase = COLOSSUS_PHASE_NORMAL;
+ Initialize();
// Note: This should not be called, but before use SetBossState function we should use BossAI
// in all the bosses of the instance
@@ -393,13 +393,19 @@ public:
{
npc_living_mojoAI(Creature* creature) : ScriptedAI(creature)
{
+ Initialize();
instance = creature->GetInstanceScript();
}
+ void Initialize()
+ {
+ mojoWaveTimer = 2 * IN_MILLISECONDS;
+ mojoPuddleTimer = 7 * IN_MILLISECONDS;
+ }
+
void Reset() override
{
- mojoWaveTimer = 2*IN_MILLISECONDS;
- mojoPuddleTimer = 7*IN_MILLISECONDS;
+ Initialize();
}
void MoveMojos(Creature* boss)
diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp
index 8e0ff54e161..0783a79b381 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp
@@ -44,9 +44,20 @@ public:
{
boss_eckAI(Creature* creature) : ScriptedAI(creature)
{
+ Initialize();
instance = creature->GetInstanceScript();
}
+ void Initialize()
+ {
+ uiBerserkTimer = urand(60 * IN_MILLISECONDS, 90 * IN_MILLISECONDS); //60-90 secs according to wowwiki
+ uiBiteTimer = 5 * IN_MILLISECONDS;
+ uiSpitTimer = 10 * IN_MILLISECONDS;
+ uiSpringTimer = 8 * IN_MILLISECONDS;
+
+ bBerserk = false;
+ }
+
uint32 uiBerserkTimer;
uint32 uiBiteTimer;
uint32 uiSpitTimer;
@@ -58,12 +69,7 @@ public:
void Reset() override
{
- uiBerserkTimer = urand(60*IN_MILLISECONDS, 90*IN_MILLISECONDS); //60-90 secs according to wowwiki
- uiBiteTimer = 5*IN_MILLISECONDS;
- uiSpitTimer = 10*IN_MILLISECONDS;
- uiSpringTimer = 8*IN_MILLISECONDS;
-
- bBerserk = false;
+ Initialize();
instance->SetData(DATA_ECK_THE_FEROCIOUS_EVENT, NOT_STARTED);
}
diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
index f1c246dbbea..22e7ac280fd 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
@@ -77,9 +77,26 @@ public:
{
boss_gal_darahAI(Creature* creature) : ScriptedAI(creature)
{
+ Initialize();
instance = creature->GetInstanceScript();
}
+ void Initialize()
+ {
+ uiStampedeTimer = 10 * IN_MILLISECONDS;
+ uiWhirlingSlashTimer = 21 * IN_MILLISECONDS;
+ uiPunctureTimer = 10 * IN_MILLISECONDS;
+ uiEnrageTimer = 15 * IN_MILLISECONDS;
+ uiImpalingChargeTimer = 21 * IN_MILLISECONDS;
+ uiStompTimer = 25 * IN_MILLISECONDS;
+ uiTransformationTimer = 9 * IN_MILLISECONDS;
+ uiPhaseCounter = 0;
+
+ shareTheLove = 0;
+ bStartOfTransformation = true;
+ Phase = TROLL;
+ }
+
uint32 uiStampedeTimer;
uint32 uiWhirlingSlashTimer;
uint32 uiPunctureTimer;
@@ -100,21 +117,9 @@ public:
void Reset() override
{
- uiStampedeTimer = 10*IN_MILLISECONDS;
- uiWhirlingSlashTimer = 21*IN_MILLISECONDS;
- uiPunctureTimer = 10*IN_MILLISECONDS;
- uiEnrageTimer = 15*IN_MILLISECONDS;
- uiImpalingChargeTimer = 21*IN_MILLISECONDS;
- uiStompTimer = 25*IN_MILLISECONDS;
- uiTransformationTimer = 9*IN_MILLISECONDS;
- uiPhaseCounter = 0;
+ Initialize();
impaledList.clear();
- shareTheLove = 0;
-
- bStartOfTransformation = true;
-
- Phase = TROLL;
me->SetDisplayId(DISPLAY_TROLL);
diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
index 7645d984aac..255a5ece261 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
@@ -61,9 +61,19 @@ public:
{
boss_moorabiAI(Creature* creature) : ScriptedAI(creature)
{
+ Initialize();
instance = creature->GetInstanceScript();
}
+ void Initialize()
+ {
+ uiGroundTremorTimer = 18 * IN_MILLISECONDS;
+ uiNumblingShoutTimer = 10 * IN_MILLISECONDS;
+ uiDeterminedStabTimer = 20 * IN_MILLISECONDS;
+ uiTransformationTImer = 12 * IN_MILLISECONDS;
+ bPhase = false;
+ }
+
InstanceScript* instance;
bool bPhase;
@@ -75,11 +85,7 @@ public:
void Reset() override
{
- uiGroundTremorTimer = 18*IN_MILLISECONDS;
- uiNumblingShoutTimer = 10*IN_MILLISECONDS;
- uiDeterminedStabTimer = 20*IN_MILLISECONDS;
- uiTransformationTImer = 12*IN_MILLISECONDS;
- bPhase = false;
+ Initialize();
instance->SetData(DATA_MOORABI_EVENT, NOT_STARTED);
}
diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
index 98c8481b5ae..5db49415604 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
@@ -83,9 +83,19 @@ public:
{
boss_slad_ranAI(Creature* creature) : ScriptedAI(creature), lSummons(me)
{
+ Initialize();
instance = creature->GetInstanceScript();
}
+ void Initialize()
+ {
+ uiPoisonNovaTimer = 10 * IN_MILLISECONDS;
+ uiPowerfullBiteTimer = 3 * IN_MILLISECONDS;
+ uiVenomBoltTimer = 15 * IN_MILLISECONDS;
+ uiSpawnTimer = 5 * IN_MILLISECONDS;
+ uiPhase = 0;
+ }
+
uint32 uiPoisonNovaTimer;
uint32 uiPowerfullBiteTimer;
uint32 uiVenomBoltTimer;
@@ -100,11 +110,7 @@ public:
void Reset() override
{
- uiPoisonNovaTimer = 10*IN_MILLISECONDS;
- uiPowerfullBiteTimer = 3*IN_MILLISECONDS;
- uiVenomBoltTimer = 15*IN_MILLISECONDS;
- uiSpawnTimer = 5*IN_MILLISECONDS;
- uiPhase = 0;
+ Initialize();
lWrappedPlayers.clear();
lSummons.DespawnAll();
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
index a9088207ebe..3aebed81f0b 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
@@ -182,14 +182,20 @@ class boss_blood_council_controller : public CreatureScript
{
boss_blood_council_controllerAI(Creature* creature) : BossAI(creature, DATA_BLOOD_PRINCE_COUNCIL)
{
+ Initialize();
+ }
+
+ void Initialize()
+ {
+ _invocationStage = 0;
+ _resetCounter = 0;
}
void Reset() override
{
events.Reset();
me->SetReactState(REACT_PASSIVE);
- _invocationStage = 0;
- _resetCounter = 0;
+ Initialize();
instance->SetBossState(DATA_BLOOD_PRINCE_COUNCIL, NOT_STARTED);
}
@@ -1142,6 +1148,7 @@ class npc_ball_of_flame : public CreatureScript
npc_ball_of_flameAI(Creature* creature) : ScriptedAI(creature), _instance(creature->GetInstanceScript())
{
_despawnTimer = 0;
+ _chaseGUID = 0;
}
void Reset() override
@@ -1224,7 +1231,12 @@ class npc_kinetic_bomb : public CreatureScript
struct npc_kinetic_bombAI : public ScriptedAI
{
- npc_kinetic_bombAI(Creature* creature) : ScriptedAI(creature) { }
+ npc_kinetic_bombAI(Creature* creature) : ScriptedAI(creature)
+ {
+ _x = 0.f;
+ _y = 0.f;
+ _groundZ = 0.f;
+ }
void Reset() override
{
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
index 104a8357917..29d50f1db2a 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
@@ -143,6 +143,14 @@ class boss_blood_queen_lana_thel : public CreatureScript
{
boss_blood_queen_lana_thelAI(Creature* creature) : BossAI(creature, DATA_BLOOD_QUEEN_LANA_THEL)
{
+ Initialize();
+ }
+
+ void Initialize()
+ {
+ _offtankGUID = 0;
+ _creditBloodQuickening = false;
+ _killMinchar = false;
}
void Reset() override
@@ -157,10 +165,8 @@ class boss_blood_queen_lana_thel : public CreatureScript
events.ScheduleEvent(EVENT_TWILIGHT_BLOODBOLT, urand(20000, 25000), EVENT_GROUP_NORMAL);
events.ScheduleEvent(EVENT_AIR_PHASE, 124000 + uint32(Is25ManRaid() ? 3000 : 0));
CleanAuras();
- _offtankGUID = 0;
_vampires.clear();
- _creditBloodQuickening = false;
- _killMinchar = false;
+ Initialize();
}
void EnterCombat(Unit* who) override
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
index 5ef84c7bb40..4b9308fc12d 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
@@ -249,18 +249,24 @@ class boss_deathbringer_saurfang : public CreatureScript
{
boss_deathbringer_saurfangAI(Creature* creature) : BossAI(creature, DATA_DEATHBRINGER_SAURFANG)
{
+ Initialize();
ASSERT(creature->GetVehicleKit()); // we dont actually use it, just check if exists
_introDone = false;
_fallenChampionCastCount = 0;
}
+ void Initialize()
+ {
+ _frenzied = false;
+ _dead = false;
+ }
+
void Reset() override
{
_Reset();
me->SetReactState(REACT_DEFENSIVE);
events.SetPhase(PHASE_COMBAT);
- _frenzied = false;
- _dead = false;
+ Initialize();
me->SetPower(POWER_ENERGY, 0);
DoCast(me, SPELL_ZERO_POWER, true);
DoCast(me, SPELL_BLOOD_LINK, true);
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
index a60d2cfd823..6cc86ff0096 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
@@ -218,6 +218,14 @@ class boss_lady_deathwhisper : public CreatureScript
boss_lady_deathwhisperAI(Creature* creature) : BossAI(creature, DATA_LADY_DEATHWHISPER),
_dominateMindCount(RAID_MODE<uint8>(0, 1, 1, 3)), _introDone(false)
{
+ Initialize();
+ }
+
+ void Initialize()
+ {
+ _waveCounter = 0;
+ _nextVengefulShadeTargetGUID = 0;
+ _darnavanGUID = 0;
}
void Reset() override
@@ -225,9 +233,7 @@ class boss_lady_deathwhisper : public CreatureScript
_Reset();
me->SetPower(POWER_MANA, me->GetMaxPower(POWER_MANA));
events.SetPhase(PHASE_ONE);
- _waveCounter = 0;
- _nextVengefulShadeTargetGUID = 0;
- _darnavanGUID = 0;
+ Initialize();
DoCast(me, SPELL_SHADOW_CHANNELING);
me->RemoveAurasDueToSpell(SPELL_BERSERK);
me->RemoveAurasDueToSpell(SPELL_MANA_BARRIER);
@@ -837,6 +843,13 @@ class npc_darnavan : public CreatureScript
{
npc_darnavanAI(Creature* creature) : ScriptedAI(creature)
{
+ Initialize();
+ }
+
+ void Initialize()
+ {
+ _canCharge = true;
+ _canShatter = true;
}
void Reset() override
@@ -846,8 +859,7 @@ class npc_darnavan : public CreatureScript
_events.ScheduleEvent(EVENT_DARNAVAN_INTIMIDATING_SHOUT, urand(20000, 25000));
_events.ScheduleEvent(EVENT_DARNAVAN_MORTAL_STRIKE, urand(25000, 30000));
_events.ScheduleEvent(EVENT_DARNAVAN_SUNDER_ARMOR, urand(5000, 8000));
- _canCharge = true;
- _canShatter = true;
+ Initialize();
}
void JustDied(Unit* killer) override
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
index 9d24ad062df..b7bf27177ea 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
@@ -133,6 +133,7 @@ class boss_lord_marrowgar : public CreatureScript
_coldflameLastPos.Relocate(creature);
_introDone = false;
_boneSlice = false;
+ _coldflameTarget = 0;
}
void Reset() override
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
index 11f20129b3e..c1a13c90780 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
@@ -223,6 +223,7 @@ class boss_professor_putricide : public CreatureScript
_baseSpeed(creature->GetSpeedRate(MOVE_RUN)), _experimentState(EXPERIMENT_STATE_OOZE)
{
_phase = PHASE_NONE;
+ _oozeFloodStage = 0;
}
void Reset() override
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
index 76c5a93f9c5..3b65c10aaa9 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
@@ -221,6 +221,14 @@ class boss_sindragosa : public CreatureScript
{
boss_sindragosaAI(Creature* creature) : BossAI(creature, DATA_SINDRAGOSA), _summoned(false)
{
+ Initialize();
+ }
+
+ void Initialize()
+ {
+ _mysticBuffetStack = 0;
+ _isInAirPhase = false;
+ _isThirdPhase = false;
}
void Reset() override
@@ -235,9 +243,7 @@ class boss_sindragosa : public CreatureScript
events.ScheduleEvent(EVENT_UNCHAINED_MAGIC, urand(9000, 14000), EVENT_GROUP_LAND_PHASE);
events.ScheduleEvent(EVENT_ICY_GRIP, 33500, EVENT_GROUP_LAND_PHASE);
events.ScheduleEvent(EVENT_AIR_PHASE, 50000);
- _mysticBuffetStack = 0;
- _isInAirPhase = false;
- _isThirdPhase = false;
+ Initialize();
if (!_summoned)
{
@@ -558,6 +564,7 @@ class npc_ice_tomb : public CreatureScript
npc_ice_tombAI(Creature* creature) : ScriptedAI(creature)
{
_trappedPlayerGUID = 0;
+ _existenceCheckTimer = 0;
SetCombatMovement(false);
}
@@ -765,6 +772,12 @@ class npc_rimefang : public CreatureScript
{
npc_rimefangAI(Creature* creature) : ScriptedAI(creature), _instance(creature->GetInstanceScript()), _summoned(false)
{
+ Initialize();
+ }
+
+ void Initialize()
+ {
+ _icyBlastCounter = 0;
}
void InitializeAI() override
@@ -783,7 +796,7 @@ class npc_rimefang : public CreatureScript
_events.ScheduleEvent(EVENT_FROST_BREATH_RIMEFANG, urand(12000, 15000));
_events.ScheduleEvent(EVENT_ICY_BLAST, urand(30000, 35000));
me->SetReactState(REACT_DEFENSIVE);
- _icyBlastCounter = 0;
+ Initialize();
if (!_summoned)
{
@@ -922,7 +935,14 @@ class npc_sindragosa_trash : public CreatureScript
{
npc_sindragosa_trashAI(Creature* creature) : ScriptedAI(creature)
{
+ Initialize();
_instance = creature->GetInstanceScript();
+ _frostwyrmId = 0;
+ }
+
+ void Initialize()
+ {
+ _isTaunted = false;
}
void InitializeAI() override
@@ -946,7 +966,7 @@ class npc_sindragosa_trash : public CreatureScript
_events.ScheduleEvent(EVENT_CONCUSSIVE_SHOCK, urand(8000, 10000));
}
- _isTaunted = false;
+ Initialize();
}
void JustRespawned() override
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
index 55c1003ff0c..50e98422481 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
@@ -483,6 +483,13 @@ class boss_the_lich_king : public CreatureScript
{
boss_the_lich_kingAI(Creature* creature) : BossAI(creature, DATA_THE_LICH_KING)
{
+ Initialize();
+ }
+
+ void Initialize()
+ {
+ _necroticPlagueStack = 0;
+ _vileSpiritExplosions = 0;
}
void Reset() override
@@ -490,8 +497,7 @@ class boss_the_lich_king : public CreatureScript
_Reset();
me->SetReactState(REACT_PASSIVE);
events.SetPhase(PHASE_INTRO);
- _necroticPlagueStack = 0;
- _vileSpiritExplosions = 0;
+ Initialize();
SetEquipmentSlots(true);
}
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
index 68344593434..6d297252dcb 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
@@ -282,6 +282,17 @@ class boss_valithria_dreamwalker : public CreatureScript
boss_valithria_dreamwalkerAI(Creature* creature) : ScriptedAI(creature),
_instance(creature->GetInstanceScript()), _portalCount(RAID_MODE<uint32>(3, 8, 3, 8))
{
+ Initialize();
+ _spawnHealth = me->GetHealth();
+ }
+
+ void Initialize()
+ {
+ _missedPortals = 0;
+ _under25PercentTalkDone = false;
+ _over75PercentTalkDone = false;
+ _justDied = false;
+ _done = false;
}
void InitializeAI() override
@@ -305,11 +316,7 @@ class boss_valithria_dreamwalker : public CreatureScript
// Glyph of Dispel Magic - not a percent heal by effect, its cast with custom basepoints
me->ApplySpellImmune(0, IMMUNITY_ID, 56131, true);
_instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me);
- _missedPortals = 0;
- _under25PercentTalkDone = false;
- _over75PercentTalkDone = false;
- _justDied = false;
- _done = false;
+ Initialize();
}
void AttackStart(Unit* /*target*/) override
@@ -680,6 +687,12 @@ class npc_risen_archmage : public CreatureScript
npc_risen_archmageAI(Creature* creature) : ScriptedAI(creature),
_instance(creature->GetInstanceScript())
{
+ Initialize();
+ }
+
+ void Initialize()
+ {
+ _canCallEnterCombat = true;
}
bool CanAIAttack(Unit const* target) const override
@@ -693,7 +706,7 @@ class npc_risen_archmage : public CreatureScript
_events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, urand(5000, 15000));
_events.ScheduleEvent(EVENT_MANA_VOID, urand(20000, 25000));
_events.ScheduleEvent(EVENT_COLUMN_OF_FROST, urand(10000, 20000));
- _canCallEnterCombat = true;
+ Initialize();
}
void EnterCombat(Unit* /*target*/) override
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
index e85ddc21dda..e403e37835c 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
@@ -385,17 +385,23 @@ class npc_highlord_tirion_fordring_lh : public CreatureScript
{
npc_highlord_tirion_fordringAI(Creature* creature) : ScriptedAI(creature), _instance(creature->GetInstanceScript())
{
+ Initialize();
}
- void Reset() override
+ void Initialize()
{
- _events.Reset();
_theLichKing = 0;
_bolvarFordragon = 0;
_factionNPC = 0;
_damnedKills = 0;
}
+ void Reset() override
+ {
+ _events.Reset();
+ Initialize();
+ }
+
// IMPORTANT NOTE: This is triggered from per-GUID scripts
// of The Damned SAI
void SetData(uint32 type, uint32 data) override
@@ -939,11 +945,18 @@ class npc_crok_scourgebane : public CreatureScript
_instance(creature->GetInstanceScript()), _respawnTime(creature->GetRespawnDelay()),
_corpseDelay(creature->GetCorpseDelay())
{
+ Initialize();
SetDespawnAtEnd(false);
SetDespawnAtFar(false);
_isEventActive = false;
_isEventDone = _instance->GetBossState(DATA_SISTER_SVALNA) == DONE;
+ _currentWPid = 0;
+ }
+
+ void Initialize()
+ {
_didUnderTenPercentText = false;
+ _wipeCheckTimer = 1000;
}
void Reset() override
@@ -952,8 +965,7 @@ class npc_crok_scourgebane : public CreatureScript
_events.ScheduleEvent(EVENT_SCOURGE_STRIKE, urand(7500, 12500));
_events.ScheduleEvent(EVENT_DEATH_STRIKE, urand(25000, 30000));
me->SetReactState(REACT_DEFENSIVE);
- _didUnderTenPercentText = false;
- _wipeCheckTimer = 1000;
+ Initialize();
}
void DoAction(int32 action) override
@@ -1647,12 +1659,18 @@ class npc_impaling_spear : public CreatureScript
{
npc_impaling_spearAI(Creature* creature) : CreatureAI(creature)
{
+ Initialize();
+ }
+
+ void Initialize()
+ {
+ _vehicleCheckTimer = 500;
}
void Reset() override
{
me->SetReactState(REACT_PASSIVE);
- _vehicleCheckTimer = 500;
+ Initialize();
}
void UpdateAI(uint32 diff) override
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
index eab3b0d2f9e..2e566915922 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
@@ -174,6 +174,9 @@ class instance_icecrown_citadel : public InstanceMapScript
UpperSpireTeleporterActiveState = NOT_STARTED;
BloodQuickeningState = NOT_STARTED;
BloodQuickeningMinutes = 0;
+ FrozenBolvarGUID = 0;
+ PillarsChainedGUID = 0;
+ PillarsUnchainedGUID = 0;
}
// A function to help reduce the number of lines for teleporter management.
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
index 676e4134f11..35402771494 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
@@ -62,7 +62,15 @@ public:
struct boss_anubrekhanAI : public BossAI
{
- boss_anubrekhanAI(Creature* creature) : BossAI(creature, BOSS_ANUBREKHAN) { }
+ boss_anubrekhanAI(Creature* creature) : BossAI(creature, BOSS_ANUBREKHAN)
+ {
+ Initialize();
+ }
+
+ void Initialize()
+ {
+ hasTaunted = false;
+ }
bool hasTaunted;
@@ -70,7 +78,7 @@ public:
{
_Reset();
- hasTaunted = false;
+ Initialize();
if (GetDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL)
{
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
index e2ff68ab851..a8de1418cc4 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
@@ -96,12 +96,25 @@ public:
{
boss_four_horsemenAI(Creature* creature) : BossAI(creature, BOSS_HORSEMEN)
{
+ Initialize();
id = Horsemen(0);
for (uint8 i = 0; i < 4; ++i)
if (me->GetEntry() == NPC_HORSEMEN[i])
id = Horsemen(i);
caster = (id == HORSEMEN_LADY || id == HORSEMEN_SIR);
+ }
+
+ void Initialize()
+ {
+ uiEventStarterGUID = 0;
+ nextWP = 0;
+ punishTimer = 2000;
+ nextMovementStarted = false;
+ movementCompleted = false;
+ movementStarted = false;
+ encounterActionAttack = false;
encounterActionReset = false;
+ doDelayPunish = false;
}
Horsemen id;
@@ -124,15 +137,7 @@ public:
instance->SetData(DATA_HORSEMEN0 + id, NOT_STARTED);
me->SetReactState(REACT_AGGRESSIVE);
- uiEventStarterGUID = 0;
- nextWP = 0;
- punishTimer = 2000;
- nextMovementStarted = false;
- movementCompleted = false;
- movementStarted = false;
- encounterActionAttack = false;
- encounterActionReset = false;
- doDelayPunish = false;
+ Initialize();
_Reset();
}
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
index 648fc3c87d2..de9d85db70b 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
@@ -162,7 +162,18 @@ class boss_gothik : public CreatureScript
struct boss_gothikAI : public BossAI
{
- boss_gothikAI(Creature* creature) : BossAI(creature, BOSS_GOTHIK) { }
+ boss_gothikAI(Creature* creature) : BossAI(creature, BOSS_GOTHIK)
+ {
+ Initialize();
+ waveCount = 0;
+ }
+
+ void Initialize()
+ {
+ mergedSides = false;
+ phaseTwo = false;
+ thirtyPercentReached = false;
+ }
uint32 waveCount;
typedef std::vector<Creature*> TriggerVct;
@@ -182,9 +193,7 @@ class boss_gothik : public CreatureScript
me->SetReactState(REACT_PASSIVE);
instance->SetData(DATA_GOTHIK_GATE, GO_STATE_ACTIVE);
_Reset();
- mergedSides = false;
- phaseTwo = false;
- thirtyPercentReached = false;
+ Initialize();
}
void EnterCombat(Unit* /*who*/) override
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
index 648da29ca66..2d0e8a6d2b2 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
@@ -66,7 +66,13 @@ public:
struct boss_heiganAI : public BossAI
{
- boss_heiganAI(Creature* creature) : BossAI(creature, BOSS_HEIGAN) { }
+ boss_heiganAI(Creature* creature) : BossAI(creature, BOSS_HEIGAN)
+ {
+ eruptSection = 0;
+ eruptDirection = false;
+ safetyDance = false;
+ phase = PHASE_FIGHT;
+ }
uint32 eruptSection;
bool eruptDirection;
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
index f010192f6f1..80bf7e39ad3 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
@@ -263,9 +263,20 @@ public:
{
boss_kelthuzadAI(Creature* creature) : BossAI(creature, BOSS_KELTHUZAD), spawns(creature)
{
+ Initialize();
uiFaction = me->getFaction();
}
+ void Initialize()
+ {
+ nGuardiansOfIcecrownCount = 0;
+ uiGuardiansOfIcecrownTimer = 5000; // 5 seconds for summoning each Guardian of Icecrown in phase 3
+
+ Phase = 0;
+ nAbomination = 0;
+ nWeaver = 0;
+ }
+
uint32 Phase;
uint32 uiGuardiansOfIcecrownTimer;
uint32 uiFaction;
@@ -315,12 +326,7 @@ public:
portal->ResetDoorOrButton();
}
- nGuardiansOfIcecrownCount = 0;
- uiGuardiansOfIcecrownTimer = 5000; // 5 seconds for summoning each Guardian of Icecrown in phase 3
-
- Phase = 0;
- nAbomination = 0;
- nWeaver = 0;
+ Initialize();
}
void KilledUnit(Unit* /*victim*/) override
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
index 9987802a165..736941949d1 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
@@ -60,15 +60,21 @@ class boss_loatheb : public CreatureScript
{
boss_loathebAI(Creature* creature) : BossAI(creature, BOSS_LOATHEB)
{
+ Initialize();
}
- void Reset() override
+ void Initialize()
{
- _Reset();
_doomCounter = 0;
_sporeLoserData = true;
}
+ void Reset() override
+ {
+ _Reset();
+ Initialize();
+ }
+
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
index f3e2f61a6fb..8cb7630e60e 100644
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
@@ -1,6 +1,5 @@
/*
* Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/>
- * Copyright (C) 2006-2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -16,13 +15,6 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/* ScriptData
-SDName: Boss_Pandemonius
-SD%Complete: 75
-SDComment: Not known how void blast is done (amount of rapid cast seems to be related to players in party). All mobs remaining in surrounding area should aggro when engaged.
-SDCategory: Auchindoun, Mana Tombs
-EndScriptData */
-
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
#include "mana_tombs.h"
diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
index 6c3e820e10f..60162188f7e 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
@@ -204,7 +204,7 @@ public:
default:
break;
}
-
+
++BeamCount;
uint32 Beam = CurrentBeam;
if (BeamCount > 3)
@@ -265,7 +265,7 @@ public:
break;
}
}
-
+
private:
uint64 TargetGUID[3];
uint32 BeamCount;
diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
index 6425675219f..c998bfed2dc 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
@@ -1,6 +1,5 @@
/*
* Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/>
- * Copyright (C) 2006-2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -16,13 +15,6 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/* ScriptData
-SDName: Boss_Warlord_Najentus
-SD%Complete: 95
-SDComment:
-SDCategory: Black Temple
-EndScriptData */
-
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
#include "black_temple.h"
@@ -187,7 +179,7 @@ public:
break;
}
}
-
+
private:
uint64 SpineTargetGUID;
};
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
index 880efd0cfaf..bd16fe9edd2 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
@@ -1,6 +1,5 @@
/*
* Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/>
- * Copyright (C) 2006-2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -16,13 +15,6 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/* ScriptData
-SDName: Boss_Broggok
-SD%Complete: 70
-SDComment: pre-event not made
-SDCategory: Hellfire Citadel, Blood Furnace
-EndScriptData */
-
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
#include "SpellScript.h"
diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp
index 23e373312cb..a00c9465a05 100644
--- a/src/server/scripts/World/boss_emerald_dragons.cpp
+++ b/src/server/scripts/World/boss_emerald_dragons.cpp
@@ -587,7 +587,7 @@ class boss_taerar : public CreatureScript
void Reset() override
{
me->RemoveAurasDueToSpell(SPELL_SHADE);
-
+
Initialize();
emerald_dragonAI::Reset();
diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp
index f5301fe5cac..1fdd314a9ed 100644
--- a/src/server/scripts/World/go_scripts.cpp
+++ b/src/server/scripts/World/go_scripts.cpp
@@ -36,7 +36,6 @@ go_jotunheim_cage
go_table_theka
go_soulwell
go_bashir_crystalforge
-go_ethereal_teleport_pad
go_soulwell
go_dragonflayer_cage
go_tadpole_cage
@@ -841,32 +840,6 @@ public:
};
/*######
-## go_ethereal_teleport_pad
-######*/
-
-enum EtherealTeleportPad
-{
- NPC_IMAGE_WIND_TRADER = 20518,
- ITEM_TELEPORTER_POWER_PACK = 28969,
-};
-
-class go_ethereal_teleport_pad : public GameObjectScript
-{
-public:
- go_ethereal_teleport_pad() : GameObjectScript("go_ethereal_teleport_pad") { }
-
- bool OnGossipHello(Player* player, GameObject* go) override
- {
- if (!player->HasItemCount(ITEM_TELEPORTER_POWER_PACK))
- return false;
-
- go->SummonCreature(NPC_IMAGE_WIND_TRADER, go->GetPositionX(), go->GetPositionY(), go->GetPositionZ(), go->GetAngle(player), TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000);
-
- return true;
- }
-};
-
-/*######
## go_soulwell
######*/
@@ -1263,7 +1236,6 @@ void AddSC_go_scripts()
new go_jotunheim_cage();
new go_table_theka();
new go_inconspicuous_landmark();
- new go_ethereal_teleport_pad();
new go_soulwell();
new go_tadpole_cage();
new go_dragonflayer_cage();
diff --git a/src/tools/vmap4_extractor/model.cpp b/src/tools/vmap4_extractor/model.cpp
index 1d4a9c060ea..d0a09271210 100644
--- a/src/tools/vmap4_extractor/model.cpp
+++ b/src/tools/vmap4_extractor/model.cpp
@@ -145,7 +145,7 @@ Vec3D fixCoordSystem2(Vec3D v)
}
ModelInstance::ModelInstance(MPQFile& f, char const* ModelInstName, uint32 mapID, uint32 tileX, uint32 tileY, FILE *pDirfile)
- : scale(0), flags(0)
+ : id(0), scale(0), flags(0)
{
float ff[3];
f.read(&id, 4);