aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTING.md55
-rw-r--r--sql/updates/world/2015_05_22_00_world.sql2
-rw-r--r--sql/updates/world/2015_05_22_01_world.sql65
-rw-r--r--sql/updates/world/2015_05_22_02_world.sql6
-rw-r--r--sql/updates/world/2015_05_22_03_world.sql2
-rw-r--r--sql/updates/world/2015_05_22_04_world.sql3
-rw-r--r--sql/updates/world/2015_05_22_05_world.sql5
-rw-r--r--sql/updates/world/2015_05_22_06_world.sql35
-rw-r--r--sql/updates/world/2015_05_22_07_world.sql4
-rw-r--r--sql/updates/world/2015_05_22_08_world_335.sql32
-rw-r--r--sql/updates/world/2015_05_22_09_world.sql18
-rw-r--r--sql/updates/world/2015_05_22_10_world.sql26
-rw-r--r--sql/updates/world/2015_05_22_11_world.sql8
-rw-r--r--sql/updates/world/2015_05_22_12_world.sql10
-rw-r--r--sql/updates/world/2015_05_22_13_world.sql51
-rw-r--r--sql/updates/world/2015_05_22_14_world.sql4
-rw-r--r--sql/updates/world/2015_05_22_15_world.sql239
-rw-r--r--sql/updates/world/2015_05_23_00_world.sql4
-rw-r--r--sql/updates/world/2015_05_23_01_world.sql2
-rw-r--r--sql/updates/world/2015_05_23_02_world.sql7
-rw-r--r--sql/updates/world/2015_05_23_03_world.sql7
-rw-r--r--sql/updates/world/2015_05_24_00_world.sql170
-rw-r--r--sql/updates/world/2015_05_24_01_world.sql365
-rw-r--r--sql/updates/world/2015_05_24_02_world.sql16
-rw-r--r--sql/updates/world/2015_05_24_03_world.sql13
-rw-r--r--sql/updates/world/2015_05_24_04_world.sql902
-rw-r--r--sql/updates/world/2015_05_24_05_world.sql10
-rw-r--r--sql/updates/world/2015_05_24_06_world.sql45
-rw-r--r--sql/updates/world/2015_05_24_07_world.sql30
-rw-r--r--sql/updates/world/2015_05_24_08_world.sql94
-rw-r--r--sql/updates/world/2015_05_25_00_world.sql6
-rw-r--r--sql/updates/world/2015_05_26_00_world.sql7
-rw-r--r--sql/updates/world/2015_05_26_01_world.sql40
-rw-r--r--sql/updates/world/2015_05_26_02_world.sql8
-rw-r--r--sql/updates/world/2015_05_26_03_world.sql3
-rw-r--r--sql/updates/world/2015_05_26_04_world.sql6
-rw-r--r--sql/updates/world/2015_05_26_05_world.sql3
-rw-r--r--sql/updates/world/2015_05_26_06_world.sql281
-rw-r--r--sql/updates/world/2015_05_27_00_world.sql343
-rw-r--r--sql/updates/world/2015_05_27_01_world.sql43
-rw-r--r--sql/updates/world/2015_05_28_00_world.sql158
-rw-r--r--sql/updates/world/2015_05_28_01_world.sql50
-rw-r--r--sql/updates/world/2015_05_28_02_world.sql115
-rw-r--r--sql/updates/world/2015_05_29_00_world.sql3
-rw-r--r--src/server/game/Entities/Object/Position.cpp2
-rwxr-xr-xsrc/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp2
-rw-r--r--src/server/game/Scripting/ScriptLoader.cpp2
-rw-r--r--src/server/game/Spells/SpellHistory.cpp2
-rw-r--r--src/server/game/Spells/SpellMgr.cpp3
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp2
-rw-r--r--src/server/scripts/Outland/CMakeLists.txt1
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp6
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp253
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp259
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h22
-rw-r--r--src/server/scripts/Spells/spell_quest.cpp11
-rw-r--r--src/server/shared/Debugging/WheatyExceptionReport.cpp203
-rw-r--r--src/server/shared/Debugging/WheatyExceptionReport.h3
-rw-r--r--src/server/shared/Updater/DBUpdater.cpp19
59 files changed, 3755 insertions, 331 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 99fb588c1cf..01e941cc465 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,12 +1,41 @@
# Contributing
-Want to contribute? Great!
+So, you want to contribute? Great!
+Contributing is not only about creating fixes, but also reporting bugs. Before reporting a bug, please make sure to use the latest core and database revision.
+
+
+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 [this](http://www.trinitycore.org/f/topic/1518-trouble-with-your-trinity-install-readme-1st-faqs/)
+
+Mandatory things when creating a ticket:
+========================================
+
+- Branch
+- commit hash (if you get something like TrinityCore rev. unknown 1970-01-01 00:00:00 +0000 (Archived branch) (Win64, Release), please read this [post](http://www.trinitycore.org/f/topic/345-howto-properly-install-git-on-windows-fix-trinitycore-rev-1970-01-01-000000-0000/) or clone this repository instead downloading the source code.
+- entries of affected creatures / items / quests with a link to the relevant wowhead page.
+- clear title and description of the bug - if your english is very bad, please use google translate or yandex to translate to english and include one text in your native language.
+
+When reporting a crash, you MUST compile in debug mode because release dumps are useless (not enough information) - if you don't know how to compile in debug, read [this](http://www.trinitycore.org/f/topic/1518-trouble-with-your-trinity-install-readme-1st-faqs/#entry47672)
+
+We sugest the title and body to have the next style:
+
+DB/Quest: The Collapse
+
+4.3.4 branch
+hash 63f96a282307
+The quest "The Collapse" http://www.wowhead.com/quest=11706 lacks final event.
+
+Creating Pull Requests:
+=======================
1. Fork it.
-2. Create a branch (`git checkout -b fixes`)
+2. Create a branch (`git checkout -b fixes`) (Note: fixes is an arbitrary name, choose whatever you want here)
3. Commit your changes (`git commit -am "Added Snarkdown"`)
4. Push to the branch (`git push origin fixes`)
-5. Open a [Pull Request][1]
+5. Open a Pull Request
When creating patches read:
@@ -14,10 +43,12 @@ When creating patches read:
- [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`.
+
+We suggest that you create one branch for each C++ based fix: this will allow you to create more fixes without having to wait for your pull request to be merged.
+For the SQL files coming with C++ based fixes the naming schema is `YYYY_MM_DD_i_database.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).
+For SQL only fixes, please [create a ticket](https://github.com/TrinityCore/TrinityCore/issues/new).
+Since it's very unlikely that your Pull Request will be merged on the day that you open it, please name the files with an impossible date to avoid merging issues ie: 2015_13_32_00_world.sql
Wiki
====
@@ -27,13 +58,6 @@ 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
============
@@ -44,7 +68,6 @@ 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)
+MS Visual Studio ≥ 12 (2013) Update 4 (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.
+If you choose Linux, we recommend to use Debian 8, since it's the Linux that we use to test compilations.
diff --git a/sql/updates/world/2015_05_22_00_world.sql b/sql/updates/world/2015_05_22_00_world.sql
new file mode 100644
index 00000000000..2949d0eca4a
--- /dev/null
+++ b/sql/updates/world/2015_05_22_00_world.sql
@@ -0,0 +1,2 @@
+--
+DELETE FROM `spell_target_position` WHERE `id`=63171;
diff --git a/sql/updates/world/2015_05_22_01_world.sql b/sql/updates/world/2015_05_22_01_world.sql
new file mode 100644
index 00000000000..676fa999ebb
--- /dev/null
+++ b/sql/updates/world/2015_05_22_01_world.sql
@@ -0,0 +1,65 @@
+--
+DELETE FROM `creature_formations` WHERE `leaderGUID`=15424;
+INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`)VALUES
+(15424,15424,0,0,2),(15424,15423,3,0,2);
+UPDATE `creature` SET `position_x`=-36.31, `position_y`=-916.366, `position_z`=55.075, `orientation`= 1.062 WHERE `guid`=15424;
+UPDATE `creature` SET `position_x`=-37.248, `position_y`=-914.605, `position_z`=55.343, `orientation`= 0.826 WHERE `guid`=15423;
+UPDATE `creature` SET `MovementType`=2 WHERE `guid` IN (15424);
+UPDATE `creature_addon` SET `path_id`=154240 WHERE `guid` IN (15424);
+DELETE FROM `waypoint_data` WHERE `id` IN (154240);
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(154240, 1, -36.31, -916.366, 55.075, 1.062, 180000, 0, 0, 100, 0),
+(154240, 2, -28.532600, -902.440735, 55.908634, 0, 0, 0, 0, 100, 0),
+(154240, 3, -26.338741, -896.902466, 56.039452, 0, 0, 0, 0, 100, 0),
+(154240, 4, -51.500923, -836.734619, 56.524872, 0, 0, 0, 0, 100, 0),
+(154240, 5, -17.165236, -802.633240, 58.751846, 0, 0, 0, 0, 100, 0),
+(154240, 6, -20.983173, -719.063965, 69.290993, 0, 0, 0, 0, 100, 0),
+(154240, 7, -149.228104, -712.801025, 64.445107, 0, 0, 0, 0, 100, 0),
+(154240, 8, -226.017303, -722.711487, 60.861263, 0, 0, 0, 0, 100, 0),
+(154240, 9, -325.539337, -754.267334, 54.089657, 0, 0, 0, 0, 100, 0),
+(154240, 10, -377.870178, -776.472351, 54.472977, 0, 0, 0, 0, 100, 0),
+(154240, 11, -403.164459, -680.892700, 54.499004, 0, 0, 0, 0, 100, 0),
+(154240, 12, -331.617737, -671.147278, 54.918808, 0, 0, 0, 0, 100, 0),
+(154240, 13, -341.247772, -713.172363, 57.733025, 0, 0, 0, 0, 100, 0),
+(154240, 14, -340.614716, -711.776184, 57.733025, 0, 120000, 0, 0, 100, 0),
+(154240, 15, -325.247681, -677.673950, 54.596302, 0, 0, 0, 0, 100, 0),
+(154240, 16, -339.869904, -673.187561, 55.012871, 0, 0, 0, 0, 100, 0),
+(154240, 17, -385.749298, -685.196350, 54.387272, 0, 0, 0, 0, 100, 0),
+(154240, 18, -413.708405, -656.887817, 54.488979, 0, 0, 0, 0, 100, 0),
+(154240, 19, -440.757660, -585.658386, 53.424225, 0, 0, 0, 0, 100, 0),
+(154240, 20, -520.923462, -558.851501, 39.920975, 0, 0, 0, 0, 100, 0),
+(154240, 21, -569.159912, -567.547302, 32.809437, 0, 0, 0, 0, 100, 0),
+(154240, 22, -594.511536, -575.940979, 31.982075, 0, 0, 0, 0, 100, 0),
+(154240, 23, -650.699402, -560.431763, 26.120964, 0, 0, 0, 0, 100, 0),
+(154240, 24, -691.624939, -568.642334, 24.540937, 0, 0, 0, 0, 100, 0),
+(154240, 25, -707.109802, -562.611023, 22.809536, 0, 0, 0, 0, 100, 0),
+(154240, 26, -724.787048, -549.384033, 20.291832, 0, 0, 0, 0, 100, 0),
+(154240, 27, -811.109985, -542.174927, 15.771987, 0, 0, 0, 0, 100, 0),
+(154240, 28, -817.549683, -533.020020, 15.160646, 0, 180000, 0, 0, 100, 0),
+(154240, 29, -811.109985, -542.174927, 15.771987, 0, 0, 0, 0, 100, 0),
+(154240, 30, -724.787048, -549.384033, 20.291832, 0, 0, 0, 0, 100, 0),
+(154240, 31, -707.109802, -562.611023, 22.809536, 0, 0, 0, 0, 100, 0),
+(154240, 32, -691.624939, -568.642334, 24.540937, 0, 0, 0, 0, 100, 0),
+(154240, 33, -650.699402, -560.431763, 26.120964, 0, 0, 0, 0, 100, 0),
+(154240, 34, -594.511536, -575.940979, 31.982075, 0, 0, 0, 0, 100, 0),
+(154240, 35, -569.159912, -567.547302, 32.809437, 0, 0, 0, 0, 100, 0),
+(154240, 36, -520.923462, -558.851501, 39.920975, 0, 0, 0, 0, 100, 0),
+(154240, 37, -440.757660, -585.658386, 53.424225, 0, 0, 0, 0, 100, 0),
+(154240, 38, -413.708405, -656.887817, 54.488979, 0, 0, 0, 0, 100, 0),
+(154240, 39, -385.749298, -685.196350, 54.387272, 0, 0, 0, 0, 100, 0),
+(154240, 40, -339.869904, -673.187561, 55.012871, 0, 0, 0, 0, 100, 0),
+(154240, 41, -325.247681, -677.673950, 54.596302, 0, 0, 0, 0, 100, 0),
+(154240, 42, -340.614716, -711.776184, 57.733025, 0, 120000, 0, 0, 100, 0),
+(154240, 43, -341.247772, -713.172363, 57.733025, 0, 0, 0, 0, 100, 0),
+(154240, 44, -331.617737, -671.147278, 54.918808, 0, 0, 0, 0, 100, 0),
+(154240, 45, -403.164459, -680.892700, 54.499004, 0, 0, 0, 0, 100, 0),
+(154240, 46, -377.870178, -776.472351, 54.472977, 0, 0, 0, 0, 100, 0),
+(154240, 47, -325.539337, -754.267334, 54.089657, 0, 0, 0, 0, 100, 0),
+(154240, 48, -226.017303, -722.711487, 60.861263, 0, 0, 0, 0, 100, 0),
+(154240, 49, -149.228104, -712.801025, 64.445107, 0, 0, 0, 0, 100, 0),
+(154240, 50, -20.983173, -719.063965, 69.290993, 0, 0, 0, 0, 100, 0),
+(154240, 51, -17.165236, -802.633240, 58.751846, 0, 0, 0, 0, 100, 0),
+(154240, 52, -51.500923, -836.734619, 56.524872, 0, 0, 0, 0, 100, 0),
+(154240, 53, -26.338741, -896.902466, 56.039452, 0, 0, 0, 0, 100, 0),
+(154240, 54, -28.532600, -902.440735, 55.908634, 0, 0, 0, 0, 100, 0),
+(154240, 55, -38.973717, -917.010193, 55.065174, 1.062, 0, 0, 0, 100, 0);
diff --git a/sql/updates/world/2015_05_22_02_world.sql b/sql/updates/world/2015_05_22_02_world.sql
new file mode 100644
index 00000000000..f4322c6c2ba
--- /dev/null
+++ b/sql/updates/world/2015_05_22_02_world.sql
@@ -0,0 +1,6 @@
+--
+UPDATE `creature_text` SET `text`='Sands consume you!', `BroadcastTextId`=6221, `sound`=5872 WHERE `entry`=7271 AND `GroupId`=1;
+UPDATE `creature_text` SET `sound`=5872 WHERE `entry`=7271 AND `GroupId`=2 AND `id`=2;
+UPDATE `creature_text` SET `sound`=5873 WHERE `entry`=7271 AND `GroupId`=2 AND `id`=3;
+-- Fix faction for some Ethereum prisoners
+UPDATE `creature_template` SET `faction`=1800 WHERE `entry`IN (20783, 20784, 20785, 20786, 20788, 20789, 20790);
diff --git a/sql/updates/world/2015_05_22_03_world.sql b/sql/updates/world/2015_05_22_03_world.sql
new file mode 100644
index 00000000000..31ba798f2da
--- /dev/null
+++ b/sql/updates/world/2015_05_22_03_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature` SET `MovementType`=1, `spawndist`=8, `position_x`=-93.361, `position_y`=1246.15, `position_z`=-123.506 WHERE `guid`=48268;
diff --git a/sql/updates/world/2015_05_22_04_world.sql b/sql/updates/world/2015_05_22_04_world.sql
new file mode 100644
index 00000000000..f99479a6042
--- /dev/null
+++ b/sql/updates/world/2015_05_22_04_world.sql
@@ -0,0 +1,3 @@
+--
+UPDATE `creature` SET `MovementType`=1, `spawndist`=10 WHERE `id`IN (10956);
+UPDATE `creature_template` SET `InhabitType`=2 WHERE `entry`=10956;
diff --git a/sql/updates/world/2015_05_22_05_world.sql b/sql/updates/world/2015_05_22_05_world.sql
new file mode 100644
index 00000000000..076c8fe22de
--- /dev/null
+++ b/sql/updates/world/2015_05_22_05_world.sql
@@ -0,0 +1,5 @@
+--
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (2261);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (2261) 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
+(2261, 0, 0, 0, 0, 0, 100, 0, 2000, 7000, 20000, 30000, 11, 3582, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0,0,'Syndicate Watchman - IC - Cast Torch Burst');
diff --git a/sql/updates/world/2015_05_22_06_world.sql b/sql/updates/world/2015_05_22_06_world.sql
new file mode 100644
index 00000000000..939ee2dbc7a
--- /dev/null
+++ b/sql/updates/world/2015_05_22_06_world.sql
@@ -0,0 +1,35 @@
+--
+UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=8276;
+UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=20454;
+UPDATE `creature` SET `position_x`=274.23, `position_y`=-2162.325, `position_z`=159.94, `orientation`= 3.227 WHERE `guid`=92880;
+UPDATE `creature` SET `MovementType`=2 WHERE `guid` IN (92880, 92881);
+DELETE FROM `creature_addon` WHERE `guid` IN (92881, 92880);
+INSERT INTO `creature_addon` (`guid`, `path_id`) VALUES (92880, 928800), (92881, 928810);
+
+DELETE FROM `waypoint_data` WHERE `id` IN (928810, 928800);
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(928810, 1, 87.198, -2237.385, 161.785, 0, 0, 1, 0, 100, 0),
+(928810, 2, -7.544, -2549.668, 181.017, 0, 0, 1, 0, 100, 0),
+(928810, 3, -237.996, -2624.749, 189.896, 0, 0, 1, 0, 100, 0),
+(928810, 4, -217.604, -3346.965, 189.025, 0, 0, 1, 0, 100, 0),
+(928810, 5, 63.265, -3628.146, 172.660, 0, 0, 1, 0, 100, 0),
+(928810, 6, 354.298, -3663.979, 170.469, 0, 0, 1, 0, 100, 0),
+(928810, 7, 438.654, -3378.017, 166.627, 0, 0, 1, 0, 100, 0),
+(928810, 8, 198.273, -3037.064, 169.242, 0, 0, 1, 0, 100, 0),
+(928810, 9, 61.098, -2856.964, 158.961, 0, 0, 1, 0, 100, 0),
+(928810, 10, -48.316, -2553.932, 190.939, 0, 0, 1, 0, 100, 0),
+(928810, 11, 139.328, -2296.988, 155.313, 0, 0, 1, 0, 100, 0),
+(928810, 12, 272.772, -2096.04, 160.766, 0, 0, 1, 0, 100, 0),
+(928800, 1, 160.229, -2189.599, 134.889, 0, 0, 1, 0, 100, 0),
+(928800, 2, 92.713, -2488.815, 171.090, 0, 0, 1, 0, 100, 0),
+(928800, 3, 34.246, -2612.019, 151.869, 0, 0, 1, 0, 100, 0),
+(928800, 4, 66.592, -2894.712, 151.56, 0, 0, 1, 0, 100, 0),
+(928800, 5, 242.969, -3067.849, 147.831, 0, 0, 1, 0, 100, 0),
+(928800, 6, 340.322, -3286.022, 160.143, 0, 0, 1, 0, 100, 0),
+(928800, 7, 383.039, -3522.556, 154.207, 0, 0, 1, 0, 100, 0),
+(928800, 8, 111.62, -3633.633, 166.753, 0, 0, 1, 0, 100, 0),
+(928800, 9, -156.406, -3358.144, 162.886, 0, 0, 1, 0, 100, 0),
+(928800, 10, -34.626, -3047.4, 160.192, 0, 0, 1, 0, 100, 0),
+(928800, 11, 171.691, -2338.09, 152.636, 0, 0, 1, 0, 100, 0),
+(928800, 12, 197.218, -2249.241, 147.71, 0, 0, 1, 0, 100, 0),
+(928800, 13, 274.237, -2162.325, 147.09, 0, 0, 1, 0, 100, 0);
diff --git a/sql/updates/world/2015_05_22_07_world.sql b/sql/updates/world/2015_05_22_07_world.sql
new file mode 100644
index 00000000000..fbc99492240
--- /dev/null
+++ b/sql/updates/world/2015_05_22_07_world.sql
@@ -0,0 +1,4 @@
+--
+DELETE FROM `gossip_menu` WHERE `entry`=1483 AND `text_id`=2155;
+INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES (1483, 2155);
+UPDATE `creature_template` SET `gossip_menu_id`=1483 WHERE `entry`=8767;
diff --git a/sql/updates/world/2015_05_22_08_world_335.sql b/sql/updates/world/2015_05_22_08_world_335.sql
new file mode 100644
index 00000000000..9cdb7edf295
--- /dev/null
+++ b/sql/updates/world/2015_05_22_08_world_335.sql
@@ -0,0 +1,32 @@
+--
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (14661) 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
+(14661, 0, 0, 0, 0, 0, 100, 0, 3000, 5000, 4000, 6000, 11, 5416, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0,0,'Stinglasher - IC - cast Venom Sting'),
+(14661, 0, 1, 0, 0, 0, 100, 0, 6000, 8000, 7000, 10000, 11, 6607, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0,0,'Stinglasher - IC - cast Lash');
+
+UPDATE `creature_template` SET `InhabitType`=4, `AIName`='SmartAI' WHERE `entry`=14661;
+UPDATE `creature` SET `MovementType`=2 WHERE `guid` IN (50074);
+UPDATE `creature_addon` SET `path_id`=500740 WHERE `guid` IN (50074);
+
+DELETE FROM `waypoint_data` WHERE (`id`=500740);
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(500740, 1, -5219.040039, 90.906799, 31.608503, 0, 0, 0, 0, 100, 0),
+(500740, 2, -5224.050293, 76.003220, 29.438269, 0, 0, 0, 0, 100, 0),
+(500740, 3, -5239.147949, 63.874466, 25.338007, 0, 0, 0, 0, 100, 0),
+(500740, 4, -5238.693848, 49.682274, 24.432926, 0, 0, 0, 0, 100, 0),
+(500740, 5, -5246.642578, 32.150028, 19.696297, 0, 0, 0, 0, 100, 0),
+(500740, 6, -5261.720703, 17.697470, 18.217318, 0, 0, 0, 0, 100, 0),
+(500740, 7, -5275.494629, 20.200960, 19.163641, 0, 0, 0, 0, 100, 0),
+(500740, 8, -5287.398438, 15.724384, 19.484865, 0, 0, 0, 0, 100, 0),
+(500740, 9, -5285.921875, -4.451639, 19.543159, 0, 0, 0, 0, 100, 0),
+(500740, 10, -5266.689453, -10.566733, 15.15608, 0, 0, 0, 0, 100, 0),
+(500740, 11, -5260.603027, -1.987386, 14.133003, 0, 0, 0, 0, 100, 0),
+(500740, 12, -5260.889160, 16.419760, 17.921291, 0, 0, 0, 0, 100, 0),
+(500740, 13, -5244.723145, 31.915073, 19.788879, 0, 0, 0, 0, 100, 0),
+(500740, 14, -5240.108887, 48.679680, 24.157497, 0, 0, 0, 0, 100, 0),
+(500740, 15, -5240.560547, 62.042046, 25.325819, 0, 0, 0, 0, 100, 0),
+(500740, 16, -5225.194336, 76.540390, 29.50018, 0, 0, 0, 0, 100, 0),
+(500740, 17, -5221.191406, 84.720314, 31.15358, 0, 0, 0, 0, 100, 0),
+(500740, 18, -5207.856934, 125.004700, 33.70418, 0, 0, 0, 0, 100, 0),
+(500740, 19, -5189.811523, 162.779144, 49.10691, 0, 0, 0, 0, 100, 0),
+(500740, 20, -5185.788086, 183.261688, 49.97140, 0, 0, 0, 0, 100, 0);
diff --git a/sql/updates/world/2015_05_22_09_world.sql b/sql/updates/world/2015_05_22_09_world.sql
new file mode 100644
index 00000000000..e24e207cd3c
--- /dev/null
+++ b/sql/updates/world/2015_05_22_09_world.sql
@@ -0,0 +1,18 @@
+--
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (3946) AND `source_type`=0 AND `id` IN (4, 5) ;
+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
+(3946, 0, 4, 0, 1, 0, 100, 1, 4000, 4000, 0, 0, 1, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,0,'Velinde Starsong - Out of Combat - Say Line 3'),
+(3946, 0, 5, 0, 1, 0, 100, 1, 11000, 11000, 0, 0, 1, 4, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,0,'Velinde Starsong - Out of Combat - Say Line 4');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceGroup` IN (1, 2, 3, 4, 5, 6) AND `SourceEntry`=3946;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`, `ErrorTextId`,`ScriptName`,`Comment`, `NegativeCondition`, `ConditionTarget`) VALUES
+(22,2,3946,0,23,2161,0,0,0,'','event require AREA 2161', 1, 1),
+(22,3,3946,0,23,2161,0,0,0,'','event require AREA 2161', 1, 1),
+(22,4,3946,0,23,2161,0,0,0,'','event require AREA 2161', 1, 1),
+(22,5,3946,0,23,2161,0,0,0,'','event require AREA 2161', 0, 1),
+(22,6,3946,0,23,2161,0,0,0,'','event require AREA 2161', 0, 1);
+
+DELETE FROM `creature_text` WHERE `entry` IN (3946) AND `groupid` IN (3, 4);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`, `BroadcastTextId`) VALUES
+(3946,3,0,'I have failed... I have failed in my duty... failed my people... The worgen run rampant, and the Scythe of my goddess is lost.',12,7,100,0,0,0,'Velinde Starsong', 1359),
+(3946,4,0,'This evil I have unleashed... In whose hand does the power my goddess granted to me now lie... By whose hand is it directed?',12,7,100,0,0,0,'Velinde Starsong', 1360);
diff --git a/sql/updates/world/2015_05_22_10_world.sql b/sql/updates/world/2015_05_22_10_world.sql
new file mode 100644
index 00000000000..a87647f1cd7
--- /dev/null
+++ b/sql/updates/world/2015_05_22_10_world.sql
@@ -0,0 +1,26 @@
+--
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (3984) AND `source_type`=0 AND `id` IN (1, 2, 3) ;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (398400) 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
+(3984, 0, 1, 0, 1, 0, 100, 0, 20000, 20000, 180000, 180000, 80, 398400, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,0,'Nancy Vishas - ooc - Action list'),
+(398400, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,0,'Nancy Vishas - Action list - talk 1'),
+(398400, 9, 1, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 1, 0, 0, 0, 0, 0, 0, 19, 3985, 15, 0, 0, 0, 0,0,'Nancy Vishas - Action list - talk 1'),
+(398400, 9, 2, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,0,'Nancy Vishas - Action list - talk 2'),
+(398400, 9, 3, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 1, 1, 0, 0, 0, 0, 0, 19, 3985, 15, 0, 0, 0, 0,0,'Nancy Vishas - Action list - talk 2'),
+(398400, 9, 4, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,0,'Nancy Vishas - Action list - talk 3'),
+(398400, 9, 5, 0, 0, 0, 100, 0, 4000, 4000, 0, 0, 53, 0, 3984, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,0,'Nancy Vishas - Action list - start wp'),
+(3984, 0, 2, 0, 40, 0, 100, 0, 1, 3984, 0, 0, 54, 30000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,0,'Nancy Vishas - on WP1 - pause wp'),
+(3984, 0, 3, 0, 40, 0, 100, 0, 2, 3984, 0, 0, 66, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,0,'Nancy Vishas - on wp2- set home orientation');
+
+DELETE FROM `waypoints` WHERE `entry`=3984;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(3984, 1, 908.933, -90.985, 33.783, 'Nancy Vishas'),
+(3984, 2, 888.142, -121.849, 38.388, 'Nancy Vishas');
+
+DELETE FROM `creature_text` WHERE `entry` IN (3984, 3985);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`, `BroadcastTextId`) VALUES
+(3984,0,0,'Sidney is late. I thought he would be home by now.',12,7,100,0,0,0,'Nancy Vishas', 1365),
+(3985,0,0,'He''s your husband, woman. How am I to know where he is?',12,7,100,0,0,0,'Grandpa Vishas', 1366),
+(3984,1,0,'He must be overwhelmed with work at the Monastery. But still, he should have returned by now.',12,7,100,0,0,0,'Nancy Vishas', 1367),
+(3985,1,0,'Cleansing the world of impure scum isn''t an easy job, Nancy. Someone''s got to do it.',12,7,100,0,0,0,'Grandpa Vishas', 1368),
+(3984,2,0,'Well, I''m going outside to check. Something is amiss.',12,7,100,0,0,0,'Nancy Vishas', 1369);
diff --git a/sql/updates/world/2015_05_22_11_world.sql b/sql/updates/world/2015_05_22_11_world.sql
new file mode 100644
index 00000000000..01122a6bc57
--- /dev/null
+++ b/sql/updates/world/2015_05_22_11_world.sql
@@ -0,0 +1,8 @@
+--
+DELETE FROM `gossip_menu` WHERE `entry`=6024 AND `text_id`=6935;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (6024, 6935);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14) AND `SourceGroup`=6024;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`, `NegativeCondition`) VALUES
+(14, 6024, 7176, 0, 8, 7783, 0, 0, 0, '', 'Show gossip text if player get the quest The Lord of Blackrockreward', 0),
+(14, 6024, 6935, 0, 8, 7783, 0, 0, 0, '', 'Show gossip text if te quest The Lord of Blackrock is not rewarded', 1);
diff --git a/sql/updates/world/2015_05_22_12_world.sql b/sql/updates/world/2015_05_22_12_world.sql
new file mode 100644
index 00000000000..84b5918e7f4
--- /dev/null
+++ b/sql/updates/world/2015_05_22_12_world.sql
@@ -0,0 +1,10 @@
+--
+DELETE FROM `smart_scripts` WHERE `entryorguid`=16522 AND `id`=12;
+UPDATE `smart_scripts` SET `action_param1`=1 WHERE `entryorguid`=16522 AND `id`=0;
+UPDATE `smart_scripts` SET `event_phase_mask`=1 WHERE entryorguid=16522 AND `id`=5;
+UPDATE `smart_scripts` SET `event_phase_mask`=0, `event_flags`=0 WHERE `entryorguid`=16522 AND `id`=6;
+UPDATE `smart_scripts` SET `event_phase_mask`=0 WHERE `entryorguid`=16522 AND `id`=7;
+UPDATE `smart_scripts` SET `event_phase_mask`=2 WHERE `entryorguid`=16522 AND `id`=11;
+UPDATE `smart_scripts` SET `event_phase_mask`=1, `action_param1`=1 WHERE entryorguid=16522 AND `id`=9;
+UPDATE `smart_scripts` SET `event_flags`=1 WHERE `entryorguid`=16522 AND `id`=2;
+UPDATE `creature_template` SET `InhabitType`=4 WHERE `Entry`=17947;
diff --git a/sql/updates/world/2015_05_22_13_world.sql b/sql/updates/world/2015_05_22_13_world.sql
new file mode 100644
index 00000000000..db90e99cf4d
--- /dev/null
+++ b/sql/updates/world/2015_05_22_13_world.sql
@@ -0,0 +1,51 @@
+--
+UPDATE `creature` SET `position_x`=-4435.777, `position_y`=-13684.191, `position_z`=44.03, `orientation`= 5.189 WHERE `guid`=57310;
+UPDATE `creature` SET `MovementType`=2, `spawndist`=0 WHERE `guid` IN (57310, 57313);
+DELETE FROM `creature_addon` WHERE `guid` IN (57310, 57313);
+INSERT INTO `creature_addon` (`guid`, `path_id`) VALUES (57310, 573100), (57313, 573130);
+DELETE FROM `waypoint_data` WHERE `id` IN (573100, 573130);
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(573100, 1, -4443.440918, -13695.226563, 46.834724, 0, 0, 0, 0, 100, 0),
+(573100, 2, -4451.548828, -13708.859375, 48.496380, 0, 0, 0, 0, 100, 0),
+(573100, 3, -4431.984863, -13722.603516, 51.757404, 0, 0, 0, 0, 100, 0),
+(573100, 4, -4385.404297, -13720.467773, 50.135044, 0, 0, 0, 0, 100, 0),
+(573100, 5, -4380.465820, -13740.443359, 50.451973, 0, 0, 0, 0, 100, 0),
+(573100, 6, -4392.348633, -13770.427734, 52.292049, 0, 0, 0, 0, 100, 0),
+(573100, 7, -4391.951660, -13786.277344, 52.664742, 0, 0, 0, 0, 100, 0),
+(573100, 8, -4396.321777, -13804.233398, 55.976879, 0, 0, 0, 0, 100, 0),
+(573100, 9, -4404.731934, -13815.549805, 60.186996, 0, 0, 0, 0, 100, 0),
+(573100, 10, -4409.673828, -13847.877930, 71.870178, 0, 0, 0, 0, 100, 0),
+(573100, 11, -4419.165527, -13854.147461, 78.347191, 0, 0, 0, 0, 100, 0),
+(573100, 12, -4432.236816, -13856.821289, 85.815552, 0, 0, 0, 0, 100, 0),
+(573100, 13, -4453.323730, -13875.177734, 101.67051, 0, 0, 0, 0, 100, 0),
+(573100, 14, -4432.236816, -13856.821289, 85.815552, 0, 0, 0, 0, 100, 0),
+(573100, 15, -4419.165527, -13854.147461, 78.347191, 0, 0, 0, 0, 100, 0),
+(573100, 16, -4409.673828, -13847.877930, 71.870178, 0, 0, 0, 0, 100, 0),
+(573100, 17, -4404.731934, -13815.549805, 60.186996, 0, 0, 0, 0, 100, 0),
+(573100, 18, -4396.321777, -13804.233398, 55.976879, 0, 0, 0, 0, 100, 0),
+(573100, 19, -4391.951660, -13786.277344, 52.664742, 0, 0, 0, 0, 100, 0),
+(573100, 20, -4392.348633, -13770.427734, 52.292049, 0, 0, 0, 0, 100, 0),
+(573100, 21, -4380.465820, -13740.443359, 50.451973, 0, 0, 0, 0, 100, 0),
+(573100, 22, -4385.404297, -13720.467773, 50.135044, 0, 0, 0, 0, 100, 0),
+(573100, 23, -4431.984863, -13722.603516, 51.757404, 0, 0, 0, 0, 100, 0),
+(573100, 24, -4451.548828, -13708.859375, 48.496380, 0, 0, 0, 0, 100, 0),
+(573100, 25, -4443.440918, -13695.226563, 46.834724, 0, 0, 0, 0, 100, 0),
+(573130, 1, -4393.079102, -13790.173828, 52.869942, 0, 0, 0, 0, 100, 0),
+(573130, 2, -4392.134766, -13761.565430, 51.793087, 0, 0, 0, 0, 100, 0),
+(573130, 3, -4412.633301, -13752.276367, 53.840073, 0, 0, 0, 0, 100, 0),
+(573130, 4, -4429.812012, -13722.834961, 51.848553, 0, 0, 0, 0, 100, 0),
+(573130, 5, -4389.571777, -13722.364258, 50.288551, 0, 0, 0, 0, 100, 0),
+(573130, 6, -4380.811523, -13731.546875, 50.451256, 0, 0, 0, 0, 100, 0),
+(573130, 7, -4385.900391, -13759.079102, 50.621365, 0, 0, 0, 0, 100, 0),
+(573130, 8, -4391.487305, -13762.515625, 51.752522, 0, 0, 0, 0, 100, 0),
+(573130, 9, -4403.406250, -13758.519531, 53.117504, 0, 0, 0, 0, 100, 0),
+(573130, 10, -4432.480469, -13756.059570, 56.591385, 0, 0, 0, 0, 100, 0),
+(573130, 11, -4403.406250, -13758.519531, 53.117504, 0, 0, 0, 0, 100, 0),
+(573130, 12, -4391.487305, -13762.515625, 51.752522, 0, 0, 0, 0, 100, 0),
+(573130, 13, -4385.900391, -13759.079102, 50.621365, 0, 0, 0, 0, 100, 0),
+(573130, 14, -4380.811523, -13731.546875, 50.451256, 0, 0, 0, 0, 100, 0),
+(573130, 15, -4389.571777, -13722.364258, 50.288551, 0, 0, 0, 0, 100, 0),
+(573130, 16, -4429.812012, -13722.834961, 51.848553, 0, 0, 0, 0, 100, 0),
+(573130, 17, -4412.633301, -13752.276367, 53.840073, 0, 0, 0, 0, 100, 0),
+(573130, 18, -4392.134766, -13761.565430, 51.793087, 0, 0, 0, 0, 100, 0),
+(573130, 19, -4393.079102, -13790.173828, 52.869942, 0, 0, 0, 0, 100, 0);
diff --git a/sql/updates/world/2015_05_22_14_world.sql b/sql/updates/world/2015_05_22_14_world.sql
new file mode 100644
index 00000000000..43bbacd2d1a
--- /dev/null
+++ b/sql/updates/world/2015_05_22_14_world.sql
@@ -0,0 +1,4 @@
+--
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=1 AND `SourceEntry`=6994;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`Scriptname`,`Comment`) VALUES
+(1,641,6994,0,0,2,0,51315,1,1,1,0 ,'' , 'whitestone oak lumber drop only if the player doesn''t have it already');
diff --git a/sql/updates/world/2015_05_22_15_world.sql b/sql/updates/world/2015_05_22_15_world.sql
new file mode 100644
index 00000000000..c2a90abf892
--- /dev/null
+++ b/sql/updates/world/2015_05_22_15_world.sql
@@ -0,0 +1,239 @@
+-- Quest 11343 "The Echo of Ymiron"
+
+SET @OGUID := 5603; -- One required
+SET @CGUID := 48229; -- 16 required
+SET @NPC := @CGUID+5;
+SET @PATH := @NPC * 10;
+
+-- Object Spawn from sniff
+DELETE FROM `gameobject` WHERE `id`=186664;
+INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES
+(@OGUID,186664,571,1,2,1073.001,-5033.952,9.771218,1.518436,0,0,0.6883545,0.7253745,300,0,1); -- Baby in Crib
+
+-- Creature Spawns from sniff
+DELETE FROM `creature` WHERE `id` IN (24314,24315,24248,24327,23935);
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`) VALUES
+(@CGUID+0,24314,571,1,2,0,0,1073.562,-5029.705,9.805857,4.660029,300,0,0,5158,0,0,0,0,0), -- Ancient Male Vrykul
+(@CGUID+1,24315,571,1,2,0,0,1074.889,-5033.892,9.711858,3.036873,300,0,0,5158,0,0,0,0,0), -- Ancient Female Vrykul
+(@CGUID+2,24248,571,1,2,0,0,1054.514,-4918.391,10.14754,3.263766,300,0,0,1,0,0,0,0,0), -- The Lich King
+(@CGUID+3,24327,571,1,2,0,0,1055.667,-4924.913,16.54569,3.281219,300,0,0,1,0,0,0,0,0), -- Val'kyr Soulclaimer
+(@CGUID+4,24327,571,1,2,0,0,1054.277,-4909.997,16.50003,3.263766,300,0,0,1,0,0,0,0,0), -- Val'kyr Soulclaimer
+(@CGUID+5,23935,571,1,2,0,0,927.0462,-4925.752,4.78267,0.1288379,300,0,0,1,0,2,0,0,0), -- Val'kyr Watcher
+(@CGUID+6,23935,571,1,2,0,0,1036.007,-4926.114,12.45767,5.548763,300,0,0,1,0,2,0,0,0), -- Val'kyr Watcher
+(@CGUID+7,23935,571,1,2,0,0,1026.868,-4944.088,12.0571,0.7522717,300,0,0,1,0,2,0,0,0), -- Val'kyr Watcher
+(@CGUID+8,23935,571,1,2,0,0,1028.676,-5012.598,13.78496,0.2954222,300,0,0,1,0,2,0,0,0), -- Val'kyr Watcher
+(@CGUID+9,23935,571,1,2,0,0,910.7372,-4961.667,33.09615,0.2954222,300,0,0,1,0,2,0,0,0), -- Val'kyr Watcher
+(@CGUID+10,23935,571,1,2,0,0,934.7177,-4890.745,34.57682,0.2954222,300,0,0,1,0,2,0,0,0), -- Val'kyr Watcher
+(@CGUID+11,23935,571,1,2,0,0,970.6052,-4993.673,29.27757,0.2954222,300,0,0,1,0,2,0,0,0), -- Val'kyr Watcher
+(@CGUID+12,23935,571,1,2,0,0,1006.246,-4868.183,47.70948,0.2954222,300,0,0,1,0,2,0,0,0), -- Val'kyr Watcher
+(@CGUID+13,23935,571,1,2,0,0,1046.627,-4824.385,47.09693,0.2954222,300,0,0,1,0,2,0,0,0), -- Val'kyr Watcher
+(@CGUID+14,23935,571,1,2,0,0,1068.264,-4965.238,47.55685,0.2954222,300,0,0,1,0,2,0,0,0), -- Val'kyr Watcher
+(@CGUID+15,23935,571,1,2,0,0,1037.688,-4934.398,31.88609,0.2954222,300,0,0,1,0,2,0,0,0); -- Val'kyr Watcher
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (24315,24248,24327);
+INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(24315,0,0,1,0,0, ''),
+(24248,0,0,0,1,0, '41408'),
+(24327,0,0,33554432,0 ,0, '');
+
+UPDATE `creature_template` SET `AIName`='SmartAI', `unit_flags`=768 WHERE `entry` IN (24314, 24315, 24327);
+UPDATE `creature_template` SET `unit_flags`=164352, `AIName`='SmartAI' WHERE `entry`=24248; -- 131072
+UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry` IN (24327, 23935);
+
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (24314,24315, 24327, 24248);
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (2431400,2431500,2431501, 2424800, 2424801);
+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
+(24314,0,0,0,10,0,100,0,0,15,50000,50000,80,2431400,2,0,0,0,0,1,0,0,0,0,0,0,0, 'Ancient Male Vrykul - OOC_LOS - Start Script'),
+(2431400,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Anchient Male Speach 1'),
+(2431400,9,1,0,0,0,100,0,2000,2000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Anchient Male Speach 2'),
+(2431400,9,2,0,0,0,100,0,3000,3000,0,0,1,0,0,0,0,0,0,10,@CGUID+1,24315,0,0,0,0,0, 'Anchient Female Speach 1'),
+(2431400,9,3,0,0,0,100,0,3000,3000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Anchient Male Speach 2'),
+(2431400,9,4,0,0,0,100,0,3000,3000,0,0,5,25,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Anchient Male emote ONESHOT_POINT'),
+(2431400,9,5,0,0,0,100,0,6000,6000,0,0,45,0,1,0,0,0,0,10,@CGUID+1,24315,0,0,0,0,0, 'Anchient Female start path'),
+(2431400,9,6,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,10,@CGUID+1,24315,0,0,0,0,0, 'Anchient Female Speach 2'), -- check timing
+(2431400,9,7,0,0,0,100,0,4000,4000,0,0,5,18,0,0,0,0,0,10,@CGUID+1,24315,0,0,0,0,0, 'Anchient Female emote ONESHOT_CRY'),
+(2431400,9,8,0,0,0,100,0,4000,4000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Anchient Male Speach 3'),
+(2431400,9,9,0,0,0,100,0,6000,6000,0,0,1,2,0,0,0,0,0,10,@CGUID+1,24315,0,0,0,0,0, 'Anchient Female Speach 2'),
+(2431400,9,10,0,0,0,100,0,3000,3000,0,0,11,43458,2,0,0,0,0,7,0,0,0,0,0,0,0, 'Quest Credit'),
+(2431400,9,11,0,0,0,100,0,3000,3000,0,0,45,0,2,0,0,0,0,10,@CGUID+1,24315,0,0,0,0,0, 'Anchient Female resume path'),
+(24315,0,0,0,11,0,100,0,0,0,0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ancient Female Vrykul - Set Passive'),
+(24315,0,1,0,38,0,100,0,0,1,0,0,80,2431500,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ancient Female Vrykul - On data set 0 1 run script'),
+(24315,0,2,0,38,0,100,0,0,2,0,0,80,2431501,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ancient Female Vrykul - On data set 0 2 run script'),
+(24315,0,3,4,40,0,100,0,1,24315,0,0,54,40000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ancient Female Vrykul - Pause at wp talk'),
+(24315,0,4,5,61,0,100,0,0,0,0,0,66,0,0,0,0,0,0,9,24315,0,15,0,0,0,0, 'Ancient Female Vrykul - turn to Ancient Male Vrykul'),
+(24315,0,5,0,61,0,100,0,0,0,0,0,90,8,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ancient Female Vrykul - kneel'),
+(24315,0,6,7,40,0,100,0,2,24315,0,0,55,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ancient Female Vrykul - Stop at wp home'),
+(24315,0,7,8,61,0,100,0,0,0,0,0,66,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ancient Female Vrykul - turn to pos'),
+(24315,0,8,0,61,0,100,0,0,0,0,0,90,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ancient Female Vrykul - kneel'),
+(2431500,9,0,0,0,0,100,0,0,0,0,0,91,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ancient Female Vrykul - stand'),
+(2431500,9,1,0,0,0,100,0,0,0,0,0,53,0,24315,0,0,0,0,1,0,0,0,0,0,0,0, 'Ancient Female Vrykul - wp start'),
+(2431501,9,0,0,0,0,100,0,0,0,0,0,65,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ancient Female Vrykul - wp resume'),
+(2431501,9,1,0,0,0,100,0,0,0,0,0,91,8,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ancient Female Vrykul - stand'),
+(24327,0,0,0,11,0,100,0,0,0,0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Ancient Male Vrykul - Set Passive'),
+
+(24248,0,0,0,10,0,100,0,0,15,3000,3000,80,2424800,2,0,0,0,0,1,0,0,0,0,0,0,0, 'The Lich King - OOC_LOS - Start Script'),
+(2424800,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Lich King - Action list - Talk0'),
+(2424800,9,1,0,0,0,100,0,0,0,0,0,11,29661,0,0,0,0,0,7,0,0,0,0,0,0,0, 'The Lich King - Action list - Cast Magnetic Pull'),
+(2424800,9,2,0,0,0,100,0,1000,1000,0,0,11,43489,0,0,0,0,0,7,0,0,0,0,0,0,0, 'The Lich King - Action list - Cast Grasp of the Lich King'),
+(2424800,9,3,0,0,0,100,0,1000,1000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Lich King - Action list - Talk1'),
+(2424800,9,4,0,0,0,100,0,3000,3000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Lich King - Action list - Talk2'),
+(2424800,9,5,0,0,0,100,0,15000,15000,0,0,1,0,0,0,0,0,0,19,24327,10,0,0,0,0,0, 'The Lich King - Action list - Talk0'),
+(2424800,9,6,0,0,0,100,0,3000,3000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Lich King - Action list - Talk3'),
+(2424800,9,7,0,0,0,100,0,7000,7000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Lich King - Action list - Talk4'),
+(2424800,9,8,0,0,0,100,0,19000,19000,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Lich King - Action list - Talk5'),
+(2424800,9,9,0,0,0,100,0,20000,20000,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Lich King - Action list - Talk6'),
+(2424800,9,10,0,0,0,100,0,17000,17000,0,0,11,43488,64,0,0,0,0,7,0,0,0,0,0,0,0, 'The Lich King - Action list - Cast'),
+(2424800,9,11,0,0,0,100,0,500,500,0,0,51,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'The Lich King - Action list - kill'),
+
+(24248,0,1,0,10,0,100,0,0,15,3000,3000,80,2424801,2,0,0,0,0,1,0,0,0,0,0,0,0, 'The Lich King - OOC_LOS - Start Script'),
+(2424801,9,0,0,0,0,100,0,0,0,0,0,1,7,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Lich King - Action list - Talk7'),
+(2424801,9,1,0,0,0,100,0,0,0,0,0,11,29661,0,0,0,0,0,7,0,0,0,0,0,0,0, 'The Lich King - Action list - Cast Magnetic Pull'),
+(2424801,9,2,0,0,0,100,0,1000,1000,0,0,11,43489,0,0,0,0,0,7,0,0,0,0,0,0,0, 'The Lich King - Action list - Cast Grasp of the Lich King'),
+(2424801,9,3,0,0,0,100,0,8000,8000,0,0,11,50156,0,0,0,0,0,7,0,0,0,0,0,0,0, 'The Lich King - Action list - Cast'),
+(2424801,9,4,0,0,0,100,0,500,500,0,0,51,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'The Lich King - Action list - kill');
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceGroup` IN (1,2) AND `SourceEntry` IN (24248, 24314);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`, `ErrorTextId`,`ScriptName`,`Comment`, `NegativeCondition`) VALUES
+(22,1,24248,0,8,12485,0,0,0,'','event require quest 12485 not rewarded', 1),
+(22,2,24248,0,8,12485,0,0,0,'','event require quest 12485 rewarded', 0),
+(22,1,24314,0,9,11343,0,0,0,'','event require quest 11344 Taken', 0);
+
+DELETE FROM `disables` WHERE `sourceType` = 1 AND `entry` = 12485;
+
+-- NPC Text from sniff
+DELETE FROM `creature_text` WHERE `entry` IN (24314,24315, 24248, 24327);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`,`BroadcastTextId`) VALUES
+(24314,0,0, 'So then we too are cursed?',12,0,100,1,0,0, 'Ancient Male Vrykul',23116),
+(24314,1,0, '%s points to the infant.',16,0,100,0,0,0, 'Ancient Male Vrykul',23117),
+(24315,0,0, '%s sobs.',16,0,100,0,0,0, 'Ancient Female Vrykul',23118),
+(24314,2,0, 'The gods have forsaken us! We must dispose of it before Ymiron is notified!',12,0,100,53,0,0, 'Ancient Male Vrykul',23119),
+(24315,1,0, 'NO! You cannot! I beg of you! It is our child!',12,0,100,0,0,0, 'Ancient Female Vrykul',23120),
+(24314,3,0, 'Then what are we to do, wife? The others cannot find out. Should they learn of this aberration, we will all be executed.',12,0,100,1,0,0, 'Ancient Male Vrykul',23121),
+(24315,2,0, 'I... I will hide it. I will hide it until I find it a home, far away from here...',12,0,100,0,0,0, 'Ancient Female Vrykul',23122),
+(24248,0,0, '%s turns to face you.',16,0,100,0,0,0, 'The Lich King',23102),
+(24248,1,0, '%s grins. ',16,0,100,11,0,14820, 'The Lich King',23146),
+(24248,2,0, 'Shamanism has brought you here... Its scent permeates the air. *The Lich King laughs* I was once a shaman.',12,0,100,0,0,14742, 'The Lich King',23147),
+(24327,0,0, 'Shall we prepare it for you, my lord?',12,0,100,0,0,0, 'Val''kyr Soulclaimer',23152),
+(24248,3,0, 'No, minion. This one is not ready.',12,0,100,274,0,14743, 'The Lich King',23148),
+(24248,4,0, 'Do you feel it, mortal? Death seeps through me, enveloping all that I touch. With just a snap of my finger your soul will languish in damnation for all eternity.',12,0,100,1,0,14744, 'The Lich King',23149),
+(24248,5,0, 'But... It is not yet your time to serve the Lich King. Yes, a greater destiny awaits you. Power... You must become more powerful before you are to serve me.',12,0,100,1,0,14745, 'The Lich King',23150),
+(24248,6,0, 'Now watch, val''kyr. Observe as I apply pressure. Can you see that it is not yet ripe? Watch as it pops and falls lifeless to the floor.',12,0,100,1,0,14746, 'The Lich King',23151),
+(24248,7,0, 'Persistence or stupidity? It matters not. Let this be a lesson learned, mortal!',12,0,100,1,0,14747, 'The Lich King',27351);
+
+-- Waypoints for Ancient Female Vrykul from sniff
+DELETE FROM `waypoints` WHERE `entry`=24315;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(24315,1,1074.016,-5031.822,9.726947,'talk point'),
+(24315,2,1074.889,-5033.892,9.711858,'home point');
+
+-- Pathing for Val'kyr Watcher Entry: 23935
+DELETE FROM `creature_addon` WHERE `guid` IN (@NPC,@NPC+1,@NPC+2,@NPC+3,@NPC+4,@NPC+5,@NPC+6,@NPC+7,@NPC+8,@NPC+9,@NPC+10);
+INSERT INTO `creature_addon` (`guid`,`path_id`) VALUES
+(@NPC,@PATH),
+(@NPC+1,@PATH+10),
+(@NPC+2,@PATH+20),
+(@NPC+3,@PATH+30),
+(@NPC+4,@PATH+40),
+(@NPC+5,@PATH+50),
+(@NPC+6,@PATH+60),
+(@NPC+7,@PATH+70),
+(@NPC+8,@PATH+80),
+(@NPC+9,@PATH+90),
+(@NPC+10,@PATH+100);
+
+DELETE FROM `waypoint_data` WHERE `id` IN (@PATH,@PATH+10,@PATH+20,@PATH+30,@PATH+40,@PATH+50,@PATH+60,@PATH+70,@PATH+80,@PATH+90,@PATH+100);
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,946.877,-4950.67,8.72458,0,0,0,100,0),
+(@PATH,2,927.046,-4925.75,8.09321,0,0,0,100,0),
+(@PATH,3,929.734,-4899.67,9.95518,0,0,0,100,0),
+(@PATH,4,939.552,-4878.05,10.4938,0,0,0,100,0),
+(@PATH,5,929.734,-4899.67,9.95518,0,0,0,100,0),
+(@PATH,6,927.046,-4925.75,8.09321,0,0,0,100,0),
+(@PATH+10,1,1036.835,-4931.16,12.83267,0,0,0,100,0),
+(@PATH+10,2,1036.007,-4926.114,12.45767,0,0,0,100,0),
+(@PATH+10,3,1023.932,-4912.754,10.5369,0,0,0,100,0),
+(@PATH+10,4,1000.253,-4901.448,7.911896,0,0,0,100,0),
+(@PATH+10,5,1023.932,-4912.754,10.5369,0,0,0,100,0),
+(@PATH+10,6,1036.007,-4926.114,12.45767,0,0,0,100,0),
+(@PATH+20,1,1026.697,-4942.586,11.8071,0,0,0,100,0),
+(@PATH+20,2,1030.085,-4970.878,12.77823,0,0,0,100,0),
+(@PATH+20,3,1034.023,-4972.842,13.0493,0,0,0,100,0),
+(@PATH+20,4,1030.085,-4970.878,12.77823,0,0,0,100,0),
+(@PATH+20,5,1026.868,-4944.088,12.0571,0,0,0,100,0),
+(@PATH+30,1,1045.199,-5071.371,13.72586,0,0,0,100,0),
+(@PATH+30,2,1069.113,-5069.303,13.34213,0,0,0,100,0),
+(@PATH+30,3,1091.871,-5063.042,13.38427,0,0,0,100,0),
+(@PATH+30,4,1103.122,-5055.239,13.92861,0,0,0,100,0),
+(@PATH+30,5,1099.777,-5030.915,13.25463,0,0,0,100,0),
+(@PATH+30,6,1088.535,-5001.179,13.00463,0,0,0,100,0),
+(@PATH+30,7,1062.886,-4976.348,13.6743,0,0,0,100,0),
+(@PATH+30,8,1044.221,-4979.022,13.7993,0,0,0,100,0),
+(@PATH+30,9,1030.879,-4997.25,13.52823,0,0,0,100,0),
+(@PATH+30,10,1028.676,-5012.598,13.78496,0,0,0,100,0),
+(@PATH+30,11,1034.265,-5039.136,13.73875,0,0,0,100,0),
+(@PATH+40,1,919.0841,-4946.079,33.09615,0,0,0,100,0),
+(@PATH+40,2,937.5836,-4953.232,30.76281,0,0,0,100,0),
+(@PATH+40,3,936.755,-4970.46,30.76281,0,0,0,100,0),
+(@PATH+40,4,929.6907,-4992.461,30.76281,0,0,0,100,0),
+(@PATH+40,5,919.143,-5002.606,30.76281,0,0,0,100,0),
+(@PATH+40,6,899.7684,-4997.275,30.76281,0,0,0,100,0),
+(@PATH+40,7,894.8842,-4973.352,31.20726,0,0,0,100,0),
+(@PATH+40,8,910.7372,-4961.667,33.09615,0,0,0,100,0),
+(@PATH+50,1,955.5239,-4883.864,28.91015,0,0,0,100,0),
+(@PATH+50,2,975.0622,-4876.539,34.57682,0,0,0,100,0),
+(@PATH+50,3,998.4828,-4882.556,34.57682,0,0,0,100,0),
+(@PATH+50,4,1007.136,-4897.439,34.57682,0,0,0,100,0),
+(@PATH+50,5,999.5431,-4915.003,34.57682,0,0,0,100,0),
+(@PATH+50,6,977.8502,-4931.425,34.57682,0,0,0,100,0),
+(@PATH+50,7,955.9329,-4951.924,34.57682,0,0,0,100,0),
+(@PATH+50,8,932.5357,-4941.676,34.57682,0,0,0,100,0),
+(@PATH+50,9,928.3145,-4926.969,35.49352,0,0,0,100,0),
+(@PATH+50,10,934.7177,-4890.745,34.57682,0,0,0,100,0),
+(@PATH+60,1,985.4891,-4985.466,29.27757,0,0,0,100,0),
+(@PATH+60,2,1003.236,-5007.198,29.27757,0,0,0,100,0),
+(@PATH+60,3,1001.194,-5018.937,29.27757,0,0,0,100,0),
+(@PATH+60,4,983.9544,-5038.578,29.27757,0,0,0,100,0),
+(@PATH+60,5,965.2218,-5035.844,29.27757,0,0,0,100,0),
+(@PATH+60,6,955.2875,-5023.462,29.27757,0,0,0,100,0),
+(@PATH+60,7,964.6006,-5006.362,29.27757,0,0,0,100,0),
+(@PATH+60,8,970.6052,-4993.673,29.27757,0,0,0,100,0),
+(@PATH+70,1,997.6531,-4837.691,50.98726,0,0,0,100,0),
+(@PATH+70,2,978.2066,-4826.199,50.98726,0,0,0,100,0),
+(@PATH+70,3,954.6121,-4846.288,50.98726,0,0,0,100,0),
+(@PATH+70,4,915.1261,-4847.07,50.98726,0,0,0,100,0),
+(@PATH+70,5,906.7595,-4877.092,50.98726,0,0,0,100,0),
+(@PATH+70,6,911.5735,-4919.276,50.98726,0,0,0,100,0),
+(@PATH+70,7,942.1261,-4946.08,42.51503,0,0,0,100,0),
+(@PATH+70,8,978.0408,-4936.854,40.5428,0,0,0,100,0),
+(@PATH+70,9,1002.55,-4900.139,38.45948,0,0,0,100,0),
+(@PATH+70,10,1006.246,-4868.183,47.70948,0,0,0,100,0),
+(@PATH+80,1,1022.976,-4810.128,38.31916,0,0,0,100,0),
+(@PATH+80,2,996.8618,-4813.854,38.31916,0,0,0,100,0),
+(@PATH+80,3,964.6756,-4838.639,38.31916,0,0,0,100,0),
+(@PATH+80,4,940.3589,-4846.21,38.31916,0,0,0,100,0),
+(@PATH+80,5,907.9418,-4846.479,34.20804,0,0,0,100,0),
+(@PATH+80,6,887.7231,-4873.045,34.59694,0,0,0,100,0),
+(@PATH+80,7,891.8184,-4898.238,30.04136,0,0,0,100,0),
+(@PATH+80,8,912.4337,-4902.996,30.04136,0,0,0,100,0),
+(@PATH+80,9,939.5068,-4887.826,30.04136,0,0,0,100,0),
+(@PATH+80,10,961.7159,-4869.482,30.04136,0,0,0,100,0),
+(@PATH+80,11,1005.307,-4881.67,30.04136,0,0,0,100,0),
+(@PATH+80,12,1029.752,-4892.972,31.93025,0,0,0,100,0),
+(@PATH+80,13,1067.775,-4894.65,39.06914,0,0,0,100,0),
+(@PATH+80,14,1059.698,-4864.968,47.09693,0,0,0,100,0),
+(@PATH+80,15,1060.522,-4845.491,47.09693,0,0,0,100,0),
+(@PATH+80,16,1046.627,-4824.385,47.09693,0,0,0,100,0),
+(@PATH+90,1,1044.91,-4980.383,47.55685,0,0,0,100,0),
+(@PATH+90,2,1040.873,-5016.178,52.69574,0,0,0,100,0),
+(@PATH+90,3,1054.767,-5042.476,52.69574,0,0,0,100,0),
+(@PATH+90,4,1084.064,-5042.998,39.22352,0,0,0,100,0),
+(@PATH+90,5,1106.236,-5031.327,39.22352,0,0,0,100,0),
+(@PATH+90,6,1106.77,-4995.738,45.02908,0,0,0,100,0),
+(@PATH+90,7,1086.711,-4972.376,47.55685,0,0,0,100,0),
+(@PATH+90,8,1068.264,-4965.238,47.55685,0,0,0,100,0),
+(@PATH+100,1,1066.911,-4940.557,48.88609,0,0,0,100,0),
+(@PATH+100,2,1069.896,-4920.431,40.85831,0,0,0,100,0),
+(@PATH+100,3,1057.342,-4903.877,40.85831,0,0,0,100,0),
+(@PATH+100,4,1044.138,-4900.038,31.74721,0,0,0,100,0),
+(@PATH+100,5,1023.748,-4899.741,28.21942,0,0,0,100,0),
+(@PATH+100,6,1017.973,-4921.141,28.21942,0,0,0,100,0),
+(@PATH+100,7,1037.688,-4934.398,31.88609,0,0,0,100,0);
diff --git a/sql/updates/world/2015_05_23_00_world.sql b/sql/updates/world/2015_05_23_00_world.sql
new file mode 100644
index 00000000000..914b721b2ed
--- /dev/null
+++ b/sql/updates/world/2015_05_23_00_world.sql
@@ -0,0 +1,4 @@
+--
+UPDATE `creature_template` SET `npcflag`=3, `gossip_menu_id`=4047 WHERE `entry`=658;
+DELETE FROM `gossip_menu` WHERE `entry`=4047;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (4047, 4937);
diff --git a/sql/updates/world/2015_05_23_01_world.sql b/sql/updates/world/2015_05_23_01_world.sql
new file mode 100644
index 00000000000..44c17b81f48
--- /dev/null
+++ b/sql/updates/world/2015_05_23_01_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature_template` SET `gossip_menu_id`=21212 WHERE `entry`=13000;
diff --git a/sql/updates/world/2015_05_23_02_world.sql b/sql/updates/world/2015_05_23_02_world.sql
new file mode 100644
index 00000000000..b00fa1c2d86
--- /dev/null
+++ b/sql/updates/world/2015_05_23_02_world.sql
@@ -0,0 +1,7 @@
+--
+UPDATE `creature_template` SET `npcflag`=3, `gossip_menu_id`=694 WHERE `entry`=1343;
+DELETE FROM `gossip_menu` WHERE `entry`=694;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (694, 1244);
+DELETE FROM `npc_text` WHERE `ID`=1244;
+INSERT INTO `npc_text` (`ID`, `text0_0`, `text0_1`, `BroadcastTextID0`, `lang0`, `prob0`, `em0_0`, `em0_1`) VALUES
+(1244, 'Well, if it isn''t a young, bristling $c, no doubt drawn here by talk of my exploits in fields of battle!$B$BNo time for stories now, for there are great, important deeds that need doing! So if you''re looking for glory, then luck shines on you today...', 'Well, if it isn''t a young, bristling $c, no doubt drawn here by talk of my exploits in fields of battle!$B$BNo time for stories now, for there are great, important deeds that need doing! So if you''re looking for glory, then luck shines on you today...', 0, 0, 1, 0, 0);
diff --git a/sql/updates/world/2015_05_23_03_world.sql b/sql/updates/world/2015_05_23_03_world.sql
new file mode 100644
index 00000000000..ace8253bbde
--- /dev/null
+++ b/sql/updates/world/2015_05_23_03_world.sql
@@ -0,0 +1,7 @@
+--
+UPDATE `creature_template` SET `npcflag`=3, `gossip_menu_id`=6159 WHERE `entry`=240;
+DELETE FROM `gossip_menu` WHERE `entry`=6159;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (6159, 6157);
+DELETE FROM `npc_text` WHERE `ID`=6157;
+INSERT INTO `npc_text` (`ID`, `text0_0`, `text0_1`, `BroadcastTextID0`, `lang0`, `prob0`, `em0_0`, `em0_1`) VALUES
+(6157, 'Ach, it''s hard enough keeping order around here without all these new troubles popping up! I hope you have good news, $n...', 'Ach, it''s hard enough keeping order around here without all these new troubles popping up! I hope you have good news, $n...', 42172, 0, 1, 5, 5);
diff --git a/sql/updates/world/2015_05_24_00_world.sql b/sql/updates/world/2015_05_24_00_world.sql
new file mode 100644
index 00000000000..946c20339cb
--- /dev/null
+++ b/sql/updates/world/2015_05_24_00_world.sql
@@ -0,0 +1,170 @@
+-- Gnomeregan Scripts
+-- Irradiated Pillager SAI
+SET @ENTRY := 6329;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,25,0,100,0,0,0,0,0,75,9798,0,0,0,0,0,1,0,0,0,0,0,0,0,"Irradiated Pillager - On Reset - Add Aura 'Radiation'"),
+(@ENTRY,0,1,0,0,0,100,0,3000,5000,10000,11000,11,9771,64,0,0,0,0,17,0,50,0,0,0,0,0,"Irradiated Pillager - In Combat CMC - Cast 'Radiation Bolt'"),
+(@ENTRY,0,2,0,2,0,100,1,0,40,0,0,11,8269,2,0,0,0,0,1,0,0,0,0,0,0,0,"Irradiated Pillager - Between 0-40% Health - Cast 'Frenzy' (No Repeat)");
+
+-- Caverndeep Ambusher SAI
+SET @ENTRY := 6207;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,3700,3700,3600,12400,11,2590,0,0,0,0,0,2,0,0,0,0,0,0,0,"Caverndeep Ambusher - In Combat - Cast 'Backstab'");
+
+-- Caverndeep Burrower SAI
+SET @ENTRY := 6206;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,3000,5000,9000,13000,11,1604,0,0,0,0,0,2,0,0,0,0,0,0,0,"Caverndeep Burrower - In Combat - Cast 'Dazed'"),
+(@ENTRY,0,1,0,0,0,100,0,2000,4000,4000,6000,11,9770,64,0,0,0,0,2,0,0,0,0,0,0,0,"Caverndeep Burrower - In Combat CMC - Cast 'Radiation'"),
+(@ENTRY,0,2,0,0,0,100,0,6000,7000,4000,8000,11,16145,0,0,0,0,0,2,0,0,0,0,0,0,0,"Caverndeep Burrower - In Combat - Cast 'Sunder Armor'"),
+(@ENTRY,0,3,0,2,0,100,1,0,15,0,0,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Caverndeep Burrower - Between 0-15% Health - Flee For Assist (No Repeat)");
+
+-- Irradiated Slime SAI
+SET @ENTRY := 6218;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,1,1000,2000,0,0,75,10341,0,0,0,0,0,1,0,0,0,0,0,0,0,"Irradiated Slime - In Combat - Add Aura 'Radiation Cloud'"),
+(@ENTRY,0,1,0,0,0,100,0,2000,9000,11000,14000,11,9459,0,0,0,0,0,17,0,50,0,0,0,0,0,"Irradiated Slime - In Combat - Cast 'Corrosive Ooze'"),
+(@ENTRY,0,2,0,0,0,100,0,4000,6000,8000,9000,11,1604,64,0,0,0,0,2,0,0,0,0,0,0,0,"Irradiated Slime - In Combat CMC - Cast 'Dazed'");
+
+-- Irradiated Horror SAI
+SET @ENTRY := 6220;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,1,1000,2000,0,0,75,10341,0,0,0,0,0,1,0,0,0,0,0,0,0,"Irradiated Horror - In Combat - Add Aura 'Radiation Cloud' (No Repeat)"),
+(@ENTRY,0,1,0,0,0,100,0,4000,5000,10000,12000,11,8211,0,0,0,0,0,2,0,0,0,0,0,0,0,"Irradiated Horror - In Combat - Cast 'Chain Burn'"),
+(@ENTRY,0,2,0,0,0,100,0,2000,9000,11000,14000,11,9459,0,0,0,0,0,17,0,50,0,0,0,0,0,"Irradiated Horror - In Combat - Cast 'Corrosive Ooze'"),
+(@ENTRY,0,3,0,0,0,100,0,4000,6000,8000,9000,11,1604,64,0,0,0,0,2,0,0,0,0,0,0,0,"Irradiated Horror - In Combat CMC - Cast 'Dazed'");
+
+-- Corrosive Lurker SAI
+SET @ENTRY := 6219;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,1,1000,2000,0,0,75,10341,0,0,0,0,0,1,0,0,0,0,0,0,0,"Corrosive Lurker - In Combat - Add Aura 'Radiation Cloud' (No Repeat)"),
+(@ENTRY,0,1,0,0,0,100,0,2000,9000,11000,14000,11,9459,0,0,0,0,0,17,0,50,0,0,0,0,0,"Corrosive Lurker - In Combat - Cast 'Corrosive Ooze'"),
+(@ENTRY,0,2,0,0,0,100,0,4000,6000,8000,9000,11,1604,64,0,0,0,0,2,0,0,0,0,0,0,0,"Corrosive Lurker - In Combat CMC - Cast 'Dazed'");
+
+UPDATE `creature` SET `spawndist`=20, `MovementType`=1 WHERE `guid`=30137;
+
+-- Viscous Fallout SAI
+SET @ENTRY := 7079;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,1,1000,2000,0,0,75,10341,2,0,0,0,0,1,0,0,0,0,0,0,0,"Viscous Fallout - In Combat - Add Aura 'Radiation Cloud'"),
+(@ENTRY,0,1,0,0,0,100,0,2000,9000,11000,14000,11,9459,64,0,0,0,0,17,0,50,0,0,0,0,0,"Viscous Fallout - In Combat CMC - Cast 'Corrosive Ooze'");
+
+-- Mechanized Sentry SAI
+SET @ENTRY := 6233;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,3000,5000,8000,9000,11,1604,0,0,0,0,0,2,0,0,0,0,0,0,0,"Mechanized Sentry - In Combat - Cast 'Dazed'");
+
+-- Leprous Defender SAI
+SET @ENTRY := 6223;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,1000,1500,2300,3900,11,6660,64,0,0,0,0,2,0,0,0,0,0,0,0,"Leprous Defender - Combat CMC - Cast 'Shoot'"),
+(@ENTRY,0,1,0,9,0,100,0,5,30,7000,9000,11,14443,0,0,0,0,0,2,0,0,0,0,0,0,0,"Leprous Defender - Within 5-30 Range - Cast 'Multi-Shot'"),
+(@ENTRY,0,2,0,9,0,100,0,5,30,9000,11000,11,5116,0,0,0,0,0,2,0,0,0,0,0,0,0,"Leprous Defender - Within 5-30 Range - Cast 'Concussive Shot'"),
+(@ENTRY,0,3,0,2,0,100,1,0,15,0,0,25,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Leprous Defender - Between 0-15% Health - Flee For Assist (No Repeat)");
+
+-- Leprous Technician SAI
+SET @ENTRY := 6222;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,4,0,100,0,0,0,0,0,11,12024,64,0,0,0,0,2,0,0,0,0,0,0,0,"Leprous Technician - On Aggro CMC - Cast 'Net'"),
+(@ENTRY,0,1,0,0,0,100,0,2000,6000,8000,9000,11,1604,0,0,0,0,0,2,0,0,0,0,0,0,0,"Leprous Technician - In Combat - Cast 'Dazed'"),
+(@ENTRY,0,2,0,0,0,100,0,2000,5000,6000,8000,11,13398,64,0,0,0,0,21,30,0,0,0,0,0,0,"Leprous Technician - In Combat CMC - Cast 'Throw Wrench'");
+
+-- Mechano-Tank SAI
+SET @ENTRY := 6225;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,5,30,2300,3900,11,1604,64,0,0,0,0,2,0,0,0,0,0,0,0,"Mechano-Tank - Combat CMC - Cast 'Dazed'"),
+(@ENTRY,0,1,0,9,0,100,0,5,30,7000,9000,11,10346,0,0,0,0,0,2,0,0,0,0,0,0,0,"Mechano-Tank - Within 5-30 Range - Cast 'Multi-Shot'"),
+(@ENTRY,0,2,0,9,0,100,0,5,30,9000,11000,11,5116,0,0,0,0,0,2,0,0,0,0,0,0,0,"Mechano-Tank - Within 5-30 Range - Cast 'Concussive Shot'"),
+(@ENTRY,0,3,0,2,0,100,1,0,15,0,0,25,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mechano-Tank - Between 0-15% Health - Flee For Assist (No Repeat)");
+
+-- Peacekeeper Security Suit SAI
+SET @ENTRY := 6230;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,5000,6000,6000,8000,11,6533,64,0,0,0,0,2,0,0,0,0,0,0,0,"Peacekeeper Security Suit - In Combat CMC - Cast 'Net'"),
+(@ENTRY,0,1,0,0,0,50,0,5000,6000,14000,16000,11,10730,0,0,0,0,0,2,0,0,0,0,0,0,0,"Peacekeeper Security Suit - In Combat - Cast 'Pacify'");
+
+-- Mechanized Guardian SAI
+SET @ENTRY := 6234;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,2000,5000,6000,7000,11,1604,0,0,0,0,0,2,0,0,0,0,0,0,0,"Mechanized Guardian - In Combat - Cast 'Dazed'"),
+(@ENTRY,0,1,0,0,0,100,0,3000,6000,6000,7000,11,11820,0,0,0,0,0,21,40,0,0,0,0,0,0,"Mechanized Guardian - In Combat - Cast 'Field'");
+
+-- Mechano-Flamewalker SAI
+SET @ENTRY := 6226;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,2000,6000,6000,10000,11,11306,64,0,0,0,0,1,0,0,0,0,0,0,0,"Mechano-Flamewalker - In Combat CMC - Cast 'Fire Nova'"),
+(@ENTRY,0,1,0,0,0,100,0,3000,6000,10000,12000,11,10733,0,0,0,0,0,2,0,0,0,0,0,0,0,"Mechano-Flamewalker - In Combat - Cast 'Flame Spray'");
+
+-- Mechano-Frostwalker SAI
+SET @ENTRY := 6227;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,2,0,100,1,0,40,0,0,11,22519,2,0,0,0,0,1,0,0,0,0,0,0,0,"Mechano-Frostwalker - Between 0-40% Health - Cast 'Ice Nova' (No Repeat)"),
+(@ENTRY,0,1,0,0,0,100,0,2000,6000,8000,9000,11,11264,64,0,0,0,0,1,0,0,0,0,0,0,0,"Mechano-Frostwalker - In Combat CMC - Cast 'Ice Blast'");
+
+-- Caverndeep Reaver SAI
+SET @ENTRY := 6211;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,4,0,100,1,0,0,0,0,11,7366,2,0,0,0,0,1,0,0,0,0,0,0,0,"Caverndeep Reaver - On Aggro - Cast 'Berserker Stance' (No Repeat)"),
+(@ENTRY,0,1,0,0,0,100,0,2000,6000,5000,8000,11,8374,2,0,0,0,0,2,0,0,0,0,0,0,0,"Caverndeep Reaver - In Combat - Cast 'Arcing Smash'"),
+(@ENTRY,0,2,0,0,0,100,0,4000,4000,4000,4000,11,845,2,0,0,0,0,2,0,0,0,0,0,0,0,"Caverndeep Reaver - In Combat - Cast 'Cleave'");
+
+-- Holdout Medic SAI
+SET @ENTRY := 6392;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,2,0,100,1,0,60,0,0,11,22167,0,0,0,0,0,1,0,0,0,0,0,0,0,"Holdout Medic - Between 0-60% Health - Cast 'Heal' (No Repeat)"),
+(@ENTRY,0,1,0,4,0,100,1,0,0,0,0,11,22168,64,0,0,0,0,1,0,0,0,0,0,0,0,"Holdout Medic - On Aggro CMC - Cast 'Renew' (No Repeat)"),
+(@ENTRY,0,2,0,1,0,100,0,5000,5000,8000,10000,11,22167,0,0,0,0,0,1,0,0,0,0,0,0,0,"Holdout Medic - Out of Combat - Cast 'Heal'"),
+(@ENTRY,0,3,0,1,0,100,0,4000,10000,15000,20000,11,22168,0,0,0,0,0,1,0,0,0,0,0,0,0,"Holdout Medic - Out of Combat - Cast 'Renew'");
+
+-- Walking Bomb SAI
+SET @ENTRY := 7915;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,3,0,0,15000,15000,11,11504,0,0,0,0,0,1,0,0,0,0,0,0,0,"Walking Bomb - In Combat - Cast 'Walking Bomb Effect' (No Repeat) (Normal Dungeon)");
+
+UPDATE `creature` SET `spawndist`=20, `MovementType`=1 WHERE `guid`=30133;
+
+-- Leprous Machinesmith SAI
+SET @ENTRY := 6224;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,4000,5000,20000,25000,11,10732,0,0,0,0,0,19,6224,50,0,0,0,0,0,"Leprous Machinesmith - In Combat - Cast 'Supercharge'"),
+(@ENTRY,0,1,0,0,0,100,0,2000,5000,4000,6000,11,13398,64,0,0,0,0,21,30,0,0,0,0,0,0,"Leprous Machinesmith - In Combat CMC - Cast 'Throw Wrench'"),
+(@ENTRY,0,2,0,2,0,100,1,0,90,0,0,11,10348,0,0,0,0,0,1,0,0,0,0,0,0,0,"Leprous Machinesmith - Between 0-90% Health - Cast 'Tune Up' (No Repeat)");
+
diff --git a/sql/updates/world/2015_05_24_01_world.sql b/sql/updates/world/2015_05_24_01_world.sql
new file mode 100644
index 00000000000..b8e343d9840
--- /dev/null
+++ b/sql/updates/world/2015_05_24_01_world.sql
@@ -0,0 +1,365 @@
+-- Ammo for Rumbleshot
+UPDATE `creature` SET position_x = -6070.349121, position_y = -285.940399, position_z = 428.220367, orientation = 1.496177 WHERE guid = 263;
+UPDATE `creature` SET position_x = -6104.470703, position_y = -163.987122, position_z = 433.257080, orientation = 1.833880 WHERE guid = 1716;
+UPDATE `creature` SET position_x = -5988.834473, position_y = -135.639069, position_z = 400.818604, orientation = 4.441411 WHERE guid = 290;
+-- Mortar Combat - event
+-- correct spawn possition for all involved in event
+UPDATE `creature` SET position_x = -6009.25, position_y = -202.649994, position_z = 406.982605, orientation = 1.58825 WHERE guid = 269; -- angus
+UPDATE `creature` SET orientation = 0.03490658 WHERE guid = 265 ; -- hegnar
+UPDATE `creature` SET position_x = -6007.301758, position_y = -200.348206, position_z = 406.777496, orientation = 3.282219 WHERE guid = 272; -- klemmy
+UPDATE `creature` SET position_x = -6007.458984, position_y = -202.157593, position_z = 407.447937, orientation = 2.478368 WHERE guid = 267; -- shorty
+UPDATE `creature` SET position_x = -6010.668151495, position_y = -199.434006, position_z = 406.792480, orientation = 5.532694 WHERE guid = 268; -- middlecamp
+UPDATE `creature` SET position_x = -6008.527832, position_y = -199.145203, position_z = 406.687225, orientation = 4.372177 WHERE guid = 266; -- wheeler
+
+DELETE FROM `waypoints` WHERE `entry`=10610;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(10610, 1, -6009.25,-202.649994,406.982605, 'Angus'),
+(10610, 2, -6009.25,-202.649994,406.982605, 'Angus'),
+(10610, 3, -6009.25,-202.649994,406.982605, 'Angus'),
+(10610, 4, -6031.16,-230.264,414.361, 'Angus');
+
+DELETE FROM `spell_target_position` WHERE id IN (18634,16572,16767,16768,16772,16775,16776,16777,16778,16779,16780,16786,18634);
+INSERT INTO `spell_target_position` (id, target_map, target_position_x, target_position_y, target_position_z, target_orientation) VALUES
+(16572,0,-6046.85,-207.329,418.304,0),
+(16767,0,-6046.73,-207.159,417.267,0),
+(16768,0,-6051.39,-206.749,418.159,0),
+(16772,0,-6046.84,-204.535,416.897,0),
+(16775,0,-6044.47,-205.783,417.267,0),
+(16776,0,-6044.54,-205.562,417.663,0),
+(16777,0,-6044.53,-202.912,416.756,0),
+(16778,0,-6042.18,-204.949,416.336,0),
+(16779,0,-6042.02,-204.134,416.894,0),
+(16780,0,-6044.79,-196.959,419.19,0),
+(16786,0,-6078.3,-211.89,424.197,0),
+(18634,0,-6076,-215,424,0);
+
+-- Hegnar Rumbleshot SAI
+SET @ENTRY := 1243;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,1,20,0,100,0,5541,0,0,0,45,1,0,0,0,0,0,19,10610,20,0,0,0,0,0,"Hegnar Rumbleshot - On Quest 'Ammo for Rumbleshot' Finished - Set Data 1 0"),
+(@ENTRY,0,1,2,61,0,100,0,5541,0,0,0,45,1,0,0,0,0,0,19,10611,20,0,0,0,0,0,"Hegnar Rumbleshot - On Quest 'Ammo for Rumbleshot' Finished - Set Data 1 0"),
+(@ENTRY,0,2,3,61,0,100,0,5541,0,0,0,45,1,0,0,0,0,0,19,10804,20,0,0,0,0,0,"Hegnar Rumbleshot - On Quest 'Ammo for Rumbleshot' Finished - Set Data 1 0"),
+(@ENTRY,0,3,4,61,0,100,0,5541,0,0,0,45,1,0,0,0,0,0,19,10805,20,0,0,0,0,0,"Hegnar Rumbleshot - On Quest 'Ammo for Rumbleshot' Finished - Set Data 1 0"),
+(@ENTRY,0,4,0,61,0,100,0,5541,0,0,0,45,1,0,0,0,0,0,19,10803,20,0,0,0,0,0,"Hegnar Rumbleshot - On Quest 'Ammo for Rumbleshot' Finished - Set Data 1 0"),
+(@ENTRY,0,5,0,38,0,100,0,2,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,3.68522,"Hegnar Rumbleshot - On Data Set 2 0 - Set Orientation 3,68522"),
+(@ENTRY,0,6,0,38,0,100,0,3,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0.03490658,"Hegnar Rumbleshot - On Data Set 3 0 - Set Orientation 0.03490658");
+
+-- Angus SAI
+SET @ENTRY := 10610;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,1,38,0,100,0,1,0,0,0,48,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Angus - On Data Set 1 0 - Set Active On"),
+(@ENTRY,0,1,2,61,0,100,0,1,0,0,0,53,0,10610,0,0,0,0,1,0,0,0,0,0,0,0,"Angus - On Data Set 1 0 - Start Waypoint"),
+(@ENTRY,0,2,0,61,0,100,0,1,0,0,0,4,6598,0,0,0,0,0,21,50,0,0,0,0,0,0,"Angus - On Data Set 1 0 - Play Sound 6598"),
+(@ENTRY,0,3,4,40,0,100,0,4,10610,0,0,54,250000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Angus - On Waypoint 4 Reached - Pause Waypoint"),
+(@ENTRY,0,4,0,61,0,100,0,4,10610,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Angus - On Waypoint 4 Reached - Run Script"),
+(@ENTRY,0,5,0,38,0,100,0,2,0,0,0,69,0,0,0,0,0,0,8,0,0,0,-6009.25,-202.649994,406.982605,2,"Shorty - On Data Set 2 0 - Move To Position"),
+(@ENTRY,0,6,0,38,0,100,0,3,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,1.58825,"Shorty - On Data Set 3 0 - Set Orientation 1.58825");
+
+-- Mortar Team Target Dummy SAI
+SET @ENTRY := 11875;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,1,0,100,1,100,100,0,0,75,42716,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mortar Team Target Dummy - Out of Combat - Add Aura 'Self Root Forever (No Visual)' (No Repeat)");
+
+-- move to eventplace
+-- Shorty SAI
+SET @ENTRY := 10611;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,1,38,0,100,0,1,0,0,0,69,0,0,0,0,0,0,8,0,0,0,-6031.589,-228.182,414.4035,2,"Shorty - On Data Set 1 0 - Move To Position"),
+(@ENTRY,0,1,0,61,0,100,0,1,0,0,0,48,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Shorty - On Data Set 1 0 - Set Active On"),
+(@ENTRY,0,2,0,38,0,100,0,2,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.18492,"Shorty - On Data Set 2 0 - Set Orientation 2,18492"),
+(@ENTRY,0,3,0,38,0,100,0,3,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.844887,"Shorty - On Data Set 3 0 - Set Orientation 2.844887"),
+(@ENTRY,0,4,0,38,0,100,0,4,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.54215,"Shorty - On Data Set 4 0 - Set Orientation 4.54215"),
+(@ENTRY,0,5,0,38,0,100,0,5,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.844887,"Shorty - On Data Set 4 0 - Set Orientation 2.844887"),
+(@ENTRY,0,6,0,38,0,100,0,6,0,0,0,11,18655,0,0,0,0,0,1,0,0,0,0,0,0,0,"Shorty - On Data Set 6 0 - Cast 'Mortar Animate'"),
+(@ENTRY,0,7,0,38,0,100,0,7,0,0,0,11,16786,0,0,0,0,0,1,0,0,0,0,0,0,0,"Shorty - On Data Set 7 0 - Cast 'Mortar Shot'"),
+(@ENTRY,0,8,0,38,0,100,0,8,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.54215,"Shorty - On Data Set 8 0 - Set Orientation 4.54215"),
+(@ENTRY,0,9,0,38,0,100,0,9,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.54215,"Shorty - On Data Set 9 0 - Set Orientation 4.54215"),
+(@ENTRY,0,10,0,38,0,100,0,10,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.844887,"Shorty - On Data Set 10 0 - Set Orientation 2.844887"),
+(@ENTRY,0,11,0,38,0,100,0,11,0,0,0,69,0,0,0,0,0,0,8,0,0,0,-6007.458984,-202.157593,407.447937,2,"Shorty - On Data Set 11 0 - Move To Position"),
+(@ENTRY,0,12,0,38,0,100,0,12,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.478368,"Shorty - On Data Set 12 0 - Set Orientation 2.478368");
+
+-- Klemmy SAI
+SET @ENTRY := 10805;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,1,38,0,100,0,1,0,0,0,53,0,10805,0,0,0,0,1,0,0,0,0,0,0,0,"Klemmy - On Data Set 1 0 - Start Waypoint"),
+(@ENTRY,0,1,0,61,0,100,0,1,0,0,0,48,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Klemmy - On Data Set 1 0 - Set Active On"),
+(@ENTRY,0,2,0,38,0,100,0,2,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.59936,"Spotter Klemmy - On Data Set 2 0 - Set Orientation 5,59936"),
+(@ENTRY,0,3,0,38,0,100,0,3,0,0,0,69,0,0,0,0,0,0,8,0,0,0,-6077.43,-213.2565,424.0502,5.59936,"Spotter Klemmy - On Data Set 3 0 - Move To Position"),
+(@ENTRY,0,4,0,38,0,100,0,4,0,0,0,69,0,0,0,0,0,0,8,0,0,0,-6065.903,-202.2976,424.3693,5,"Spotter Klemmy - On Data Set 4 0 - Move To Position"),
+(@ENTRY,0,5,0,38,0,100,0,5,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.59936,"Spotter Klemmy - On Data Set 5 0 - Set Orientation 5.59936"),
+(@ENTRY,0,6,0,38,0,100,0,6,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.0985,"Spotter Klemmy - On Data Set 6 0 - Set Orientation 4.0985"),
+(@ENTRY,0,7,0,38,0,100,0,7,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.0985,"Spotter Klemmy - On Data Set 7 0 - Set Orientation 4.0985"),
+(@ENTRY,0,8,0,38,0,100,0,8,0,0,0,69,0,0,0,0,0,0,8,0,0,0,-6077.43,-213.2565,424.0502,5.59936,"Spotter Klemmy - On Data Set 8 0 - Move To Position"),
+(@ENTRY,0,9,0,38,0,100,0,9,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.844887,"Spotter Klemmy - On Data Set 9 0 - Set Orientation 2.844887"),
+(@ENTRY,0,10,0,38,0,100,0,10,0,0,0,69,0,0,0,0,0,0,8,0,0,0,-6071.88,-212.831,422.929,5,"Spotter Klemmy - On Data Set 10 0 - Move To Position"),
+(@ENTRY,0,11,0,38,0,100,0,11,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,6.04228,"Spotter Klemmy - On Data Set 11 0 - Set Orientation 6.04228"),
+(@ENTRY,0,12,0,38,0,100,0,12,0,0,0,69,0,0,0,0,0,0,8,0,0,0,-6065.903,-202.2976,424.3693,5,"Spotter Klemmy - On Data Set 12 0 - Move To Position"),
+(@ENTRY,0,13,0,38,0,100,0,13,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.0985,"Spotter Klemmy - On Data Set 13 0 - Set Orientation 4.0985"),
+(@ENTRY,0,14,0,38,0,100,0,14,0,0,0,69,0,0,0,0,0,0,8,0,0,0,-6064.07,-209.851,421.98,6.10275,"Spotter Klemmy - On Data Set 14 0 - Move To Position"),
+(@ENTRY,0,15,0,38,0,100,0,15,0,0,0,69,0,0,0,0,0,0,8,0,0,0,-6061.97,-218.956,421.085,5.92054,"Spotter Klemmy - On Data Set 15 0 - Move To Position"),
+(@ENTRY,0,16,0,38,0,100,0,16,0,0,0,69,0,0,0,0,0,0,8,0,0,0,-6040.96,-221.929,414.921,5.92054,"Spotter Klemmy - On Data Set 16 0 - Move To Position"),
+(@ENTRY,0,17,0,38,0,100,0,17,0,0,0,69,0,0,0,0,0,0,8,0,0,0,-6007.301758,-200.348206,406.777496,3.282219,"Spotter Klemmy - On Data Set 17 0 - Move To Position"),
+(@ENTRY,0,18,0,38,0,100,0,18,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,3.282219,"Spotter Klemmy - On Data Set 18 0 - Set Orientation 3.282219");
+
+-- Wheeler SAI
+SET @ENTRY := 10803;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,1,38,0,100,0,1,0,0,0,53,0,10803,0,0,0,0,1,0,0,0,0,0,0,0,"Wheeler - On Data Set 1 0 - Start Waypoint"),
+(@ENTRY,0,1,0,61,0,100,0,1,0,0,0,48,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wheeler - On Data Set 1 0 - Set Active On"),
+(@ENTRY,0,2,0,38,0,100,0,2,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.443461,"Wheeler - On Data Set 2 0 - Set Orientation 2,443461"),
+(@ENTRY,0,3,0,38,0,100,0,3,0,0,0,11,16767,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wheeler - On Data Set 3 0 - Cast 'Shoot'"),
+(@ENTRY,0,4,0,38,0,100,0,4,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.00565,"Wheeler - On Data Set 4 0 - Set Orientation 4.00565"),
+(@ENTRY,0,5,0,38,0,100,0,5,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.443461,"Wheeler - On Data Set 5 0 - Set Orientation 2.443461"),
+(@ENTRY,0,6,0,38,0,100,0,6,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.00565,"Wheeler - On Data Set 6 0 - Set Orientation 4.00565"),
+(@ENTRY,0,7,0,38,0,100,0,7,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.443461,"Wheeler - On Data Set 7 0 - Set Orientation 2.443461"),
+(@ENTRY,0,8,0,38,0,100,0,8,0,0,0,11,16775,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wheeler - On Data Set 8 0 - Cast 'Shoot'"),
+(@ENTRY,0,9,0,38,0,100,0,9,0,0,0,11,16778,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wheeler - On Data Set 9 0 - Cast 'Shoot'"),
+(@ENTRY,0,10,0,38,0,100,0,10,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.00565,"Wheeler - On Data Set 10 0 - Set Orientation 4.00565"),
+(@ENTRY,0,11,0,38,0,100,0,11,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.443461,"Wheeler - On Data Set 11 0 - Set Orientation 4.00565"),
+(@ENTRY,0,12,0,38,0,100,0,12,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.00565,"Wheeler - On Data Set 12 0 - Set Orientation 4.00565"),
+(@ENTRY,0,13,0,38,0,100,0,13,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.77803,"Wheeler - On Data Set 13 0 - Set Orientation 4.77803"),
+(@ENTRY,0,14,0,38,0,100,0,14,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,3.01942,"Wheeler - On Data Set 14 0 - Set Orientation 3.01942"),
+(@ENTRY,0,15,0,38,0,100,0,15,0,0,0,69,0,0,0,0,0,0,8,0,0,0,-6008.527832,-199.145203,406.687225,4.372177,"Wheeler - On Data Set 15 0 - Move To Position"),
+(@ENTRY,0,16,0,38,0,100,0,16,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.372177,"Wheeler - On Data Set 16 0 - Set Orientation 4.372177");
+
+-- Rifleman Middlecamp SAI
+SET @ENTRY := 10804;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,1,38,0,100,0,1,0,0,0,69,0,0,0,0,0,0,8,0,0,0,-6034.14,-223.333,413.4,1,"Rifleman Middlecamp - On Data Set 1 0 - Move To Position"),
+(@ENTRY,0,1,0,61,0,100,0,1,0,0,0,48,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rifleman Middlecamp - On Data Set 1 0 - Set Active On"),
+(@ENTRY,0,2,0,38,0,100,0,2,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,1.884956,"Rifleman Middlecamp - On Data Set 2 0 - Set Orientation 1,884956"),
+(@ENTRY,0,3,0,38,0,100,0,3,0,0,0,11,16768,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rifleman Middlecamp - On Data Set 3 0 - Cast 'Shoot'"),
+(@ENTRY,0,4,0,38,0,100,0,4,0,0,0,11,16772,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rifleman Middlecamp - On Data Set 4 0 - Cast 'Shoot'"),
+(@ENTRY,0,5,0,38,0,100,0,5,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0.810652,"Rifleman Middlecamp - On Data Set 5 0 - Set Orientation 0.810652"),
+(@ENTRY,0,6,0,38,0,100,0,6,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,1.884956,"Rifleman Middlecamp - On Data Set 6 0 - Set Orientation 1.884956"),
+(@ENTRY,0,7,0,38,0,100,0,7,0,0,0,11,16777,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rifleman Middlecamp - On Data Set 7 0 - Cast 'Shoot'"),
+(@ENTRY,0,8,0,38,0,100,0,8,0,0,0,11,16780,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rifleman Middlecamp - On Data Set 8 0 - Cast 'Shoot'"),
+(@ENTRY,0,9,0,38,0,100,0,9,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0.810652,"Rifleman Middlecamp - On Data Set 9 0 - Set Orientation 0.810652"),
+(@ENTRY,0,10,0,38,0,100,0,10,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,1.884956,"Rifleman Middlecamp - On Data Set 10 0 - Set Orientation 1.884956"),
+(@ENTRY,0,11,0,38,0,100,0,11,0,0,0,11,16572,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rifleman Middlecamp - On Data Set 11 0 - Cast 'Shoot'"),
+(@ENTRY,0,12,0,38,0,100,0,12,0,0,0,11,16776,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rifleman Middlecamp - On Data Set 12 0 - Cast 'Shoot'"),
+(@ENTRY,0,13,0,38,0,100,0,13,0,0,0,11,16779,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rifleman Middlecamp - On Data Set 13 0 - Cast 'Shoot'"),
+(@ENTRY,0,14,0,38,0,100,0,14,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0.810652,"Rifleman Middlecamp - On Data Set 14 0 - Set Orientation 0.810652"),
+(@ENTRY,0,15,0,38,0,100,0,15,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.13852,"Rifleman Middlecamp - On Data Set 15 0 - Set Orientation 5.13852"),
+(@ENTRY,0,16,0,38,0,100,0,16,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.9147,"Rifleman Middlecamp - On Data Set 16 0 - Set Orientation 2.9147"),
+(@ENTRY,0,17,1,38,0,100,0,17,0,0,0,69,0,0,0,0,0,0,8,0,0,0,-6010.668151495,-199.434006,406.792480,5.532694,"Rifleman Middlecamp - On Data Set 17 0 - Move To Position"),
+(@ENTRY,0,18,0,38,0,100,0,18,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.532694,"Rifleman Middlecamp - On Data Set 18 0 - Set Orientation 5.532694");
+
+DELETE FROM `waypoints` WHERE `entry`=10805;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(10805, 1, -6011.17,-197.021,406.765, 'Klemmy'),
+(10805, 2, -6015.51,-184.362,407.712, 'Klemmy'),
+(10805, 3, -6042.365723,-191.418701,421.045868, 'Klemmy'),
+(10805, 4, -6065.18,-201.938,424.419, 'Klemmy');
+
+DELETE FROM `waypoints` WHERE `entry`=10803;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(10803, 1, -6011.87,-199.241,406.834, 'Wheeler'),
+(10803, 2, -6031.929,-221.0882,413.1531, 'Wheeler');
+
+DELETE FROM `creature_text` WHERE `entry` IN (10804, 10803);
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`, `BroadcastTextId`) VALUES
+(10804, 0, 0, '%s picks the orc target...', 16, 0, 100, 25, 0, 0, 'Middlecamp', 6107),
+(10804, 1, 0, '%s misses...', 16, 0, 100, 6, 0, 0, 'Middlecamp', 6140),
+(10804, 2, 0, '%s takes a more careful aim...', 16, 0, 100, 6, 0, 6247, 'Middlecamp', 6106),
+(10804, 3, 0, '%s misses again...', 16, 0, 100, 6, 0, 0, 'Middlecamp', 6141),
+(10804, 4, 0, '%s takes aim at the bottles...', 16, 0, 100, 0, 0, 0, 'Middlecamp', 6120),
+(10804, 5, 0, '%s misses...', 16, 0, 100, 15, 0, 0, 'Middlecamp', 6140),
+(10804, 6, 0, '%s takes aim at the bottles again...', 16, 0, 100, 0, 0, 0, 'Middlecamp', 6121),
+(10804, 7, 0, '%s misses again...', 16, 0, 100, 18, 0, 0, 'Middlecamp', 6141),
+(10804, 8, 0, '%s quickly shoots the orc dummy...', 16, 0, 100, 0, 0, 0, 'Middlecamp', 6137),
+(10804, 9, 0, '%s turns to the paper target...', 16, 0, 100, 0, 0, 0, 'Middlecamp', 6136),
+(10804, 10, 0, '%s shoots from the hip at the bottles...', 16, 0, 100, 0, 0, 0, 'Middlecamp', 6138),
+--
+(10803, 0, 0, '%s casually points at the orc target...', 16, 0, 100, 25, 0, 0, 'Wheeler', 6118),
+(10803, 1, 0, '%s hits!', 16, 0, 100, 0, 0, 0, 'Wheeler', 6142),
+(10803, 2, 0, '%s quickly shoots the middle target dead center...', 16, 0, 100, 0, 0, 0, 'Wheeler', 6124),
+(10803, 3, 0, '%s then takes aim at the bottles...', 16, 0, 100, 0, 0, 0, 'Wheeler', 6122),
+(10803, 4, 0, '%s only hits the side of the box!', 16, 0, 100, 0, 0, 0, 'Wheeler', 6123);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=18655;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13, 1, 18655, 0, 0, 31, 0, 5, 176557, 0, 0, 0, 0, '', 'Mörser - Mörser');
+
+-- Actionlist SAI
+SET @ENTRY := 1061000;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,45,2,0,0,0,0,0,19,10805,100,0,0,0,0,0,"On Script - Set Data 2 0"),
+(@ENTRY,9,1,0,0,0,100,0,0,0,0,0,45,2,0,0,0,0,0,19,10611,100,0,0,0,0,0,"On Script - Set Data 2 0"),
+(@ENTRY,9,2,0,0,0,100,0,0,0,0,0,45,2,0,0,0,0,0,19,10803,100,0,0,0,0,0,"On Script - Set Data 2 0"),
+(@ENTRY,9,3,0,0,0,100,0,0,0,0,0,45,2,0,0,0,0,0,19,10804,100,0,0,0,0,0,"On Script - Set Data 2 0"),
+(@ENTRY,9,4,0,0,0,100,0,0,0,0,0,45,2,0,0,0,0,0,19,1243,100,0,0,0,0,0,"On Script - Set Data 2 0"),
+(@ENTRY,9,5,0,0,0,100,0,5000,5000,0,0,1,0,0,0,0,0,0,19,10804,100,0,0,0,0,0,"Angus - On Script - Say Line 0"),
+(@ENTRY,9,6,0,0,0,100,0,3000,3000,0,0,45,3,0,0,0,0,0,19,10804,50,0,0,0,0,0,"Angus - On Script - Set Data 3 0"),
+(@ENTRY,9,7,0,0,0,100,0,2000,2000,0,0,1,1,0,0,0,0,0,19,10804,100,0,0,0,0,0,"Angus - On Script - Say Line 1"),
+(@ENTRY,9,8,0,0,0,100,0,4000,4000,0,0,1,2,0,0,0,0,0,19,10804,100,0,0,0,0,0,"Angus - On Script - Say Line 2"),
+(@ENTRY,9,9,0,0,0,100,0,2000,2000,0,0,45,4,0,0,0,0,0,19,10804,50,0,0,0,0,0,"Angus - On Script - Set Data 4 0"),
+(@ENTRY,9,10,0,0,0,100,0,2000,2000,0,0,1,3,0,0,0,0,0,19,10804,100,0,0,0,0,0,"Angus - On Script - Say Line 3"),
+(@ENTRY,9,11,0,0,0,100,0,2000,2000,0,0,45,5,0,0,0,0,0,19,10804,50,0,0,0,0,0,"Angus - On Script - Set Data 5 0"),
+(@ENTRY,9,12,0,0,0,100,0,1000,1000,0,0,5,5,0,0,0,0,0,19,10804,100,0,0,0,0,0,"Angus - On Script - Play Emote 5"),
+(@ENTRY,9,13,0,0,0,100,0,1000,1000,0,0,5,11,0,0,0,0,0,19,10803,100,0,0,0,0,0,"Angus - On Script - Play Emote 11"),
+(@ENTRY,9,14,0,0,0,100,0,1000,1000,0,0,5,274,0,0,0,0,0,19,10611,100,0,0,0,0,0,"Angus - On Script - Play Emote 11"),
+(@ENTRY,9,15,0,0,0,100,0,0,0,0,0,5,274,0,0,0,0,0,1,0,0,0,0,0,0,0,"Angus - On Script - Play Emote 11"),
+(@ENTRY,9,16,0,0,0,100,0,1000,1000,0,0,45,6,0,0,0,0,0,19,10804,50,0,0,0,0,0,"Angus - On Script - Set Data 6 0"),
+(@ENTRY,9,17,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,19,10803,100,0,0,0,0,0,"Angus - On Script - Say Line 0"),
+(@ENTRY,9,18,0,0,0,100,0,4000,4000,0,0,45,3,0,0,0,0,0,19,10803,50,0,0,0,0,0,"Angus - On Script - Set Data 3 0"),
+(@ENTRY,9,19,0,0,0,100,0,2000,2000,0,0,1,1,0,0,0,0,0,19,10803,100,0,0,0,0,0,"Angus - On Script - Say Line 1"),
+(@ENTRY,9,20,0,0,0,100,0,2000,2000,0,0,45,4,0,0,0,0,0,19,10803,50,0,0,0,0,0,"Angus - On Script - Set Data 4 0"),
+(@ENTRY,9,21,0,0,0,100,0,1000,1000,0,0,5,25,0,0,0,0,0,19,10803,50,0,0,0,0,0,"Angus - On Script - Play Emote 25"),
+(@ENTRY,9,22,0,0,0,100,0,0,0,0,0,4,6249,0,0,0,0,0,21,100,0,0,0,0,0,0,"Angus - On Script - Play Sound 6249"),
+(@ENTRY,9,23,0,0,0,100,0,2000,2000,0,0,5,21,0,0,0,0,0,1,0,0,0,0,0,0,0,"Angus - On Script - Play Emote 21"),
+(@ENTRY,9,24,0,0,0,100,0,1000,1000,0,0,5,21,0,0,0,0,0,19,10611,100,0,0,0,0,0,"Angus - On Script - Play Emote 21"),
+(@ENTRY,9,25,0,0,0,100,0,0,0,0,0,5,23,0,0,0,0,0,19,10803,100,0,0,0,0,0,"Angus - On Script - Play Emote 23"),
+(@ENTRY,9,26,0,0,0,100,0,2000,2000,0,0,45,5,0,0,0,0,0,19,10803,50,0,0,0,0,0,"Angus - On Script - Set Data 5 0 Wheeler"),
+(@ENTRY,9,27,0,0,0,100,0,3000,3000,0,0,1,4,0,0,0,0,0,19,10804,100,0,0,0,0,0,"Angus - On Script - Say Line 4"),
+(@ENTRY,9,28,0,0,0,100,0,2000,2000,0,0,45,7,0,0,0,0,0,19,10804,50,0,0,0,0,0,"Angus - On Script - Set Data 5 0 Middlecamp"),
+(@ENTRY,9,29,0,0,0,100,0,2000,2000,0,0,1,5,0,0,0,0,0,19,10804,100,0,0,0,0,0,"Angus - On Script - Say Line 5 Middlecamp"),
+(@ENTRY,9,30,0,0,0,100,0,2000,2000,0,0,5,20,0,0,0,0,0,19,10804,100,0,0,0,0,0,"Angus - On Script - Play Emote 20 Middlecamp"),
+(@ENTRY,9,31,0,0,0,100,0,0,0,0,0,45,6,0,0,0,0,0,19,10803,50,0,0,0,0,0,"Angus - On Script - Set Data 6 0 Wheeler"),
+(@ENTRY,9,32,0,0,0,100,0,1000,1000,0,0,5,6,0,0,0,0,0,19,10803,100,0,0,0,0,0,"Angus - On Script - Play Emote 6 Wheeler"),
+(@ENTRY,9,33,0,0,0,100,0,0,0,0,0,4,6248,0,0,0,0,0,21,100,0,0,0,0,0,0,"Angus - On Script - Play Sound 6248"),
+(@ENTRY,9,34,0,0,0,100,0,3000,3000,0,0,45,7,0,0,0,0,0,19,10803,50,0,0,0,0,0,"Angus - On Script - Set Data 6 0 Wheeler"),
+(@ENTRY,9,35,0,0,0,100,0,0,0,0,0,1,6,0,0,0,0,0,19,10804,100,0,0,0,0,0,"Angus - On Script - Say Line 6 Middlecamp"),
+(@ENTRY,9,36,0,0,0,100,0,1000,1000,0,0,45,8,0,0,0,0,0,19,10804,50,0,0,0,0,0,"Angus - On Script - Set Data 8 0 Middlecamp"),
+(@ENTRY,9,38,0,0,0,100,0,0,0,0,0,1,7,0,0,0,0,0,19,10804,100,0,0,0,0,0,"Angus - On Script - Say Line 7 Middlecamp"),
+(@ENTRY,9,40,0,0,0,100,0,0,0,0,0,1,2,0,0,0,0,0,19,10803,100,0,0,0,0,0,"Angus - On Script - Say Line 2 Wheeler"),
+(@ENTRY,9,41,0,0,0,100,0,2000,2000,0,0,45,8,0,0,0,0,0,19,10803,50,0,0,0,0,0,"Angus - On Script - Set Data 8 0 Wheeler"),
+(@ENTRY,9,42,0,0,0,100,0,2000,2000,0,0,1,3,0,0,0,0,0,19,10803,100,0,0,0,0,0,"Angus - On Script - Say Line 3 Wheeler"),
+(@ENTRY,9,43,0,0,0,100,0,2000,2000,0,0,45,9,0,0,0,0,0,19,10803,50,0,0,0,0,0,"Angus - On Script - Set Data 9 0 Wheeler"),
+(@ENTRY,9,44,0,0,0,100,0,2000,2000,0,0,1,4,0,0,0,0,0,19,10803,100,0,0,0,0,0,"Angus - On Script - Say Line 4 Wheeler"),
+(@ENTRY,9,45,0,0,0,100,0,1000,1000,0,0,45,10,0,0,0,0,0,19,10803,50,0,0,0,0,0,"Angus - On Script - Set Data 10 0 Wheeler"),
+(@ENTRY,9,46,0,0,0,100,0,1000,1000,0,0,5,5,0,0,0,0,0,19,10803,100,0,0,0,0,0,"Angus - On Script - Play Emote 5 Wheeler"),
+(@ENTRY,9,47,0,0,0,100,0,0,0,0,0,45,9,0,0,0,0,0,19,10804,50,0,0,0,0,0,"Angus - On Script - Set Data 9 0 Middlecamp"),
+(@ENTRY,9,48,0,0,0,100,0,2000,2000,0,0,5,25,0,0,0,0,0,19,10804,100,0,0,0,0,0,"Angus - On Script - Play Emote 25 Middlecamp"),
+(@ENTRY,9,59,0,0,0,100,0,2000,2000,0,0,5,11,0,0,0,0,0,19,10804,100,0,0,0,0,0,"Angus - On Script - Play Emote 11 Middlecamp"),
+(@ENTRY,9,60,0,0,0,100,0,3000,3000,0,0,45,10,0,0,0,0,0,19,10803,50,0,0,0,0,0,"Angus - On Script - Set Data 10 0 Middlecamp"),
+(@ENTRY,9,61,0,0,0,100,0,0,0,0,0,45,11,0,0,0,0,0,19,10803,50,0,0,0,0,0,"Angus - On Script - Set Data 11 0 Wheeler"),
+(@ENTRY,9,62,0,0,0,100,0,2000,2000,0,0,1,8,0,0,0,0,0,19,10804,100,0,0,0,0,0,"Angus - On Script - Say Line 8 Middlecamp"),
+(@ENTRY,9,63,0,0,0,100,0,0,0,0,0,4,6250,0,0,0,0,0,21,100,0,0,0,0,0,0,"Angus - On Script - Play Sound 6250"),
+(@ENTRY,9,64,0,0,0,100,0,0,0,0,0,45,11,0,0,0,0,0,19,10804,50,0,0,0,0,0,"Angus - On Script - Set Data 11 0 Middlecamp"),
+(@ENTRY,9,65,0,0,0,100,0,3000,3000,0,0,1,9,0,0,0,0,0,19,10804,100,0,0,0,0,0,"Angus - On Script - Say Line 9 Middlecamp"),
+(@ENTRY,9,66,0,0,0,100,0,0,0,0,0,4,6250,0,0,0,0,0,21,100,0,0,0,0,0,0,"Angus - On Script - Play Sound 6250"),
+(@ENTRY,9,67,0,0,0,100,0,0,0,0,0,45,12,0,0,0,0,0,19,10804,50,0,0,0,0,0,"Angus - On Script - Set Data 12 0 Middlecamp"),
+(@ENTRY,9,68,0,0,0,100,0,3000,3000,0,0,1,10,0,0,0,0,0,19,10804,100,0,0,0,0,0,"Angus - On Script - Say Line 10 Middlecamp"),
+(@ENTRY,9,69,0,0,0,100,0,0,0,0,0,4,6250,0,0,0,0,0,21,100,0,0,0,0,0,0,"Angus - On Script - Play Sound 6250"),
+(@ENTRY,9,70,0,0,0,100,0,0,0,0,0,45,13,0,0,0,0,0,19,10804,50,0,0,0,0,0,"Angus - On Script - Set Data 13 0 Middlecamp"),
+(@ENTRY,9,71,0,0,0,100,0,0,0,0,0,5,71,0,0,0,0,0,19,10804,100,0,0,0,0,0,"Angus - On Script - Play Emote 71 Middlecamp"),
+(@ENTRY,9,72,0,0,0,100,0,0,0,0,0,4,6246,0,0,0,0,0,21,100,0,0,0,0,0,0,"Angus - On Script - Play Sound 6246"),
+(@ENTRY,9,73,0,0,0,100,0,3000,3000,0,0,45,14,0,0,0,0,0,19,10804,50,0,0,0,0,0,"Angus - On Script - Set Data 14 0 Middlecamp"),
+(@ENTRY,9,74,0,0,0,100,0,1000,1000,0,0,45,12,0,0,0,0,0,19,10803,50,0,0,0,0,0,"Angus - On Script - Set Data 12 0 Wheeler"),
+(@ENTRY,9,75,0,0,0,100,0,1000,1000,0,0,5,2,0,0,0,0,0,19,10804,100,0,0,0,0,0,"Angus - On Script - Play Emote 2 Middlecamp"),
+(@ENTRY,9,76,0,0,0,100,0,0,0,0,0,5,21,0,0,0,0,0,19,10803,100,0,0,0,0,0,"Angus - On Script - Play Emote 21 Wheeler"),
+(@ENTRY,9,77,0,0,0,100,0,4000,4000,0,0,45,15,0,0,0,0,0,19,10804,50,0,0,0,0,0,"Angus - On Script - Set Data 15 0 Middlecamp"),
+(@ENTRY,9,78,0,0,0,100,0,0,0,0,0,45,13,0,0,0,0,0,19,10803,50,0,0,0,0,0,"Angus - On Script - Set Data 13 0 Wheeler"),
+(@ENTRY,9,79,0,0,0,100,0,0,0,0,0,45,3,0,0,0,0,0,19,10611,50,0,0,0,0,0,"Angus - On Script - Set Data 3 0 Shorty"),
+(@ENTRY,9,80,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.844887,"Angus - On Script - Set Orientation 2,844887"),
+(@ENTRY,9,81,0,0,0,100,0,2000,2000,0,0,5,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Angus - On Script - Play Emote 4 Wheeler"),
+(@ENTRY,9,82,0,0,0,100,0,0,0,0,0,5,4,0,0,0,0,0,19,10611,100,0,0,0,0,0,"Angus - On Script - Play Emote 4 Shorty"),
+(@ENTRY,9,83,0,0,0,100,0,0,0,0,0,4,6256,0,0,0,0,0,21,100,0,0,0,0,0,0,"Angus - On Script - Play Sound 6256"),
+(@ENTRY,9,84,0,0,0,100,0,0,0,0,0,45,3,0,0,0,0,0,19,10805,100,0,0,0,0,0,"Angus - On Script - Set Data 3 0 Klemmy"),
+(@ENTRY,9,85,0,0,0,100,0,10000,10000,0,0,11,18634,2,0,0,0,0,8,0,0,0,0,0,0,0,"Angus - On Script - Summon Creature 'Mortar Team Target Dummy'"),
+(@ENTRY,9,86,0,0,0,100,0,3000,3000,0,0,45,4,0,0,0,0,0,19,10805,100,0,0,0,0,0,"Angus - On Script - Set Data 4 0 Klemmy"),
+(@ENTRY,9,87,0,0,0,100,0,3000,3000,0,0,45,5,0,0,0,0,0,19,10805,100,0,0,0,0,0,"Angus - On Script - Set Data 5 0 Klemmy"),
+(@ENTRY,9,88,0,0,0,100,0,2000,2000,0,0,5,3,0,0,0,0,0,19,10805,100,0,0,0,0,0,"Angus - On Script - Play Emote 3 Klemmy"),
+(@ENTRY,9,89,0,0,0,100,0,0,0,0,0,45,4,0,0,0,0,0,19,10611,50,0,0,0,0,0,"Angus - On Script - Set Data 4 0 Shorty"),
+(@ENTRY,9,90,0,0,0,100,0,1000,1000,0,0,45,6,0,0,0,0,0,19,10805,100,0,0,0,0,0,"Angus - On Script - Set Data 6 0 Klemmy"),
+(@ENTRY,9,91,0,0,0,100,0,1000,1000,0,0,5,16,0,0,0,0,0,19,10611,100,0,0,0,0,0,"Angus - On Script - Play Emote 16 Shorty"),
+(@ENTRY,9,92,0,0,0,100,0,1000,1000,0,0,5,69,0,0,0,0,0,19,10611,100,0,0,0,0,0,"Angus - On Script - Play Emote 69 Shorty"),
+(@ENTRY,9,93,0,0,0,100,0,1000,1000,0,0,5,0,0,0,0,0,0,19,10611,100,0,0,0,0,0,"Angus - On Script - Play Emote 0 Shorty"),
+(@ENTRY,9,94,0,0,0,100,0,2000,2000,0,0,45,5,0,0,0,0,0,19,10611,50,0,0,0,0,0,"Angus - On Script - Set Data 5 0 Shorty"),
+(@ENTRY,9,95,0,0,0,100,0,1000,1000,0,0,45,16,0,0,0,0,0,19,10804,50,0,0,0,0,0,"Angus - On Script - Set Data 16 0 Middlecamp"),
+(@ENTRY,9,96,0,0,0,100,0,0,0,0,0,45,14,0,0,0,0,0,19,10803,50,0,0,0,0,0,"Angus - On Script - Set Data 14 0 Wheeler"),
+(@ENTRY,9,97,0,0,0,100,0,0,0,0,0,5,25,0,0,0,0,0,1,0,0,0,0,0,0,0,"Angus - On Script - Play Emote 25"),
+(@ENTRY,9,98,0,0,0,100,0,1000,1000,0,0,45,6,0,0,0,0,0,19,10611,50,0,0,0,0,0,"Angus - On Script - Set Data 6 0 Shorty"),
+(@ENTRY,9,99,0,0,0,100,0,2000,2000,0,0,4,7316,0,0,0,0,0,21,100,0,0,0,0,0,0,"Angus - On Script - Play Sound 7316"),
+(@ENTRY,9,100,0,0,0,100,0,2000,2000,0,0,45,7,0,0,0,0,0,19,10611,50,0,0,0,0,0,"Angus - On Script - Set Data 7 0 Shorty"),
+(@ENTRY,9,101,0,0,0,100,0,0,0,0,0,51,0,0,0,0,0,0,19,11875,200,0,0,0,0,0,"On Script - Kill Target"),
+(@ENTRY,9,102,0,0,0,100,0,3000,3000,0,0,5,17,0,0,0,0,0,19,10611,100,0,0,0,0,0,"Angus - On Script - Play Emote 17 Shorty"),
+(@ENTRY,9,103,0,0,0,100,0,3000,3000,0,0,45,8,0,0,0,0,0,19,10611,50,0,0,0,0,0,"Angus - On Script - Set Data 8 0 Shorty"),
+(@ENTRY,9,104,0,0,0,100,0,0,0,0,0,45,8,0,0,0,0,0,19,10805,100,0,0,0,0,0,"Angus - On Script - Set Data 8 0 Klemmy"),
+(@ENTRY,9,105,0,0,0,100,0,0,0,0,0,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Angus - On Script - Play Emote 1"),
+(@ENTRY,9,106,0,0,0,100,0,0,0,0,0,4,6252,0,0,0,0,0,21,100,0,0,0,0,0,0,"Angus - On Script - Play Sound 6252"),
+(@ENTRY,9,107,0,0,0,100,0,1000,1000,0,0,5,4,0,0,0,0,0,19,10611,100,0,0,0,0,0,"Angus - On Script - Play Emote 4 Shorty"),
+(@ENTRY,9,108,0,0,0,100,0,3000,3000,0,0,45,9,0,0,0,0,0,19,10611,100,0,0,0,0,0,"Angus - On Script - Set Data 8 0 Shorty"),
+(@ENTRY,9,109,0,0,0,100,0,5000,5000,0,0,11,18634,2,0,0,0,0,1,0,0,0,0,0,0,0,"Angus - On Script - Summon Creature 'Mortar Team Target Dummy'"),
+(@ENTRY,9,110,0,0,0,100,0,2000,2000,0,0,45,10,0,0,0,0,0,19,10805,100,0,0,0,0,0,"Angus - On Script - Set Data 10 0 Klemmy"),
+(@ENTRY,9,111,0,0,0,100,0,2000,2000,0,0,45,11,0,0,0,0,0,19,10805,100,0,0,0,0,0,"Angus - On Script - Set Data 11 0 Klemmy"),
+(@ENTRY,9,112,0,0,0,100,0,2000,2000,0,0,5,66,0,0,0,0,0,19,10805,100,0,0,0,0,0,"Angus - On Script - Play Emote 66 Klemmy"),
+(@ENTRY,9,113,0,0,0,100,0,3000,3000,0,0,45,9,0,0,0,0,0,19,10611,100,0,0,0,0,0,"Angus - On Script - Set Data 9 0 Shorty"),
+(@ENTRY,9,114,0,0,0,100,0,2000,2000,0,0,45,12,0,0,0,0,0,19,10805,100,0,0,0,0,0,"Angus - On Script - Set Data 12 0 Klemmy"),
+(@ENTRY,9,115,0,0,0,100,0,0,0,0,0,5,25,0,0,0,0,0,19,10611,100,0,0,0,0,0,"Angus - On Script - Play Emote 8 Shorty"),
+(@ENTRY,9,116,0,0,0,100,0,2000,2000,0,0,4,6254,0,0,0,0,0,21,100,0,0,0,0,0,0,"Angus - On Script - Play Sound 6254"),
+(@ENTRY,9,117,0,0,0,100,0,1000,1000,0,0,45,13,0,0,0,0,0,19,10805,100,0,0,0,0,0,"Angus - On Script - Set Data 13 0 Klemmy"),
+(@ENTRY,9,118,0,0,0,100,0,3000,3000,0,0,17,0,0,0,0,0,0,19,10611,100,0,0,0,0,0,"Angus - On Script - Play Emote 0 Shorty"),
+(@ENTRY,9,119,0,0,0,100,0,1000,1000,0,0,45,10,0,0,0,0,0,19,10611,100,0,0,0,0,0,"Angus - On Script - Set Data 10 0 Shorty"),
+(@ENTRY,9,120,0,0,0,100,0,1000,1000,0,0,5,25,0,0,0,0,0,19,10611,100,0,0,0,0,0,"Angus - On Script - Play Emote 25 Shorty"),
+(@ENTRY,9,121,0,0,0,100,0,0,0,0,0,4,6255,0,0,0,0,0,21,100,0,0,0,0,0,0,"Angus - On Script - Play Sound 6255"),
+(@ENTRY,9,122,0,0,0,100,0,1000,1000,0,0,45,6,0,0,0,0,0,19,10611,50,0,0,0,0,0,"Angus - On Script - Set Data 6 0 Shorty"),
+(@ENTRY,9,123,0,0,0,100,0,1000,1000,0,0,4,7316,0,0,0,0,0,21,100,0,0,0,0,0,0,"Angus - On Script - Play Sound 7316"),
+(@ENTRY,9,124,0,0,0,100,0,1000,1000,0,0,45,7,0,0,0,0,0,19,10611,50,0,0,0,0,0,"Angus - On Script - Set Data 7 0 Shorty"),
+(@ENTRY,9,125,0,0,0,100,0,0,0,0,0,51,0,0,0,0,0,0,19,11875,200,0,0,0,0,0,"On Script - Kill Target"),
+(@ENTRY,9,126,0,0,0,100,0,1000,1000,0,0,45,9,0,0,0,0,0,19,10611,50,0,0,0,0,0,"Angus - On Script - Set Data 9 0 Shorty"),
+(@ENTRY,9,127,0,0,0,100,0,2000,2000,0,0,5,25,0,0,0,0,0,19,10611,100,0,0,0,0,0,"Angus - On Script - Play Emote 25 Shorty"),
+(@ENTRY,9,128,0,0,0,100,0,0,0,0,0,4,6251,0,0,0,0,0,21,100,0,0,0,0,0,0,"Angus - On Script - Play Sound 6251"),
+(@ENTRY,9,129,0,0,0,100,0,1000,1000,0,0,45,15,0,0,0,0,0,19,10804,50,0,0,0,0,0,"Angus - On Script - Set Data 15 0 Middlecamp"),
+(@ENTRY,9,130,0,0,0,100,0,0,0,0,0,45,8,0,0,0,0,0,19,10805,100,0,0,0,0,0,"Angus - On Script - Set Data 8 0 Klemmy"),
+(@ENTRY,9,131,0,0,0,100,0,1000,1000,0,0,45,13,0,0,0,0,0,19,10803,100,0,0,0,0,0,"Angus - On Script - Set Data 13 0 Wheeler"),
+(@ENTRY,9,132,0,0,0,100,0,1000,1000,0,0,45,10,0,0,0,0,0,19,10611,100,0,0,0,0,0,"Angus - On Script - Set Data 10 0 Shorty"),
+(@ENTRY,9,133,0,0,0,100,0,0,0,0,0,5,4,0,0,0,0,0,19,10803,100,0,0,0,0,0,"Angus - On Script - Play Emote 4 Wheeler"),
+(@ENTRY,9,134,0,0,0,100,0,7000,7000,0,0,11,18634,0,0,0,0,0,1,0,0,0,0,0,0,0,"Angus - On Script - Summon Creature 'Mortar Team Target Dummy'"),
+(@ENTRY,9,135,0,0,0,100,0,1000,1000,0,0,45,10,0,0,0,0,0,19,10805,100,0,0,0,0,0,"Angus - On Script - Set Data 10 0 Klemmy"),
+(@ENTRY,9,136,0,0,0,100,0,1000,1000,0,0,45,11,0,0,0,0,0,19,10805,100,0,0,0,0,0,"Angus - On Script - Set Data 11 0 Klemmy"),
+(@ENTRY,9,137,0,0,0,100,0,2000,2000,0,0,45,6,0,0,0,0,0,19,10611,50,0,0,0,0,0,"Angus - On Script - Set Data 6 0 Shorty"),
+(@ENTRY,9,138,0,0,0,100,0,0,0,0,0,5,25,0,0,0,0,0,19,10805,100,0,0,0,0,0,"Angus - On Script - Play Emote 25 Klemmy"),
+(@ENTRY,9,139,0,0,0,100,0,1000,1000,0,0,5,11,0,0,0,0,0,19,10805,100,0,0,0,0,0,"Angus - On Script - Play Emote 11 Klemmy"),
+(@ENTRY,9,140,0,0,0,100,0,0,0,0,0,5,15,0,0,0,0,0,19,10611,100,0,0,0,0,0,"Angus - On Script - Play Emote 15 Shorty"),
+(@ENTRY,9,141,0,0,0,100,0,0,0,0,0,5,5,0,0,0,0,0,1,0,0,0,0,0,0,0,"Angus - On Script - Play Emote 5"),
+(@ENTRY,9,142,0,0,0,100,0,0,0,0,0,4,6258,0,0,0,0,0,21,100,0,0,0,0,0,0,"Angus - On Script - Play Sound 6258"),
+(@ENTRY,9,143,0,0,0,100,0,2000,2000,0,0,4,7316,0,0,0,0,0,21,100,0,0,0,0,0,0,"Angus - On Script - Play Sound 7316"),
+(@ENTRY,9,144,0,0,0,100,0,1000,1000,0,0,45,16,0,0,0,0,0,19,10804,50,0,0,0,0,0,"Angus - On Script - Set Data 16 0 Middlecamp"),
+(@ENTRY,9,145,0,0,0,100,0,1000,1000,0,0,45,14,0,0,0,0,0,19,10803,100,0,0,0,0,0,"Angus - On Script - Set Data 14 0 Wheeler"),
+(@ENTRY,9,146,0,0,0,100,0,0,0,0,0,45,14,0,0,0,0,0,19,10805,100,0,0,0,0,0,"Angus - On Script - Set Data 14 0 Klemmy"),
+(@ENTRY,9,147,0,0,0,100,0,1000,1000,0,0,45,7,0,0,0,0,0,19,10611,50,0,0,0,0,0,"Angus - On Script - Set Data 6 0 Shorty"),
+(@ENTRY,9,148,0,0,0,100,0,0,0,0,0,51,0,0,0,0,0,0,19,11875,200,0,0,0,0,0,"On Script - Kill Target"),
+(@ENTRY,9,149,0,0,0,100,0,1000,1000,0,0,5,10,0,0,0,0,0,1,0,0,0,0,0,0,0,"Angus - On Script - Play Emote 10"),
+(@ENTRY,9,150,0,0,0,100,0,0,0,0,0,5,10,0,0,0,0,0,19,10611,100,0,0,0,0,0,"Angus - On Script - Play Emote 10 Shorty"),
+(@ENTRY,9,151,0,0,0,100,0,2000,2000,0,0,45,15,0,0,0,0,0,19,10805,100,0,0,0,0,0,"Angus - On Script - Set Data 15 0 Klemmy"),
+(@ENTRY,9,152,0,0,0,100,0,3000,3000,0,0,45,16,0,0,0,0,0,19,10805,100,0,0,0,0,0,"Angus - On Script - Set Data 16 0 Klemmy"),
+(@ENTRY,9,153,0,0,0,100,0,6000,6000,0,0,5,14,0,0,0,0,0,19,10805,100,0,0,0,0,0,"Angus - On Script - Play Emote 14 Klemmy"),
+(@ENTRY,9,154,0,0,0,100,0,0,0,0,0,5,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Angus - On Script - Play Emote 0"),
+(@ENTRY,9,155,0,0,0,100,0,0,0,0,0,5,0,0,0,0,0,0,19,10611,100,0,0,0,0,0,"Angus - On Script - Play Emote 0 Shorty"),
+(@ENTRY,9,156,0,0,0,100,0,0,0,0,0,5,11,0,0,0,0,0,1,0,0,0,0,0,0,0,"Angus - On Script - Play Emote 11"),
+(@ENTRY,9,157,0,0,0,100,0,0,0,0,0,5,11,0,0,0,0,0,19,10611,100,0,0,0,0,0,"Angus - On Script - Play Emote 11 Shorty"),
+(@ENTRY,9,158,0,0,0,100,0,1000,1000,0,0,5,11,0,0,0,0,0,19,10804,100,0,0,0,0,0,"Angus - On Script - Play Emote 11 Middlecamp"),
+(@ENTRY,9,159,0,0,0,100,0,0,0,0,0,5,11,0,0,0,0,0,19,10803,100,0,0,0,0,0,"Angus - On Script - Play Emote 11 Wheeler"),
+(@ENTRY,9,160,0,0,0,100,0,0,0,0,0,5,11,0,0,0,0,0,19,10805,100,0,0,0,0,0,"Angus - On Script - Play Emote 11 Klemmy"),
+(@ENTRY,9,161,0,0,0,100,0,1000,1000,0,0,5,11,0,0,0,0,0,1,0,0,0,0,0,0,0,"Angus - On Script - Play Emote 11"),
+(@ENTRY,9,162,0,0,0,100,0,0,0,0,0,5,11,0,0,0,0,0,19,10611,100,0,0,0,0,0,"Angus - On Script - Play Emote 11 Shorty"),
+(@ENTRY,9,163,0,0,0,100,0,1000,1000,0,0,5,11,0,0,0,0,0,19,10804,100,0,0,0,0,0,"Angus - On Script - Play Emote 11 Middlecamp"),
+(@ENTRY,9,164,0,0,0,100,0,0,0,0,0,5,11,0,0,0,0,0,19,10803,100,0,0,0,0,0,"Angus - On Script - Play Emote 11 Wheeler"),
+(@ENTRY,9,165,0,0,0,100,0,1000,1000,0,0,45,17,0,0,0,0,0,19,10805,100,0,0,0,0,0,"Angus - On Script - Set Data 17 0 Klemmy"),
+(@ENTRY,9,166,0,0,0,100,0,0,0,0,0,45,11,0,0,0,0,0,19,10611,50,0,0,0,0,0,"Angus - On Script - Set Data 11 0 Shorty"),
+(@ENTRY,9,167,0,0,0,100,0,0,0,0,0,45,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Angus - On Script - Set Data 2 0 Angus"),
+(@ENTRY,9,168,0,0,0,100,0,0,0,0,0,45,17,0,0,0,0,0,19,10804,50,0,0,0,0,0,"Angus - On Script - Set Data 17 0 Middlecamp"),
+(@ENTRY,9,169,0,0,0,100,0,0,0,0,0,45,15,0,0,0,0,0,19,10803,50,0,0,0,0,0,"Angus - On Script - Set Data 15 0 Wheeler"),
+(@ENTRY,9,170,0,0,0,100,0,12000,12000,0,0,45,18,0,0,0,0,0,19,10805,100,0,0,0,0,0,"Angus - On Script - Set Data 18 0 Klemmy"),
+(@ENTRY,9,171,0,0,0,100,0,4000,4000,0,0,45,16,0,0,0,0,0,19,10803,100,0,0,0,0,0,"Angus - On Script - Set Data 16 0 Wheeler"),
+(@ENTRY,9,172,0,0,0,100,0,2000,2000,0,0,45,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Angus - On Script - Set Data 3 0 Angus"),
+(@ENTRY,9,173,0,0,0,100,0,1000,1000,0,0,45,18,0,0,0,0,0,19,10804,100,0,0,0,0,0,"Angus - On Script - Set Data 18 0 Middlecamp"),
+(@ENTRY,9,174,0,0,0,100,0,1000,1000,0,0,45,3,0,0,0,0,0,19,1243,100,0,0,0,0,0,"Angus - On Script - Set Data 3 0 Hegnar"),
+(@ENTRY,9,175,0,0,0,100,0,0,0,0,0,45,12,0,0,0,0,0,19,10611,100,0,0,0,0,0,"Angus - On Script - Set Data 12 0 Shorty");
diff --git a/sql/updates/world/2015_05_24_02_world.sql b/sql/updates/world/2015_05_24_02_world.sql
new file mode 100644
index 00000000000..7f8cd3a457f
--- /dev/null
+++ b/sql/updates/world/2015_05_24_02_world.sql
@@ -0,0 +1,16 @@
+-- The Farstrider Lodge flavor texts
+DELETE FROM `gossip_menu` WHERE `text_id` IN (3522, 3525, 3495);
+INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES
+(2831, 3522),
+(2831, 3525),
+(2801, 3495);
+
+--
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceEntry` IN (3522, 3525, 3495, 3523) AND `ConditionTypeOrReference` IN (8);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(14, 2831, 3523, 0, 0, 8, 0, 258, 0, 0, 1, 0, 0, '', 'Show gossip text if player has quest 258 not completed'),
+(14, 2831, 3522, 0, 0, 8, 0, 258, 0, 0, 0, 0, 0, '', 'Show gossip text if player has quest 258 completed'),
+(14, 2831, 3525, 0, 0, 8, 0, 271, 0, 0, 0, 0, 0, '', 'Show gossip text if player has quest 271 completed'),
+(14, 2801, 3495, 0, 0, 8, 0, 385, 0, 0, 0, 0, 0, '', 'Show gossip text if player has quest 385 completed');
+
+UPDATE `npc_text` SET `BroadcastTextID0`=5854 WHERE `id`=3522;
diff --git a/sql/updates/world/2015_05_24_03_world.sql b/sql/updates/world/2015_05_24_03_world.sql
new file mode 100644
index 00000000000..e4283fae295
--- /dev/null
+++ b/sql/updates/world/2015_05_24_03_world.sql
@@ -0,0 +1,13 @@
+--
+-- Grizzly Hills Giant SAI
+SET @ENTRY := 26261;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,1,8,0,100,0,47394,0,0,0,80,26261,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grizzly Hills Giant - On Spellhit 'Kurun's Blessing' - Run Script"),
+(@ENTRY,0,1,0,61,0,100,0,47394,0,0,0,33,26261,0,0,0,0,0,7,0,0,0,0,0,0,0,"Grizzly Hills Giant - On Spellhit 'Kurun's Blessing' - Quest Credit 'Rallying the Troops'"),
+(@ENTRY,0,2,0,1,0,100,0,2000,5000,4000,6000,11,46815,0,0,0,0,0,19,26264,500,0,0,0,0,0,"Grizzly Hills Giant - Out of Combat - Cast 'Toss Boulder'");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=46815;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13, 1, 46815, 0, 0, 31, 0, 3, 26264, 0, 0, 0, 0, '', 'Toss Boulder - only targets Dummy');
diff --git a/sql/updates/world/2015_05_24_04_world.sql b/sql/updates/world/2015_05_24_04_world.sql
new file mode 100644
index 00000000000..70cc65fb490
--- /dev/null
+++ b/sql/updates/world/2015_05_24_04_world.sql
@@ -0,0 +1,902 @@
+-- Complete Grizzlyhills Movement
+DELETE FROM `creature_addon` WHERE `guid` IN (109382, 109390,109409,110794, 110792,110787,110793, 110791,110797,110796,110795,110799,110798, 110801,98066, 98056, 98060, 118835, 98047, 98059, 98053);
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(118835,0,0,1,1,0, ''),
+(98047,0,0,1,1,0, ''),
+(98059,0,0,0,1,69, ''),
+(98060,0,0,0,1,234, ''),
+(98053,0,0,0,1,1, ''),
+(98056,0,0,0,1,234, ''),
+(98066,0,0,0,1,234, ''),
+(110801,0,0,0,1,234, ''),
+(110798,0,0,0,1,234, ''),
+(110799,0,0,0,1,234, ''),
+(110795,0,0,0,1,234, ''),
+(110796,0,0,0,1,234, ''),
+(110797,0,0,0,1,234, ''),
+(110791,0,0,0,1,234, ''),
+(110793,0,0,0,1,234, ''),
+(110787,0,0,0,1,234, ''),
+(110792,0,0,0,1,234, ''),
+(110794,0,0,0,1,234, ''),
+(109409,0,0,8,1,0, ''),
+(109390,0,0,8,1,0, ''),
+(109382,0,0,8,1,0, '');
+
+SET @NPC := 109402;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4642.88,`position_y`=-5573.969,`position_z`=43.38401 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4642.88,-5573.969,43.38401,0,0,0,0,100,0),
+(@PATH,2,4642.38,-5575.719,43.63401,0,0,0,0,100,0),
+(@PATH,3,4639.13,-5580.469,42.88401,0,0,0,0,100,0),
+(@PATH,4,4637.13,-5583.719,41.63401,0,0,0,0,100,0),
+(@PATH,5,4635.38,-5586.219,40.38401,0,0,0,0,100,0),
+(@PATH,6,4635.204,-5586.526,40.13166,0,0,0,0,100,0),
+(@PATH,7,4634.204,-5587.776,39.63166,0,0,0,0,100,0),
+(@PATH,8,4633.204,-5587.776,38.88166,0,0,0,0,100,0),
+(@PATH,9,4632.204,-5588.026,38.13166,0,0,0,0,100,0),
+(@PATH,10,4631.204,-5588.026,37.63166,0,0,0,0,100,0),
+(@PATH,11,4630.204,-5588.026,36.88166,0,0,0,0,100,0),
+(@PATH,12,4629.204,-5588.026,36.38166,0,0,0,0,100,0),
+(@PATH,13,4628.204,-5588.026,35.63166,0,0,0,0,100,0),
+(@PATH,14,4626.204,-5588.026,35.13166,0,0,0,0,100,0),
+(@PATH,15,4625.204,-5588.026,34.38166,0,0,0,0,100,0),
+(@PATH,16,4624.204,-5588.026,33.88166,0,0,0,0,100,0),
+(@PATH,17,4623.454,-5588.026,33.38166,0,0,0,0,100,0),
+(@PATH,18,4622.454,-5588.276,32.88166,0,0,0,0,100,0),
+(@PATH,19,4621.454,-5588.276,32.13166,0,0,0,0,100,0),
+(@PATH,20,4620.454,-5588.276,31.63166,0,0,0,0,100,0),
+(@PATH,21,4618.454,-5588.276,30.38166,0,0,0,0,100,0),
+(@PATH,22,4616.454,-5588.276,29.63166,0,0,0,0,100,0),
+(@PATH,23,4615.454,-5588.276,28.88166,0,0,0,0,100,0),
+(@PATH,24,4613.454,-5588.276,27.88166,0,0,0,0,100,0),
+(@PATH,25,4615.112,-5588.271,28.6151,0,0,0,0,100,0),
+(@PATH,26,4613.112,-5588.271,27.6151,0,0,0,0,100,0),
+(@PATH,27,4612.612,-5588.271,27.3651,0,0,0,0,100,0),
+(@PATH,28,4609.862,-5587.021,25.8651,0,0,0,0,100,0),
+(@PATH,29,4608.112,-5586.021,24.8651,0,0,0,0,100,0),
+(@PATH,30,4606.362,-5585.021,24.1151,0,0,0,0,100,0),
+(@PATH,31,4604.612,-5584.021,22.8651,0,0,0,0,100,0),
+(@PATH,32,4602.862,-5583.021,21.6151,0,0,0,0,100,0),
+(@PATH,33,4601.112,-5582.021,20.8651,0,0,0,0,100,0),
+(@PATH,34,4599.362,-5581.021,19.3651,0,0,0,0,100,0),
+(@PATH,35,4597.612,-5580.021,18.3651,0,0,0,0,100,0),
+(@PATH,36,4595.362,-5578.521,16.8651,0,0,0,0,100,0),
+(@PATH,37,4593.612,-5577.771,15.6151,0,0,0,0,100,0),
+(@PATH,38,4591.862,-5576.771,14.6151,0,0,0,0,100,0),
+(@PATH,39,4590.112,-5575.771,13.8651,0,0,0,0,100,0),
+(@PATH,40,4588.362,-5574.771,13.1151,0,0,0,0,100,0),
+(@PATH,41,4586.612,-5573.771,12.1151,0,0,0,0,100,0),
+(@PATH,42,4584.862,-5572.771,11.6151,0,0,0,0,100,0),
+(@PATH,43,4583.112,-5571.771,10.8651,0,0,0,0,100,0),
+(@PATH,44,4580.612,-5570.271,10.1151,0,0,0,0,100,0),
+(@PATH,45,4578.862,-5569.271,9.365101,0,0,0,0,100,0),
+(@PATH,46,4578.588,-5569.066,9.268532,0,0,0,0,100,0),
+(@PATH,47,4577.088,-5568.316,8.768532,0,0,0,0,100,0),
+(@PATH,48,4575.838,-5565.566,7.768532,0,0,0,0,100,0),
+(@PATH,49,4575.338,-5563.816,7.018532,0,0,0,0,100,0),
+(@PATH,50,4574.588,-5562.066,6.518532,0,0,0,0,100,0),
+(@PATH,51,4573.588,-5560.316,5.768532,0,0,0,0,100,0),
+(@PATH,52,4572.338,-5557.566,5.018532,0,0,0,0,100,0),
+(@PATH,53,4572.302,-5557.273,4.829211,0,0,0,0,100,0),
+(@PATH,54,4571.052,-5554.523,4.079211,0,0,0,0,100,0),
+(@PATH,55,4570.302,-5551.523,3.579211,0,0,0,0,100,0),
+(@PATH,56,4569.302,-5544.773,3.079211,0,0,0,0,100,0),
+(@PATH,57,4565.425,-5523.652,2.546694,0,0,0,0,100,0),
+(@PATH,58,4558.431,-5505.637,2.508454,0,0,0,0,100,0),
+(@PATH,59,4558.492,-5505.963,2.279056,0,0,0,0,100,0),
+(@PATH,60,4558.656,-5505.855,2.526844,0,0,0,0,100,0),
+(@PATH,61,4565.748,-5523.84,2.603909,0,0,0,0,100,0),
+(@PATH,62,4569.748,-5548.34,3.103909,0,0,0,0,100,0),
+(@PATH,63,4570.498,-5552.09,3.603909,0,0,0,0,100,0),
+(@PATH,64,4571.125,-5554.945,4.307666,0,0,0,0,100,0),
+(@PATH,65,4572.375,-5557.695,5.057666,0,0,0,0,100,0),
+(@PATH,66,4573.375,-5559.445,5.807666,0,0,0,0,100,0),
+(@PATH,67,4574.375,-5561.945,6.307666,0,0,0,0,100,0),
+(@PATH,68,4575.125,-5563.695,7.057666,0,0,0,0,100,0),
+(@PATH,69,4575.875,-5565.445,7.807666,0,0,0,0,100,0),
+(@PATH,70,4577.315,-5568.442,8.979671,0,0,0,0,100,0),
+(@PATH,71,4580.065,-5569.942,9.979671,0,0,0,0,100,0),
+(@PATH,72,4581.815,-5570.942,10.72967,0,0,0,0,100,0),
+(@PATH,73,4584.315,-5572.442,11.47967,0,0,0,0,100,0),
+(@PATH,74,4586.065,-5573.442,12.22967,0,0,0,0,100,0),
+(@PATH,75,4587.815,-5574.442,12.97967,0,0,0,0,100,0),
+(@PATH,76,4589.565,-5575.442,13.72967,0,0,0,0,100,0),
+(@PATH,77,4591.315,-5576.442,14.72967,0,0,0,0,100,0),
+(@PATH,78,4593.065,-5577.442,15.72967,0,0,0,0,100,0),
+(@PATH,79,4594.565,-5578.192,16.47967,0,0,0,0,100,0),
+(@PATH,80,4596.315,-5579.192,17.47967,0,0,0,0,100,0),
+(@PATH,81,4598.065,-5580.192,18.72967,0,0,0,0,100,0),
+(@PATH,82,4599.815,-5581.192,19.72967,0,0,0,0,100,0),
+(@PATH,83,4601.565,-5582.192,20.97967,0,0,0,0,100,0),
+(@PATH,84,4603.315,-5583.192,21.97967,0,0,0,0,100,0),
+(@PATH,85,4605.065,-5583.942,22.72967,0,0,0,0,100,0),
+(@PATH,86,4606.815,-5584.942,24.22967,0,0,0,0,100,0),
+(@PATH,87,4609.315,-5586.442,25.47967,0,0,0,0,100,0),
+(@PATH,88,4611.065,-5587.442,26.72967,0,0,0,0,100,0),
+(@PATH,89,4611.174,-5587.652,26.94344,0,0,0,0,100,0),
+(@PATH,90,4612.674,-5588.402,27.69344,0,0,0,0,100,0),
+(@PATH,91,4615.674,-5588.402,28.94344,0,0,0,0,100,0),
+(@PATH,92,4616.674,-5588.402,29.69344,0,0,0,0,100,0),
+(@PATH,93,4618.674,-5588.152,30.44344,0,0,0,0,100,0),
+(@PATH,94,4619.674,-5588.152,31.19344,0,0,0,0,100,0),
+(@PATH,95,4621.674,-5588.152,32.19344,0,0,0,0,100,0),
+(@PATH,96,4622.424,-5588.152,32.94344,0,0,0,0,100,0),
+(@PATH,97,4623.424,-5588.152,33.19344,0,0,0,0,100,0),
+(@PATH,98,4624.424,-5588.152,33.94344,0,0,0,0,100,0),
+(@PATH,99,4625.424,-5588.152,34.44344,0,0,0,0,100,0),
+(@PATH,100,4626.424,-5588.152,35.19344,0,0,0,0,100,0),
+(@PATH,101,4627.424,-5588.152,35.69344,0,0,0,0,100,0),
+(@PATH,102,4628.424,-5588.152,36.44344,0,0,0,0,100,0),
+(@PATH,103,4629.424,-5587.902,36.94344,0,0,0,0,100,0),
+(@PATH,104,4630.424,-5587.902,37.69344,0,0,0,0,100,0),
+(@PATH,105,4631.424,-5587.902,38.19344,0,0,0,0,100,0),
+(@PATH,106,4632.424,-5587.902,38.94344,0,0,0,0,100,0),
+(@PATH,107,4633.424,-5587.902,39.44344,0,0,0,0,100,0),
+(@PATH,108,4632.743,-5587.937,39.25474,0,0,0,0,100,0),
+(@PATH,109,4633.743,-5587.937,39.75474,0,0,0,0,100,0),
+(@PATH,110,4634.243,-5587.937,40.00474,0,0,0,0,100,0),
+(@PATH,111,4635.993,-5585.437,40.75474,0,0,0,0,100,0),
+(@PATH,112,4636.993,-5583.687,41.50474,0,0,0,0,100,0),
+(@PATH,113,4638.493,-5581.437,42.25474,0,0,0,0,100,0),
+(@PATH,114,4640.743,-5578.187,43.50474,0,0,0,0,100,0),
+(@PATH,115,4641.032,-5577.918,43.48087,0,0,0,0,100,0),
+(@PATH,116,4642.532,-5575.418,43.48087,0,0,0,0,100,0),
+(@PATH,117,4643.532,-5572.418,42.98087,0,0,0,0,100,0),
+(@PATH,118,4644.032,-5570.668,42.23087,0,0,0,0,100,0),
+(@PATH,119,4644.532,-5567.668,41.23087,0,0,0,0,100,0),
+(@PATH,120,4645.032,-5565.668,40.23087,0,0,0,0,100,0),
+(@PATH,121,4645.532,-5564.168,38.98087,0,0,0,0,100,0),
+(@PATH,122,4646.032,-5562.168,37.98087,0,0,0,0,100,0),
+(@PATH,123,4646.532,-5560.168,36.98087,0,0,0,0,100,0),
+(@PATH,124,4647.032,-5558.168,35.98087,0,0,0,0,100,0),
+(@PATH,125,4647.782,-5555.418,35.23087,0,0,0,0,100,0),
+(@PATH,126,4648.282,-5553.418,34.48087,0,0,0,0,100,0),
+(@PATH,127,4648.611,-5553.267,34.28629,0,0,0,0,100,0),
+(@PATH,128,4648.861,-5552.517,33.78629,0,0,0,0,100,0),
+(@PATH,129,4649.361,-5550.767,33.03629,0,0,0,0,100,0),
+(@PATH,130,4650.361,-5547.767,32.28629,0,0,0,0,100,0),
+(@PATH,131,4651.111,-5546.017,31.78629,0,0,0,0,100,0),
+(@PATH,132,4651.611,-5544.267,31.28629,0,0,0,0,100,0),
+(@PATH,133,4652.111,-5542.517,30.78629,0,0,0,0,100,0),
+(@PATH,134,4653.611,-5538.767,30.03629,0,0,0,0,100,0),
+(@PATH,135,4654.861,-5534.767,29.53629,0,0,0,0,100,0),
+(@PATH,136,4655.176,-5534.61,29.14608,0,0,0,0,100,0),
+(@PATH,137,4655.426,-5533.86,29.14608,0,0,0,0,100,0),
+(@PATH,138,4658.176,-5528.61,28.39608,0,0,0,0,100,0),
+(@PATH,139,4661.176,-5522.61,28.14608,0,0,0,0,100,0),
+(@PATH,140,4663.296,-5518.52,27.41638,0,0,0,0,100,0),
+(@PATH,141,4666.796,-5515.52,26.66638,0,0,0,0,100,0),
+(@PATH,142,4667.602,-5514.735,26.7351,0,0,0,0,100,0),
+(@PATH,143,4664.102,-5517.985,27.2351,0,0,0,0,100,0),
+(@PATH,144,4663.71,-5518.2,27.46549,0,0,0,0,100,0),
+(@PATH,145,4663.21,-5518.7,27.71549,0,0,0,0,100,0),
+(@PATH,146,4660.71,-5523.2,27.96549,0,0,0,0,100,0),
+(@PATH,147,4657.71,-5529.2,28.71549,0,0,0,0,100,0),
+(@PATH,148,4655.082,-5533.99,29.53152,0,0,0,0,100,0),
+(@PATH,149,4653.332,-5538.74,30.03152,0,0,0,0,100,0),
+(@PATH,150,4652.332,-5542.49,30.78152,0,0,0,0,100,0),
+(@PATH,151,4651.832,-5544.24,31.28152,0,0,0,0,100,0),
+(@PATH,152,4651.082,-5546.24,31.78152,0,0,0,0,100,0),
+(@PATH,153,4650.332,-5547.99,32.28152,0,0,0,0,100,0),
+(@PATH,154,4649.832,-5549.99,33.03152,0,0,0,0,100,0),
+(@PATH,155,4648.461,-5552.834,34.08023,0,0,0,0,100,0),
+(@PATH,156,4647.961,-5554.834,34.83023,0,0,0,0,100,0),
+(@PATH,157,4647.461,-5556.584,35.58023,0,0,0,0,100,0),
+(@PATH,158,4646.961,-5558.584,36.58023,0,0,0,0,100,0),
+(@PATH,159,4646.461,-5560.584,37.58023,0,0,0,0,100,0),
+(@PATH,160,4645.711,-5563.334,38.33023,0,0,0,0,100,0),
+(@PATH,161,4645.461,-5565.084,39.58023,0,0,0,0,100,0),
+(@PATH,162,4644.961,-5567.084,40.83023,0,0,0,0,100,0),
+(@PATH,163,4644.461,-5569.084,41.83023,0,0,0,0,100,0),
+(@PATH,164,4643.961,-5570.834,42.58023,0,0,0,0,100,0),
+(@PATH,165,4642.961,-5573.834,43.33023,0,0,0,0,100,0),
+(@PATH,166,4642.868,-5574.016,43.39613,0,0,0,0,100,0),
+(@PATH,167,4642.368,-5575.766,43.64613,0,0,0,0,100,0),
+(@PATH,168,4639.118,-5580.516,42.89613,0,0,0,0,100,0),
+(@PATH,169,4637.118,-5583.766,41.64613,0,0,0,0,100,0),
+(@PATH,170,4635.368,-5586.266,40.39613,0,0,0,0,100,0);
+
+SET @NPC := 110474;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4974.067,`position_y`=-4702.151,`position_z`=211.6858 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4974.067,-4702.151,211.6858,0,0,0,0,100,0),
+(@PATH,2,4973.567,-4694.401,211.6858,0,0,0,0,100,0),
+(@PATH,3,4972.317,-4684.151,211.6858,0,0,0,0,100,0),
+(@PATH,4,4972.449,-4684.032,211.6815,0,0,0,0,100,0),
+(@PATH,5,4972.199,-4683.032,211.6815,0,0,0,0,100,0),
+(@PATH,6,4972.073,-4683.314,211.4305,0,0,0,0,100,0),
+(@PATH,7,4972.434,-4683.377,211.6818,0,0,0,0,100,0),
+(@PATH,8,4973.184,-4694.377,211.6818,0,0,0,0,100,0),
+(@PATH,9,4974.222,-4702.475,211.6772,0,0,0,0,100,0),
+(@PATH,10,4976.222,-4706.975,211.6772,0,0,0,0,100,0),
+(@PATH,11,4979.872,-4716.739,211.652,0,0,0,0,100,0),
+(@PATH,12,4979.707,-4716.649,211.4221,0,0,0,0,100,0),
+(@PATH,13,4979.64,-4716.295,211.6743,0,0,0,0,100,0),
+(@PATH,14,4976.14,-4707.045,211.6743,0,0,0,0,100,0);
+
+SET @NPC := 110473;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4971.524,`position_y`=-4651.398,`position_z`=211.6646 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4971.524,-4651.398,211.6646,0,0,0,0,100,0),
+(@PATH,2,4971.524,-4650.148,211.6646,0,0,0,0,100,0),
+(@PATH,3,4971.274,-4642.898,211.6646,0,0,0,0,100,0),
+(@PATH,4,4971.195,-4642.912,211.4312,0,0,0,0,100,0),
+(@PATH,5,4971.593,-4650.481,211.6812,0,0,0,0,100,0),
+(@PATH,6,4971.843,-4651.481,211.6812,0,0,0,0,100,0),
+(@PATH,7,4972.093,-4657.231,211.6812,0,0,0,0,100,0),
+(@PATH,8,4972.093,-4659.231,211.6812,0,0,0,0,100,0),
+(@PATH,9,4972.093,-4660.231,211.6812,0,0,0,0,100,0),
+(@PATH,10,4972.593,-4665.231,211.6812,0,0,0,0,100,0),
+(@PATH,11,4972.628,-4665.171,211.6984,0,0,0,0,100,0),
+(@PATH,12,4972.378,-4661.171,211.6984,0,0,0,0,100,0),
+(@PATH,13,4972.128,-4659.421,211.6984,0,0,0,0,100,0),
+(@PATH,14,4972.128,-4657.421,211.6984,0,0,0,0,100,0),
+(@PATH,15,4971.628,-4651.671,211.6984,0,0,0,0,100,0);
+
+SET @NPC := 110472;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=5006.468,`position_y`=-4761.551,`position_z`=211.3855 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,5006.468,-4761.551,211.3855,0,0,0,0,100,0),
+(@PATH,2,5005.218,-4760.301,211.3855,0,0,0,0,100,0),
+(@PATH,3,5003.468,-4759.551,211.3855,0,0,0,0,100,0),
+(@PATH,4,5001.968,-4758.551,211.6355,0,0,0,0,100,0),
+(@PATH,5,4999.169,-4756.928,211.6723,0,0,0,0,100,0),
+(@PATH,6,4999.078,-4756.74,211.6491,0,0,0,0,100,0),
+(@PATH,7,4995.578,-4756.99,211.6491,0,0,0,0,100,0),
+(@PATH,8,4994.328,-4755.24,211.6491,0,0,0,0,100,0),
+(@PATH,9,4994.02,-4755.05,211.6453,0,0,0,0,100,0),
+(@PATH,10,4994.472,-4755.252,211.6491,0,0,0,0,100,0),
+(@PATH,11,4995.472,-4757.002,211.6491,0,0,0,0,100,0),
+(@PATH,12,4999.36,-4757.021,211.6276,0,0,0,0,100,0),
+(@PATH,13,5001.86,-4758.521,211.6276,0,0,0,0,100,0),
+(@PATH,14,5003.61,-4759.271,211.3776,0,0,0,0,100,0),
+(@PATH,15,5003.792,-4759.599,211.3631,0,0,0,0,100,0),
+(@PATH,16,5005.542,-4760.349,211.6131,0,0,0,0,100,0),
+(@PATH,17,5006.792,-4761.849,211.6131,0,0,0,0,100,0),
+(@PATH,18,5011.292,-4766.849,211.6131,0,0,0,0,100,0),
+(@PATH,19,5014.042,-4769.599,211.6131,0,0,0,0,100,0),
+(@PATH,20,5014.364,-4769.94,211.6148,0,0,0,0,100,0),
+(@PATH,21,5014.864,-4770.44,211.6148,0,0,0,0,100,0),
+(@PATH,22,5018.389,-4774.991,211.6234,0,0,0,0,100,0),
+(@PATH,23,5020.639,-4778.491,211.6234,0,0,0,0,100,0),
+(@PATH,24,5021.389,-4779.741,211.3734,0,0,0,0,100,0),
+(@PATH,25,5021.803,-4779.973,211.3778,0,0,0,0,100,0),
+(@PATH,26,5023.303,-4782.723,211.6278,0,0,0,0,100,0),
+(@PATH,27,5031.042,-4794.147,211.6393,0,0,0,0,100,0),
+(@PATH,28,5032.792,-4795.897,211.6393,0,0,0,0,100,0),
+(@PATH,29,5037.042,-4799.647,211.6393,0,0,0,0,100,0),
+(@PATH,30,5023.104,-4782.475,211.6226,0,0,0,0,100,0),
+(@PATH,31,5021.354,-4779.975,211.6226,0,0,0,0,100,0),
+(@PATH,32,5020.854,-4778.725,211.6226,0,0,0,0,100,0),
+(@PATH,33,5018.14,-4774.706,211.6087,0,0,0,0,100,0),
+(@PATH,34,5014.669,-4770.225,211.5951,0,0,0,0,100,0),
+(@PATH,35,5011.419,-4766.725,211.5951,0,0,0,0,100,0);
+
+DELETE FROM `creature_template_addon` WHERE `entry`=26268;
+INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(26268,0,0,0,1,27, '');
+
+SET @NPC := 110556;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4970.492,`position_y`=-4715.575,`position_z`=219.7441 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4970.492,-4715.575,219.7441,0,0,0,0,100,0),
+(@PATH,2,4971.992,-4715.325,220.4941,0,0,0,0,100,0),
+(@PATH,3,4973.492,-4714.825,221.2441,0,0,0,0,100,0),
+(@PATH,4,4975.742,-4714.325,221.7441,0,0,0,0,100,0),
+(@PATH,5,4978.742,-4713.825,222.2441,0,0,0,0,100,0),
+(@PATH,6,4980.742,-4713.575,221.9941,0,0,0,0,100,0),
+(@PATH,7,4981.992,-4713.325,221.7441,0,0,0,0,100,0),
+(@PATH,8,4983.742,-4712.825,221.2441,0,0,0,0,100,0),
+(@PATH,9,4985.242,-4712.575,220.4941,0,0,0,0,100,0),
+(@PATH,10,4986.242,-4712.325,219.7441,0,0,0,0,100,0),
+(@PATH,11,4968.5,-4716.197,219.4686,0,0,0,0,100,0),
+(@PATH,12,4968.5,-4716.197,219.4686,0.2173836,0,0,0,100,0),
+(@PATH,13,4970.5,-4714.933,219.7303,0,0,0,0,100,0),
+(@PATH,14,4971.75,-4714.433,220.4803,0,0,0,0,100,0),
+(@PATH,15,4973,-4713.683,221.2303,0,0,0,0,100,0),
+(@PATH,16,4975,-4712.683,221.7303,0,0,0,0,100,0),
+(@PATH,17,4976,-4712.183,221.9803,0,0,0,0,100,0),
+(@PATH,18,4978,-4711.183,222.2303,0,0,0,0,100,0),
+(@PATH,19,4979.75,-4710.183,222.2303,0,0,0,0,100,0),
+(@PATH,20,4982.5,-4708.683,221.4803,0,0,0,0,100,0),
+(@PATH,21,4984,-4707.933,220.7303,0,0,0,0,100,0),
+(@PATH,22,4985,-4707.433,219.7303,0,0,0,0,100,0),
+(@PATH,23,4985.5,-4707.183,219.7303,0,0,0,0,100,0),
+(@PATH,24,4987.75,-4704.183,219.7303,0,0,0,0,100,0),
+(@PATH,25,4985.311,-4707.438,219.4958,0,0,0,0,100,0),
+(@PATH,26,4985.311,-4707.438,219.4958,0.6189525,0,0,0,100,0),
+(@PATH,27,4987.121,-4708.128,219.7317,0,0,0,0,100,0),
+(@PATH,28,4996.999,-4712.775,219.6996,0,0,0,0,100,0),
+(@PATH,29,4997.249,-4716.525,219.6996,0,0,0,0,100,0),
+(@PATH,30,4996.261,-4712.509,219.4735,0,0,0,0,100,0),
+(@PATH,31,4996.261,-4712.509,219.4735,5.849536,0,0,0,100,0),
+(@PATH,32,4997.006,-4716.74,219.7261,0,0,0,0,100,0),
+(@PATH,33,4997.506,-4720.74,219.4761,0,0,0,0,100,0),
+(@PATH,34,4998.006,-4723.49,219.7261,0,0,0,0,100,0),
+(@PATH,35,4998.103,-4723.636,219.7025,0,0,0,0,100,0),
+(@PATH,36,4997.853,-4720.886,219.7025,0,0,0,0,100,0),
+(@PATH,37,4997.595,-4720.635,219.7042,0,0,0,0,100,0),
+(@PATH,38,4997.345,-4720.135,219.7042,0,0,0,0,100,0),
+(@PATH,39,4997.345,-4716.885,219.4542,0,0,0,0,100,0),
+(@PATH,40,4997.056,-4712.651,219.6972,0,0,0,0,100,0),
+(@PATH,41,4991.556,-4700.401,219.6972,0,0,0,0,100,0),
+(@PATH,42,4988.556,-4693.901,219.6972,0,0,0,0,100,0),
+(@PATH,43,4986.112,-4688.446,219.7411,0,0,0,0,100,0),
+(@PATH,44,4988.362,-4693.696,219.7411,0,0,0,0,100,0),
+(@PATH,45,4989.805,-4696.215,219.7516,0,0,0,0,100,0),
+(@PATH,46,4991.805,-4699.465,219.7516,0,0,0,0,100,0),
+(@PATH,47,4988.768,-4694.563,219.4946,0,0,0,0,100,0),
+(@PATH,48,4988.768,-4694.563,219.4946,5.140615,0,0,0,100,0),
+(@PATH,49,4987.719,-4703.979,219.9336,0,0,0,0,100,0),
+(@PATH,50,4985.469,-4706.229,219.9336,0,0,0,0,100,0),
+(@PATH,51,4984.969,-4707.479,220.4336,0,0,0,0,100,0),
+(@PATH,52,4984.469,-4708.479,220.4336,0,0,0,0,100,0),
+(@PATH,53,4983.469,-4710.229,221.1836,0,0,0,0,100,0),
+(@PATH,54,4982.217,-4712.462,221.5245,0,0,0,0,100,0),
+(@PATH,55,4980.967,-4712.462,221.7745,0,0,0,0,100,0),
+(@PATH,56,4978.467,-4712.962,222.0245,0,0,0,0,100,0),
+(@PATH,57,4976.467,-4713.462,221.7745,0,0,0,0,100,0),
+(@PATH,58,4976.035,-4713.909,221.9419,0,0,0,0,100,0),
+(@PATH,59,4974.785,-4714.159,221.6919,0,0,0,0,100,0),
+(@PATH,60,4973.035,-4714.659,221.1919,0,0,0,0,100,0),
+(@PATH,61,4972.035,-4714.909,220.6919,0,0,0,0,100,0),
+(@PATH,62,4970.535,-4715.409,219.9419,0,0,0,0,100,0),
+(@PATH,63,4978.076,-4713.338,221.915,0,0,0,0,100,0),
+(@PATH,64,4978.076,-4713.338,221.915,3.368376,0,0,0,100,0),
+(@PATH,65,4976.91,-4713.574,221.9563,0,0,0,0,100,0),
+(@PATH,66,4975.91,-4713.574,221.9563,0,0,0,0,100,0),
+(@PATH,67,4972.91,-4713.824,221.2063,0,0,0,0,100,0),
+(@PATH,68,4971.41,-4714.074,220.7063,0,0,0,0,100,0),
+(@PATH,69,4970.16,-4714.324,219.9563,0,0,0,0,100,0),
+(@PATH,70,4967.606,-4714.529,219.4961,0,0,0,0,100,0),
+(@PATH,71,4967.606,-4714.529,219.4961,3.254826,0,0,0,100,0),
+(@PATH,72,4965.34,-4710.163,219.7599,0,0,0,0,100,0),
+(@PATH,73,4963.59,-4707.163,219.7599,0,0,0,0,100,0),
+(@PATH,74,4959.034,-4705.619,219.5352,0,0,0,0,100,0),
+(@PATH,75,4959.39,-4705.551,219.7635,0,0,0,0,100,0),
+(@PATH,76,4959.64,-4707.801,219.7635,0,0,0,0,100,0),
+(@PATH,77,4960.14,-4711.551,219.7635,0,0,0,0,100,0),
+(@PATH,78,4960.938,-4715.122,219.7473,0,0,0,0,100,0),
+(@PATH,79,4968.219,-4716.248,219.9708,0,0,0,0,100,0),
+(@PATH,80,4970.219,-4715.498,219.9708,0,0,0,0,100,0),
+(@PATH,81,4971.719,-4714.998,220.4708,0,0,0,0,100,0),
+(@PATH,82,4972.969,-4714.748,221.2208,0,0,0,0,100,0),
+(@PATH,83,4975.053,-4713.824,221.6586,0,0,0,0,100,0),
+(@PATH,84,4976.303,-4713.574,221.9086,0,0,0,0,100,0),
+(@PATH,85,4978.303,-4713.324,222.1586,0,0,0,0,100,0),
+(@PATH,86,4980.553,-4712.824,221.9086,0,0,0,0,100,0),
+(@PATH,87,4975.714,-4713.883,221.6543,0,0,0,0,100,0),
+(@PATH,88,4975.714,-4713.883,221.6543,0.2268625,0,0,0,100,0),
+(@PATH,89,4978.577,-4713.063,222.0859,0,0,0,0,100,0),
+(@PATH,90,4980.827,-4712.813,221.8359,0,0,0,0,100,0),
+(@PATH,91,4983.827,-4712.563,221.0859,0,0,0,0,100,0),
+(@PATH,92,4985.077,-4712.313,220.5859,0,0,0,0,100,0),
+(@PATH,93,4986.077,-4712.063,219.8359,0,0,0,0,100,0);
+
+SET @NPC := 118822;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3494.382,`position_y`=-4552.813,`position_z`=224.2461 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3494.382,-4552.813,224.2461,0,0,0,0,100,0),
+(@PATH,2,3495.632,-4551.813,223.9961,0,0,0,0,100,0),
+(@PATH,3,3497.382,-4550.813,222.9961,0,0,0,0,100,0),
+(@PATH,4,3499.882,-4549.313,222.4961,0,0,0,0,100,0),
+(@PATH,5,3501.382,-4548.313,221.9961,0,0,0,0,100,0),
+(@PATH,6,3503.882,-4546.813,221.2461,0,0,0,0,100,0),
+(@PATH,7,3506.382,-4545.313,220.4961,0,0,0,0,100,0),
+(@PATH,8,3506.673,-4544.896,220.2739,0,0,0,0,100,0),
+(@PATH,9,3507.423,-4544.646,220.2739,0,0,0,0,100,0),
+(@PATH,10,3508.673,-4543.396,219.7739,0,0,0,0,100,0),
+(@PATH,11,3511.423,-4540.896,219.2739,0,0,0,0,100,0),
+(@PATH,12,3514.411,-4538.24,218.5021,0,0,0,0,100,0),
+(@PATH,13,3515.411,-4534.24,217.7521,0,0,0,0,100,0),
+(@PATH,14,3516.161,-4531.74,217.2521,0,0,0,0,100,0),
+(@PATH,15,3517.161,-4528.74,216.7521,0,0,0,0,100,0),
+(@PATH,16,3518.161,-4524.99,216.2521,0,0,0,0,100,0),
+(@PATH,17,3518.383,-4524.767,216.0448,0,0,0,0,100,0),
+(@PATH,18,3518.883,-4523.517,215.7948,0,0,0,0,100,0),
+(@PATH,19,3521.883,-4521.517,215.2948,0,0,0,0,100,0),
+(@PATH,20,3523.383,-4520.267,214.7948,0,0,0,0,100,0),
+(@PATH,21,3524.552,-4519.662,214.4079,0,0,0,0,100,0),
+(@PATH,22,3526.552,-4519.912,213.4079,0,0,0,0,100,0),
+(@PATH,23,3528.552,-4519.912,212.6579,0,0,0,0,100,0),
+(@PATH,24,3530.552,-4519.912,211.9079,0,0,0,0,100,0),
+(@PATH,25,3533.302,-4520.162,211.4079,0,0,0,0,100,0),
+(@PATH,26,3535.302,-4520.162,210.6579,0,0,0,0,100,0),
+(@PATH,27,3537.302,-4520.412,209.9079,0,0,0,0,100,0),
+(@PATH,28,3537.519,-4520.006,209.603,0,0,0,0,100,0),
+(@PATH,29,3539.019,-4520.256,209.103,0,0,0,0,100,0),
+(@PATH,30,3542.519,-4518.756,208.353,0,0,0,0,100,0),
+(@PATH,31,3541.411,-4519.309,208.4283,0,0,0,0,100,0),
+(@PATH,32,3538.654,-4520.119,209.2209,0,0,0,0,100,0),
+(@PATH,33,3536.654,-4520.119,209.7209,0,0,0,0,100,0),
+(@PATH,34,3534.654,-4519.869,210.4709,0,0,0,0,100,0),
+(@PATH,35,3532.654,-4519.869,211.2209,0,0,0,0,100,0),
+(@PATH,36,3530.904,-4519.869,211.9709,0,0,0,0,100,0),
+(@PATH,37,3528.904,-4519.619,212.7209,0,0,0,0,100,0),
+(@PATH,38,3526.904,-4519.619,213.4709,0,0,0,0,100,0),
+(@PATH,39,3524.904,-4519.619,214.2209,0,0,0,0,100,0),
+(@PATH,40,3524.787,-4519.809,214.4233,0,0,0,0,100,0),
+(@PATH,41,3524.287,-4519.809,214.6733,0,0,0,0,100,0),
+(@PATH,42,3522.537,-4520.809,214.9233,0,0,0,0,100,0),
+(@PATH,43,3520.537,-4522.309,215.6733,0,0,0,0,100,0),
+(@PATH,44,3520.155,-4522.621,215.7749,0,0,0,0,100,0),
+(@PATH,45,3518.655,-4523.871,216.2749,0,0,0,0,100,0),
+(@PATH,46,3517.655,-4527.621,216.7749,0,0,0,0,100,0),
+(@PATH,47,3516.905,-4530.121,217.0249,0,0,0,0,100,0),
+(@PATH,48,3515.655,-4534.121,217.7749,0,0,0,0,100,0),
+(@PATH,49,3514.23,-4538.046,218.7422,0,0,0,0,100,0),
+(@PATH,50,3511.48,-4540.546,219.2422,0,0,0,0,100,0),
+(@PATH,51,3507.98,-4544.046,219.9922,0,0,0,0,100,0),
+(@PATH,52,3507.672,-4544.28,220.189,0,0,0,0,100,0),
+(@PATH,53,3507.172,-4544.78,220.439,0,0,0,0,100,0),
+(@PATH,54,3503.672,-4547.03,221.439,0,0,0,0,100,0),
+(@PATH,55,3501.922,-4547.78,221.939,0,0,0,0,100,0),
+(@PATH,56,3499.672,-4549.28,222.439,0,0,0,0,100,0),
+(@PATH,57,3497.922,-4550.28,223.189,0,0,0,0,100,0),
+(@PATH,58,3495.37,-4551.927,224.1924,0,0,0,0,100,0),
+(@PATH,59,3493.12,-4553.927,224.9424,0,0,0,0,100,0),
+(@PATH,60,3491.37,-4555.177,225.4424,0,0,0,0,100,0),
+(@PATH,61,3489.37,-4556.927,226.1924,0,0,0,0,100,0),
+(@PATH,62,3487.12,-4558.677,226.9424,0,0,0,0,100,0),
+(@PATH,63,3488.252,-4557.707,226.4908,0,0,0,0,100,0),
+(@PATH,64,3490.502,-4555.957,225.7408,0,0,0,0,100,0),
+(@PATH,65,3492.002,-4554.957,225.2408,0,0,0,0,100,0),
+(@PATH,66,3494.252,-4552.957,224.4908,0,0,0,0,100,0),
+(@PATH,67,3494.369,-4552.621,224.1573,0,0,0,0,100,0),
+(@PATH,68,3495.619,-4551.871,223.9073,0,0,0,0,100,0),
+(@PATH,69,3497.369,-4550.621,223.1573,0,0,0,0,100,0),
+(@PATH,70,3499.869,-4549.121,222.4073,0,0,0,0,100,0),
+(@PATH,71,3501.369,-4548.371,222.1573,0,0,0,0,100,0),
+(@PATH,72,3503.869,-4546.871,221.4073,0,0,0,0,100,0),
+(@PATH,73,3506.369,-4545.371,220.6573,0,0,0,0,100,0);
+UPDATE `smart_scripts` SET `action_param1`=1 WHERE `entryorguid`=26356 AND `source_type`=0 AND `id`=0 AND `link`=1;
+
+SET @NPC := 98061;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4037.801,`position_y`=-4305.377,`position_z`=252.4434 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4037.801,-4305.377,252.4434,0,0,0,0,100,0),
+(@PATH,2,4029.266,-4311.001,252.5234,0,0,0,0,100,0),
+(@PATH,3,4029.175,-4310.955,252.2501,0,0,0,0,100,0),
+(@PATH,4,4029.509,-4310.642,252.4412,0,0,0,0,100,0),
+(@PATH,5,4037.943,-4305.163,252.2845,0,0,0,0,100,0),
+(@PATH,6,4054.193,-4300.913,251.7845,0,0,0,0,100,0),
+(@PATH,7,4062.19,-4298.607,251.5605,0,0,0,0,100,0),
+(@PATH,8,4086.898,-4293.291,251.9268,0,0,0,0,100,0),
+(@PATH,9,4086.576,-4293.453,251.7249,0,0,0,0,100,0),
+(@PATH,10,4086.678,-4293.366,251.7816,0,0,0,0,100,0),
+(@PATH,11,4062,-4298.887,251.8086,0,0,0,0,100,0),
+(@PATH,12,4046.75,-4302.637,252.0586,0,0,0,0,100,0),
+(@PATH,13,4037.769,-4305.386,252.4443,0,0,0,0,100,0),
+(@PATH,14,4029.219,-4311.032,252.5237,0,0,0,0,100,0),
+(@PATH,15,4029.175,-4310.955,252.2501,0,0,0,0,100,0);
+
+UPDATE `smart_scripts` SET `action_param1`=1 WHERE `entryorguid`=26389 AND `source_type`=0 AND `id`=0 AND `link`=1;
+SET @NPC := 98054;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4043.963,`position_y`=-4430.786,`position_z`=261.5165 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4043.963,-4430.786,261.5165,0,0,0,0,100,0),
+(@PATH,2,4044.963,-4432.786,262.0165,0,0,0,0,100,0),
+(@PATH,3,4044.713,-4435.286,262.7665,0,0,0,0,100,0),
+(@PATH,4,4045.213,-4436.286,263.0165,0,0,0,0,100,0),
+(@PATH,5,4045.463,-4436.786,263.0165,0,0,0,0,100,0),
+(@PATH,6,4047.463,-4438.786,262.7665,0,0,0,0,100,0),
+(@PATH,7,4047.963,-4439.786,263.5165,0,0,0,0,100,0),
+(@PATH,8,4047.949,-4440.013,263.7135,0,0,0,0,100,0),
+(@PATH,9,4049.949,-4440.513,264.2135,0,0,0,0,100,0),
+(@PATH,10,4048.949,-4441.763,264.7135,0,0,0,0,100,0),
+(@PATH,11,4048.949,-4443.763,265.2135,0,0,0,0,100,0),
+(@PATH,12,4047.699,-4445.763,266.2135,0,0,0,0,100,0),
+(@PATH,13,4046.199,-4447.263,266.7135,0,0,0,0,100,0),
+(@PATH,14,4043.449,-4446.763,267.4635,0,0,0,0,100,0),
+(@PATH,15,4042.699,-4448.013,267.9635,0,0,0,0,100,0),
+(@PATH,16,4041.949,-4448.513,267.9635,0,0,0,0,100,0),
+(@PATH,17,4041.449,-4453.513,267.4635,0,0,0,0,100,0),
+(@PATH,18,4041.242,-4453.717,267.8022,0,0,0,0,100,0),
+(@PATH,19,4040.242,-4454.467,268.3022,0,0,0,0,100,0),
+(@PATH,20,4040.242,-4456.467,268.8022,0,0,0,0,100,0),
+(@PATH,21,4040.242,-4460.217,269.5522,0,0,0,0,100,0),
+(@PATH,22,4040.489,-4464.713,269.6811,0,0,0,0,100,0),
+(@PATH,23,4046.239,-4480.213,269.1811,0,0,0,0,100,0),
+(@PATH,24,4046.276,-4479.878,269.3551,0,0,0,0,100,0),
+(@PATH,25,4044.026,-4474.378,270.1051,0,0,0,0,100,0),
+(@PATH,26,4040.298,-4464.532,269.725,0,0,0,0,100,0),
+(@PATH,27,4040.298,-4459.782,269.225,0,0,0,0,100,0),
+(@PATH,28,4040.298,-4455.782,268.475,0,0,0,0,100,0),
+(@PATH,29,4040.299,-4455.474,268.2261,0,0,0,0,100,0),
+(@PATH,30,4040.299,-4454.224,267.9761,0,0,0,0,100,0),
+(@PATH,31,4042.799,-4453.224,267.7261,0,0,0,0,100,0),
+(@PATH,32,4046.049,-4454.224,267.7261,0,0,0,0,100,0),
+(@PATH,33,4047.799,-4452.974,267.2261,0,0,0,0,100,0),
+(@PATH,34,4048.549,-4450.474,266.7261,0,0,0,0,100,0),
+(@PATH,35,4049.049,-4444.724,265.7261,0,0,0,0,100,0),
+(@PATH,36,4050.049,-4444.724,265.7261,0,0,0,0,100,0),
+(@PATH,37,4050.549,-4442.974,264.9761,0,0,0,0,100,0),
+(@PATH,38,4049.437,-4441.189,263.9388,0,0,0,0,100,0),
+(@PATH,39,4047.937,-4438.439,262.9388,0,0,0,0,100,0),
+(@PATH,40,4045.687,-4436.939,262.9388,0,0,0,0,100,0),
+(@PATH,41,4044.687,-4436.189,262.9388,0,0,0,0,100,0),
+(@PATH,42,4043.937,-4433.189,261.9388,0,0,0,0,100,0),
+(@PATH,43,4043.437,-4430.439,261.4388,0,0,0,0,100,0),
+(@PATH,44,4043.437,-4428.939,261.4388,0,0,0,0,100,0),
+(@PATH,45,4038.512,-4412.942,261.4726,0,0,0,0,100,0),
+(@PATH,46,4045.009,-4403.787,261.2599,0,0,0,0,100,0),
+(@PATH,47,4050.509,-4398.787,260.7599,0,0,0,0,100,0),
+(@PATH,48,4054.184,-4395.831,260.5081,0,0,0,0,100,0),
+(@PATH,49,4060.914,-4401.005,260.7264,0,0,0,0,100,0),
+(@PATH,50,4060.763,-4401.35,260.5203,0,0,0,0,100,0),
+(@PATH,51,4060.835,-4401.013,260.7022,0,0,0,0,100,0);
+
+-- Earthen Warrior SAI
+SET @ENTRY := 26282;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,1,0,100,0,5000,5000,10000,10000,49,0,0,0,0,0,0,19,26284,10,0,0,0,0,0,"Earthen Warrior - Out of Combat - Start Attacking");
+
+SET @NPC := 112260;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4626.77,`position_y`=-4468.18,`position_z`=188.7218 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4626.77,-4468.18,188.7218,0,0,0,0,100,0),
+(@PATH,2,4628.02,-4468.43,188.7218,0,0,0,0,100,0),
+(@PATH,3,4633.77,-4469.43,189.2218,0,0,0,0,100,0),
+(@PATH,4,4638.52,-4470.18,189.7218,0,0,0,0,100,0),
+(@PATH,5,4642.52,-4470.93,190.4718,0,0,0,0,100,0),
+(@PATH,6,4644.66,-4471.42,191.0322,0,0,0,0,100,0),
+(@PATH,7,4647.66,-4471.42,191.5322,0,0,0,0,100,0),
+(@PATH,8,4651.41,-4471.42,191.7822,0,0,0,0,100,0),
+(@PATH,9,4655.41,-4471.42,192.5322,0,0,0,0,100,0),
+(@PATH,10,4659.563,-4471.758,193.4037,0,0,0,0,100,0),
+(@PATH,11,4667.063,-4474.758,193.9037,0,0,0,0,100,0),
+(@PATH,12,4667.158,-4472.282,193.5602,0,0,0,0,100,0),
+(@PATH,13,4659.328,-4471.715,193.0153,0,0,0,0,100,0),
+(@PATH,14,4655.328,-4471.715,192.5153,0,0,0,0,100,0),
+(@PATH,15,4651.578,-4471.465,191.7653,0,0,0,0,100,0),
+(@PATH,16,4647.578,-4471.465,191.5153,0,0,0,0,100,0),
+(@PATH,17,4644.492,-4471.189,190.7167,0,0,0,0,100,0),
+(@PATH,18,4640.492,-4470.439,189.9667,0,0,0,0,100,0),
+(@PATH,19,4635.742,-4469.689,189.7167,0,0,0,0,100,0),
+(@PATH,20,4630.992,-4468.939,188.9667,0,0,0,0,100,0),
+(@PATH,21,4627.861,-4468.194,188.4529,0,0,0,0,100,0),
+(@PATH,22,4625.361,-4467.944,188.7029,0,0,0,0,100,0),
+(@PATH,23,4619.689,-4466.896,187.1016,0,0,0,0,100,0),
+(@PATH,24,4609.689,-4465.646,184.6016,0,0,0,0,100,0),
+(@PATH,25,4608.689,-4465.646,184.6016,0,0,0,0,100,0),
+(@PATH,26,4608.402,-4465.411,184.3824,0,0,0,0,100,0),
+(@PATH,27,4605.652,-4465.161,184.3824,0,0,0,0,100,0),
+(@PATH,28,4595.808,-4461.938,184.4014,0,0,0,0,100,0),
+(@PATH,29,4595.772,-4462.198,184.1551,0,0,0,0,100,0),
+(@PATH,30,4595.927,-4462.176,184.3824,0,0,0,0,100,0),
+(@PATH,31,4605.99,-4465.424,184.4906,0,0,0,0,100,0),
+(@PATH,32,4609.24,-4465.924,183.9906,0,0,0,0,100,0),
+(@PATH,33,4619.987,-4467.194,187.3334,0,0,0,0,100,0),
+(@PATH,34,4626.487,-4467.944,188.5834,0,0,0,0,100,0),
+(@PATH,35,4626.743,-4468.349,188.8552,0,0,0,0,100,0),
+(@PATH,36,4627.993,-4468.349,188.8552,0,0,0,0,100,0),
+(@PATH,37,4633.993,-4469.349,189.1052,0,0,0,0,100,0),
+(@PATH,38,4638.493,-4470.099,189.8552,0,0,0,0,100,0),
+(@PATH,39,4642.493,-4470.849,190.3552,0,0,0,0,100,0);
+
+SET @NPC := 112265;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4740.915,`position_y`=-4506.604,`position_z`=199.756 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4740.915,-4506.604,199.756,0,0,0,0,100,0),
+(@PATH,2,4739.165,-4508.604,200.256,0,0,0,0,100,0),
+(@PATH,3,4736.571,-4511.472,200.7764,0,0,0,0,100,0),
+(@PATH,4,4732.571,-4516.722,201.2764,0,0,0,0,100,0),
+(@PATH,5,4729.089,-4521.665,201.4696,0,0,0,0,100,0),
+(@PATH,6,4729.089,-4524.915,202.2196,0,0,0,0,100,0),
+(@PATH,7,4727.339,-4528.165,202.7196,0,0,0,0,100,0),
+(@PATH,8,4725.089,-4532.415,203.2196,0,0,0,0,100,0),
+(@PATH,9,4720.262,-4531.4,203.6031,0,0,0,0,100,0),
+(@PATH,10,4719.762,-4532.4,203.8531,0,0,0,0,100,0),
+(@PATH,11,4719.762,-4533.4,204.1031,0,0,0,0,100,0),
+(@PATH,12,4718.512,-4536.15,204.6031,0,0,0,0,100,0),
+(@PATH,13,4715.762,-4538.4,205.1031,0,0,0,0,100,0),
+(@PATH,14,4714.762,-4539.65,205.6031,0,0,0,0,100,0),
+(@PATH,15,4715.869,-4538.347,205.2154,0,0,0,0,100,0),
+(@PATH,16,4717.119,-4536.597,204.7154,0,0,0,0,100,0),
+(@PATH,17,4718.119,-4535.847,204.4654,0,0,0,0,100,0),
+(@PATH,18,4717.619,-4533.347,204.4654,0,0,0,0,100,0),
+(@PATH,19,4719.119,-4530.597,203.4654,0,0,0,0,100,0),
+(@PATH,20,4719.277,-4530.432,203.2003,0,0,0,0,100,0),
+(@PATH,21,4720.527,-4531.182,203.4503,0,0,0,0,100,0),
+(@PATH,22,4721.527,-4529.432,202.9503,0,0,0,0,100,0),
+(@PATH,23,4723.027,-4525.432,202.4503,0,0,0,0,100,0),
+(@PATH,24,4726.277,-4523.432,201.7003,0,0,0,0,100,0),
+(@PATH,25,4729.367,-4521.513,201.2202,0,0,0,0,100,0),
+(@PATH,26,4736.9,-4511.23,200.8284,0,0,0,0,100,0),
+(@PATH,27,4739.9,-4507.73,199.8284,0,0,0,0,100,0),
+(@PATH,28,4742.65,-4504.73,199.5784,0,0,0,0,100,0);
+
+SET @NPC := 112263;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4763.436,`position_y`=-4489.991,`position_z`=196.598 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4763.436,-4489.991,196.598,0,0,0,0,100,0),
+(@PATH,2,4777.686,-4503.491,197.098,0,0,0,0,100,0),
+(@PATH,3,4777.988,-4503.717,197.3403,0,0,0,0,100,0),
+(@PATH,4,4779.238,-4504.967,197.3403,0,0,0,0,100,0),
+(@PATH,5,4787.988,-4509.217,197.5903,0,0,0,0,100,0),
+(@PATH,6,4797.488,-4514.217,198.3403,0,0,0,0,100,0),
+(@PATH,7,4791.602,-4511.282,197.6792,0,0,0,0,100,0),
+(@PATH,8,4781.352,-4506.032,197.4292,0,0,0,0,100,0),
+(@PATH,9,4779.015,-4504.664,197.1621,0,0,0,0,100,0),
+(@PATH,10,4764.765,-4491.164,196.6621,0,0,0,0,100,0),
+(@PATH,11,4764.466,-4490.788,196.5181,0,0,0,0,100,0),
+(@PATH,12,4763.216,-4489.788,196.5181,0,0,0,0,100,0),
+(@PATH,13,4757.216,-4483.288,195.7681,0,0,0,0,100,0),
+(@PATH,14,4751.675,-4477.44,195.3216,0,0,0,0,100,0),
+(@PATH,15,4740.917,-4467.688,195.4378,0,0,0,0,100,0),
+(@PATH,16,4733.417,-4458.938,194.9378,0,0,0,0,100,0),
+(@PATH,17,4730.063,-4454.976,194.4022,0,0,0,0,100,0),
+(@PATH,18,4726.313,-4450.476,193.9022,0,0,0,0,100,0),
+(@PATH,19,4721.563,-4444.476,193.4022,0,0,0,0,100,0),
+(@PATH,20,4721.331,-4444.313,193.3035,0,0,0,0,100,0),
+(@PATH,21,4719.581,-4442.063,193.0535,0,0,0,0,100,0),
+(@PATH,22,4712.081,-4433.313,192.5535,0,0,0,0,100,0),
+(@PATH,23,4706.962,-4427.567,192.1902,0,0,0,0,100,0),
+(@PATH,24,4700.712,-4420.317,191.6902,0,0,0,0,100,0),
+(@PATH,25,4704.823,-4424.94,191.8282,0,0,0,0,100,0),
+(@PATH,26,4705.068,-4425.129,192.0756,0,0,0,0,100,0),
+(@PATH,27,4707.318,-4427.629,192.3256,0,0,0,0,100,0),
+(@PATH,28,4714.318,-4435.879,192.8256,0,0,0,0,100,0),
+(@PATH,29,4719.729,-4442.429,193.2542,0,0,0,0,100,0),
+(@PATH,30,4725.229,-4449.179,193.7542,0,0,0,0,100,0),
+(@PATH,31,4729.479,-4454.679,194.2542,0,0,0,0,100,0),
+(@PATH,32,4729.81,-4454.901,194.5507,0,0,0,0,100,0),
+(@PATH,33,4730.31,-4455.401,194.5507,0,0,0,0,100,0),
+(@PATH,34,4734.56,-4460.401,195.0507,0,0,0,0,100,0),
+(@PATH,35,4741.313,-4467.867,195.4152,0,0,0,0,100,0);
+
+-- correction
+-- Grizzly Hills Giant SAI
+SET @ENTRY := 26261;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,8,0,100,0,47394,0,0,0,33,26261,0,0,0,0,0,7,0,0,0,0,0,0,0,"Grizzly Hills Giant - On Spellhit 'Kurun's Blessing' - Quest Credit 'Rallying the Troops'"),
+(@ENTRY,0,1,0,1,0,100,0,2000,5000,4000,6000,11,46815,0,0,0,0,0,19,26264,100,0,0,0,0,0,"Grizzly Hills Giant - Out of Combat - Cast 'Toss Boulder'");
+
+SET @NPC := 110559;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4974.938,`position_y`=-4745.822,`position_z`=219.5011 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4974.938,-4745.822,219.5011,0,0,0,0,100,0),
+(@PATH,2,4974.938,-4745.822,219.5011,2.057687,0,0,0,100,0),
+(@PATH,3,4974.938,-4745.822,219.5011,0,0,0,0,100,0),
+(@PATH,4,4974.938,-4745.822,219.5011,2.057687,0,0,0,100,0),
+(@PATH,5,4970.268,-4736.388,219.75,0,0,0,0,100,0),
+(@PATH,6,4969.018,-4734.138,219.75,0,0,0,0,100,0),
+(@PATH,7,4968.648,-4734.162,219.7481,0,0,0,0,100,0),
+(@PATH,8,4969.148,-4736.162,219.7481,0,0,0,0,100,0),
+(@PATH,9,4970.325,-4738.761,219.7499,0,0,0,0,100,0),
+(@PATH,10,4974.973,-4749.851,219.75,0,0,0,0,100,0),
+(@PATH,11,4977.148,-4754.923,219.7599,0,0,0,0,100,0),
+(@PATH,12,4977.898,-4756.173,219.7599,0,0,0,0,100,0),
+(@PATH,13,4976.332,-4753.346,219.5004,0,0,0,0,100,0),
+(@PATH,14,4976.332,-4753.346,219.5004,5.131248,0,0,0,100,0),
+(@PATH,15,4978.357,-4755.924,219.7322,0,0,0,0,100,0),
+(@PATH,16,4985.357,-4766.174,219.7322,0,0,0,0,100,0),
+(@PATH,17,4988.607,-4770.424,219.7322,0,0,0,0,100,0),
+(@PATH,18,4990.607,-4773.424,219.7322,0,0,0,0,100,0),
+(@PATH,19,4978.615,-4756.599,219.5061,0,0,0,0,100,0),
+(@PATH,20,4978.615,-4756.599,219.5061,5.324385,0,0,0,100,0),
+(@PATH,21,4989.826,-4764.923,219.9392,0,0,0,0,100,0),
+(@PATH,22,4992.076,-4766.923,220.9392,0,0,0,0,100,0),
+(@PATH,23,4994.826,-4767.173,219.9392,0,0,0,0,100,0),
+(@PATH,24,4997.076,-4766.923,220.9392,0,0,0,0,100,0),
+(@PATH,25,4998.326,-4766.423,221.4392,0,0,0,0,100,0),
+(@PATH,26,5002.076,-4765.673,221.9392,0,0,0,0,100,0),
+(@PATH,27,5004.826,-4765.173,222.1892,0,0,0,0,100,0),
+(@PATH,28,5005.213,-4765.373,222.2207,0,0,0,0,100,0),
+(@PATH,29,5006.713,-4764.873,221.9707,0,0,0,0,100,0),
+(@PATH,30,5008.463,-4763.873,221.7207,0,0,0,0,100,0),
+(@PATH,31,5010.463,-4762.623,221.2207,0,0,0,0,100,0),
+(@PATH,32,5011.713,-4762.123,220.7207,0,0,0,0,100,0),
+(@PATH,33,5012.463,-4761.623,219.9707,0,0,0,0,100,0),
+(@PATH,34,5014.963,-4760.373,219.9707,0,0,0,0,100,0),
+(@PATH,35,5013.416,-4761.159,219.5162,0,0,0,0,100,0),
+(@PATH,36,5013.416,-4761.159,219.5162,0.5364561,0,0,0,100,0),
+(@PATH,37,5012.949,-4758.56,219.7025,0,0,0,0,100,0),
+(@PATH,38,5011.449,-4752.56,219.7025,0,0,0,0,100,0),
+(@PATH,39,5011.199,-4749.81,219.7025,0,0,0,0,100,0),
+(@PATH,40,5010.699,-4747.81,219.7025,0,0,0,0,100,0),
+(@PATH,41,5011.182,-4745.968,219.433,0,0,0,0,100,0),
+(@PATH,42,5013.682,-4748.968,219.683,0,0,0,0,100,0),
+(@PATH,43,5014.682,-4750.218,219.683,0,0,0,0,100,0),
+(@PATH,44,5013.822,-4749.14,219.4679,0,0,0,0,100,0),
+(@PATH,45,5015.072,-4750.64,219.7179,0,0,0,0,100,0),
+(@PATH,46,5015.822,-4751.89,219.7179,0,0,0,0,100,0),
+(@PATH,47,5016.797,-4758.994,219.9411,0,0,0,0,100,0),
+(@PATH,48,5014.797,-4760.244,219.9411,0,0,0,0,100,0),
+(@PATH,49,5013.047,-4760.994,219.9411,0,0,0,0,100,0),
+(@PATH,50,5011.547,-4761.994,220.6911,0,0,0,0,100,0),
+(@PATH,51,5010.547,-4762.744,221.1911,0,0,0,0,100,0),
+(@PATH,52,5008.547,-4763.994,221.6911,0,0,0,0,100,0),
+(@PATH,53,5007.547,-4764.494,221.9411,0,0,0,0,100,0),
+(@PATH,54,5016.685,-4757.653,219.5163,0,0,0,0,100,0),
+(@PATH,55,5016.685,-4757.653,219.5163,4.85295,0,0,0,100,0),
+(@PATH,56,5014.053,-4759.563,219.7658,0,0,0,0,100,0),
+(@PATH,57,5012.553,-4760.563,219.7658,0,0,0,0,100,0),
+(@PATH,58,5011.053,-4761.563,220.5158,0,0,0,0,100,0),
+(@PATH,59,5010.053,-4762.563,221.2658,0,0,0,0,100,0),
+(@PATH,60,5007.553,-4764.063,221.7658,0,0,0,0,100,0),
+(@PATH,61,5005.303,-4765.813,222.0158,0,0,0,0,100,0),
+(@PATH,62,5003.553,-4767.063,222.0158,0,0,0,0,100,0),
+(@PATH,63,5000.803,-4769.063,221.2658,0,0,0,0,100,0),
+(@PATH,64,4999.553,-4769.813,220.5158,0,0,0,0,100,0),
+(@PATH,65,4998.303,-4770.813,219.7658,0,0,0,0,100,0),
+(@PATH,66,5015.091,-4758.8,219.5454,0,0,0,0,100,0),
+(@PATH,67,5015.091,-4758.8,219.5454,3.765347,0,0,0,100,0),
+(@PATH,68,5013.777,-4759.399,219.7824,0,0,0,0,100,0),
+(@PATH,69,5012.027,-4760.149,219.5324,0,0,0,0,100,0),
+(@PATH,70,5010.527,-4760.399,220.5324,0,0,0,0,100,0),
+(@PATH,71,5009.027,-4761.149,221.2824,0,0,0,0,100,0),
+(@PATH,72,5007.277,-4761.899,221.5324,0,0,0,0,100,0),
+(@PATH,73,5005.277,-4761.899,222.0324,0,0,0,0,100,0),
+(@PATH,74,5003.527,-4763.399,222.2824,0,0,0,0,100,0),
+(@PATH,75,5001.527,-4764.899,222.2824,0,0,0,0,100,0),
+(@PATH,76,4998.527,-4766.399,221.2824,0,0,0,0,100,0),
+(@PATH,77,4997.527,-4767.149,220.7824,0,0,0,0,100,0),
+(@PATH,78,4996.527,-4767.399,219.7824,0,0,0,0,100,0),
+(@PATH,79,4995.777,-4767.649,219.7824,0,0,0,0,100,0),
+(@PATH,80,4991.527,-4767.899,219.7824,0,0,0,0,100,0),
+(@PATH,81,4987.777,-4765.649,219.7824,0,0,0,0,100,0),
+(@PATH,82,4981.399,-4761.659,219.763,0,0,0,0,100,0),
+(@PATH,83,4977.899,-4756.159,219.763,0,0,0,0,100,0),
+(@PATH,84,4977.707,-4755.765,219.7526,0,0,0,0,100,0),
+(@PATH,85,4976.957,-4754.515,219.7526,0,0,0,0,100,0),
+(@PATH,86,4974.813,-4749.59,219.7486,0,0,0,0,100,0),
+(@PATH,87,4975.045,-4750.456,219.4998,0,0,0,0,100,0),
+(@PATH,88,4975.045,-4750.456,219.4998,1.989743,0,0,0,100,0),
+(@PATH,89,4969.571,-4736.454,219.7493,0,0,0,0,100,0),
+(@PATH,90,4968.821,-4734.204,219.7493,0,0,0,0,100,0),
+(@PATH,91,4972.802,-4744.884,219.4986,0,0,0,0,100,0),
+(@PATH,92,4972.802,-4744.884,219.4986,1.953552,0,0,0,100,0),
+(@PATH,93,4969.699,-4736.418,219.7488,0,0,0,0,100,0),
+(@PATH,94,4968.699,-4734.168,219.7488,0,0,0,0,100,0);
+
+-- Runed Giant SAI
+SET @ENTRY := 26417;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0 AND `id`=2;
+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,2,0,1,0,100,0,5000,5000,10000,10000,49,0,0,0,0,0,0,19,26261,15,0,0,0,0,0,"Runed Giant - Out of Combat - Start Attacking");
+
+SET @NPC := 86438;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4795.183,`position_y`=-4858.25,`position_z`=25.82121 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4795.183,-4858.25,25.82121,0,0,0,0,100,0),
+(@PATH,2,4793.933,-4857.25,25.82121,0,0,0,0,100,0),
+(@PATH,3,4786.933,-4851,25.82121,0,0,0,0,100,0),
+(@PATH,4,4783.933,-4848.5,25.57121,0,0,0,0,100,0),
+(@PATH,5,4775.606,-4841.151,25.45528,0,0,0,0,100,0),
+(@PATH,6,4775.606,-4841.151,25.45528,2.513274,0,0,0,100,0),
+(@PATH,7,4783.6,-4848.556,25.60373,0,0,0,0,100,0),
+(@PATH,8,4786.35,-4851.306,25.85373,0,0,0,0,100,0),
+(@PATH,9,4793.35,-4858.056,25.85373,0,0,0,0,100,0),
+(@PATH,10,4793.512,-4857.986,25.97804,0,0,0,0,100,0),
+(@PATH,11,4794.762,-4859.236,25.97804,0,0,0,0,100,0),
+(@PATH,12,4798.762,-4857.986,25.72804,0,0,0,0,100,0),
+(@PATH,13,4800.262,-4857.736,25.72804,0,0,0,0,100,0),
+(@PATH,14,4802.262,-4856.986,25.72804,0,0,0,0,100,0),
+(@PATH,15,4810.12,-4854.692,25.79934,0,0,0,0,100,0),
+(@PATH,16,4816.12,-4851.192,25.79934,0,0,0,0,100,0),
+(@PATH,17,4818.37,-4850.192,25.54934,0,0,0,0,100,0),
+(@PATH,18,4819.37,-4849.692,25.54934,0,0,0,0,100,0),
+(@PATH,19,4821.12,-4848.942,25.79934,0,0,0,0,100,0),
+(@PATH,20,4823.87,-4847.192,25.54934,0,0,0,0,100,0),
+(@PATH,21,4825.23,-4846.544,25.45987,5.550147,0,0,0,100,0),
+(@PATH,22,4823.903,-4847.049,25.59635,0,0,0,0,100,0),
+(@PATH,23,4821.653,-4848.049,25.59635,0,0,0,0,100,0),
+(@PATH,24,4820.403,-4848.549,25.59635,0,0,0,0,100,0),
+(@PATH,25,4816.653,-4850.049,25.59635,0,0,0,0,100,0),
+(@PATH,26,4814.903,-4850.549,25.59635,0,0,0,0,100,0),
+(@PATH,27,4803.903,-4854.799,25.84635,0,0,0,0,100,0),
+(@PATH,28,4800.153,-4856.299,25.84635,0,0,0,0,100,0),
+(@PATH,29,4799.153,-4856.799,25.84635,0,0,0,0,100,0),
+(@PATH,30,4795.174,-4858.254,25.82136,0,0,0,0,100,0),
+(@PATH,31,4793.924,-4857.254,25.82136,0,0,0,0,100,0),
+(@PATH,32,4786.924,-4851.004,25.82136,0,0,0,0,100,0),
+(@PATH,33,4783.924,-4848.504,25.57136,0,0,0,0,100,0),
+(@PATH,34,4775.606,-4841.151,25.45528,0,0,0,0,100,0),
+(@PATH,35,4775.606,-4841.151,25.45528,2.513274,0,0,0,100,0);
+
+SET @NPC := 86437;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4766.285,`position_y`=-4851.221,`position_z`=25.88538 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4766.285,-4851.221,25.88538,0,0,0,0,100,0),
+(@PATH,2,4764.035,-4852.971,25.63538,0,0,0,0,100,0),
+(@PATH,3,4762.535,-4853.971,25.38538,0,0,0,0,100,0),
+(@PATH,4,4761.535,-4853.971,25.38538,0,0,0,0,100,0),
+(@PATH,5,4760.035,-4853.971,25.63538,0,0,0,0,100,0),
+(@PATH,6,4758.785,-4853.971,26.13538,0,0,0,0,100,0),
+(@PATH,7,4758.035,-4854.221,26.38538,0,0,0,0,100,0),
+(@PATH,8,4756.035,-4854.471,26.38538,0,0,0,0,100,0),
+(@PATH,9,4753.785,-4854.971,26.38538,0,0,0,0,100,0),
+(@PATH,10,4752.035,-4855.221,26.38538,0,0,0,0,100,0),
+(@PATH,11,4748.035,-4856.471,26.38538,0,0,0,0,100,0),
+(@PATH,12,4745.785,-4856.721,26.38538,0,0,0,0,100,0),
+(@PATH,13,4739.535,-4857.221,26.38538,0,0,0,0,100,0),
+(@PATH,14,4733.245,-4857.637,26.4931,0,0,0,0,100,0),
+(@PATH,15,4733.245,-4857.637,26.4931,2.617994,0,0,0,100,0),
+(@PATH,16,4737.667,-4857.782,26.4303,0,0,0,0,100,0),
+(@PATH,17,4739.417,-4857.782,26.4303,0,0,0,0,100,0),
+(@PATH,18,4745.917,-4857.782,26.4303,0,0,0,0,100,0),
+(@PATH,19,4747.667,-4857.782,26.1803,0,0,0,0,100,0),
+(@PATH,20,4750.917,-4857.782,26.1803,0,0,0,0,100,0),
+(@PATH,21,4752.667,-4857.782,26.1803,0,0,0,0,100,0),
+(@PATH,22,4755.667,-4857.782,26.1803,0,0,0,0,100,0),
+(@PATH,23,4755.755,-4857.606,26.16596,0,0,0,0,100,0),
+(@PATH,24,4758.755,-4857.606,25.91596,0,0,0,0,100,0),
+(@PATH,25,4761.005,-4855.856,25.66596,0,0,0,0,100,0),
+(@PATH,26,4762.505,-4854.356,25.41596,0,0,0,0,100,0),
+(@PATH,27,4764.255,-4853.106,25.66596,0,0,0,0,100,0),
+(@PATH,28,4766.005,-4851.606,25.66596,0,0,0,0,100,0);
+
+-- Shade of Arugal SAI
+SET @ENTRY := 27018;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,1,0,100,0,1000,1000,20000,20000,11,48185,0,0,0,0,0,19,27024,20,0,0,0,0,0,"Shade of Arugal - Out of Combat - Cast 'Arugal Channel'"),
+(@ENTRY,0,1,0,0,0,100,0,2000,3000,2000,3000,11,53086,0,0,0,0,0,2,0,0,0,0,0,0,0,"Shade of Arugal - In Combat - Cast 'Shadow Bolt'");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry`=48185;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13, 1, 48185, 0, 0, 31, 0, 3, 27024, 0, 0, 0, 0, '', 'Arugal Channel only target Cultists');
diff --git a/sql/updates/world/2015_05_24_05_world.sql b/sql/updates/world/2015_05_24_05_world.sql
new file mode 100644
index 00000000000..2b3641b257c
--- /dev/null
+++ b/sql/updates/world/2015_05_24_05_world.sql
@@ -0,0 +1,10 @@
+-- Scarlet Hound
+DELETE FROM `creature` WHERE `id` IN (10979);
+DELETE FROM `creature_addon` WHERE `guid` IN (52633, 52634, 52635, 52637, 52641, 52662, 52664, 52665, 52666, 52667, 52668);
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=10979;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=10979 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=1831 AND `source_type`=0 AND `id`=2;
+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
+(1831, 0, 2, 0, 25, 0, 100, 0, 0, 0, 0, 0, 11, 17164, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,0,'Scarlet Hunter - On Reset - Cast to summon Scarlet Hound'),
+(10979, 0, 0, 0, 0, 0, 100, 0, 3000, 7000, 6000, 9000, 11, 17260, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0,0,'Scarlet Hound - IC - Cast Bite'),
+(10979, 0, 1, 0, 0, 0, 100, 0, 5000, 10000, 22000, 25000, 11, 59274, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,0,'Scarlet Hound - IC - Furious Howl');
diff --git a/sql/updates/world/2015_05_24_06_world.sql b/sql/updates/world/2015_05_24_06_world.sql
new file mode 100644
index 00000000000..756b2d569cf
--- /dev/null
+++ b/sql/updates/world/2015_05_24_06_world.sql
@@ -0,0 +1,45 @@
+-- DB/Quest: Escape from the Staging Grounds
+DELETE FROM `waypoints` WHERE `entry`=20763;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`) VALUES
+(20763, 1, 4081.3, 2296.6, 110.75),
+(20763, 2, 4095.3, 2296.37, 108.392),
+(20763, 3, 4123.42, 2297.51, 104.368),
+(20763, 4, 4146.48, 2298.85, 102.475),
+(20763, 5, 4169.75, 2301.11, 104.503),
+(20763, 6, 4181.37, 2301.19, 108.692),
+(20763, 7, 4195.51, 2301.28, 113.981),
+(20763, 8, 4215.69, 2295.79, 122.162),
+(20763, 9, 4229.79, 2295.09, 127.068),
+(20763, 10, 4250.86, 2293.49, 128.848),
+(20763, 11, 4271.72, 2290, 125.243),
+(20763, 12, 4277.21, 2276.97, 125.337),
+(20763, 13, 4269.13, 2262.97, 127.868),
+(20763, 14, 4262.07, 2250.73, 131.257),
+(20763, 15, 4253.95, 2236.66, 134.959),
+(20763, 16, 4249.61, 2220.86, 137.445),
+(20763, 17, 4251.74, 2186.12, 137.08),
+(20763, 18, 4252, 2172.27, 137.678);
+
+-- Captured Protectorate Vanguard SAI
+SET @ENTRY := 20763;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,1,19,0,100,0,10425,0,0,0,1,0,0,0,0,0,0,21,10,0,0,0,0,0,0,"Captured Protectorate Vanguard - On Quest 'Escape from the Staging Grounds' Taken - Say Line 0"),
+(@ENTRY,0,1,2,61,0,100,0,10425,0,0,0,53,0,20763,0,0,0,2,1,0,0,0,0,0,0,0,"Captured Protectorate Vanguard - On Quest 'Escape from the Staging Grounds' Taken - Start Waypoint"),
+(@ENTRY,0,2,14,61,0,100,0,10425,0,0,0,64,1,0,0,0,0,0,21,10,0,0,0,0,0,0,"Captured Protectorate Vanguard - On Quest 'Escape from the Staging Grounds' Taken - Store Targetlist"),
+(@ENTRY,0,7,0,40,0,100,0,16,20763,0,0,54,4000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Captured Protectorate Vanguard - On Waypoint 16 Reached - Pause Waypoint"),
+(@ENTRY,0,8,10,40,0,100,0,17,20763,0,0,15,10425,0,0,0,0,0,12,1,0,0,0,0,0,0,"Captured Protectorate Vanguard - On Waypoint 17 Reached - Quest Credit 'Escape from the Staging Grounds'"),
+(@ENTRY,0,9,0,6,0,100,0,0,0,0,0,6,10425,0,0,0,0,0,12,1,0,0,0,0,0,0,"Captured Protectorate Vanguard - On Just Died - Fail Quest 'Escape from the Staging Grounds'"),
+(@ENTRY,0,10,0,61,0,100,0,17,20763,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Captured Protectorate Vanguard - On Waypoint 17 Reached - Say Line 1"),
+(@ENTRY,0,11,12,40,0,100,0,18,20763,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Captured Protectorate Vanguard - On Waypoint 18 Reached - Say Line 2"),
+(@ENTRY,0,12,13,61,0,100,0,18,20763,0,0,11,35517,0,0,0,0,0,1,0,0,0,0,0,0,0,"Captured Protectorate Vanguard - On Waypoint 18 Reached - Cast 'Teleport'"),
+(@ENTRY,0,13,0,61,0,100,0,18,20763,0,0,41,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Captured Protectorate Vanguard - On Waypoint 18 Reached - Despawn In 3000 ms"),
+(@ENTRY,0,14,0,61,0,100,0,10425,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Captured Protectorate Vanguard - On Quest 'Escape from the Staging Grounds' Taken - Set Npc Flag "),
+(@ENTRY,0,15,0,11,0,100,0,0,0,0,0,81,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Captured Protectorate Vanguard - On Respawn - Set Npc Flag Questgiver");
+
+DELETE FROM `creature_text` WHERE `entry`=20763;
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextID`, `comment`) VALUES
+(20763, 0, 0, 'We''re not too far from the Protectorate Watch Post, $n. This way!', 12, 0, 100, 0, 0, 0, 18566, 'Captured Protectorate Vanguard to Player'),
+(20763, 1, 0, 'Commander! This fleshling rescued me!', 12, 0, 100, 0, 0, 0, 18567, 'Captured Protectorate Vanguard to Player'),
+(20763, 2, 0, '%s salutes Commander Ameer.', 16, 0, 100, 0, 0, 0, 18568, 'Captured Protectorate Vanguard to Player');
diff --git a/sql/updates/world/2015_05_24_07_world.sql b/sql/updates/world/2015_05_24_07_world.sql
new file mode 100644
index 00000000000..af7e82b8087
--- /dev/null
+++ b/sql/updates/world/2015_05_24_07_world.sql
@@ -0,0 +1,30 @@
+-- Dragonflayer Fanatic
+DELETE FROM `waypoints` WHERE `entry`=26553;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`) VALUES
+(26553,1,467.5089,-325.5417,104.0859),
+(26553,2,483.179,-325.046,104.0471);
+
+-- Dragonflayer Fanatic SAI
+SET @GUID := -126160;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=26553;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@GUID 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
+(@GUID,0,0,0,25,0,100,0,0,0,0,0,53,0,26553,1,0,0,0,1,0,0,0,0,0,0,0,"Dragonflayer Fanatic - On Reset - Start Waypoint"),
+(@GUID,0,1,0,40,0,100,0,1,26553,0,0,80,12616000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonflayer Fanatic - On Waypoint 1 Reached - Run Script"),
+(@GUID,0,2,0,40,0,100,0,2,26553,0,0,80,12616001,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonflayer Fanatic - On Waypoint 2 Reached - Run Script"),
+(@GUID,0,3,0,1,1,100,0,2000,2000,2000,2000,10,274,25,5,22,0,0,1,0,0,0,0,0,0,0,"Dragonflayer Fanatic - Out of Combat - Play Random Emote (274, 25, 5, 22)");
+
+-- Actionlist SAI
+SET @ENTRY := 12616000;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,35000,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Pause Waypoint"),
+(@ENTRY,9,1,0,0,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Set Event Phase 1"),
+(@ENTRY,9,2,0,0,0,100,0,35000,35000,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Set Event Phase 2");
+
+-- Actionlist SAI
+SET @ENTRY := 12616001;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,15000,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Pause Waypoint"),
+(@ENTRY,9,1,0,0,0,100,0,2000,2000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.986479,"On Script - Set Orientation 5,986479");
diff --git a/sql/updates/world/2015_05_24_08_world.sql b/sql/updates/world/2015_05_24_08_world.sql
new file mode 100644
index 00000000000..d8bc19aaffb
--- /dev/null
+++ b/sql/updates/world/2015_05_24_08_world.sql
@@ -0,0 +1,94 @@
+-- Complete UP Movement
+SET @NPC := 126159;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=408.6479,`position_y`=-247.8646,`position_z`=105.1593 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,408.6479,-247.8646,105.1593,0,0,0,0,100,0),
+(@PATH,2,413.1479,-247.3646,105.4093,0,0,0,0,100,0),
+(@PATH,3,417.3979,-247.1146,105.4093,0,0,0,0,100,0),
+(@PATH,4,421.3979,-246.8646,105.1593,0,0,0,0,100,0),
+(@PATH,5,424.6479,-246.8646,105.4093,0,0,0,0,100,0),
+(@PATH,6,431.6479,-246.3646,105.1593,0,0,0,0,100,0),
+(@PATH,7,437.3979,-245.8646,105.1593,0,0,0,0,100,0),
+(@PATH,8,439.8979,-245.6146,105.1593,0,6000,0,0,100,0),
+(@PATH,9,439.8979,-245.6146,105.1593,0,0,0,0,100,0),
+(@PATH,10,437.3979,-245.8646,105.1593,0,0,0,0,100,0),
+(@PATH,11,431.6479,-246.3646,105.1593,0,0,0,0,100,0),
+(@PATH,12,424.6479,-246.8646,105.4093,0,0,0,0,100,0),
+(@PATH,13,421.3979,-246.8646,105.1593,0,0,0,0,100,0),
+(@PATH,14,417.3979,-247.1146,105.4093,0,0,0,0,100,0),
+(@PATH,15,413.1479,-247.3646,105.4093,0,0,0,0,100,0),
+(@PATH,16,408.6479,-247.8646,105.1593,0,6000,0,0,100,0);
+
+SET @NPC := 126083;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=281.2139,`position_y`=-383.5794,`position_z`=90.28523 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH, 10, 273.909, -398.059, 90.1069, 0, 10, 0, 0, 100, 0),
+(@PATH, 9, 262.177, -400.701, 83.5446, 0, 10, 0, 0, 100, 0),
+(@PATH, 8, 248.65, -398.957, 75.1077, 0, 10, 0, 0, 100, 0),
+(@PATH, 7, 262.177, -400.701, 83.5446, 0, 10, 0, 0, 100, 0),
+(@PATH, 6, 273.909, -398.059, 90.1069, 0, 10, 0, 0, 100, 0),
+(@PATH, 5, 281.51, -396.934, 89.9561, 0, 10, 0, 0, 100, 0),
+(@PATH, 4, 281.066, -384.517, 90.0477, 0, 10, 0, 0, 100, 0),
+(@PATH, 3, 263.144, -381.767, 96.7176, 0, 10, 0, 0, 100, 0),
+(@PATH, 2, 248.789, -383.987, 104.753, 0, 10, 0, 0, 100, 0),
+(@PATH, 1, 263.144, -381.767, 96.7176, 0, 10, 0, 0, 100, 0);
+
+UPDATE `smart_scripts` SET `action_param1`=1 WHERE `entryorguid`=26670 AND `source_type`=0 AND `id`=0 AND `link`=1;
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=126083;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES
+(126083, 126087, 3, 270, 2, 0, 0),
+(126083, 126088, 3, 90, 2, 0, 0),
+(126083, 126083, 0, 0, 2, 0, 0);
+
+
+SET @NPC := 126086;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH, 8, 238.128, -450.66, 104.736, 0, 10, 0, 0, 100, 0),
+(@PATH, 7, 236.583, -435.635, 104.736, 0, 10, 0, 0, 100, 0),
+(@PATH, 6, 236.444, -449.692, 104.736, 0, 10, 0, 0, 100, 0),
+(@PATH, 5, 238.128, -450.66, 104.736, 0, 10, 0, 0, 100, 0),
+(@PATH, 4, 309.006, -451.589, 104.718, 0, 10, 0, 0, 100, 0),
+(@PATH, 3, 310.79, -451.589, 104.718, 0, 10, 0, 0, 100, 0),
+(@PATH, 2, 310.682, -467.433, 104.718, 0, 10, 0, 0, 100, 0),
+(@PATH, 1, 310.79, -451.589, 104.718, 0, 10, 0, 0, 100, 0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=126086;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES
+(126086, 126078, 5, 180, 2, 0, 0),
+(126086, 126081, 5, 90, 2, 0, 0),
+(126086, 126082, 5, 270, 2, 0, 0),
+(126086, 126086, 0, 0, 2, 0, 0);
+
+SET @NPC := 126111;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH, 7, 368.053, -432.959, 75.1209, 0, 10, 0, 0, 100, 0),
+(@PATH, 6, 402.875, -428.319, 75.1263, 0, 10, 0, 0, 100, 0),
+(@PATH, 5, 407.49, -441.521, 75.0988, 0, 10, 0, 0, 100, 0),
+(@PATH, 4, 429.311, -447.42, 75.1166, 0, 10, 0, 0, 100, 0),
+(@PATH, 3, 428.506, -467.335, 75.1153, 0, 10, 0, 0, 100, 0),
+(@PATH, 2, 400.957, -455.234, 75.1132, 0, 10, 0, 0, 100, 0),
+(@PATH, 1, 372.02, -450.569, 75.1308, 0, 10, 0, 0, 100, 0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=126111;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES
+(126111, 126110, 3, 280, 2, 0, 0),
+(126111, 126111, 0, 0, 2, 0, 0);
diff --git a/sql/updates/world/2015_05_25_00_world.sql b/sql/updates/world/2015_05_25_00_world.sql
new file mode 100644
index 00000000000..4b1cc48da5a
--- /dev/null
+++ b/sql/updates/world/2015_05_25_00_world.sql
@@ -0,0 +1,6 @@
+--
+-- Forsaken Crossbowman SAI
+SET @ENTRY := 23883;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0 AND `id`=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,1,0,100,0,0,2000,2000,3000,11,61512,0,0,0,0,0,19,23803,200,0,0,0,0,0,"Forsaken Crossbowman - Out of Combat - Cast 'Shoot'");
diff --git a/sql/updates/world/2015_05_26_00_world.sql b/sql/updates/world/2015_05_26_00_world.sql
new file mode 100644
index 00000000000..cc1a6810764
--- /dev/null
+++ b/sql/updates/world/2015_05_26_00_world.sql
@@ -0,0 +1,7 @@
+--
+UPDATE `creature_template` SET `npcflag`=3, `gossip_menu_id`=5032 WHERE `entry`=241;
+DELETE FROM `gossip_menu` WHERE `entry`=5032;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (5032, 6158);
+DELETE FROM `npc_text` WHERE `ID`=6158;
+INSERT INTO `npc_text` (`ID`, `text0_0`, `text0_1`, `BroadcastTextID0`, `lang0`, `prob0`, `em0_0`, `em0_1`) VALUES
+(6158, 'Hey there, friend. My name''s Remy. I''m from Redridge to the east, and came here looking for business, looking for business. You got any...got any??', 'Hey there, friend. My name''s Remy. I''m from Redridge to the east, and came here looking for business, looking for business. You got any...got any??', 0, 0, 1, 0, 0);
diff --git a/sql/updates/world/2015_05_26_01_world.sql b/sql/updates/world/2015_05_26_01_world.sql
new file mode 100644
index 00000000000..b1dd41196a6
--- /dev/null
+++ b/sql/updates/world/2015_05_26_01_world.sql
@@ -0,0 +1,40 @@
+--
+DELETE FROM `creature_formations` WHERE `leaderGUID`=26233;
+INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`)VALUES
+(26233,26233,0,0,2),(26233,26192,15,0,2),(26233,26194,15,90,2),(26233,26193,9,0,2),(26233,26195,9,90,2);
+UPDATE `creature` SET `MovementType`=2 WHERE `guid` IN (26233);
+UPDATE `creature_addon` SET `path_id`=262330 WHERE `guid` IN (26233);
+DELETE FROM `creature_addon` WHERE `guid` IN (26233);
+INSERT INTO `creature_addon` (`guid`, `path_id`) VALUES (26233, 262330);
+DELETE FROM `waypoint_data` WHERE `id` IN (262330);
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(262330, 1,-1317.949951, -926.414978, 1.9346, 0, 0, 0, 0, 100, 0),
+(262330, 2,-1244.693726, -980.329773, -4.920392, 0, 0, 0, 0, 100, 0),
+(262330, 3,-1193.669312, -948.340393, -3.643325, 0, 0, 0, 0, 100, 0),
+(262330, 4,-1182.622681, -859.417419, -11.058956, 0, 0, 0, 0, 100, 0),
+(262330, 5,-1183.541138, -796.475952, -36.551662, 0, 0, 0, 0, 100, 0),
+(262330, 6,-1182.812988, -740.116638, -52.754967, 0, 0, 0, 0, 100, 0),
+(262330, 7,-1200.200806, -605.367249, -57.754887, 0, 0, 0, 0, 100, 0),
+(262330, 8,-1242.377563, -494.067078, -57.610630, 0, 0, 0, 0, 100, 0),
+(262330, 9,-1468.878052, -522.602173, -55.496475, 0, 0, 0, 0, 100, 0),
+(262330, 10,-1551.133789, -656.098145, -50.817574, 0, 0, 0, 0, 100, 0),
+(262330, 11,-1394.677490, -802.561279, -21.880009, 0, 0, 0, 0, 100, 0),
+(262330, 12,-1317.949951, -926.414978, 1.9346, 0, 0, 0, 0, 100, 0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=26213;
+INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`)VALUES
+(26213,26213,0,0,2),(26213,26185,15,0,2),(26213,26207,15,90,2),(26213,26186,9,0,2),(26213,26187,9,90,2);
+UPDATE `creature` SET `MovementType`=2 WHERE `guid` IN (26213);
+UPDATE `creature_addon` SET `path_id`=262130 WHERE `guid` IN (26213);
+DELETE FROM `creature_addon` WHERE `guid` IN (26213);
+INSERT INTO `creature_addon` (`guid`, `path_id`) VALUES (26213, 262130);
+DELETE FROM `waypoint_data` WHERE `id` IN (262130);
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(262130, 1,-2545.065918, 21.190157, 11.805480, 0, 0, 0, 0, 100, 0),
+(262130, 2,-2487.883789, 100.192146, 33.786736, 0, 0, 0, 0, 100, 0),
+(262130, 3,-2420.558350, 88.399445, 38.040539, 0, 0, 0, 0, 100, 0),
+(262130, 4,-2318.995361, 115.247169, 50.718586, 0, 0, 0, 0, 100, 0),
+(262130, 5,-2284.748779, 27.045509, 22.492968, 0, 0, 0, 0, 100, 0),
+(262130, 6,-2349.130615, -61.506725, -8.763674, 0, 0, 0, 0, 100, 0);
+
+UPDATE `creature` SET `MovementType`=1, `spawndist`=15 WHERE `guid` IN (26214, 26231, 26189, 26188, 26196, 26184, 26210, 26209, 26211, 26232, 26190, 26191, 26212);
diff --git a/sql/updates/world/2015_05_26_02_world.sql b/sql/updates/world/2015_05_26_02_world.sql
new file mode 100644
index 00000000000..d56e45a1514
--- /dev/null
+++ b/sql/updates/world/2015_05_26_02_world.sql
@@ -0,0 +1,8 @@
+--
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (12479, 12480, -12480) AND `spell_effect` IN (12480, 530, -530);
+INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
+(12479, 12480, 0, 'Hex of Jammal''an'),
+(12480, 530, 0, 'Hex of Jammal''an'),
+(-12480, -530, 0, 'Hex of Jammal''an');
+
+UPDATE `smart_scripts` SET `event_type`=0, `Comment`= "Jammal'an the Prophet - In combat - Cast 'Hex of Jammal'an' (Phase 1)" WHERE `entryorguid`=5710 AND `source_Type`=0 AND `id`=5;
diff --git a/sql/updates/world/2015_05_26_03_world.sql b/sql/updates/world/2015_05_26_03_world.sql
new file mode 100644
index 00000000000..30b5103caa8
--- /dev/null
+++ b/sql/updates/world/2015_05_26_03_world.sql
@@ -0,0 +1,3 @@
+--
+DELETE FROM `spell_group` WHERE `id`=1001 AND `spell_id` IN (45694, 20875, 25804, 25722, 25037);
+INSERT INTO `spell_group` (`id`, `spell_id`) VALUES (1001, 45694), (1001, 20875), (1001, 25804), (1001, 25722), (1001, 25037);
diff --git a/sql/updates/world/2015_05_26_04_world.sql b/sql/updates/world/2015_05_26_04_world.sql
new file mode 100644
index 00000000000..39728f515ee
--- /dev/null
+++ b/sql/updates/world/2015_05_26_04_world.sql
@@ -0,0 +1,6 @@
+--
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (20748);
+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
+(20748,0,0,0,25,0,100,0,0,0,0,0,11,37691,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Thunderlord Dire Wolf - On Reset - Cast Stealth Detection'),
+(20748,0,1,0,0,0,100,0,4000,6000,10000,11000,11,5781,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Thunderlord Dire Wolf - IC - Cast Threatening Growl'),
+(20748,0,2,0,8,0,100,0,32578,0,120000,120000,33,21142,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Thunderlord Dire Wolf - on spell hit - Credit quest');
diff --git a/sql/updates/world/2015_05_26_05_world.sql b/sql/updates/world/2015_05_26_05_world.sql
new file mode 100644
index 00000000000..d7ef0e17204
--- /dev/null
+++ b/sql/updates/world/2015_05_26_05_world.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `spell_id` = 39291;
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(39291, 'spell_remove_kargath_executioner');
diff --git a/sql/updates/world/2015_05_26_06_world.sql b/sql/updates/world/2015_05_26_06_world.sql
new file mode 100644
index 00000000000..09010f2475b
--- /dev/null
+++ b/sql/updates/world/2015_05_26_06_world.sql
@@ -0,0 +1,281 @@
+-- Stranglethorn - Missing Scripts
+-- Gorlash SAI
+SET @ENTRY := 1492;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,3000,4000,5000,6000,11,5568,2,0,0,0,0,2,0,0,0,0,0,0,0,"Gorlash - In Combat - Cast 'Trample'");
+
+-- Silverback Patriarch SAI
+SET @ENTRY := 1558;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,4000,6000,7000,8000,11,6253,2,0,0,0,0,2,0,0,0,0,0,0,0,"Silverback Patriarch - In Combat - Cast 'Backhand'");
+
+-- Zanzil Witch Doctor SAI
+SET @ENTRY := 1490;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,3000,4000,5000,6000,11,9613,64,0,0,0,0,2,0,0,0,0,0,0,0,"Zanzil Witch Doctor - In Combat CMC - Cast 'Shadow Bolt'");
+
+-- Zanzil Zombie SAI
+SET @ENTRY := 1488;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,1,2000,3000,0,0,11,7102,2,0,0,0,0,2,0,0,0,0,0,0,0,"Zanzil Zombie - In Combat - Cast 'Contagion of Rot' (No Repeat)");
+
+-- Zanzil the Outcast SAI
+SET @ENTRY := 2534;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,1,0,0,0,0,11,8832,2,0,0,0,0,1,0,0,0,0,0,0,0,"Zanzil the Outcast - In Combat - Cast 'Ward of Zanzil' (No Repeat)"),
+(@ENTRY,0,1,0,0,0,100,0,3000,4000,5000,6000,11,9532,64,0,0,0,0,2,0,0,0,0,0,0,0,"Zanzil the Outcast - In Combat CMC - Cast 'Lightning Bolt'");
+
+-- Bloodscalp Axe Thrower SAI
+SET @ENTRY := 694;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,5,30,3500,4900,11,10277,64,0,0,0,0,2,0,0,0,0,0,0,0,"Bloodscalp Axe Thrower - In Combat CMC - Cast 'Throw'"),
+(@ENTRY,0,1,2,2,0,100,1,0,30,0,0,11,8599,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bloodscalp Axe Thrower - Between 0-30% Health - Cast 'Enrage' (No Repeat)"),
+(@ENTRY,0,2,0,61,0,100,0,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bloodscalp Axe Thrower - Between 0-30% Health - Say Line 0 (No Repeat)"),
+(@ENTRY,0,3,0,2,0,100,1,0,15,0,0,25,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bloodscalp Axe Thrower - Between 0-15% Health - Flee For Assist (No Repeat)");
+
+-- Texts for Bloodscalp Axe Thrower
+SET @ENTRY := 694;
+DELETE FROM `creature_text` WHERE `entry`=@ENTRY;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`, `BroadcastTextId`) VALUES
+(@ENTRY,0,0,"%s becomes enraged!",16,0,100,0,0,0,"Bloodscalp Axe Thrower",10677);
+
+-- Zanzil Hunter SAI
+SET @ENTRY := 1489;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,4,0,100,0,0,0,0,0,11,10277,0,0,0,0,0,2,0,0,0,0,0,0,0,"Zanzil Hunter - On Aggro - Cast 'Throw'"),
+(@ENTRY,0,1,0,2,0,100,1,0,15,0,0,25,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Zanzil Hunter - Between 0-15% Health - Flee For Assist (No Repeat)");
+
+-- Zanzil Naga SAI
+SET @ENTRY := 1491;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,3000,6000,7000,8000,11,9080,2,0,0,0,0,2,0,0,0,0,0,0,0,"Zanzil Naga - In Combat - Cast 'Hamstring'"),
+(@ENTRY,0,1,0,0,0,100,0,4000,5000,10000,11000,11,12555,2,0,0,0,0,2,0,0,0,0,0,0,0,"Zanzil Naga - In Combat - Cast 'Pummel'");
+
+-- Venture Co. Tinkerer SAI
+SET @ENTRY := 677;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,54,0,100,0,1000,2000,0,0,11,12544,2,0,0,0,0,1,0,0,0,0,0,0,0,"Venture Co. Tinkerer - On Just Summoned - Cast 'Frost Armor'"),
+(@ENTRY,0,1,0,0,0,100,0,3000,4000,5000,6000,11,20823,64,0,0,0,0,2,0,0,0,0,0,0,0,"Venture Co. Tinkerer - In Combat CMC - Cast 'Fireball'");
+
+-- Venture Co. Strip Miner SAI
+SET @ENTRY := 674;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,2000,6000,12000,15000,11,7978,64,0,0,0,0,2,0,0,0,0,0,0,0,"Venture Co. Strip Miner - In Combat CMC - Cast 'Throw Dynamite'");
+
+-- Skullsplitter Warrior SAI
+SET @ENTRY := 667;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,2000,3000,15000,20000,11,3148,2,0,0,0,0,2,0,0,0,0,0,0,0,"Skullsplitter Warrior - In Combat - Cast 'Head Crack'"),
+(@ENTRY,0,1,0,0,0,100,0,4000,5000,11000,12000,11,11972,2,0,0,0,0,2,0,0,0,0,0,0,0,"Skullsplitter Warrior - In Combat - Cast 'Shield Bash'");
+
+-- Skullsplitter Witch Doctor SAI
+SET @ENTRY := 670;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,1000,2000,10000,11000,11,8376,0,0,0,0,0,1,0,0,0,0,0,0,0,"Skullsplitter Witch Doctor - In Combat - Cast 'Earthgrab Totem'"),
+(@ENTRY,0,1,0,0,0,100,0,5000,6000,20000,30000,11,5605,0,0,0,0,0,1,0,0,0,0,0,0,0,"Skullsplitter Witch Doctor - In Combat - Cast 'Healing Ward'");
+
+-- Skullsplitter Scout SAI
+SET @ENTRY := 782;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,4000,5000,18000,20000,11,3148,2,0,0,0,0,2,0,0,0,0,0,0,0,"Skullsplitter Scout - In Combat - Cast 'Head Crack'");
+
+-- Skullsplitter Spiritchaser SAI
+SET @ENTRY := 672;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,2,0,100,0,0,40,10000,11000,11,11986,0,0,0,0,0,1,0,0,0,0,0,0,0,"Skullsplitter Spiritchaser - Between 0-40% Health - Cast 'Healing Wave'"),
+(@ENTRY,0,1,0,0,0,100,0,3000,4000,5000,6000,11,9532,64,0,0,0,0,2,0,0,0,0,0,0,0,"Skullsplitter Spiritchaser - In Combat CMC - Cast 'Lightning Bolt'"),
+(@ENTRY,0,2,0,0,0,100,1,6000,7000,0,0,11,11981,0,0,0,0,0,2,0,0,0,0,0,0,0,"Skullsplitter Spiritchaser - In Combat - Cast 'Mana Burn' (No Repeat)");
+
+-- Ana'thek the Cruel SAI
+SET @ENTRY := 1059;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,3000,6000,18000,20000,11,9791,2,0,0,0,0,2,0,0,0,0,0,0,0,"Ana'thek the Cruel - In Combat - Cast 'Head Crack'");
+
+-- Mosh'Ogg Spellcrafter SAI
+SET @ENTRY := 710;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,54,0,100,1,0,0,0,0,11,12544,64,0,0,0,0,1,0,0,0,0,0,0,0,"Mosh'Ogg Spellcrafter - On Just Summoned - Cast 'Frost Armor' (No Repeat)"),
+(@ENTRY,0,1,0,0,0,100,0,3000,4000,5000,6000,11,9053,64,0,0,0,0,2,0,0,0,0,0,0,0,"Mosh'Ogg Spellcrafter - In Combat CMC - Cast 'Fireball'"),
+(@ENTRY,0,2,0,0,0,100,0,6000,7000,6000,7000,11,11829,0,0,0,0,0,2,0,0,0,0,0,0,0,"Mosh'Ogg Spellcrafter - In Combat - Cast 'Flamestrike'");
+
+-- Mosh'Ogg Warmonger SAI
+SET @ENTRY := 709;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,75,0,2000,3000,10000,11000,11,8147,2,0,0,0,0,1,0,0,0,0,0,0,0,"Mosh'Ogg Warmonger - In Combat - Cast 'Thunderclap'");
+
+-- Mosh'Ogg Lord SAI
+SET @ENTRY := 680;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,3000,4000,30000,40000,11,9128,2,0,0,0,0,1,0,0,0,0,0,0,0,"Mosh'Ogg Lord - In Combat - Cast 'Battle Shout'");
+
+-- Mosh'Ogg Mauler SAI
+SET @ENTRY := 678;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,50,0,4000,6000,11000,12000,11,5164,2,0,0,0,0,2,0,0,0,0,0,0,0,"Mosh'Ogg Mauler - In Combat - Cast 'Knockdown'");
+
+-- Mai'Zoth SAI
+SET @ENTRY := 818;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,2000,5000,5000,6000,11,8398,64,0,0,0,0,2,0,0,0,0,0,0,0,"Mai'Zoth - In Combat CMC - Cast 'Frostbolt Volley'"),
+(@ENTRY,0,1,0,0,0,100,0,3000,6000,8000,9000,11,8814,0,0,0,0,0,2,0,0,0,0,0,0,0,"Mai'Zoth - In Combat - Cast 'Flame Spike'");
+
+-- Young Panther SAI
+SET @ENTRY := 683;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,2000,5000,5000,6000,11,16830,2,0,0,0,0,2,0,0,0,0,0,0,0,"Young Panther - In Combat - Cast 'Claw'");
+
+-- Bloodscalp Witch Doctor SAI
+SET @ENTRY := 660;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,1,2000,3000,0,0,11,8376,64,0,0,0,0,1,0,0,0,0,0,0,0,"Bloodscalp Witch Doctor - In Combat - Cast 'Earthgrab Totem' (No Repeat)"),
+(@ENTRY,0,1,0,2,0,100,1,0,30,0,0,11,8599,2,0,0,0,0,1,0,0,0,0,0,0,0,"Bloodscalp Witch Doctor - Between 0-30% Health - Cast 'Enrage' (No Repeat)");
+
+-- Bloodscalp Beastmaster SAI
+SET @ENTRY := 699;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,4,0,100,0,0,0,0,0,11,10277,0,0,0,0,0,2,0,0,0,0,0,0,0,"Bloodscalp Beastmaster - On Aggro - Cast 'Throw'"),
+(@ENTRY,0,1,2,2,0,100,1,0,30,0,0,11,8599,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bloodscalp Beastmaster - Between 0-30% Health - Cast 'Enrage' (No Repeat)"),
+(@ENTRY,0,2,0,61,0,100,0,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bloodscalp Beastmaster - Between 0-30% Health - Say Line 0 (No Repeat)"),
+(@ENTRY,0,3,0,2,0,100,1,0,15,0,0,25,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bloodscalp Beastmaster - Between 0-15% Health - Flee For Assist (No Repeat)");
+
+-- Texts for Bloodscalp Axe Thrower
+SET @ENTRY := 699;
+DELETE FROM `creature_text` WHERE `entry`=@ENTRY;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`, `BroadcastTextId`) VALUES
+(@ENTRY,0,0,"%s becomes enraged!",16,0,100,0,0,0,"Bloodscalp Beastmaster",10677);
+
+-- Bloodscalp Headhunter SAI
+SET @ENTRY := 671;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,4,0,100,0,0,0,0,0,11,10277,0,0,0,0,0,2,0,0,0,0,0,0,0,"Bloodscalp Headhunter - On Aggro - Cast 'Throw'"),
+(@ENTRY,0,1,2,2,0,100,1,0,30,0,0,11,8599,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bloodscalp Headhunter - Between 0-30% Health - Cast 'Enrage' (No Repeat)"),
+(@ENTRY,0,2,0,61,0,100,0,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bloodscalp Headhunter - Between 0-30% Health - Say Line 0 (No Repeat)"),
+(@ENTRY,0,3,0,2,0,100,1,0,15,0,0,25,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bloodscalp Headhunter - Between 0-15% Health - Flee For Assist (No Repeat)");
+
+-- Texts for Bloodscalp Headhunter
+SET @ENTRY := 671;
+DELETE FROM `creature_text` WHERE `entry`=@ENTRY;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`, `BroadcastTextId`) VALUES
+(@ENTRY,0,0,"%s becomes enraged!",16,0,100,0,0,0,"Bloodscalp Headhunter",10677);
+
+-- Bloodscalp Tiger SAI
+SET @ENTRY := 698;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,2,0,50,1,0,30,0,0,11,8599,2,0,0,0,0,1,0,0,0,0,0,0,0,"Bloodscalp Tiger - Between 0-30% Health - Cast 'Enrage' (No Repeat)");
+
+-- Nezzliok the Dire SAI
+SET @ENTRY := 1062;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,2000,4000,5000,6000,11,421,64,0,0,0,0,2,0,0,0,0,0,0,0,"Nezzliok the Dire - In Combat CMC - Cast 'Chain Lightning'"),
+(@ENTRY,0,1,0,0,0,100,0,6000,7000,6000,7000,11,2610,0,0,0,0,0,2,0,0,0,0,0,0,0,"Nezzliok the Dire - In Combat - Cast 'Shock'");
+
+-- Gan'zulah SAI
+SET @ENTRY := 1061;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,2,0,100,1,0,30,0,0,11,8599,2,0,0,0,0,1,0,0,0,0,0,0,0,"Gan'zulah - Between 0-30% Health - Cast 'Enrage' (No Repeat)");
+
+-- Bloodscalp Scout SAI
+SET @ENTRY := 588;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,2,0,50,1,0,30,0,0,11,8599,2,0,0,0,0,1,0,0,0,0,0,0,0,"Bloodscalp Scout - Between 0-30% Health - Cast 'Enrage' (No Repeat)");
+
+-- Panther SAI
+SET @ENTRY := 736;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,3000,4000,4000,5000,11,16831,2,0,0,0,0,2,0,0,0,0,0,0,0,"Panther - In Combat - Cast 'Claw'");
+
+-- Mosh'Ogg Witch Doctor SAI
+SET @ENTRY := 1144;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,1000,4000,20000,30000,11,11980,2,0,0,0,0,2,0,0,0,0,0,0,0,"Mosh'Ogg Witch Doctor - In Combat - Cast 'Curse of Weakness'"),
+(@ENTRY,0,1,0,0,0,100,1,4000,6000,0,0,11,3827,2,0,0,0,0,1,0,0,0,0,0,0,0,"Mosh'Ogg Witch Doctor - In Combat - Cast 'Ward of Laze' (No Repeat)");
+
+-- Roloch SAI
+SET @ENTRY := 14488;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,2000,4000,5000,6000,11,15496,2,0,0,0,0,2,0,0,0,0,0,0,0,"Roloch - In Combat - Cast 'Cleave'");
+
+-- Bloodscalp Scavenger SAI
+SET @ENTRY := 702;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,2000,4000,6000,7000,11,37685,0,0,0,0,0,2,0,0,0,0,0,0,0,"Bloodscalp Scavenger - In Combat - Cast 'Backstab'"),
+(@ENTRY,0,1,0,0,0,50,0,1000,2000,20000,30000,11,744,2,0,0,0,0,2,0,0,0,0,0,0,0,"Bloodscalp Scavenger - In Combat - Cast 'Poison'"),
+(@ENTRY,0,2,0,2,0,100,0,0,30,0,0,11,8599,2,0,0,0,0,1,0,0,0,0,0,0,0,"Bloodscalp Scavenger - Between 0-30% Health - Cast 'Enrage'");
+
+-- Tethis SAI
+SET @ENTRY := 730;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,3000,4000,10000,10000,11,3604,2,0,0,0,0,2,0,0,0,0,0,0,0,"Tethis - In Combat - Cast 'Tendon Rip'");
+
+-- Sin'Dall SAI
+SET @ENTRY := 729;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,0,100,0,3000,4000,10000,10000,11,5164,2,0,0,0,0,2,0,0,0,0,0,0,0,"Sin'Dall - In Combat - Cast 'Knockdown'");
diff --git a/sql/updates/world/2015_05_27_00_world.sql b/sql/updates/world/2015_05_27_00_world.sql
new file mode 100644
index 00000000000..8f0f712ea27
--- /dev/null
+++ b/sql/updates/world/2015_05_27_00_world.sql
@@ -0,0 +1,343 @@
+-- Horde Honor the Flame Quests
+DELETE FROM `creature_queststarter` WHERE `quest` IN (11821,11836,11856,11838,11843);
+DELETE FROM `creature_questender` WHERE `quest` IN (11847,11849,11854);
+INSERT INTO `creature_questender` (`id`, `quest`) VALUES
+(25932, 11849), -- Feralas
+(25930, 11847), -- Dustwallow marsh
+(25937, 11854); -- Nagrand
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Durotar flame!' WHERE `Id`=11846;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Mulgore flame!' WHERE `Id`=11852;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Barrens flame!' WHERE `Id`=11859;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Tanaris flame!' WHERE `Id`=11838;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Ashenvale flame!' WHERE `Id`=11841;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Winterspring flame!' WHERE `Id`=11839;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Desolace flame!' WHERE `Id`=11845;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Thousand Needles flame!' WHERE `Id`=11861;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Feralas flame!' WHERE `Id`=11849;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Dustwallow Marsh flame!' WHERE `Id`=11847;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Silithus flame!' WHERE `Id`=11836;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Stonetalon Mountains flame!' WHERE `Id`=11856;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Hellfire Peninsula flame!' WHERE `Id`=11851;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Shadowmoon Valley flame!' WHERE `Id`=11855;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Nagrand flame!' WHERE `Id`=11854;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Netherstorm flame!' WHERE `Id`=11835;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Blades Edge Mountains flame! ' WHERE `Id`=11843;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Terokkar flame!' WHERE `Id`=11858;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Zangarmarsh flame!' WHERE `Id`=11863;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Zul''Drak flame!' WHERE `Id`=13500;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Borean Tundra flame!' WHERE `Id`=13493;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Sholazar Basin flame!' WHERE `Id`=13494;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Dragonblight flame!' WHERE `Id`=13495;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Crystalsong Forest flame!' WHERE `Id`=13499;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Storm Peaks flame!' WHERE `Id`=13498;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Grizzly Hills flame!' WHERE `Id`=13497;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Howling Fjords flame!' WHERE `Id`=13496;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Ghostland flame!' WHERE `Id`=11850;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Eversong woods flame!' WHERE `Id`=11848;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Hillsbrad Foothills flame!' WHERE `Id`=11853;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Swamp of sorrows flame!' WHERE `Id`=11857;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Cape of Stranglethorn flame!' WHERE `Id`=11837;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Burning Steppes flame!' WHERE `Id`=11844;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Hinterlands flame!' WHERE `Id`=11860;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Silverpine Forest flame!' WHERE `Id`=11584;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Tirisfal Glades flame!' WHERE `Id`=11862;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Badlands flame!' WHERE `Id`=11842;
+UPDATE `quest_template` SET `RequiredRaces`=690,`OfferRewardText`='Honor the Arathi Highlands flame!' WHERE `Id`=11840;
+UPDATE `creature_template` SET `npcflag`=3, `unit_flags`=33356 WHERE `entry`=32816;
+UPDATE `creature_template` SET `npcflag`=3, `unit_flags`=33536 WHERE `entry`=32813;
+UPDATE `creature_template` SET `npcflag`=3, `unit_flags`=33536 WHERE `entry`=32812;
+UPDATE `creature_template` SET `npcflag`=3, `unit_flags`=33536 WHERE `entry`=32811;
+UPDATE `creature_template` SET `npcflag`=3, `unit_flags`=33536 WHERE `entry`=25946;
+UPDATE `creature_template` SET `npcflag`=3, `unit_flags`=33536 WHERE `entry`=25938;
+UPDATE `creature_template` SET `npcflag`=3, `unit_flags`=33536 WHERE `entry`=25936;
+UPDATE `creature_template` SET `npcflag`=3, `unit_flags`=33536 WHERE `entry`=25933;
+UPDATE `creature_template` SET `npcflag`=3, `unit_flags`=33536 WHERE `entry`=25931;
+UPDATE `creature_template` SET `npcflag`=3, `unit_flags`=33536 WHERE `entry`=25929;
+UPDATE `creature_template` SET `npcflag`=3, `unit_flags`=33536 WHERE `entry`=25926;
+UPDATE `creature_template` SET `npcflag`=3, `unit_flags`=33536 WHERE `entry`=25918;
+-- Alliance Honor the Flame Quests
+DELETE FROM `creature_questender` WHERE `quest` IN (11805,11812,11815,11834,11833,11831,11817,11811,11806,11809,11826,11824,11826,11827,11819,11583,11828,11816,11810,11808,11804,11832,11813,11814,11820,11822,13485,13487,13489,13488,13492,13490,13486,13491,11823,11821,11830,11818,11825,11807,11829);
+INSERT INTO `creature_questender` (`id`, `quest`) VALUES
+(25883, 11805), -- Ashenvale
+(25894, 11812), -- Desolace
+(25897, 11815), -- Dustwallow Marsh
+(25917, 11834), -- Winterspring
+(25916, 11833), -- Tanaris
+(25914, 11831), -- Silithus
+(25899, 11817), -- Feralas
+(25893, 11811), -- Darkshore
+(25888, 11806), -- Azuremyst Isle
+(25891, 11809), -- Bloodmyst Isle
+(25906, 11824), -- Teldrassil
+(25908, 11826), -- The Hinterlands
+(25909, 11827), -- The Western Plaguelands
+(25901, 11819), -- Hillsbrad Foothills
+(25910, 11583), -- Westfall
+(25911, 11828), -- Wetlands
+(25898, 11816), -- Elwynn Forest
+(25892, 11810), -- Burning Steppes
+(25890, 11808), -- Blasted Lands
+(25887, 11804), -- Arathi Highlands
+(25915, 11832), -- Cape of Stranglethorn
+(25895, 11813), -- Dun Morogh
+(25896, 11814), -- Duskwood
+(25902, 11820), -- Loch Modan
+(25904, 11822), -- Redridge Mountains
+(32801, 13485), -- Borean Tundra
+(32803, 13487), -- Dragonblight
+(32805, 13489), -- Grizzly Hills
+(32804, 13488), -- Howling Fjord
+(32808, 13492), -- Zul'Drak
+(32806, 13490), -- The Storm Peaks
+(32802, 13486), -- Sholazar Basin
+(32807, 13491), -- Crystalsong Forest
+(25905, 11823), -- Shadowmoon Valley
+(25903, 11821), -- Nagrand
+(25913, 11830), -- Netherstorm
+(25900, 11818), -- Hellfire Peninsula
+(25907, 11825), -- Terokkar
+(25889, 11807), -- Blade's Edge
+(25912, 11829); -- Zangarmarsh
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Ashenvale flame!' WHERE `Id`=11805;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Desolace flame!' WHERE `Id`=11812;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Dustwallow Marsh flame!' WHERE `Id`=11815;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Winterspring flame!' WHERE `Id`=11834;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Tanaris flame!' WHERE `Id`=11833;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Silithus flame!' WHERE `Id`=11831;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Feralas flame!' WHERE `Id`=11817;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Darkshore flame!' WHERE `Id`=11811;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Azuremyst Isle flame!' WHERE `Id`=11806;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Bloodmyst Isle flame!' WHERE `Id`=11809;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Teldrassil flame!' WHERE `Id`=11824;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Hinterlands flame!' WHERE `Id`=11826;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Western Plaguelands flame!' WHERE `Id`=11827;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Hillsbrad Foothills flame!' WHERE `Id`=11819;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Westfall flame!' WHERE `Id`=11583;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Wetlands flame!' WHERE `Id`=11828;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Elwynn Forest flame!' WHERE `Id`=11816;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Burning Steppes flame!' WHERE `Id`=11810;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Blasted Lands flame!' WHERE `Id`=11808;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Arathi Highlands flame!' WHERE `Id`=11804;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Cape of Stranglethorn flame!' WHERE `Id`=11832;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Dun Morogh flame!' WHERE `Id`=11813;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Duskwood flame!' WHERE `Id`=11814;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Loch Modan flame!' WHERE `Id`=11820;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Redridge Mountains flame!' WHERE `Id`=11822;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Borean Tundra flame!' WHERE `Id`=13485;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Dragonblight flame!' WHERE `Id`=13487;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Grizzly Hills flame!' WHERE `Id`=13489;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Howling Fjord flame!' WHERE `Id`=13488;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Zul''Drak flame!' WHERE `Id`=13492;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Storm Peaks flame!' WHERE `Id`=13490;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Sholazar Basin flame!' WHERE `Id`=13486;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Crystalsong Forest flame!' WHERE `Id`=13491;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Shadowmoon Valley flame!' WHERE `Id`=11823;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Nagrand flame!' WHERE `Id`=11821;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Netherstorm flame!' WHERE `Id`=11830;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Hellfire Peninsula flame!' WHERE `Id`=11818;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Terokkar flame!' WHERE `Id`=11825;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Blade''s Edge Mountains flame!' WHERE `Id`=11807;
+UPDATE `quest_template` SET `RequiredRaces`=1101,`OfferRewardText`='Honor the Zangarmarsh flame!' WHERE `Id`=11829;
+UPDATE `creature_template` SET `gossip_menu_id`=9203, `npcflag`=3, `unit_flags`=33536 WHERE `entry`=32803;
+UPDATE `creature_template` SET `gossip_menu_id`=9203, `npcflag`=3, `unit_flags`=33536 WHERE `entry`=32804;
+UPDATE `creature_template` SET `gossip_menu_id`=9203, `npcflag`=3, `unit_flags`=33536 WHERE `entry`=32805;
+UPDATE `creature_template` SET `npcflag`=3, `unit_flags`=33536 WHERE `entry`=25888;
+UPDATE `creature_template` SET `npcflag`=3, `unit_flags`=33536 WHERE `entry`=25891;
+UPDATE `creature_template` SET `npcflag`=3, `unit_flags`=33536 WHERE `entry`=25892;
+UPDATE `creature_template` SET `npcflag`=3, `unit_flags`=33536 WHERE `entry`=25903;
+UPDATE `creature_template` SET `npcflag`=3, `unit_flags`=33536 WHERE `entry`=25905;
+UPDATE `creature_template` SET `npcflag`=3, `unit_flags`=33536 WHERE `entry`=25907;
+UPDATE `creature_template` SET `npcflag`=3, `unit_flags`=33536 WHERE `entry`=25909;
+UPDATE `creature_template` SET `npcflag`=3, `unit_flags`=33536 WHERE `entry`=25912;
+UPDATE `creature_template` SET `npcflag`=3, `unit_flags`=33536 WHERE `entry`=25913;
+UPDATE `creature_template` SET `npcflag`=3, `unit_flags`=33536 WHERE `entry`=32808;
+UPDATE `creature_template` SET `npcflag`=3, `unit_flags`=33536 WHERE `entry`=25889;
+-- Northrend Alliance's Bonfire Quests
+DELETE FROM `gameobject_queststarter` WHERE `quest` IN (13441,13450,13451,13453,13454,13455,13457,13458);
+-- Northrend Horde's Bonfire Quests
+DELETE FROM `gameobject_queststarter` WHERE `quest` IN (13440,13442,13443,13444,13445,13446,13447,13449);
+-- Stealing the flame
+DELETE FROM `creature_queststarter` WHERE `quest` IN (11933,11935);
+DELETE FROM `spell_scripts` WHERE `id` IN (29137,29135,29126,46671,29139,29138,29136,46672);
+INSERT INTO `spell_scripts` (`id`, `effIndex`,`command`, `datalong`, `datalong2`) VALUES
+(29137, 2, 15,29101, 2),
+(29135, 2, 15,29102, 2),
+(29126, 2, 15,29099, 2),
+(46671, 2, 15,46690, 2),
+(29139, 2, 15,29133, 2),
+(29136, 2, 15,29130, 2),
+(29138, 2, 15,29132, 2),
+(46672, 2, 15,46689, 2);
+-- A Thief's Reward
+DELETE FROM `creature_queststarter` WHERE `quest` IN (9365,9339);
+INSERT INTO `creature_queststarter` (`id`, `quest`) VALUES
+(16817, 9365), -- Alliance
+(16818, 9339); -- Horde
+DELETE FROM `creature_questender` WHERE `quest` IN (9365,9339);
+INSERT INTO `creature_questender` (`id`, `quest`) VALUES
+(16817, 9365), -- Alliance
+(16818, 9339); -- Horde
+-- Alliance Desecrate the flame
+DELETE FROM `gameobject_queststarter` WHERE `id` IN (187958,187952,187953,187950,187973,187971,187968,187965,187961,187957,187959,187948,187963,187967,187949,187970,187975,187966,187955,194048,194033,194034,194037,194046,194043,194042,194039,187962,187960,187964,187969,187951,187956,187972,187559,187974,187954,187947);
+DELETE FROM `gameobject_questender` WHERE `id` IN (187958,187952,187953,187950,187973,187971,187968,187965,187961,187957,187959,187948,187963,187967,187949,187970,187975,187966,187955,194048,194033,194034,194037,194046,194043,194042,194039,187962,187960,187964,187969,187951,187956,187972,187559,187974,187954,187947);
+INSERT INTO `gameobject_questender` (`id`, `quest`) VALUES
+(187958, 11770), -- Durotar
+(187957, 11769), -- Desolace
+(187965, 11777), -- Mulgore
+(187953, 11803), -- Winterspring
+(187971, 11783), -- Barrens
+(187961, 11773), -- Feralas
+(187948, 11765), -- Ashenvale
+(187959, 11771), -- Dustwallow marsh
+(187973, 11785), -- Thousand Needles
+(187950, 11800), -- Silithus
+(187968, 11780), -- Stonetalon Mountains
+(187952, 11802), -- Tanaris
+(187963, 11775), -- Hellfire Peninsula
+(187967, 11779), -- Shadowmoon Valley
+(187949, 11799), -- Netherstorm
+(187970, 11782), -- Terokkar
+(187975, 11787), -- Zangarmarsh
+(187955, 11767), -- Blade' Edge
+(187966, 11778), -- Nagrand
+(194048, 13458), -- Zul'Drak
+(194033, 13441), -- Borean Tundra
+(194034, 13450), -- Sholazar Basin
+(194037, 13451), -- Dragonblight
+(194046, 13457), -- Crystalsong Forest
+(194043, 13455), -- Storm Peaks
+(194042, 13454), -- Grizzly Hills
+(194039, 13453), -- Howling Fjords
+(187962, 11774), -- Ghostland
+(187960, 11772), -- Eversong woods
+(187964, 11776), -- Hillsbrad Foothills
+(187969, 11781), -- Swamp of sorrows
+(187951, 11801), -- Cape of Stranglethorn
+(187956, 11768), -- Burning Steppes
+(187972, 11784), -- The Hinterlands
+(187559, 11580), -- Silverpine Forest
+(187974, 11786), -- Tirisfal Glades
+(187954, 11766), -- Badlands
+(187947, 11764); -- Arathi Highlands
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Zul''Drak bonfire!' WHERE `id`=13458;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Crystalsong Forest bonfire!' WHERE `id`=13457;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Storm Peaks bonfire!' WHERE `id`=13455;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Grizzly Hills bonfire!' WHERE `id`=13454;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Howling Fjord bonfire!' WHERE `id`=13453;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Dragonblight bonfire!' WHERE `id`=13451;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Sholazar Basin bonfire!' WHERE `id`=13450;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Borean Tundra bonfire!' WHERE `id`=13441;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Winterspring bonfire!' WHERE `id`=11803;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Tanaris bonfire!' WHERE `id`=11802;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Stranglethorn Vale bonfire!' WHERE `id`=11801;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Silithus bonfire!' WHERE `id`=11800;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Netherstorm bonfire!' WHERE `id`=11799;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Zangarmarsh bonfire!' WHERE `id`=11787;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Dustwallow Marsh bonfire!' WHERE `id`=11771;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Hinterlands bonfire!' WHERE `id`=11784;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Terokkar Forest bonfire!' WHERE `id`=11782;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Shadowmoon Valley bonfire!' WHERE `id`=11779;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Nagrand bonfire!' WHERE `id`=11778;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Hillsbrad Foothills Bonfire!' WHERE `id`=11776;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Hellfire Peninsula bonfire!' WHERE `id`=11775;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Feralas bonfire!' WHERE `id`=11773;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Desolace bonfire!' WHERE `id`=11769;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Burning Steppes bonfire!' WHERE `id`=11768;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Blade''s Edge Mountains bonfire!' WHERE `id`=11767;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Ashenvale bonfire!' WHERE `id`=11765;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Arathi Highlands bonfire!' WHERE `id`=11764;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Silverpine bonfire!' WHERE `id`=11580;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Durotar bonfire!' WHERE `id`=11770;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Mulgore bonfire!' WHERE `id`=11777;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Barrens bonfire!' WHERE `id`=11783;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Thousand Needles bonfire!' WHERE `id`=11785;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Stonetalon Mountains bonfire!' WHERE `id`=11780;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Ghostlands bonfire!' WHERE `id`=11774;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Eversong Woods bonfire!' WHERE `id`=11772;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Swamp of Sorrows bonfire!' WHERE `id`=11781;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Tirisfal Glades bonfire!' WHERE `id`=11786;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Horde''s Badlands bonfire!' WHERE `id`=11766;
+-- Horde Desecrate the flame
+DELETE FROM `gameobject_queststarter` WHERE `id` IN (187916,187924,187927,187946,187945,187943,187929,187923,187917,187921,187936,187938,187939,187931,187564,187940,187928,187922,187920,187914,187944,187925,187926,187932,187934,194032,194036,194040,194038,194049,194044,194035,194045,187935,187933,187942,187930,187937,187919,187941);
+DELETE FROM `gameobject_questender` WHERE `id` IN (187916,187924,187927,187946,187945,187943,187929,187923,187917,187921,187936,187938,187939,187931,187564,187940,187928,187922,187920,187914,187944,187925,187926,187932,187934,194032,194036,194040,194038,194049,194044,194035,194045,187935,187933,187942,187930,187937,187919,187941);
+INSERT INTO `gameobject_questender` (`id`, `quest`) VALUES
+(187916, 11734), -- Ashenvale
+(187924, 11741), -- Desolace
+(187927, 11744), -- Dustwallow Marsh
+(187946, 11763), -- Winterspring
+(187945, 11762), -- Tanaris
+(187943, 11760), -- Silithus
+(187929, 11746), -- Feralas
+(187923, 11740), -- Darkshore
+(187917, 11735), -- Azuremyst Isle
+(187921, 11738), -- Bloodmyst Isle
+(187936, 11753), -- Teldrassil
+(187938, 11755), -- The Hinterlands
+(187939, 11756), -- The Western Plaguelands
+(187931, 11748), -- Hillsbrad Foothills
+(187564, 11581), -- Westfall
+(187940, 11757), -- Wetlands
+(187928, 11745), -- Elwynn Forest
+(187922, 11739), -- Burning Steppes
+(187920, 11737), -- Blasted Lands
+(187914, 11732), -- Arathi Highlands
+(187944, 11761), -- Cape of Stranglethorn
+(187925, 11742), -- Dun Morogh
+(187926, 11743), -- Duskwood
+(187932, 11749), -- Loch Modan
+(187934, 11751), -- Redridge Mountains
+(194032, 13440), -- Borean Tundra
+(194036, 13443), -- Dragonblight
+(194040, 13445), -- Grizzly
+(194038, 13444), -- Howling Fjord
+(194049, 13449), -- Zul'Drak
+(194044, 13446), -- The Storm Peaks
+(194035, 13442), -- Sholazar Basin
+(194045, 13447), -- Crystalsong Forest
+(187935, 11752), -- Shadowmoon Valley
+(187933, 11750), -- Nagrand
+(187942, 11759), -- Netherstorm
+(187930, 11747), -- Hellfire Peninsula
+(187937, 11754), -- Terokkar
+(187919, 11736), -- Blade's Edge
+(187941, 11758); -- Zangarmarsh
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Zul''Drak bonfire!' WHERE `id`=13449;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Crystalsong Forest bonfire!' WHERE `id`=13447;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Storm Peaks bonfire!' WHERE `id`=13446;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Grizzly Hills bonfire!' WHERE `id`=13445;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Howling Fjord bonfire!' WHERE `id`=13444;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Dragonblight bonfire!' WHERE `id`=13443;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Sholazar Basin bonfire!' WHERE `id`=13442;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Borean Tundra bonfire!' WHERE `id`=13440;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Winterspring bonfire!' WHERE `id`=11763;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Tanaris bonfire!' WHERE `id`=11762;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Stranglethorn Vale bonfire!' WHERE `id`=11761;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Silithus bonfire!' WHERE `id`=11760;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Netherstorm bonfire!' WHERE `id`=11759;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Zangarmarsh bonfire!' WHERE `id`=11758;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Wetlands bonfire!' WHERE `id`=11757;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Western Plaguelands bonfire!' WHERE `id`=11756;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Hinterlands bonfire!' WHERE `id`=11755;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Terokkar Forest bonfire!' WHERE `id`=11754;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Teldrassil bonfire!' WHERE `id`=11753;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Shadowmoon Valley bonfire!' WHERE `id`=11752;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Redridge Mountains bonfire!' WHERE `id`=11751;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Nagrand bonfire!' WHERE `id`=11750;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Loch Modan bonfire!' WHERE `id`=11749;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Hillsbrad Foothills Bonfire!' WHERE `id`=11748;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Hellfire Peninsula bonfire!' WHERE `id`=11747;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Feralas bonfire!' WHERE `id`=11746;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Elywnn Forest bonfire!' WHERE `id`=11745;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Dustwallow Marsh bonfire!' WHERE `id`=11744;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Duskwood bonfire!' WHERE `id`=11743;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Dun Morogh bonfire!' WHERE `id`=11742;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Desolace bonfire!' WHERE `id`=11741;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Darkshore bonfire!' WHERE `id`=11740;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Burning Steppes bonfire!' WHERE `id`=11739;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Bloodmyst Isle bonfire!' WHERE `id`=11738;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Blasted Lands bonfire!' WHERE `id`=11737;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Blade''s Edge Mountains bonfire!' WHERE `id`=11736;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Azuremyst Isle bonfire!' WHERE `id`=11735;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Ashenvale bonfire!' WHERE `id`=11734;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Arathi Highlands bonfire!' WHERE `id`=11732;
+UPDATE `quest_template` SET `OfferRewardText`='Desecrate the Alliance''s Westfall bonfire!' WHERE `id`=11581;
diff --git a/sql/updates/world/2015_05_27_01_world.sql b/sql/updates/world/2015_05_27_01_world.sql
new file mode 100644
index 00000000000..0c706304d60
--- /dev/null
+++ b/sql/updates/world/2015_05_27_01_world.sql
@@ -0,0 +1,43 @@
+UPDATE `creature_template` SET `gossip_menu_id`=5746, `npcflag`=1 WHERE `entry`=11444;
+UPDATE `gameobject_template` SET `faction`=114 ,`flags`=34 where `entry`=177219;
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=14323 AND `id`>6;
+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
+(14323, 0, 7, 0, 11, 0, 100, 0, 0, 0, 0, 0, 53, 0, 14323, 1, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 'Guard Slip\'kik - On Spawn - Start WP'),
+(14323, 0, 8, 0, 38, 0, 100, 0, 1, 1, 0, 0, 22, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Guard Slip\'kik - On Data Set 1 1 - Set Phase 2'),
+(14323, 0, 9, 10, 40, 2, 100, 0, 19, 14323, 0, 0, 55, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Guard Slip\'kik - On Reached WP19 (Phase 2) - Stop WP'),
+(14323, 0, 10, 11, 61, 2, 100, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Guard Slip\'kik - On Reached WP19 (Phase 2) - Set Home Position'),
+(14323, 0, 11, 12, 61, 2, 100, 0, 0, 0, 0, 0, 18, 768, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Guard Slip\'kik - On Reached WP19 (Phase 2) - Set Unit Flags'),
+(14323, 0, 12, 0, 61, 2, 100, 0, 0, 0, 0, 0, 11, 22856, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Guard Slip\'kik - On Reached WP19 (Phase 2) - Cast Icelock');
+
+DELETE FROM `waypoints` where `entry`=14323;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(14323, 1, 550.9423, 528.1198, -25.40169, 'Guard Slip kik'),
+(14323, 2, 556.3312, 543.3906, -25.39986, 'Guard Slip kik'),
+(14323, 3, 566.9871, 557.3884, -25.39788, 'Guard Slip kik'),
+(14323, 4, 573.3212, 578.565, -25.40273, 'Guard Slip kik'),
+(14323, 5, 532.9773, 586.9559, -25.40273, 'Guard Slip kik'),
+(14323, 6, 515.2665, 599.5718, -25.40246, 'Guard Slip kik'),
+(14323, 7, 494.9027, 606.5114, -25.40438, 'Guard Slip kik'),
+(14323, 8, 480.8065, 598.4612, -25.40517, 'Guard Slip kik'),
+(14323, 9, 477.7994, 587.293, -25.40587, 'Guard Slip kik'),
+(14323, 10, 504.7797, 574.7651, -25.40086, 'Guard Slip kik'),
+(14323, 11, 480.9391, 578.991, -25.40194, 'Guard Slip kik'),
+(14323, 12, 477.7994, 587.293, -25.40587, 'Guard Slip kik'),
+(14323, 13, 484.9685, 603.9871, -25.40483, 'Guard Slip kik'),
+(14323, 14, 501.5791, 606.5353, -25.40406, 'Guard Slip kik'),
+(14323, 15, 519.1758, 594.009, -25.403, 'Guard Slip kik'),
+(14323, 16, 570.0894, 586.4958, -25.40273, 'Guard Slip kik'),
+(14323, 17, 573.4045, 571.6358, -25.40239, 'Guard Slip kik'),
+(14323, 18, 561.7436, 552.6977, -25.3998, 'Guard Slip kik'),
+(14323, 19, 560.2891, 551.3965, -25.39884, 'Guard Slip kik');
+
+UPDATE `gameobject_template` SET `AIName`= 'SmartGameObjectAI' WHERE `entry` =179485;
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` =179485 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
+
+(179485,1,0,1,20,0,100,0,1193,0,0,0,45,1,1,0,0,0,0,19,14323,0,0,0,0,0,0,'Broken Trap - On Quest Reward (A Broken Trap) - Set Data on Guard Slip kik'),
+(179485,1,1,2,61,0,100,0,0,0,0,0,70,7200,0,0,0,0,0,1,0,0,0,0,0,0,0,'Broken Trap - On Quest Reward (A Broken Trap) - Despawn GO'),
+(179485,1,2,0,61,0,100,0,0,0,0,0,50,179512,300,0,0,0,0,8,0,0,0,558.806, 550.065, -25.4008, 3.14159,'Broken Trap - On Quest Reward (A Broken Trap) - Summon Fixed Trap');
diff --git a/sql/updates/world/2015_05_28_00_world.sql b/sql/updates/world/2015_05_28_00_world.sql
new file mode 100644
index 00000000000..e8bdb13ddb5
--- /dev/null
+++ b/sql/updates/world/2015_05_28_00_world.sql
@@ -0,0 +1,158 @@
+UPDATE `creature_template` SET `gossip_menu_id`=5746, `npcflag`=1 WHERE `entry`=11444;
+UPDATE `gameobject_template` SET `faction`=114 ,`flags`=34 where `entry`=177219;
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=14323 AND `id`>6;
+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
+(14323, 0, 7, 0, 11, 0, 100, 0, 0, 0, 0, 0, 53, 0, 14323, 1, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 'Guard Slip\'kik - On Spawn - Start WP'),
+(14323, 0, 8, 0, 38, 0, 100, 0, 1, 1, 0, 0, 22, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Guard Slip\'kik - On Data Set 1 1 - Set Phase 2'),
+(14323, 0, 9, 10, 40, 2, 100, 0, 19, 14323, 0, 0, 55, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Guard Slip\'kik - On Reached WP19 (Phase 2) - Stop WP'),
+(14323, 0, 10, 11, 61, 2, 100, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Guard Slip\'kik - On Reached WP19 (Phase 2) - Set Home Position'),
+(14323, 0, 11, 12, 61, 2, 100, 0, 0, 0, 0, 0, 18, 768, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Guard Slip\'kik - On Reached WP19 (Phase 2) - Set Unit Flags'),
+(14323, 0, 12, 0, 61, 2, 100, 0, 0, 0, 0, 0, 11, 22856, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Guard Slip\'kik - On Reached WP19 (Phase 2) - Cast Icelock'),
+(14323, 0, 13, 0, 62, 2, 100, 0, 5733, 0, 0, 0, 85, 22820, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Guard Slip\'kik - On Gossip Option Selected - Invoker Cast 22820');
+
+DELETE FROM `waypoints` where `entry`=14323;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(14323, 1, 550.9423, 528.1198, -25.40169, 'Guard Slip kik'),
+(14323, 2, 556.3312, 543.3906, -25.39986, 'Guard Slip kik'),
+(14323, 3, 566.9871, 557.3884, -25.39788, 'Guard Slip kik'),
+(14323, 4, 573.3212, 578.565, -25.40273, 'Guard Slip kik'),
+(14323, 5, 532.9773, 586.9559, -25.40273, 'Guard Slip kik'),
+(14323, 6, 515.2665, 599.5718, -25.40246, 'Guard Slip kik'),
+(14323, 7, 494.9027, 606.5114, -25.40438, 'Guard Slip kik'),
+(14323, 8, 480.8065, 598.4612, -25.40517, 'Guard Slip kik'),
+(14323, 9, 477.7994, 587.293, -25.40587, 'Guard Slip kik'),
+(14323, 10, 504.7797, 574.7651, -25.40086, 'Guard Slip kik'),
+(14323, 11, 480.9391, 578.991, -25.40194, 'Guard Slip kik'),
+(14323, 12, 477.7994, 587.293, -25.40587, 'Guard Slip kik'),
+(14323, 13, 484.9685, 603.9871, -25.40483, 'Guard Slip kik'),
+(14323, 14, 501.5791, 606.5353, -25.40406, 'Guard Slip kik'),
+(14323, 15, 519.1758, 594.009, -25.403, 'Guard Slip kik'),
+(14323, 16, 570.0894, 586.4958, -25.40273, 'Guard Slip kik'),
+(14323, 17, 573.4045, 571.6358, -25.40239, 'Guard Slip kik'),
+(14323, 18, 561.7436, 552.6977, -25.3998, 'Guard Slip kik'),
+(14323, 19, 560.2891, 551.3965, -25.39884, 'Guard Slip kik');
+
+UPDATE `gameobject_template` SET `AIName`= 'SmartGameObjectAI' WHERE `entry` =179485;
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` =179485 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
+
+(179485,1,0,1,20,0,100,0,1193,0,0,0,45,1,1,0,0,0,0,19,14323,0,0,0,0,0,0,'Broken Trap - On Quest Reward (A Broken Trap) - Set Data on Guard Slip kik'),
+(179485,1,1,2,61,0,100,0,0,0,0,0,70,7200,0,0,0,0,0,1,0,0,0,0,0,0,0,'Broken Trap - On Quest Reward (A Broken Trap) - Despawn GO'),
+(179485,1,2,0,61,0,100,0,0,0,0,0,50,179512,300,0,0,0,0,8,0,0,0,558.806, 550.065, -25.4008, 3.14159,'Broken Trap - On Quest Reward (A Broken Trap) - Summon Fixed Trap');
+
+
+DELETE FROM `creature_text` WHERE `entry` IN(14353,11501);
+DELETE FROM `creature_text` WHERE `entry` IN(14325) AND `groupid`>2;
+
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextID`, `comment`) VALUES
+(14353, 0, 0, 'OH NOES! Da king is dead! Uh... hail to da new king! Yeah!', 14, 0, 100, 0, 0, 0, 9348, 'Mizzle the Crafty to 58960'),
+(14353, 1, 0, 'Yar, he''s dead all right. That makes you da new king... well, all of you! Gordok is yours now, boss! You should talk to me so you can learn everything there is about being da king! I was... is his assistant! Yeah, that''s why I''m called da crafty one!', 12, 0, 100, 0, 0, 0, 9411, 'Mizzle the Crafty to 58960'),
+(11501, 0, 0, 'You no challenge me, scrubs! I''m da king now, and I stay king FOREVER!!!', 12, 0, 100, 0, 0, 0, 9481, 'King Gordok to Player'),
+(14325, 3, 0, 'Hey, who Fengus callin'' a gnoll lover?! Take da prisoners to da king; you smart to bring them with their weapons and show da king that they a threat. I''ll go see if Fengus talk smack when I give him da beatdown! HAR!', 12, 0, 100, 0, 0, 0, 9416, 'Captain Kromcrush'),
+(14325, 4, 0, 'OK Fengus, where you at?! You come call me a gnoll lover while I give you da hammer upside da head!', 14, 0, 100, 0, 0, 0, 9424, 'Captain Kromcrush');
+
+UPDATE `creature_template` SET `gossip_menu_id`=5739, `npcflag`=1 WHERE `entry`=14325;
+UPDATE `creature_template` SET `gossip_menu_id`=5734, `npcflag`=1 WHERE `entry`=14321;
+
+DELETE FROM `creature` WHERE `guid`IN(84194,84195);
+DELETE FROM `gameobject` WHERE `guid`=35834;
+
+DELETE FROM `gossip_menu` WHERE `entry` IN(5739,5738,5734);
+DELETE FROM `gossip_menu` WHERE `entry` =5733 AND `text_id`=6906;
+DELETE FROM `gossip_menu` WHERE `entry` =5735 AND `text_id`=6908;
+
+INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES
+(5733, 6906),
+(5734, 6903),
+(5734, 6904),
+(5735, 6908),
+(5739, 6913),
+(5739, 6914),
+(5738, 6915);
+
+DELETE FROM `gossip_menu_option` WHERE `menu_id` IN(5738,5739,5733,5734,5735);
+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
+(5739, 0, 0, 'Um, I''m taking some prisoners we found outside before the king for punishment.', 9421, 1, 1, 5738, 0, 0, 0, '', 0),
+(5738, 0, 0, 'Er... that''s how I found them. I wanted to show the king that they were a threat! Say Captain... I overheard Guard Fengus calling you a fat, useless gnoll lover!', 9423, 1, 1, 0, 0, 0, 0, '', 0),
+(5733, 0, 0, 'Yeah, you''re a real brainiac. Just how smart do you think you are, Slip''kik?', 9398, 1, 1, 5733, 0, 0, 0, '', 0),
+(5734, 0, 0, 'So, now that I''m the king... what have you got for me?!', 9451, 1, 1, 5734, 0, 0, 0, '', 0),
+(5735, 0, 0, 'Call me "Boss". What have you got for me!', 9401, 1, 1, 5735, 0, 0, 0, '', 0);
+
+UPDATE `gameobject_template` SET `faction`=0, `flags`=34 WHERE `entry`=177217;
+
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=14353;
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=11501 AND `id`>3;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=14324 AND `id`>27;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=14325 AND `id`>7;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=14326 AND `id`>6;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=14321 AND `id`>6;
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=14353;
+
+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
+(11501, 0, 4, 0, 4, 0, 100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'King Gordok - On Agro - Say'),
+(11501, 0, 5, 0, 6, 0, 100, 0, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 19, 14324, 0, 0, 0, 0, 0, 0, 'King Gordok - On Death - Set Data on Cho Rush the Observer'),
+(14324, 0, 28, 0, 11, 0, 100, 0, 0, 0, 0, 0, 42, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cho\'Rush the Observer - On Spawn - Set Invincibility HP'),
+(14324, 0, 29, 30, 38, 0, 100, 0, 1, 1, 0, 0, 18, 768, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cho\'Rush the Observer - On Data Set - Set Unit Flags'),
+(14324, 0, 30, 31, 61, 0, 100, 0, 0, 0, 0, 0, 12, 14353, 1, 720000, 0, 0, 0, 8, 0, 0, 0, 683.2966, 484.3845, 29.54451, 0.01745329, 'Cho\'Rush the Observer - On Data Set - Summon Mizzle the Crafty'),
+(14324, 0, 31, 0, 61, 0, 100, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cho\'Rush the Observer - On Data Set - Evade'),
+(14325, 0, 8, 9, 62, 0, 100, 0, 5738, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Captain Kromcrush - On Gossip Option Selected - Close Gossip'),
+(14325, 0, 9, 10, 61, 0, 100, 0, 0, 0, 0, 0, 1, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Captain Kromcrush - On Gossip Option Selected - Say Line 3'),
+(14325, 0, 10, 11, 61, 0, 100, 0, 0, 0, 0, 0, 18, 768, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Captain Kromcrush - On Gossip Option Selected - Set Unit Flags'),
+(14325, 0, 11, 0, 61, 0, 100, 0, 0, 0, 0, 0, 53, 1, 14325, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Captain Kromcrush - On Gossip Option Selected - Start WP'),
+(14325, 0, 12, 0, 40, 0, 100, 0, 1, 14325, 0, 0, 1, 4, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Captain Kromcrush - On Reached WP1 - Say Line 4'),
+(14325, 0, 13, 0, 40, 0, 100, 0, 2, 14325, 0, 0, 81, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Captain Kromcrush - On Reached WP2 - Set NPC Flags'),
+(14326, 0, 7, 0, 62, 0, 100, 0, 5735, 0, 0, 0, 85, 22818, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Guard Mol\'dar - On Gossip Option Selected - Invoker Cast 22818'),
+(14321, 0, 7, 0, 62, 0, 100, 0, 5734, 0, 0, 0, 85, 22817, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Guard Fengus - On Gossip Option Selected - Invoker Cast 22818'),
+(14353, 0, 0, 1, 54, 0, 100, 0, 0, 0, 0, 0, 53, 0, 14353, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Mizzle the Crafty - On Just Summoned - Start WP'),
+(14353, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 81, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Mizzle the Crafty - On Just Summoned - Set NPC Flags'),
+(14353, 0, 2, 0, 40, 0, 100, 0, 1, 14353, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Mizzle the Crafty - On Reached WP1 - Say Line 0'),
+(14353, 0, 3, 4, 40, 0, 100, 0, 4, 14353, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Mizzle the Crafty - On Reached WP4 - Say Line 1'),
+(14353, 0, 4, 0, 61, 0, 100, 0, 0, 0, 0, 0, 81, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Mizzle the Crafty - On Reached WP4 - Set NPC Flags'),
+(14353, 0, 5, 0, 62, 0, 100, 0, 5708, 0, 0, 0, 11, 22799, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 'Mizzle the Crafty - On Gossip Option Selected - Cast King of the Gordok'),
+(14353, 0, 6, 0, 62, 0, 100, 0, 5715, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Mizzle the Crafty - On Gossip Option Selected - Close Gossip'),
+(14353, 0, 7, 0, 62, 0, 100, 0, 5740, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Mizzle the Crafty - On Gossip Option Selected - Close Gossip'),
+(14353, 0, 8, 9, 62, 0, 100, 1, 5740, 0, 0, 0, 50, 179564, 7200, 0, 0, 0, 0, 8, 0, 0, 0, 808.3697, 482.1281, 37.3182, 3.194002, 'Mizzle the Crafty - On Gossip Option Selected - Summon Gordok Tribute (No Repeat)'),
+(14353, 0, 9, 0, 61, 0, 100, 0, 0, 0, 0, 0, 81, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Mizzle the Crafty - On Gossip Option Selected - Set NPC Flags');
+
+DELETE FROM `waypoints` WHERE `entry`IN(14353,14325);
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(14353, 1, 683.2966, 484.3845, 29.54451, 'Mizzle the Crafty'),
+(14353, 2, 721.1365, 483.4832, 28.18014, 'Mizzle the Crafty'),
+(14353, 3, 756.7082, 482.5323, 28.18394, 'Mizzle the Crafty'),
+(14353, 4, 816.5302, 482.3017, 37.31819, 'Mizzle the Crafty'),
+(14325, 1, 492.7128, 483.2709, 29.46278 , 'Captain Kromcrush'),
+(14325, 2, 491.0189, 505.9179, 29.46236 , 'Captain Kromcrush');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`IN(14,15) AND `SourceGroup`IN(5708,5739,5733,5734,5735);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(15, 5708, 0, 0, 0, 1, 0, 22799, 0, 0, 1, 0, 0, '', 'Mizzle the Crafty Show Gossip option 0 only if player does not have aura 22799'),
+(15, 5708, 1, 0, 0, 1, 0, 22799, 0, 0, 0, 0, 0, '', 'Mizzle the Crafty Show Gossip option 1 only if player has aura 22799'),
+(15, 5739, 0, 0, 0, 1, 0, 22799, 0, 0, 1, 0, 0, '', 'Captain Kromcrush Show Gossip option 0 only if player does not have aura 22799'),
+(15, 5733, 0, 0, 0, 1, 0, 22799, 0, 0, 0, 0, 0, '', 'Guard Slip Kik Show Gossip option 0 only if player has aura 22799'),
+(15, 5733, 0, 0, 0, 1, 0, 22820, 0, 0, 1, 0, 0, '', 'Guard Slip Kik Show Gossip option 0 only if player does not have aura 22820'),
+(15, 5733, 0, 0, 0,27, 0, 63, 4, 0, 0, 0, 0, '', 'Guard Slip Kik Show Gossip option 0 only if player is level 63 or Lower'),
+(15, 5735, 0, 0, 0, 1, 0, 22799, 0, 0, 0, 0, 0, '', 'Guard Mol Dar Show Gossip option 0 only if player has aura 22799'),
+(15, 5735, 0, 0, 0, 1, 0, 22818, 0, 0, 1, 0, 0, '', 'Guard Mol Dar Show Gossip option 0 only if player does not have aura 22818'),
+(15, 5735, 0, 0, 0,27, 0, 63, 4, 0, 0, 0, 0, '', 'Guard Mol Dar Show Gossip option 0 only if player is level 63 or Lower'),
+(15, 5734, 0, 0, 0, 1, 0, 22799, 0, 0, 0, 0, 0, '', 'Guard Fengus Show Gossip option 0 only if player has aura 22799'),
+(15, 5734, 0, 0, 0, 1, 0, 22817, 0, 0, 1, 0, 0, '', 'Guard Fengus Show Gossip option 0 only if player does not have aura 22817'),
+(15, 5734, 0, 0, 0,27, 0, 63, 4, 0, 0, 0, 0, '', 'Guard Fengus Show Gossip option 0 only if player is level 63 or Lower'),
+(14, 5739, 6913, 0, 0, 1, 0, 22799, 0, 0, 1, 0, 0, '', 'Captain Kromcrush Show text 6913 only if player does not have aura 22799'),
+(14, 5739, 6914, 0, 0, 1, 0, 22799, 0, 0, 0, 0, 0, '', 'Captain Kromcrush Show text 6914 only if player has aura 22799'),
+(14, 5733, 6905, 0, 0, 1, 0, 22820, 0, 0, 1, 0, 0, '', 'Guard Slip Kik Show text 6905 only if player does not have aura 22820'),
+(14, 5733, 6905, 0, 0, 1, 0, 22799, 0, 0, 0, 0, 0, '', 'Guard Slip Kik Show text 6906 only if player has aura 22799'),
+(14, 5733, 6906, 0, 0, 1, 0, 22820, 0, 0, 0, 0, 0, '', 'Guard Slip Kik Show text 6905 only if player does not have aura 22820'),
+(14, 5733, 6906, 0, 0, 1, 0, 22799, 0, 0, 0, 0, 0, '', 'Guard Slip Kik Show text 6906 only if player has aura 22799'),
+(14, 5734, 6903, 0, 0, 1, 0, 22817, 0, 0, 1, 0, 0, '', 'Guard Fengus Show text 6905 only if player does not have aura 22817'),
+(14, 5734, 6903, 0, 0, 1, 0, 22799, 0, 0, 0, 0, 0, '', 'Guard Fengus Show text 6906 only if player has aura 22799'),
+(14, 5734, 6904, 0, 0, 1, 0, 22817, 0, 0, 0, 0, 0, '', 'Guard Fengus Show text 6905 only if player does not have aura 22817'),
+(14, 5734, 6904, 0, 0, 1, 0, 22799, 0, 0, 0, 0, 0, '', 'Guard Fengus Show text 6906 only if player has aura 22799'),
+(14, 5735, 6907, 0, 0, 1, 0, 22818, 0, 0, 1, 0, 0, '', 'Guard Mol Dar Show text 6907 only if player does not have aura 22818'),
+(14, 5735, 6907, 0, 0, 1, 0, 22799, 0, 0, 0, 0, 0, '', 'Guard Mol Dar Show text 6907 only if player has aura 22799'),
+(14, 5735, 6908, 0, 0, 1, 0, 22818, 0, 0, 0, 0, 0, '', 'Guard Mol Dar Show text 6908 only if player does not have aura 22818'),
+(14, 5735, 6908, 0, 0, 1, 0, 22799, 0, 0, 0, 0, 0, '', 'Guard Mol Dar Show text 6908 only if player has aura 22799');
diff --git a/sql/updates/world/2015_05_28_01_world.sql b/sql/updates/world/2015_05_28_01_world.sql
new file mode 100644
index 00000000000..1199e250c47
--- /dev/null
+++ b/sql/updates/world/2015_05_28_01_world.sql
@@ -0,0 +1,50 @@
+-- UP Creature Emotes
+-- Mindless Servant SAI
+SET @ENTRY := 26536;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,1,0,100,0,3000,5000,12000,20000,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Mindless Servant - Out of Combat - Run Script");
+
+-- Actionlist SAI
+SET @ENTRY := 2653600;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,17,398,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Set Emote State 398"),
+(@ENTRY,9,1,0,0,0,100,0,5000,5000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Set Emote State 0");
+
+-- Dragonflayer Deathseeker SAI
+SET @ENTRY := 26550;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0 AND `id`=3;
+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,3,0,1,0,100,0,1000,1000,2000,3000,10,1,11,6,92,274,273,1,0,0,0,0,0,0,0,"Dragonflayer Deathseeker - Out of Combat - Play Random Emote (1, 11, 6, 92, 274, 273)");
+
+-- Dragonflayer Seer SAI
+SET @ENTRY := 26554;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0 AND `id`=3;
+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,3,0,1,0,100,0,1000,1000,2000,3000,10,1,11,6,92,274,273,1,0,0,0,0,0,0,0,"Dragonflayer Seer - Out of Combat - Play Random Emote (1, 11, 6, 92, 274, 273)");
+
+-- Dragonflayer Fanatic SAI
+SET @ENTRY := 26553;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0 AND `id`=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
+(@ENTRY,0,1,0,1,0,100,0,1000,1000,2000,3000,10,1,11,6,92,274,273,1,0,0,0,0,0,0,0,"Dragonflayer Fanatic - Out of Combat - Play Random Emote (1, 11, 6, 92, 274, 273)");
+
+-- Ymirjar Necromancer SAI
+SET @ENTRY := 28368;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0 AND `id`=4;
+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,4,0,1,0,100,0,1000,1000,2000,3000,10,396,1,6,92,273,0,1,0,0,0,0,0,0,0,"Ymirjar Necromancer - Out of Combat - Play Random Emote (396,1,6,92,273)");
+
+-- Ymirjar Berserker SAI
+SET @ENTRY := 26696;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0 AND `id`=3;
+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,3,0,1,0,100,0,1000,1000,2000,3000,10,396,1,6,92,273,0,1,0,0,0,0,0,0,0,"Ymirjar Berserker - Out of Combat - Play Random Emote (396,1,6,92,273)");
+
+-- Ymirjar Dusk Shaman SAI
+SET @ENTRY := 26694;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0 AND `id`=3;
+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,3,0,1,0,100,0,1000,1000,2000,3000,10,396,1,6,92,273,0,1,0,0,0,0,0,0,0,"Ymirjar Dusk Shaman - Out of Combat - Play Random Emote (396,1,6,92,273)");
diff --git a/sql/updates/world/2015_05_28_02_world.sql b/sql/updates/world/2015_05_28_02_world.sql
new file mode 100644
index 00000000000..1376088c3e1
--- /dev/null
+++ b/sql/updates/world/2015_05_28_02_world.sql
@@ -0,0 +1,115 @@
+-- Howling Fjord Initial
+SET @NPC := 86760;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=1704.93,`position_y`=-6282.997,`position_z`=9.110443 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,1704.93,-6282.997,9.110443,0,0,0,0,100,0),
+(@PATH,2,1704.68,-6282.497,9.110443,0,0,0,0,100,0),
+(@PATH,3,1702.336,-6278.131,9.618036,0,0,0,0,100,0),
+(@PATH,4,1706.836,-6275.631,10.36804,0,0,0,0,100,0),
+(@PATH,5,1707.836,-6275.131,10.36804,0,0,0,0,100,0),
+(@PATH,6,1709.219,-6274.038,10.71679,0,0,0,0,100,0),
+(@PATH,7,1708.469,-6275.288,10.46679,0,0,0,0,100,0),
+(@PATH,8,1707.719,-6276.788,10.21679,0,0,0,0,100,0),
+(@PATH,9,1706.646,-6278.834,9.859894,0,0,0,0,100,0),
+(@PATH,10,1707.896,-6280.584,9.859894,0,0,0,0,100,0),
+(@PATH,11,1708.069,-6280.779,10.15218,0,0,0,0,100,0),
+(@PATH,12,1708.569,-6281.529,10.15218,0,0,0,0,100,0),
+(@PATH,13,1711.569,-6281.779,10.40218,0,0,0,0,100,0),
+(@PATH,14,1713.069,-6281.779,10.40218,0,0,0,0,100,0),
+(@PATH,15,1713.006,-6282.089,10.39413,0,0,0,0,100,0),
+(@PATH,16,1714.506,-6282.339,10.64413,0,0,0,0,100,0),
+(@PATH,17,1713.006,-6283.339,10.39413,0,0,0,0,100,0),
+(@PATH,18,1708.032,-6286.899,9.245476,0,0,0,0,100,0),
+(@PATH,19,1705.282,-6283.399,9.245476,0,0,0,0,100,0),
+(@PATH,20,1704.981,-6283.126,9.115644,0,0,0,0,100,0);
+
+SET @NPC := 118716;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=1522.899,`position_y`=-6314.966,`position_z`=6.290161 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,1522.899,-6314.966,6.290161,0,0,0,0,100,0),
+(@PATH,2,1524.649,-6315.216,6.040161,0,0,0,0,100,0),
+(@PATH,3,1525.149,-6314.216,6.040161,0,0,0,0,100,0),
+(@PATH,4,1528.399,-6312.216,6.040161,0,0,0,0,100,0),
+(@PATH,5,1529.399,-6311.216,6.040161,0,0,0,0,100,0),
+(@PATH,6,1531.399,-6311.216,6.040161,0,0,0,0,100,0),
+(@PATH,7,1533.649,-6311.216,6.040161,0,0,0,0,100,0),
+(@PATH,8,1537.399,-6309.466,6.290161,0,0,0,0,100,0),
+(@PATH,9,1539.649,-6308.966,6.290161,0,0,0,0,100,0),
+(@PATH,10,1541.649,-6307.216,6.290161,0,0,0,0,100,0),
+(@PATH,11,1545.899,-6306.216,6.290161,0,0,0,0,100,0),
+(@PATH,12,1549.899,-6306.216,6.540161,0,0,0,0,100,0),
+(@PATH,13,1550.147,-6306.042,6.77546,0,0,0,0,100,0),
+(@PATH,14,1551.647,-6305.042,6.77546,0,0,0,0,100,0),
+(@PATH,15,1555.897,-6299.292,7.27546,0,0,0,0,100,0),
+(@PATH,16,1560.647,-6293.042,7.77546,0,0,0,0,100,0),
+(@PATH,17,1571.466,-6279.009,7.792542,0,0,0,0,100,0),
+(@PATH,18,1569.216,-6277.009,7.542542,0,0,0,0,100,0),
+(@PATH,19,1566.466,-6274.759,6.792542,0,0,0,0,100,0),
+(@PATH,20,1563.323,-6271.979,6.153687,0,0,0,0,100,0),
+(@PATH,21,1561.034,-6260.083,5.902053,0,0,0,0,100,0),
+(@PATH,22,1550.784,-6252.083,6.652053,0,0,0,0,100,0),
+(@PATH,23,1544.534,-6247.333,7.152053,0,0,0,0,100,0),
+(@PATH,24,1535.034,-6240.083,6.652053,0,0,0,0,100,0),
+(@PATH,25,1537.18,-6241.825,6.897589,0,0,0,0,100,0),
+(@PATH,26,1553.43,-6254.325,6.147589,0,0,0,0,100,0),
+(@PATH,27,1561.12,-6260.274,6.114735,0,0,0,0,100,0),
+(@PATH,28,1563.273,-6272.198,6.296275,0,0,0,0,100,0),
+(@PATH,29,1566.523,-6274.448,6.796275,0,0,0,0,100,0),
+(@PATH,30,1568.523,-6276.448,7.296275,0,0,0,0,100,0),
+(@PATH,31,1570.773,-6278.448,7.796275,0,0,0,0,100,0),
+(@PATH,32,1570.818,-6278.787,7.928142,0,0,0,0,100,0),
+(@PATH,33,1571.568,-6279.287,7.928142,0,0,0,0,100,0),
+(@PATH,34,1559.318,-6294.787,7.428142,0,0,0,0,100,0),
+(@PATH,35,1555.068,-6300.287,6.928142,0,0,0,0,100,0),
+(@PATH,36,1545.231,-6307.126,6.122152,0,0,0,0,100,0),
+(@PATH,37,1541.731,-6308.876,6.122152,0,0,0,0,100,0),
+(@PATH,38,1541.231,-6309.376,6.122152,0,0,0,0,100,0),
+(@PATH,39,1538.231,-6312.876,6.122152,0,0,0,0,100,0),
+(@PATH,40,1535.731,-6313.376,5.872152,0,0,0,0,100,0),
+(@PATH,41,1524.618,-6315.203,6.112886,0,0,0,0,100,0),
+(@PATH,42,1520.618,-6314.953,6.612886,0,0,0,0,100,0),
+(@PATH,43,1515.618,-6314.453,7.112886,0,0,0,0,100,0),
+(@PATH,44,1519.643,-6314.803,6.643581,0,0,0,0,100,0),
+(@PATH,45,1522.643,-6315.053,6.393581,0,0,0,0,100,0);
+
+SET @NPC := 108487;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=1456.961,`position_y`=-6305.669,`position_z`=7.115809 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,1456.961,-6305.669,7.115809,0,0,0,0,100,0),
+(@PATH,2,1446.711,-6314.919,6.365809,0,0,0,0,100,0),
+(@PATH,3,1433.461,-6326.669,6.115809,0,0,0,0,100,0),
+(@PATH,4,1433.146,-6326.916,5.966949,0,0,0,0,100,0),
+(@PATH,5,1432.646,-6327.416,5.966949,0,0,0,0,100,0),
+(@PATH,6,1417.412,-6345.985,6.104269,3.805819,0,0,0,100,0),
+(@PATH,7,1424.511,-6337.054,5.964785,0,0,0,0,100,0),
+(@PATH,8,1434.761,-6324.054,6.214785,0,0,0,0,100,0),
+(@PATH,9,1434.957,-6323.92,6.428545,0,0,0,0,100,0),
+(@PATH,10,1437.457,-6320.92,6.678545,0,0,0,0,100,0),
+(@PATH,11,1454.207,-6308.92,6.928545,0,0,0,0,100,0),
+(@PATH,12,1466.842,-6300.059,7.55334,0,0,0,0,100,0),
+(@PATH,13,1468.342,-6292.059,6.80334,0,0,0,0,100,0),
+(@PATH,14,1469.842,-6283.559,6.30334,0,0,0,0,100,0),
+(@PATH,15,1471.342,-6276.559,5.80334,0,0,0,0,100,0),
+(@PATH,16,1383.172,-6396.671,3.304667,0,0,0,0,100,0),
+(@PATH,17,1388.672,-6390.171,4.054667,0,0,0,0,100,0),
+(@PATH,18,1473.499,-6265.724,5.148712,0,0,0,0,100,0),
+(@PATH,19,1426.144,-6369.358,5.581006,0,0,0,0,100,0),
+(@PATH,20,1422.894,-6375.108,5.331006,0,0,0,0,100,0),
+(@PATH,21,1422.838,-6368.968,5.859815,0,0,0,0,100,0),
+(@PATH,22,1426.253,-6368.985,5.704663,0,0,0,0,100,0),
+(@PATH,23,1461.052,-6258.63,5.217323,2.633967,0,0,0,100,0),
+(@PATH,24,1460.06,-6270.612,6.09376,0,0,0,0,100,0),
+(@PATH,25,1459.31,-6278.612,6.59376,0,0,0,0,100,0),
+(@PATH,26,1457.81,-6300.112,7.09376,0,0,0,0,100,0);
diff --git a/sql/updates/world/2015_05_29_00_world.sql b/sql/updates/world/2015_05_29_00_world.sql
new file mode 100644
index 00000000000..0f3c69c0b4d
--- /dev/null
+++ b/sql/updates/world/2015_05_29_00_world.sql
@@ -0,0 +1,3 @@
+--
+DELETE FROM `skill_fishing_base_level` WHERE `entry`=4656;
+INSERT INTO `skill_fishing_base_level` (`entry`, `skill`) VALUES (4656, 430);
diff --git a/src/server/game/Entities/Object/Position.cpp b/src/server/game/Entities/Object/Position.cpp
index e31b913a25a..530e51cd8f5 100644
--- a/src/server/game/Entities/Object/Position.cpp
+++ b/src/server/game/Entities/Object/Position.cpp
@@ -17,6 +17,8 @@
#include "Position.h"
#include "ByteBuffer.h"
+#include "G3D/g3dmath.h"
+#include "GridDefines.h"
bool Position::operator==(Position const &a)
{
diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
index 97e3880161a..f91fc1985d5 100755
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
@@ -367,7 +367,7 @@ void FlightPathMovementGenerator::InitEndGridInfo()
_endMapId = (*i_path)[nodeCount - 1].MapID; //! MapId of last node
_preloadTargetNode = nodeCount - 3;
_endGridX = (*i_path)[nodeCount - 1].LocX;
- _endGridY = (*i_path)[nodeCount - 1].LocZ;
+ _endGridY = (*i_path)[nodeCount - 1].LocY;
}
void FlightPathMovementGenerator::PreloadEndGrid()
diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp
index 8be5da91c32..f0ee013bcc2 100644
--- a/src/server/game/Scripting/ScriptLoader.cpp
+++ b/src/server/game/Scripting/ScriptLoader.cpp
@@ -622,6 +622,7 @@ void AddSC_instance_magtheridons_lair();
void AddSC_boss_grand_warlock_nethekurse(); //HC Shattered Halls
void AddSC_boss_warbringer_omrogg();
void AddSC_boss_warchief_kargath_bladefist();
+void AddSC_shattered_halls();
void AddSC_instance_shattered_halls();
void AddSC_boss_watchkeeper_gargolmar(); //HC Ramparts
void AddSC_boss_omor_the_unscarred();
@@ -1152,6 +1153,7 @@ void AddOutlandScripts()
AddSC_boss_grand_warlock_nethekurse(); //HC Shattered Halls
AddSC_boss_warbringer_omrogg();
AddSC_boss_warchief_kargath_bladefist();
+ AddSC_shattered_halls();
AddSC_instance_shattered_halls();
AddSC_boss_watchkeeper_gargolmar(); //HC Ramparts
AddSC_boss_omor_the_unscarred();
diff --git a/src/server/game/Spells/SpellHistory.cpp b/src/server/game/Spells/SpellHistory.cpp
index b16993f28a3..09e3be690b1 100644
--- a/src/server/game/Spells/SpellHistory.cpp
+++ b/src/server/game/Spells/SpellHistory.cpp
@@ -22,6 +22,7 @@
#include "SpellInfo.h"
#include "Spell.h"
#include "World.h"
+#include "Opcodes.h"
SpellHistory::Clock::duration const SpellHistory::InfinityCooldownDelay = std::chrono::duration_cast<SpellHistory::Clock::duration>(std::chrono::seconds(MONTH));
SpellHistory::Clock::duration const SpellHistory::InfinityCooldownDelayCheck = std::chrono::duration_cast<SpellHistory::Clock::duration>(std::chrono::seconds(MONTH / 2));
@@ -627,6 +628,7 @@ void SpellHistory::BuildCooldownPacket(WorldPacket& data, uint8 flags, uint32 sp
void SpellHistory::BuildCooldownPacket(WorldPacket& data, uint8 flags, PacketCooldowns const& cooldowns) const
{
data.Initialize(SMSG_SPELL_COOLDOWN, 8 + 1 + (4 + 4) * cooldowns.size());
+ data << uint64(_owner->GetGUID());
data << uint8(flags);
for (auto const& cooldown : cooldowns)
{
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 191850516d4..13290320084 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -2955,7 +2955,7 @@ void SpellMgr::LoadSpellInfoCorrections()
switch (spellInfo->Id)
{
case 63026: // Force Cast (HACK: Target shouldn't be changed)
- case 63171: // Force Cast (HACK: Target shouldn't be changed; summon position should be untied from spell destination)
+ case 63137: // Force Cast (HACK: Target shouldn't be changed; summon position should be untied from spell destination)
spellInfo->Effects[0].TargetA = SpellImplicitTargetInfo(TARGET_DEST_DB);
break;
case 53096: // Quetz'lun's Judgment
@@ -3134,6 +3134,7 @@ void SpellMgr::LoadSpellInfoCorrections()
case 64823: // Item - Druid T8 Balance 4P Bonus
case 34477: // Misdirection
case 44401: // Missile Barrage
+ case 18820: // Insight
spellInfo->ProcCharges = 1;
break;
case 44544: // Fingers of Frost
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
index 63082808e03..d7a580800bc 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
@@ -1060,8 +1060,8 @@ class spell_putricide_ooze_eruption_searcher : public SpellScriptLoader
uint32 adhesiveId = sSpellMgr->GetSpellIdForDifficulty(SPELL_VOLATILE_OOZE_ADHESIVE, GetCaster());
if (GetHitUnit()->HasAura(adhesiveId))
{
- GetCaster()->CastSpell(GetHitUnit(), SPELL_OOZE_ERUPTION, true);
GetHitUnit()->RemoveAurasDueToSpell(adhesiveId, GetCaster()->GetGUID(), 0, AURA_REMOVE_BY_ENEMY_SPELL);
+ GetCaster()->CastSpell(GetHitUnit(), SPELL_OOZE_ERUPTION, true);
}
}
diff --git a/src/server/scripts/Outland/CMakeLists.txt b/src/server/scripts/Outland/CMakeLists.txt
index 24658dbc21f..42621b76941 100644
--- a/src/server/scripts/Outland/CMakeLists.txt
+++ b/src/server/scripts/Outland/CMakeLists.txt
@@ -27,6 +27,7 @@ set(scripts_STAT_SRCS
Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+ Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp
Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
index 21ed710f4d8..7f2e08b39ca 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
@@ -87,11 +87,11 @@ class boss_warchief_kargath_bladefist : public CreatureScript
resetcheck_timer = 5000;
}
- void SetData(uint32 type, uint32 data) override
+ void DoAction(int32 action) override
{
- if (type == 1)
+ if (action == ACTION_EXECUTIONER_TAUNT)
{
- switch (data)
+ switch (instance->GetData(DATA_TEAM_IN_INSTANCE))
{
case ALLIANCE:
Talk(SAY_CALL_EXECUTIONER_A);
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
index 6939b15585a..5cfae286f9b 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
@@ -32,20 +32,11 @@ EndScriptData */
#include "SpellAuras.h"
#include "shattered_halls.h"
-enum Spells
-{
- SPELL_CLEAVE = 15284,
-
- SPELL_EXECUTE_1 = 39288,
- SPELL_EXECUTE_2,
- SPELL_EXECUTE_3
-};
-
DoorData const doorData[] =
{
- {GO_GRAND_WARLOCK_CHAMBER_DOOR_1, DATA_NETHEKURSE, DOOR_TYPE_PASSAGE, BOUNDARY_S },
- {GO_GRAND_WARLOCK_CHAMBER_DOOR_2, DATA_NETHEKURSE, DOOR_TYPE_PASSAGE, BOUNDARY_N },
- {0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE}
+ { GO_GRAND_WARLOCK_CHAMBER_DOOR_1, DATA_NETHEKURSE, DOOR_TYPE_PASSAGE, BOUNDARY_NONE },
+ { GO_GRAND_WARLOCK_CHAMBER_DOOR_2, DATA_NETHEKURSE, DOOR_TYPE_PASSAGE, BOUNDARY_NONE },
+ { 0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE }
};
class instance_shattered_halls : public InstanceMapScript
@@ -77,9 +68,7 @@ class instance_shattered_halls : public InstanceMapScript
if (!_team)
_team = player->GetTeam();
- player->RemoveAurasDueToSpell(SPELL_EXECUTE_1);
- player->RemoveAurasDueToSpell(SPELL_EXECUTE_2);
- player->RemoveAurasDueToSpell(SPELL_EXECUTE_3);
+ player->CastSpell(player, SPELL_REMOVE_KARGATH_EXECUTIONER, true);
if (!executionTimer || executionerGUID.IsEmpty())
return;
@@ -87,13 +76,13 @@ class instance_shattered_halls : public InstanceMapScript
switch (executed)
{
case 0:
- ex = player->AddAura(SPELL_EXECUTE_1, player);
+ ex = player->AddAura(SPELL_KARGATH_EXECUTIONER_1, player);
break;
case 1:
- ex = player->AddAura(SPELL_EXECUTE_2, player);
+ ex = player->AddAura(SPELL_KARGATH_EXECUTIONER_2, player);
break;
case 2:
- ex = player->AddAura(SPELL_EXECUTE_3, player);
+ ex = player->AddAura(SPELL_KARGATH_EXECUTIONER_3, player);
break;
default:
break;
@@ -151,10 +140,22 @@ class instance_shattered_halls : public InstanceMapScript
break;
case NPC_SHATTERED_EXECUTIONER:
executionTimer = 55 * MINUTE * IN_MILLISECONDS;
- DoCastSpellOnPlayers(SPELL_EXECUTE_1);
+ DoCastSpellOnPlayers(SPELL_KARGATH_EXECUTIONER_1);
executionerGUID = creature->GetGUID();
SaveToDB();
break;
+ case NPC_CAPTAIN_ALINA:
+ case NPC_CAPTAIN_BONESHATTER:
+ victimsGUID[0] = creature->GetGUID();
+ break;
+ case NPC_ALLIANCE_VICTIM_1:
+ case NPC_HORDE_VICTIM_1:
+ victimsGUID[1] = creature->GetGUID();
+ break;
+ case NPC_ALLIANCE_VICTIM_2:
+ case NPC_HORDE_VICTIM_2:
+ victimsGUID[2] = creature->GetGUID();
+ break;
}
}
@@ -168,16 +169,14 @@ class instance_shattered_halls : public InstanceMapScript
case DATA_SHATTERED_EXECUTIONER:
if (state == DONE)
{
- DoRemoveAurasDueToSpellOnPlayers(SPELL_EXECUTE_1);
- DoRemoveAurasDueToSpellOnPlayers(SPELL_EXECUTE_2);
- DoRemoveAurasDueToSpellOnPlayers(SPELL_EXECUTE_3);
+ DoCastSpellOnPlayers(SPELL_REMOVE_KARGATH_EXECUTIONER);
executionTimer = 0;
SaveToDB();
}
break;
case DATA_KARGATH:
if (Creature* executioner = instance->GetCreature(executionerGUID))
- executioner->AI()->Reset();
+ executioner->AI()->Reset(); // trigger removal of IMMUNE_TO_PC flag
break;
case DATA_OMROGG:
break;
@@ -191,16 +190,16 @@ class instance_shattered_halls : public InstanceMapScript
{
case NPC_GRAND_WARLOCK_NETHEKURSE:
return nethekurseGUID;
- break;
case NPC_KARGATH_BLADEFIST:
return kargathGUID;
- break;
case NPC_SHATTERED_EXECUTIONER:
return executionerGUID;
- break;
+ case DATA_FIRST_PRISONER:
+ case DATA_SECOND_PRISONER:
+ case DATA_THIRD_PRISONER:
+ return victimsGUID[data - DATA_FIRST_PRISONER];
default:
return ObjectGuid::Empty;
- break;
}
}
@@ -253,13 +252,10 @@ class instance_shattered_halls : public InstanceMapScript
{
case DATA_PRISONERS_EXECUTED:
return executed;
- break;
case DATA_TEAM_IN_INSTANCE:
return _team;
- break;
default:
return 0;
- break;
}
}
@@ -269,27 +265,25 @@ class instance_shattered_halls : public InstanceMapScript
return;
if (executionTimer <= diff)
- {
+ {
+ DoCastSpellOnPlayers(SPELL_REMOVE_KARGATH_EXECUTIONER);
switch (++executed)
{
case 1:
- DoRemoveAurasDueToSpellOnPlayers(SPELL_EXECUTE_1);
- DoCastSpellOnPlayers(SPELL_EXECUTE_2);
+ DoCastSpellOnPlayers(SPELL_KARGATH_EXECUTIONER_2);
executionTimer = 10 * MINUTE * IN_MILLISECONDS;
break;
case 2:
- DoRemoveAurasDueToSpellOnPlayers(SPELL_EXECUTE_2);
- DoCastSpellOnPlayers(SPELL_EXECUTE_3);
+ DoCastSpellOnPlayers(SPELL_KARGATH_EXECUTIONER_3);
executionTimer = 15 * MINUTE * IN_MILLISECONDS;
break;
default:
- DoRemoveAurasDueToSpellOnPlayers(SPELL_EXECUTE_3);
executionTimer = 0;
break;
}
if (Creature* executioner = instance->GetCreature(executionerGUID))
- executioner->AI()->SetData(1, executed);
+ executioner->AI()->SetData(DATA_PRISONERS_EXECUTED, executed);
SaveToDB();
}
@@ -297,10 +291,11 @@ class instance_shattered_halls : public InstanceMapScript
executionTimer -= diff;
}
- protected:
+ private:
ObjectGuid nethekurseGUID;
ObjectGuid kargathGUID;
ObjectGuid executionerGUID;
+ ObjectGuid victimsGUID[3];
uint8 executed;
uint32 executionTimer;
@@ -308,189 +303,7 @@ class instance_shattered_halls : public InstanceMapScript
};
};
-class at_nethekurse_exit : public AreaTriggerScript
-{
- public:
- at_nethekurse_exit() : AreaTriggerScript("at_nethekurse_exit") { };
-
- bool OnTrigger(Player* player, AreaTriggerEntry const*) override
- {
- if (InstanceScript* is = player->GetInstanceScript())
- {
- if (is->instance->IsHeroic())
- {
- Creature* executioner = nullptr;
-
- is->instance->LoadGrid(Executioner.GetPositionX(), Executioner.GetPositionY());
- if (Creature* kargath = ObjectAccessor::GetCreature(*player, is->GetGuidData(NPC_KARGATH_BLADEFIST)))
- {
- if (is->GetGuidData(NPC_SHATTERED_EXECUTIONER).IsEmpty())
- {
- executioner = kargath->SummonCreature(NPC_SHATTERED_EXECUTIONER, Executioner);
- kargath->AI()->SetData(1, is->GetData(DATA_TEAM_IN_INSTANCE));
- }
- }
-
- if (executioner)
- for (uint8 i = 0; i < VictimCount; ++i)
- executioner->SummonCreature(executionerVictims[i](is->GetData(DATA_TEAM_IN_INSTANCE)), executionerVictims[i].GetPos());
- }
- }
-
- return false;
- }
-};
-
-class boss_shattered_executioner : public CreatureScript
-{
- public:
- boss_shattered_executioner() : CreatureScript("boss_shattered_executioner") { }
-
- struct boss_shattered_executionerAI : public BossAI
- {
- boss_shattered_executionerAI(Creature* creature) : BossAI(creature, DATA_SHATTERED_EXECUTIONER)
- {
- Initialize();
- };
-
- void Initialize()
- {
- cleaveTimer = 500;
- me->ResetLootMode();
- switch (instance->GetData(DATA_PRISONERS_EXECUTED))
- {
- case 0:
- me->AddLootMode(LOOT_MODE_HARD_MODE_3);
- case 1:
- me->AddLootMode(LOOT_MODE_HARD_MODE_2);
- case 2:
- me->AddLootMode(LOOT_MODE_HARD_MODE_1);
- }
- }
-
- void Reset() override
- {
- _Reset();
- if (instance->GetBossState(DATA_KARGATH) == DONE)
- me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
- else
- me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
-
- Initialize();
- }
-
- void JustSummoned(Creature*) override { }
-
- void JustDied(Unit*) override
- {
- _JustDied();
- Map::PlayerList const &players = instance->instance->GetPlayers();
- for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
- {
- Player* pl = itr->GetSource();
- uint32 qId = pl->GetTeam() == ALLIANCE ? QUEST_IMPRISONED_A : QUEST_IMPRISONED_H;
- if (pl->GetQuestStatus(qId) != QUEST_STATUS_NONE && pl->GetQuestStatus(qId) != QUEST_STATUS_FAILED)
- pl->CompleteQuest(qId);
- }
- }
-
- void SetData(uint32 type, uint32 data) override
- {
- if (type == 1)
- {
- uint32 entry = executionerVictims[data - 1](instance->GetData(DATA_TEAM_IN_INSTANCE));
- if (Creature* victim = me->FindNearestCreature(entry, 30.0f, true))
- me->Kill(victim);
-
- if (data == 1)
- {
- Map::PlayerList const &players = instance->instance->GetPlayers();
- for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
- {
- Player* pl = itr->GetSource();
- uint32 qId = pl->GetTeam() == ALLIANCE ? QUEST_IMPRISONED_A : QUEST_IMPRISONED_H;
- if (pl->GetQuestStatus(qId) == QUEST_STATUS_INCOMPLETE)
- pl->FailQuest(qId);
- }
- }
-
- switch (data)
- {
- case 3:
- me->RemoveLootMode(LOOT_MODE_HARD_MODE_1);
- case 2:
- me->RemoveLootMode(LOOT_MODE_HARD_MODE_2);
- case 1:
- me->RemoveLootMode(LOOT_MODE_HARD_MODE_3);
- default:
- break;
- }
- }
- }
-
- void UpdateAI(uint32 diff) override
- {
- if (!UpdateVictim())
- return;
-
- if (cleaveTimer <= diff)
- {
- DoCast(SPELL_CLEAVE);
- cleaveTimer = urand(5000, 7000);
- }
- else
- cleaveTimer -= diff;
-
- DoMeleeAttackIfReady();
- }
- private:
- uint32 cleaveTimer;
- };
-
- CreatureAI* GetAI(Creature* creature) const override
- {
- return GetInstanceAI<boss_shattered_executionerAI>(creature);
- }
-};
-
-class spell_kargath_executioner : public SpellScriptLoader
-{
- public:
- spell_kargath_executioner() : SpellScriptLoader("spell_kargath_executioner") { }
-
- class spell_kargath_executioner_AuraScript : public AuraScript
- {
- PrepareAuraScript(spell_kargath_executioner_AuraScript);
-
- bool AreaCheck(Unit* target)
- {
- if (target->GetMap()->GetId() != 540)
- return false;
-
- return true;
- }
-
- bool Load() override
- {
- return GetCaster()->GetTypeId() == TYPEID_PLAYER;
- }
-
- void Register() override
- {
- DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_kargath_executioner_AuraScript::AreaCheck);
- }
- };
-
- AuraScript* GetAuraScript() const override
- {
- return new spell_kargath_executioner_AuraScript();
- }
-};
-
void AddSC_instance_shattered_halls()
{
new instance_shattered_halls();
- new at_nethekurse_exit();
- new boss_shattered_executioner();
- new spell_kargath_executioner();
}
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp
new file mode 100644
index 00000000000..81c1283768b
--- /dev/null
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp
@@ -0,0 +1,259 @@
+/*
+ * Copyright (C) 2008-2015 TrinityCore <http://www.trinitycore.org/>
+ *
+ * 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
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ScriptMgr.h"
+#include "ScriptedCreature.h"
+#include "SpellScript.h"
+#include "SpellAuraEffects.h"
+#include "InstanceScript.h"
+#include "Player.h"
+#include "SpellAuras.h"
+#include "shattered_halls.h"
+
+class at_nethekurse_exit : public AreaTriggerScript
+{
+ public:
+ at_nethekurse_exit() : AreaTriggerScript("at_nethekurse_exit") { };
+
+ bool OnTrigger(Player* player, AreaTriggerEntry const*) override
+ {
+ if (InstanceScript* is = player->GetInstanceScript())
+ {
+ if (is->instance->IsHeroic())
+ {
+ Creature* executioner = nullptr;
+
+ is->instance->LoadGrid(Executioner.GetPositionX(), Executioner.GetPositionY());
+ if (Creature* kargath = ObjectAccessor::GetCreature(*player, is->GetGuidData(NPC_KARGATH_BLADEFIST)))
+ {
+ if (is->GetGuidData(NPC_SHATTERED_EXECUTIONER).IsEmpty())
+ {
+ executioner = kargath->SummonCreature(NPC_SHATTERED_EXECUTIONER, Executioner);
+ kargath->AI()->DoAction(ACTION_EXECUTIONER_TAUNT);
+ }
+ }
+
+ if (executioner)
+ for (uint8 i = 0; i < VictimCount; ++i)
+ executioner->SummonCreature(executionerVictims[i](is->GetData(DATA_TEAM_IN_INSTANCE)), executionerVictims[i].GetPos());
+ }
+ }
+
+ return false;
+ }
+};
+
+enum Spells
+{
+ SPELL_CLEAVE = 15284
+};
+
+class boss_shattered_executioner : public CreatureScript
+{
+ public:
+ boss_shattered_executioner() : CreatureScript("boss_shattered_executioner") { }
+
+ struct boss_shattered_executionerAI : public BossAI
+ {
+ boss_shattered_executionerAI(Creature* creature) : BossAI(creature, DATA_SHATTERED_EXECUTIONER)
+ {
+ Initialize();
+ };
+
+ void Initialize()
+ {
+ cleaveTimer = 500;
+ }
+
+ void Reset() override
+ {
+ _Reset();
+
+ // _Reset() resets the loot mode, so we add them again, if any
+ switch (instance->GetData(DATA_PRISONERS_EXECUTED))
+ {
+ case 0:
+ me->AddLootMode(LOOT_MODE_HARD_MODE_3);
+ case 1:
+ me->AddLootMode(LOOT_MODE_HARD_MODE_2);
+ case 2:
+ me->AddLootMode(LOOT_MODE_HARD_MODE_1);
+ default:
+ break;
+ }
+
+ if (instance->GetBossState(DATA_KARGATH) == DONE)
+ me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
+ else
+ me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
+
+ Initialize();
+ }
+
+ void JustSummoned(Creature*) override { } // avoid despawn of prisoners on death/reset
+
+ void JustDied(Unit*) override
+ {
+ _JustDied();
+
+ if (instance->GetData(DATA_PRISONERS_EXECUTED) > 0)
+ return;
+
+ Map::PlayerList const &players = instance->instance->GetPlayers();
+ for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+ {
+ Player* pl = itr->GetSource();
+ uint32 qId = pl->GetTeam() == ALLIANCE ? QUEST_IMPRISONED_A : QUEST_IMPRISONED_H;
+ if (pl->GetQuestStatus(qId) == QUEST_STATUS_INCOMPLETE)
+ pl->CompleteQuest(qId);
+ }
+ }
+
+ void SetData(uint32 type, uint32 data) override
+ {
+ if (type == DATA_PRISONERS_EXECUTED && data <= 3)
+ {
+ if (Creature* victim = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_FIRST_PRISONER + data - 1)))
+ me->Kill(victim);
+
+ if (data == 1)
+ {
+ Map::PlayerList const &players = instance->instance->GetPlayers();
+ for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+ {
+ Player* pl = itr->GetSource();
+ uint32 qId = pl->GetTeam() == ALLIANCE ? QUEST_IMPRISONED_A : QUEST_IMPRISONED_H;
+ if (pl->GetQuestStatus(qId) == QUEST_STATUS_INCOMPLETE)
+ pl->FailQuest(qId);
+ }
+ }
+
+ switch (data)
+ {
+ case 3:
+ me->RemoveLootMode(LOOT_MODE_HARD_MODE_1);
+ case 2:
+ me->RemoveLootMode(LOOT_MODE_HARD_MODE_2);
+ case 1:
+ me->RemoveLootMode(LOOT_MODE_HARD_MODE_3);
+ default:
+ break;
+ }
+ }
+ }
+
+ void UpdateAI(uint32 diff) override
+ {
+ if (!UpdateVictim())
+ return;
+
+ if (cleaveTimer <= diff)
+ {
+ DoCast(SPELL_CLEAVE);
+ cleaveTimer = urand(5000, 7000);
+ }
+ else
+ cleaveTimer -= diff;
+
+ DoMeleeAttackIfReady();
+ }
+ private:
+ uint32 cleaveTimer;
+ };
+
+ CreatureAI* GetAI(Creature* creature) const override
+ {
+ return GetInstanceAI<boss_shattered_executionerAI>(creature);
+ }
+};
+
+class spell_kargath_executioner : public SpellScriptLoader
+{
+ public:
+ spell_kargath_executioner() : SpellScriptLoader("spell_kargath_executioner") { }
+
+ class spell_kargath_executioner_AuraScript : public AuraScript
+ {
+ PrepareAuraScript(spell_kargath_executioner_AuraScript);
+
+ bool AreaCheck(Unit* target)
+ {
+ if (target->GetMap()->GetId() != 540)
+ return false;
+
+ return true;
+ }
+
+ bool Load() override
+ {
+ return GetCaster()->GetTypeId() == TYPEID_PLAYER;
+ }
+
+ void Register() override
+ {
+ DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_kargath_executioner_AuraScript::AreaCheck);
+ }
+ };
+
+ AuraScript* GetAuraScript() const override
+ {
+ return new spell_kargath_executioner_AuraScript();
+ }
+};
+
+class spell_remove_kargath_executioner : public SpellScriptLoader
+{
+ public:
+ spell_remove_kargath_executioner() : SpellScriptLoader("spell_remove_kargath_executioner") { }
+
+ class spell_remove_kargath_executioner_SpellScript : public SpellScript
+ {
+ PrepareSpellScript(spell_remove_kargath_executioner_SpellScript);
+
+ void HandleScript(SpellEffIndex /*effIndex*/)
+ {
+ Unit* target = GetCaster();
+
+ target->RemoveAurasDueToSpell(SPELL_KARGATH_EXECUTIONER_1);
+ target->RemoveAurasDueToSpell(SPELL_KARGATH_EXECUTIONER_2);
+ target->RemoveAurasDueToSpell(SPELL_KARGATH_EXECUTIONER_3);
+ }
+
+ bool Load() override
+ {
+ return GetCaster()->GetTypeId() == TYPEID_PLAYER;
+ }
+
+ void Register() override
+ {
+ OnEffectHitTarget += SpellEffectFn(spell_remove_kargath_executioner_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
+ }
+ };
+
+ SpellScript* GetSpellScript() const override
+ {
+ return new spell_remove_kargath_executioner_SpellScript();
+ }
+};
+
+void AddSC_shattered_halls()
+{
+ new at_nethekurse_exit();
+ new boss_shattered_executioner();
+ new spell_kargath_executioner();
+ new spell_remove_kargath_executioner();
+}
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
index adc07bec2ff..894cc9c40a6 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
@@ -33,7 +33,11 @@ enum DataTypes
DATA_SHATTERED_EXECUTIONER = 3,
DATA_PRISONERS_EXECUTED = 4,
- DATA_TEAM_IN_INSTANCE = 5
+ DATA_TEAM_IN_INSTANCE = 5,
+
+ DATA_FIRST_PRISONER,
+ DATA_SECOND_PRISONER,
+ DATA_THIRD_PRISONER
};
enum CreatureIds
@@ -70,6 +74,20 @@ enum QuestIds
QUEST_IMPRISONED_H = 9525
};
+enum InstanceSpells
+{
+ SPELL_KARGATH_EXECUTIONER_1 = 39288,
+ SPELL_KARGATH_EXECUTIONER_2 = 39289,
+ SPELL_KARGATH_EXECUTIONER_3 = 39290,
+
+ SPELL_REMOVE_KARGATH_EXECUTIONER = 39291
+};
+
+enum Actions
+{
+ ACTION_EXECUTIONER_TAUNT = 1
+};
+
const Position Executioner = { 152.8524f, -83.63912f, 2.021005f, 0.06981317f };
struct FactionSpawnerHelper
@@ -77,7 +95,7 @@ struct FactionSpawnerHelper
FactionSpawnerHelper(uint32 allianceEntry, uint32 hordeEntry, const Position& pos) : _allianceNPC(allianceEntry), _hordeNPC(hordeEntry), _spawnPos(pos) { }
inline uint32 operator()(uint32 teamID) const { return teamID == ALLIANCE ? _allianceNPC : _hordeNPC; }
- inline const Position GetPos() const { return _spawnPos; }
+ inline Position const& GetPos() const { return _spawnPos; }
private:
const uint32 _allianceNPC;
diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp
index d98ef2ec799..0ec8bfc3a9c 100644
--- a/src/server/scripts/Spells/spell_quest.cpp
+++ b/src/server/scripts/Spells/spell_quest.cpp
@@ -208,22 +208,23 @@ class spell_q6124_6129_apply_salve : public SpellScriptLoader
if (GetCastItem())
if (Creature* creatureTarget = GetHitCreature())
{
- uint32 uiNewEntry = 0;
+ uint32 newEntry = 0;
switch (caster->GetTeam())
{
case HORDE:
if (creatureTarget->GetEntry() == NPC_SICKLY_GAZELLE)
- uiNewEntry = NPC_CURED_GAZELLE;
+ newEntry = NPC_CURED_GAZELLE;
break;
case ALLIANCE:
if (creatureTarget->GetEntry() == NPC_SICKLY_DEER)
- uiNewEntry = NPC_CURED_DEER;
+ newEntry = NPC_CURED_DEER;
break;
}
- if (uiNewEntry)
+ if (newEntry)
{
- creatureTarget->UpdateEntry(uiNewEntry);
+ creatureTarget->UpdateEntry(newEntry);
creatureTarget->DespawnOrUnsummon(DESPAWN_TIME);
+ caster->KilledMonsterCredit(newEntry);
}
}
}
diff --git a/src/server/shared/Debugging/WheatyExceptionReport.cpp b/src/server/shared/Debugging/WheatyExceptionReport.cpp
index f8f641a9ea7..e50cf42e439 100644
--- a/src/server/shared/Debugging/WheatyExceptionReport.cpp
+++ b/src/server/shared/Debugging/WheatyExceptionReport.cpp
@@ -61,6 +61,7 @@ HANDLE WheatyExceptionReport::m_hDumpFile;
HANDLE WheatyExceptionReport::m_hProcess;
SymbolPairs WheatyExceptionReport::symbols;
std::stack<SymbolDetail> WheatyExceptionReport::symbolDetails;
+bool WheatyExceptionReport::stackOverflowException;
// Declare global instance of class
WheatyExceptionReport g_WheatyExceptionReport;
@@ -72,6 +73,7 @@ WheatyExceptionReport::WheatyExceptionReport() // Constructor
// Install the unhandled exception filter function
m_previousFilter = SetUnhandledExceptionFilter(WheatyUnhandledExceptionFilter);
m_hProcess = GetCurrentProcess();
+ stackOverflowException = false;
if (!IsDebuggerPresent())
{
_CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE);
@@ -97,6 +99,9 @@ WheatyExceptionReport::~WheatyExceptionReport()
LONG WINAPI WheatyExceptionReport::WheatyUnhandledExceptionFilter(
PEXCEPTION_POINTERS pExceptionInfo)
{
+ if (pExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_STACK_OVERFLOW)
+ stackOverflowException = true;
+
TCHAR module_folder_name[MAX_PATH];
GetModuleFileName(0, module_folder_name, MAX_PATH);
TCHAR* pos = _tcsrchr(module_folder_name, '\\');
@@ -419,107 +424,114 @@ void WheatyExceptionReport::printTracesForAllThreads(bool bWriteVariables)
void WheatyExceptionReport::GenerateExceptionReport(
PEXCEPTION_POINTERS pExceptionInfo)
{
- SYSTEMTIME systime;
- GetLocalTime(&systime);
-
- // Start out with a banner
- _tprintf(_T("Revision: %s\r\n"), _FULLVERSION);
- _tprintf(_T("Date %u:%u:%u. Time %u:%u \r\n"), systime.wDay, systime.wMonth, systime.wYear, systime.wHour, systime.wMinute);
- PEXCEPTION_RECORD pExceptionRecord = pExceptionInfo->ExceptionRecord;
-
- PrintSystemInfo();
- // First print information about the type of fault
- _tprintf(_T("\r\n//=====================================================\r\n"));
- _tprintf(_T("Exception code: %08X %s\r\n"),
- pExceptionRecord->ExceptionCode,
- GetExceptionString(pExceptionRecord->ExceptionCode));
-
- // Now print information about where the fault occured
- TCHAR szFaultingModule[MAX_PATH];
- DWORD section;
- DWORD_PTR offset;
- GetLogicalAddress(pExceptionRecord->ExceptionAddress,
- szFaultingModule,
- sizeof(szFaultingModule),
- section, offset);
+ __try
+ {
+ SYSTEMTIME systime;
+ GetLocalTime(&systime);
+
+ // Start out with a banner
+ _tprintf(_T("Revision: %s\r\n"), _FULLVERSION);
+ _tprintf(_T("Date %u:%u:%u. Time %u:%u \r\n"), systime.wDay, systime.wMonth, systime.wYear, systime.wHour, systime.wMinute);
+ PEXCEPTION_RECORD pExceptionRecord = pExceptionInfo->ExceptionRecord;
+
+ PrintSystemInfo();
+ // First print information about the type of fault
+ _tprintf(_T("\r\n//=====================================================\r\n"));
+ _tprintf(_T("Exception code: %08X %s\r\n"),
+ pExceptionRecord->ExceptionCode,
+ GetExceptionString(pExceptionRecord->ExceptionCode));
+
+ // Now print information about where the fault occured
+ TCHAR szFaultingModule[MAX_PATH];
+ DWORD section;
+ DWORD_PTR offset;
+ GetLogicalAddress(pExceptionRecord->ExceptionAddress,
+ szFaultingModule,
+ sizeof(szFaultingModule),
+ section, offset);
#ifdef _M_IX86
- _tprintf(_T("Fault address: %08X %02X:%08X %s\r\n"),
- pExceptionRecord->ExceptionAddress,
- section, offset, szFaultingModule);
+ _tprintf(_T("Fault address: %08X %02X:%08X %s\r\n"),
+ pExceptionRecord->ExceptionAddress,
+ section, offset, szFaultingModule);
#endif
#ifdef _M_X64
- _tprintf(_T("Fault address: %016I64X %02X:%016I64X %s\r\n"),
- pExceptionRecord->ExceptionAddress,
- section, offset, szFaultingModule);
+ _tprintf(_T("Fault address: %016I64X %02X:%016I64X %s\r\n"),
+ pExceptionRecord->ExceptionAddress,
+ section, offset, szFaultingModule);
#endif
- PCONTEXT pCtx = pExceptionInfo->ContextRecord;
+ PCONTEXT pCtx = pExceptionInfo->ContextRecord;
- // Show the registers
- #ifdef _M_IX86 // X86 Only!
- _tprintf(_T("\r\nRegisters:\r\n"));
+ // Show the registers
+#ifdef _M_IX86 // X86 Only!
+ _tprintf(_T("\r\nRegisters:\r\n"));
- _tprintf(_T("EAX:%08X\r\nEBX:%08X\r\nECX:%08X\r\nEDX:%08X\r\nESI:%08X\r\nEDI:%08X\r\n")
- , pCtx->Eax, pCtx->Ebx, pCtx->Ecx, pCtx->Edx,
- pCtx->Esi, pCtx->Edi);
+ _tprintf(_T("EAX:%08X\r\nEBX:%08X\r\nECX:%08X\r\nEDX:%08X\r\nESI:%08X\r\nEDI:%08X\r\n")
+ , pCtx->Eax, pCtx->Ebx, pCtx->Ecx, pCtx->Edx,
+ pCtx->Esi, pCtx->Edi);
- _tprintf(_T("CS:EIP:%04X:%08X\r\n"), pCtx->SegCs, pCtx->Eip);
- _tprintf(_T("SS:ESP:%04X:%08X EBP:%08X\r\n"),
- pCtx->SegSs, pCtx->Esp, pCtx->Ebp);
- _tprintf(_T("DS:%04X ES:%04X FS:%04X GS:%04X\r\n"),
- pCtx->SegDs, pCtx->SegEs, pCtx->SegFs, pCtx->SegGs);
- _tprintf(_T("Flags:%08X\r\n"), pCtx->EFlags);
- #endif
+ _tprintf(_T("CS:EIP:%04X:%08X\r\n"), pCtx->SegCs, pCtx->Eip);
+ _tprintf(_T("SS:ESP:%04X:%08X EBP:%08X\r\n"),
+ pCtx->SegSs, pCtx->Esp, pCtx->Ebp);
+ _tprintf(_T("DS:%04X ES:%04X FS:%04X GS:%04X\r\n"),
+ pCtx->SegDs, pCtx->SegEs, pCtx->SegFs, pCtx->SegGs);
+ _tprintf(_T("Flags:%08X\r\n"), pCtx->EFlags);
+#endif
- #ifdef _M_X64
- _tprintf(_T("\r\nRegisters:\r\n"));
- _tprintf(_T("RAX:%016I64X\r\nRBX:%016I64X\r\nRCX:%016I64X\r\nRDX:%016I64X\r\nRSI:%016I64X\r\nRDI:%016I64X\r\n")
- _T("R8: %016I64X\r\nR9: %016I64X\r\nR10:%016I64X\r\nR11:%016I64X\r\nR12:%016I64X\r\nR13:%016I64X\r\nR14:%016I64X\r\nR15:%016I64X\r\n")
- , pCtx->Rax, pCtx->Rbx, pCtx->Rcx, pCtx->Rdx,
- pCtx->Rsi, pCtx->Rdi, pCtx->R9, pCtx->R10, pCtx->R11, pCtx->R12, pCtx->R13, pCtx->R14, pCtx->R15);
- _tprintf(_T("CS:RIP:%04X:%016I64X\r\n"), pCtx->SegCs, pCtx->Rip);
- _tprintf(_T("SS:RSP:%04X:%016X RBP:%08X\r\n"),
- pCtx->SegSs, pCtx->Rsp, pCtx->Rbp);
- _tprintf(_T("DS:%04X ES:%04X FS:%04X GS:%04X\r\n"),
- pCtx->SegDs, pCtx->SegEs, pCtx->SegFs, pCtx->SegGs);
- _tprintf(_T("Flags:%08X\r\n"), pCtx->EFlags);
- #endif
+#ifdef _M_X64
+ _tprintf(_T("\r\nRegisters:\r\n"));
+ _tprintf(_T("RAX:%016I64X\r\nRBX:%016I64X\r\nRCX:%016I64X\r\nRDX:%016I64X\r\nRSI:%016I64X\r\nRDI:%016I64X\r\n")
+ _T("R8: %016I64X\r\nR9: %016I64X\r\nR10:%016I64X\r\nR11:%016I64X\r\nR12:%016I64X\r\nR13:%016I64X\r\nR14:%016I64X\r\nR15:%016I64X\r\n")
+ , pCtx->Rax, pCtx->Rbx, pCtx->Rcx, pCtx->Rdx,
+ pCtx->Rsi, pCtx->Rdi, pCtx->R9, pCtx->R10, pCtx->R11, pCtx->R12, pCtx->R13, pCtx->R14, pCtx->R15);
+ _tprintf(_T("CS:RIP:%04X:%016I64X\r\n"), pCtx->SegCs, pCtx->Rip);
+ _tprintf(_T("SS:RSP:%04X:%016X RBP:%08X\r\n"),
+ pCtx->SegSs, pCtx->Rsp, pCtx->Rbp);
+ _tprintf(_T("DS:%04X ES:%04X FS:%04X GS:%04X\r\n"),
+ pCtx->SegDs, pCtx->SegEs, pCtx->SegFs, pCtx->SegGs);
+ _tprintf(_T("Flags:%08X\r\n"), pCtx->EFlags);
+#endif
- SymSetOptions(SYMOPT_DEFERRED_LOADS);
+ SymSetOptions(SYMOPT_DEFERRED_LOADS);
- // Initialize DbgHelp
- if (!SymInitialize(GetCurrentProcess(), 0, TRUE))
- {
- _tprintf(_T("\n\rCRITICAL ERROR.\n\r Couldn't initialize the symbol handler for process.\n\rError [%s].\n\r\n\r"),
- ErrorMessage(GetLastError()));
- }
+ // Initialize DbgHelp
+ if (!SymInitialize(GetCurrentProcess(), 0, TRUE))
+ {
+ _tprintf(_T("\n\rCRITICAL ERROR.\n\r Couldn't initialize the symbol handler for process.\n\rError [%s].\n\r\n\r"),
+ ErrorMessage(GetLastError()));
+ }
- CONTEXT trashableContext = *pCtx;
+ CONTEXT trashableContext = *pCtx;
- WriteStackDetails(&trashableContext, false, NULL);
- printTracesForAllThreads(false);
+ WriteStackDetails(&trashableContext, false, NULL);
+ printTracesForAllThreads(false);
-// #ifdef _M_IX86 // X86 Only!
+ // #ifdef _M_IX86 // X86 Only!
- _tprintf(_T("========================\r\n"));
- _tprintf(_T("Local Variables And Parameters\r\n"));
+ _tprintf(_T("========================\r\n"));
+ _tprintf(_T("Local Variables And Parameters\r\n"));
- trashableContext = *pCtx;
- WriteStackDetails(&trashableContext, true, NULL);
- printTracesForAllThreads(true);
+ trashableContext = *pCtx;
+ WriteStackDetails(&trashableContext, true, NULL);
+ printTracesForAllThreads(true);
- /*_tprintf(_T("========================\r\n"));
- _tprintf(_T("Global Variables\r\n"));
+ /*_tprintf(_T("========================\r\n"));
+ _tprintf(_T("Global Variables\r\n"));
- SymEnumSymbols(GetCurrentProcess(),
+ SymEnumSymbols(GetCurrentProcess(),
(UINT_PTR)GetModuleHandle(szFaultingModule),
0, EnumerateSymbolsCallback, 0);*/
- // #endif // X86 Only!
+ // #endif // X86 Only!
- SymCleanup(GetCurrentProcess());
+ SymCleanup(GetCurrentProcess());
- _tprintf(_T("\r\n"));
+ _tprintf(_T("\r\n"));
+ }
+ __except (EXCEPTION_EXECUTE_HANDLER)
+ {
+ _tprintf(_T("Error writing the crash log\r\n"));
+ }
}
//======================================================================
@@ -1313,16 +1325,43 @@ DWORD_PTR WheatyExceptionReport::DereferenceUnsafePointer(DWORD_PTR address)
//============================================================================
int __cdecl WheatyExceptionReport::_tprintf(const TCHAR * format, ...)
{
- TCHAR szBuff[WER_LARGE_BUFFER_SIZE];
int retValue;
- DWORD cbWritten;
va_list argptr;
-
va_start(argptr, format);
+ if (stackOverflowException)
+ {
+ retValue = heapprintf(format, argptr);
+ va_end(argptr);
+ }
+ else
+ {
+ retValue = stackprintf(format, argptr);
+ va_end(argptr);
+ }
+
+ return retValue;
+}
+
+int __cdecl WheatyExceptionReport::stackprintf(const TCHAR * format, va_list argptr)
+{
+ int retValue;
+ DWORD cbWritten;
+
+ TCHAR szBuff[WER_LARGE_BUFFER_SIZE];
retValue = vsprintf(szBuff, format, argptr);
- va_end(argptr);
+ WriteFile(m_hReportFile, szBuff, retValue * sizeof(TCHAR), &cbWritten, 0);
+ return retValue;
+}
+
+int __cdecl WheatyExceptionReport::heapprintf(const TCHAR * format, va_list argptr)
+{
+ int retValue;
+ DWORD cbWritten;
+ TCHAR* szBuff = (TCHAR*)malloc(sizeof(TCHAR) * WER_LARGE_BUFFER_SIZE);
+ retValue = vsprintf(szBuff, format, argptr);
WriteFile(m_hReportFile, szBuff, retValue * sizeof(TCHAR), &cbWritten, 0);
+ free(szBuff);
return retValue;
}
diff --git a/src/server/shared/Debugging/WheatyExceptionReport.h b/src/server/shared/Debugging/WheatyExceptionReport.h
index b7731daaa2b..101b6187f2b 100644
--- a/src/server/shared/Debugging/WheatyExceptionReport.h
+++ b/src/server/shared/Debugging/WheatyExceptionReport.h
@@ -178,6 +178,8 @@ class WheatyExceptionReport
static DWORD_PTR DereferenceUnsafePointer(DWORD_PTR address);
static int __cdecl _tprintf(const TCHAR * format, ...);
+ static int __cdecl stackprintf(const TCHAR * format, va_list argptr);
+ static int __cdecl heapprintf(const TCHAR * format, va_list argptr);
static bool StoreSymbol(DWORD type , DWORD_PTR offset);
static void ClearSymbols();
@@ -191,6 +193,7 @@ class WheatyExceptionReport
static HANDLE m_hProcess;
static SymbolPairs symbols;
static std::stack<SymbolDetail> symbolDetails;
+ static bool stackOverflowException;
static char* PushSymbolDetail(char* pszCurrBuffer);
static char* PopSymbolDetail(char* pszCurrBuffer);
diff --git a/src/server/shared/Updater/DBUpdater.cpp b/src/server/shared/Updater/DBUpdater.cpp
index e5c571e4517..20ded669cec 100644
--- a/src/server/shared/Updater/DBUpdater.cpp
+++ b/src/server/shared/Updater/DBUpdater.cpp
@@ -349,8 +349,27 @@ void DBUpdater<T>::ApplyFile(DatabaseWorkerPool<T>& pool, std::string const& hos
args.push_back("-h" + host);
args.push_back("-u" + user);
args.push_back("-p" + password);
+
+ // Check if we want to connect through ip or socket (Unix only)
+#ifdef _WIN32
+
args.push_back("-P" + port_or_socket);
+#else
+
+ if (!std::isdigit(port_or_socket[0]))
+ {
+ // We can't check here if host == "." because is named localhost if socket option is enabled
+ args.push_back("-P0");
+ args.push_back("--protocol=SOCKET");
+ args.push_back("-S" + port_or_socket);
+ }
+ else
+ // generic case
+ args.push_back("-P" + port_or_socket);
+
+#endif
+
// Set the default charset to utf8
args.push_back("--default-character-set=utf8");