From c2d8e57a20e89628fb60847f35554cd58ad0a2a2 Mon Sep 17 00:00:00 2001
From: Aokromes <aokromes@gmail.com>
Date: Sun, 12 Jun 2016 09:39:02 +0200
Subject: [PATCH] DB/Misc: 3.3.5a fixes

---
 ...6_11_world.sql => 2016_06_11_00_world.sql} |  0
 ...world_from_335_was_2016_06_11_00_world.sql |  3 ++
 ...world_from_335_was_2016_06_11_01_world.sql |  2 +
 ...world_from_335_was_2016_06_11_02_world.sql |  9 ++++
 ...world_from_335_was_2016_06_11_03_world.sql |  5 ++
 ...world_from_335_was_2016_06_11_04_world.sql |  5 ++
 ...world_from_335_was_2016_06_11_05_world.sql |  6 +++
 ...world_from_335_was_2016_06_11_06_world.sql |  4 ++
 ...world_from_335_was_2016_06_11_07_world.sql |  6 +++
 ...world_from_335_was_2016_06_11_08_world.sql |  9 ++++
 ...world_from_335_was_2016_06_11_09_world.sql |  7 +++
 ...world_from_335_was_2016_06_11_10_world.sql | 50 ++++++++++++++++++
 ...world_from_335_was_2016_06_11_11_world.sql | 32 ++++++++++++
 ...world_from_335_was_2016_06_11_12_world.sql | 24 +++++++++
 ...d_from_335_was_2016_06_12_00_world_335.sql | 29 +++++++++++
 ...world_from_335_was_2016_06_12_01_world.sql | 45 ++++++++++++++++
 ...world_from_335_was_2016_06_12_02_world.sql |  2 +
 ...world_from_335_was_2016_06_12_03_world.sql |  3 ++
 ...world_from_335_was_2016_06_12_04_world.sql |  3 ++
 ...d_from_335_was_2016_06_12_05_world_355.sql |  4 ++
 ...world_from_335_was_2016_06_12_06_world.sql | 52 +++++++++++++++++++
 ...world_from_335_was_2016_06_12_07_world.sql | 33 ++++++++++++
 ...world_from_335_was_2016_06_12_08_world.sql |  3 ++
 ...world_from_335_was_2016_06_12_09_world.sql | 35 +++++++++++++
 24 files changed, 371 insertions(+)
 rename sql/updates/world/{2016_06_11_world.sql => 2016_06_11_00_world.sql} (100%)
 create mode 100644 sql/updates/world/2016_06_12_00_world_from_335_was_2016_06_11_00_world.sql
 create mode 100644 sql/updates/world/2016_06_12_01_world_from_335_was_2016_06_11_01_world.sql
 create mode 100644 sql/updates/world/2016_06_12_02_world_from_335_was_2016_06_11_02_world.sql
 create mode 100644 sql/updates/world/2016_06_12_03_world_from_335_was_2016_06_11_03_world.sql
 create mode 100644 sql/updates/world/2016_06_12_04_world_from_335_was_2016_06_11_04_world.sql
 create mode 100644 sql/updates/world/2016_06_12_05_world_from_335_was_2016_06_11_05_world.sql
 create mode 100644 sql/updates/world/2016_06_12_06_world_from_335_was_2016_06_11_06_world.sql
 create mode 100644 sql/updates/world/2016_06_12_07_world_from_335_was_2016_06_11_07_world.sql
 create mode 100644 sql/updates/world/2016_06_12_08_world_from_335_was_2016_06_11_08_world.sql
 create mode 100644 sql/updates/world/2016_06_12_09_world_from_335_was_2016_06_11_09_world.sql
 create mode 100644 sql/updates/world/2016_06_12_10_world_from_335_was_2016_06_11_10_world.sql
 create mode 100644 sql/updates/world/2016_06_12_11_world_from_335_was_2016_06_11_11_world.sql
 create mode 100644 sql/updates/world/2016_06_12_12_world_from_335_was_2016_06_11_12_world.sql
 create mode 100644 sql/updates/world/2016_06_12_13_world_from_335_was_2016_06_12_00_world_335.sql
 create mode 100644 sql/updates/world/2016_06_12_14_world_from_335_was_2016_06_12_01_world.sql
 create mode 100644 sql/updates/world/2016_06_12_15_world_from_335_was_2016_06_12_02_world.sql
 create mode 100644 sql/updates/world/2016_06_12_16_world_from_335_was_2016_06_12_03_world.sql
 create mode 100644 sql/updates/world/2016_06_12_17_world_from_335_was_2016_06_12_04_world.sql
 create mode 100644 sql/updates/world/2016_06_12_18_world_from_335_was_2016_06_12_05_world_355.sql
 create mode 100644 sql/updates/world/2016_06_12_19_world_from_335_was_2016_06_12_06_world.sql
 create mode 100644 sql/updates/world/2016_06_12_20_world_from_335_was_2016_06_12_07_world.sql
 create mode 100644 sql/updates/world/2016_06_12_21_world_from_335_was_2016_06_12_08_world.sql
 create mode 100644 sql/updates/world/2016_06_12_22_world_from_335_was_2016_06_12_09_world.sql

diff --git a/sql/updates/world/2016_06_11_world.sql b/sql/updates/world/2016_06_11_00_world.sql
similarity index 100%
rename from sql/updates/world/2016_06_11_world.sql
rename to sql/updates/world/2016_06_11_00_world.sql
diff --git a/sql/updates/world/2016_06_12_00_world_from_335_was_2016_06_11_00_world.sql b/sql/updates/world/2016_06_12_00_world_from_335_was_2016_06_11_00_world.sql
new file mode 100644
index 00000000000..ea81a3ce563
--- /dev/null
+++ b/sql/updates/world/2016_06_12_00_world_from_335_was_2016_06_11_00_world.sql
@@ -0,0 +1,3 @@
+-- Creature entry 19871 World Trigger (Not Immune NPC)
+-- set InhabitType [Flying] to enable hover mode for this creature
+UPDATE `creature_template` SET `InhabitType`= 4 WHERE `entry` = 19871;
diff --git a/sql/updates/world/2016_06_12_01_world_from_335_was_2016_06_11_01_world.sql b/sql/updates/world/2016_06_12_01_world_from_335_was_2016_06_11_01_world.sql
new file mode 100644
index 00000000000..c7185f6642c
--- /dev/null
+++ b/sql/updates/world/2016_06_12_01_world_from_335_was_2016_06_11_01_world.sql
@@ -0,0 +1,2 @@
+-- Correct page text for item 9568, Rune-Inscribed Parchment
+UPDATE `page_text` SET `Text` = "Lok'tar, $g brother:sister;. The elements beckon you closer and bid me to show you the path of the shaman. The spirits of our ancestors watch from beyond and swell with pride knowing you have joined our ranks.$B$BWhen you are ready, seek me out near the entrance to the Den. It is there that I will be training others of our kind. Until then, may the wind be at your back.$B$B-Shikrik, Shaman Trainer" WHERE `ID`= 2461;
diff --git a/sql/updates/world/2016_06_12_02_world_from_335_was_2016_06_11_02_world.sql b/sql/updates/world/2016_06_12_02_world_from_335_was_2016_06_11_02_world.sql
new file mode 100644
index 00000000000..ac5d1f6037c
--- /dev/null
+++ b/sql/updates/world/2016_06_12_02_world_from_335_was_2016_06_11_02_world.sql
@@ -0,0 +1,9 @@
+--
+DELETE FROM `conditions` WHERE `SourceEntry`=6383 AND SourceTypeOrReferenceId IN(19, 20);
+INSERT INTO `conditions` VALUES
+(19, 0, 6383, 0, 0, 28, 0, 235, 0, 0, 1, 0, 0, "", "Show quest 'The Ashenvale Hunt' if quest 'The Ashenvale Hunt' (breadcrumb) is not completed"),
+(20, 0, 6383, 0, 0, 28, 0, 235, 0, 0, 1, 0, 0, "", "Show quest 'The Ashenvale Hunt' if quest 'The Ashenvale Hunt' (breadcrumb) is not completed"),
+(19, 0, 6383, 0, 0, 28, 0, 742, 0, 0, 1, 0, 0, "", "Show quest 'The Ashenvale Hunt' if quest 'The Ashenvale Hunt' (breadcrumb) is not completed"),
+(20, 0, 6383, 0, 0, 28, 0, 742, 0, 0, 1, 0, 0, "", "Show quest 'The Ashenvale Hunt' if quest 'The Ashenvale Hunt' (breadcrumb) is not completed"),
+(19, 0, 6383, 0, 0, 28, 0, 6382, 0, 0, 1, 0, 0, "", "Show quest 'The Ashenvale Hunt' if quest 'The Ashenvale Hunt' (breadcrumb) is not completed"),
+(20, 0, 6383, 0, 0, 28, 0, 6382, 0, 0, 1, 0, 0, "", "Show quest 'The Ashenvale Hunt' if quest 'The Ashenvale Hunt' (breadcrumb) is not completed");
diff --git a/sql/updates/world/2016_06_12_03_world_from_335_was_2016_06_11_03_world.sql b/sql/updates/world/2016_06_12_03_world_from_335_was_2016_06_11_03_world.sql
new file mode 100644
index 00000000000..47e3aefa366
--- /dev/null
+++ b/sql/updates/world/2016_06_12_03_world_from_335_was_2016_06_11_03_world.sql
@@ -0,0 +1,5 @@
+-- fix string in trinity_string incorrectly implying character customization is forced at login
+UPDATE `trinity_string` SET `content_default`='customization for player %s will be requested at next login.' WHERE `entry`=345;
+UPDATE `trinity_string` SET `content_default`='customization for player %s (GUID #%u) will be requested at next login.' WHERE `entry`=346;
+
+UPDATE `trinity_string` SET `content_default`='You already have a pet.' WHERE `entry`=344; -- add missing article
diff --git a/sql/updates/world/2016_06_12_04_world_from_335_was_2016_06_11_04_world.sql b/sql/updates/world/2016_06_12_04_world_from_335_was_2016_06_11_04_world.sql
new file mode 100644
index 00000000000..f45f868006b
--- /dev/null
+++ b/sql/updates/world/2016_06_12_04_world_from_335_was_2016_06_11_04_world.sql
@@ -0,0 +1,5 @@
+--
+UPDATE `quest_request_items` SET `CompletionText`="So, Motega Firemane sends word of Arikara... well now that is grave news.$B$B<Magatha looks around.>$B$BArikara is a deadly creature born only to seek vengeance against those who have committed heinous acts.$B$B<Magatha smiles.>" WHERE `ID`=5062;
+UPDATE `quest_offer_reward` SET `RewardText`="You have returned from Desolace more than successful, $N. Thank you.$B$BThank you for your efforts, your time, and your understanding to my plea. Thrall understands and desires peace between the Horde and Alliance, and by taking measures to insure our appearance is acceptable, we will not provoke any further threats of unnecessary violence." WHERE `ID`=1436;
+UPDATE `quest_offer_reward` SET `RewardText`="Ah, this horn belongs to a Tauren, Roon Wildmane. My father spoke often of the good times they had together hunting the beasts of Desolace. So Roon is inviting me to join him, is he?$B$BWe're neck deep in the jungle right now, but thank you, $N. Perhaps my next expedition will take me to Desolace, the land of the centaurs." WHERE `ID`=5763;
+UPDATE `quest_offer_reward` SET `RewardText`="This does not make sense. Why would Arikara be after Cairne Bloodhoof? Magatha could not be wrong, she is our most powerful shaman.$B$B<Motega shakes his head.>$B$BRegardless, your great deed to the Horde shall not go unnoticed - please, choose one of these as a reward for your aid." WHERE `ID`=5088;
diff --git a/sql/updates/world/2016_06_12_05_world_from_335_was_2016_06_11_05_world.sql b/sql/updates/world/2016_06_12_05_world_from_335_was_2016_06_11_05_world.sql
new file mode 100644
index 00000000000..8c088c6f139
--- /dev/null
+++ b/sql/updates/world/2016_06_12_05_world_from_335_was_2016_06_11_05_world.sql
@@ -0,0 +1,6 @@
+--
+DELETE FROM `creature_queststarter` WHERE `quest`=1361;
+INSERT INTO `creature_queststarter` VALUES
+(2229, 1361),
+(10540, 1361),
+(4485, 1361);
diff --git a/sql/updates/world/2016_06_12_06_world_from_335_was_2016_06_11_06_world.sql b/sql/updates/world/2016_06_12_06_world_from_335_was_2016_06_11_06_world.sql
new file mode 100644
index 00000000000..12def3cc386
--- /dev/null
+++ b/sql/updates/world/2016_06_12_06_world_from_335_was_2016_06_11_06_world.sql
@@ -0,0 +1,4 @@
+--
+DELETE FROM `quest_template_addon` WHERE `ID`=680;
+INSERT INTO `quest_template_addon` (`ID`, `PrevQuestID`) VALUES
+(680, 678);
diff --git a/sql/updates/world/2016_06_12_07_world_from_335_was_2016_06_11_07_world.sql b/sql/updates/world/2016_06_12_07_world_from_335_was_2016_06_11_07_world.sql
new file mode 100644
index 00000000000..2e05fbac8fc
--- /dev/null
+++ b/sql/updates/world/2016_06_12_07_world_from_335_was_2016_06_11_07_world.sql
@@ -0,0 +1,6 @@
+--
+UPDATE `quest_template_addon` SET `SpecialFlags`=0 WHERE `ID` IN (8552, 3785);
+
+DELETE FROM `quest_template_addon` WHERE `ID`=2882;
+INSERT INTO `quest_template_addon` (`ID`, `SpecialFlags`) VALUES
+(2882, 1);
diff --git a/sql/updates/world/2016_06_12_08_world_from_335_was_2016_06_11_08_world.sql b/sql/updates/world/2016_06_12_08_world_from_335_was_2016_06_11_08_world.sql
new file mode 100644
index 00000000000..be72014d0ba
--- /dev/null
+++ b/sql/updates/world/2016_06_12_08_world_from_335_was_2016_06_11_08_world.sql
@@ -0,0 +1,9 @@
+--
+DELETE FROM `conditions` WHERE `SourceEntry`=1127 AND `SourceTypeOrReferenceId` IN (19, 20);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(19, 0, 1127, 0, 0, 9, 0, 1119, 0, 0, 0, 0, 0, "", "Quest 'Fool's Stout' - Can accept if player has quest 'Zanzil's Mixture and a Fool's Stout'"),
+(20, 0, 1127, 0, 0, 9, 0, 1119, 0, 0, 0, 0, 0, "", "Quest 'Fool's Stout' - Can accept if player has quest 'Zanzil's Mixture and a Fool's Stout'");
+
+DELETE FROM `quest_template_addon` WHERE `ID`=1127;
+INSERT INTO `quest_template_addon` (`ID`, `SpecialFlags`) VALUES
+(1127, 1);
diff --git a/sql/updates/world/2016_06_12_09_world_from_335_was_2016_06_11_09_world.sql b/sql/updates/world/2016_06_12_09_world_from_335_was_2016_06_11_09_world.sql
new file mode 100644
index 00000000000..71368bfb9c2
--- /dev/null
+++ b/sql/updates/world/2016_06_12_09_world_from_335_was_2016_06_11_09_world.sql
@@ -0,0 +1,7 @@
+-- 
+UPDATE `quest_template_addon` SET `SpecialFlags`=1 WHERE `id`=1463;
+DELETE FROM `conditions` WHERE `SourceEntry`=1463 AND `SourceTypeOrReferenceId` IN (20, 19) AND `ConditionTypeOrReference` IN (2);
+INSERT INTO `conditions` VALUES
+(19, 0, 1463, 0, 0, 2, 0, 6635, 1, 1, 1, 0, 0, "", "Show quest 'Earth Sapta' only if the item 'earth-sapta' is not in player's bags or bank"),
+(20, 0, 1463, 0, 0, 2, 0, 6635, 1, 1, 1, 0, 0, "", "Show question mark for quest 'Earth Sapta' only if the item 'earth-sapta' is not in player's bags or bank");
+UPDATE `quest_request_items` SET `CompletionText`="I give you one in good faith. You already proved yourself once, but me tinkin' you should be more careful in the future." WHERE `ID`= 1463;
diff --git a/sql/updates/world/2016_06_12_10_world_from_335_was_2016_06_11_10_world.sql b/sql/updates/world/2016_06_12_10_world_from_335_was_2016_06_11_10_world.sql
new file mode 100644
index 00000000000..68f5151dc87
--- /dev/null
+++ b/sql/updates/world/2016_06_12_10_world_from_335_was_2016_06_11_10_world.sql
@@ -0,0 +1,50 @@
+-- 
+DELETE FROM `conditions` WHERE `SourceEntry` IN (403, 308) AND `SourceTypeOrReferenceId` IN (19, 20);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(19, 0, 403, 0, 0, 28, 0, 310, 0, 0, 0, 0, 0, "", "Show quest 'Guarded Thunderbrew Barrel' if quest 'Bitter Rivals' is completed"),
+(20, 0, 403, 0, 0, 28, 0, 310, 0, 0, 0, 0, 0, "", "Show quest 'Guarded Thunderbrew Barrel' if quest 'Bitter Rivals' is completed"),
+(19, 0, 308, 0, 0, 8, 0, 403, 0, 0, 0, 0, 0, "", "Show quest 'Distracting Jarven' if quest 'Guarded Thunderbrew Barrel' is rewarded"),
+(20, 0, 308, 0, 0, 8, 0, 403, 0, 0, 0, 0, 0, "", "Show quest 'Distracting Jarven' if quest 'Guarded Thunderbrew Barrel' is rewarded"),
+(19, 0, 308, 0, 0, 28, 0, 310, 0, 0, 0, 0, 0, "", "Show quest 'Distracting Jarven' if quest 'Bitter Rivals' is completed"),
+(20, 0, 308, 0, 0, 28, 0, 310, 0, 0, 0, 0, 0, "", "Show quest 'Distracting Jarven' if quest 'Bitter Rivals' is completed");
+
+DELETE FROM `creature_text` WHERE `entry`=1373 AND `groupid`=0;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(1373, 0, 0, (SELECT `MaleText` FROM `broadcast_text` WHERE `id`=127), 12, 7, 100, 1, 0, 0, 127, 0, "Jarven Thunderbrew");
+
+UPDATE `gameobject` SET `position_x`=-5607.24, `position_y`=-547.934, `position_z`=392.985 WHERE `id`=270;
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (1373, 137300);
+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
+(1373, 0, 0, 1, 20, 0, 100, 0, 308, 0, 0, 0, 53, 0, 1373, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Jarven Thunderbrew - On Quest Rewarded - Start WP"),
+(1373, 0, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 83, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Jarven Thunderbrew - On Quest Rewarded - Remove Questgiver Flag"),
+(1373, 0, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Jarven Thunderbrew - On Quest Rewarded - Say Line 0"),
+(1373, 0, 3, 4, 40, 0, 100, 0, 2, 0, 0, 0, 41, 44, 0, 0, 0, 0, 0, 14, 1037, 269, 0, 0, 0, 0, 0, "Jarven Thunderbrew - On WP 2 Reached - Despawn Closest Gameobject \'Guarded Thunder Ale Barrel\'"),
+(1373, 0, 4, 0, 61, 0, 100, 0, 0, 0, 0, 0, 70, 45, 0, 0, 0,0, 0, 14, 35875, 270, 0, 0, 0, 0, 0, "Jarven Thunderbrew - On WP 2 Reached - Respawn Closest Gameobject \'Unguarded Thunder Ale Barrel\'"),
+(1373, 0, 5, 6, 40, 0, 100, 0, 8, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Jarven Thunderbrew - On WP 8 Reached - Say Line 1"),
+(1373, 0, 6, 7, 61, 0, 100, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 5.6724, "Jarven Thunderbrew - On WP 8 Reached - Turn"),
+(1373, 0, 7, 0, 61, 0, 100, 0, 0, 0, 0, 0, 54, 10000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Jarven Thunderbrew - On WP 8 Reached - Pause WP for 10 seconds"),
+(1373, 0, 8, 0, 40, 0, 100, 0, 15, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Jarven Thunderbrew - On WP 15 Reached - Say Line 2"),
+(1373, 0, 9, 10, 58, 0, 100, 0, 0, 0, 0, 0, 1, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Jarven Thunderbrew - On WP Ended - Say Line 3"),
+(1373, 0, 10, 11, 61, 0, 100, 0, 0, 0, 0, 0, 82, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Jarven Thunderbrew - On WP Ended - Add Questgiver Flag"),
+(1373, 0, 11, 0, 61, 0, 100, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Jarven Thunderbrew - On WP Ended - Reset Orientation");
+
+DELETE FROM `waypoints` WHERE `entry`= 1373;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(1373,  1, -5601.64, -541.38, 392.42, 'Jarven Thunderbrew - Quest 308 Waypoint movement'),
+(1373,  2, -5597.94, -542.04, 392.42, 'Jarven Thunderbrew - Quest 308 Waypoint movement'),
+(1373,  3, -5597.95, -548.43, 395.48, 'Jarven Thunderbrew - Quest 308 Waypoint movement'),
+(1373,  4, -5605.31, -549.33, 399.09, 'Jarven Thunderbrew - Quest 308 Waypoint movement'),
+(1373,  5, -5607.55, -546.63, 399.09, 'Jarven Thunderbrew - Quest 308 Waypoint movement'),
+(1373,  6, -5597.52, -538.75, 399.09, 'Jarven Thunderbrew - Quest 308 Waypoint movement'),
+(1373,  7, -5597.62, -530.24, 399.65, 'Jarven Thunderbrew - Quest 308 Waypoint movement'),
+(1373,  8, -5603.67, -529.91, 399.65, 'Jarven Thunderbrew - Quest 308 Waypoint movement'),
+(1373,  9, -5603.67, -529.91, 399.65, 'Jarven Thunderbrew - Quest 308 Waypoint movement'),
+(1373, 10, -5597.62, -530.24, 399.65, 'Jarven Thunderbrew - Quest 308 Waypoint movement'),
+(1373, 11, -5597.52, -538.75, 399.09, 'Jarven Thunderbrew - Quest 308 Waypoint movement'),
+(1373, 12, -5607.55, -546.63, 399.09, 'Jarven Thunderbrew - Quest 308 Waypoint movement'),
+(1373, 13, -5605.31, -549.33, 399.09, 'Jarven Thunderbrew - Quest 308 Waypoint movement'),
+(1373, 14, -5597.95, -548.43, 395.48, 'Jarven Thunderbrew - Quest 308 Waypoint movement'),
+(1373, 15, -5597.94, -542.04, 392.42, 'Jarven Thunderbrew - Quest 308 Waypoint movement'),
+(1373, 16, -5601.64, -541.38, 392.42, 'Jarven Thunderbrew - Quest 308 Waypoint movement'),
+(1373, 17, -5605.96, -544.45, 392.43, 'Jarven Thunderbrew - Quest 308 Waypoint movement');
diff --git a/sql/updates/world/2016_06_12_11_world_from_335_was_2016_06_11_11_world.sql b/sql/updates/world/2016_06_12_11_world_from_335_was_2016_06_11_11_world.sql
new file mode 100644
index 00000000000..86e6fa082b2
--- /dev/null
+++ b/sql/updates/world/2016_06_12_11_world_from_335_was_2016_06_11_11_world.sql
@@ -0,0 +1,32 @@
+-- 
+-- Mebok Mizzyrix SAI
+
+SET @ENTRY := 3446;
+DELETE FROM `creature_text` WHERE `entry`= @ENTRY AND `GroupId`=2;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ENTRY,2,0,"Hey $n!  Don't forget to grab a crate, a manual and a command stick!", 12,0,100,0,0,0,1788,0,'Mebok Mizzyrix on Quest 1221 taken');
+
+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,20,0,100,0,865,0,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mebok Mizzyrix - On Quest 'Raptor Horns' Finished - Run Script"),
+(@ENTRY,0,1,0,19,0,100,0,1221,0,0,0,80,@ENTRY*100+01,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mebok Mizzyrix - On Quest 'Blueleaf Tubers' Taken - Run Script");
+
+-- Actionlist SAI
+SET @ENTRY := 344600;
+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,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mebok Mizzyrix - On Script - Say Line 0"),
+(@ENTRY,9,1,0,0,0,100,0,2000,2000,0,0,11,17550,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mebok Mizzyrix - On Script - Cast 'Purification'"),
+(@ENTRY,9,2,0,0,0,100,0,4000,4000,0,0,5,34,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mebok Mizzyrix - On Script - Play Emote 34"),
+(@ENTRY,9,3,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mebok Mizzyrix - On Script - Say Line 1");
+
+-- Actionlist SAI
+SET @ENTRY := 344601;
+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,1,2,0,0,0,0,0,7,0,0,0,0,0,0,0,"Mebok Mizzyrix - On Script - Say Line 2"),
+(@ENTRY,9,1,0,0,0,100,0,2000,2000,0,0,69,0,0,0,0,0,0,8,0,0,0,-929.023,-3696.98,7.97395,1.7352,"Mebok Mizzyrix - On Script - Move To Position"),
+(@ENTRY,9,2,0,0,0,100,0,3000,3000,0,0,5,25,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mebok Mizzyrix - On Script - Play Emote 25"),
+(@ENTRY,9,3,0,0,0,100,0,3000,3000,0,0,69,0,0,0,0,0,0,8,0,0,0,-928.778,-3697.25,7.99705,6.17741,"Mebok Mizzyrix - On Script - Move To Position"),
+(@ENTRY,9,4,0,0,0,100,0,1000,1000,0,0,69,0,0,0,0,0,0,8,0,0,0,-928.982,-3697.23,8.06642,3.08923,"Mebok Mizzyrix - On Script - Move To Position");
diff --git a/sql/updates/world/2016_06_12_12_world_from_335_was_2016_06_11_12_world.sql b/sql/updates/world/2016_06_12_12_world_from_335_was_2016_06_11_12_world.sql
new file mode 100644
index 00000000000..be2587e862a
--- /dev/null
+++ b/sql/updates/world/2016_06_12_12_world_from_335_was_2016_06_11_12_world.sql
@@ -0,0 +1,24 @@
+-- 
+UPDATE `creature_template` SET `InhabitType`=4 WHERE `Entry` IN (21159, 18793, 20654);
+DELETE FROM `smart_scripts` WHERE `entryorguid`=18794; 
+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
+(18794, 0, 0, 0, 1, 0, 100, 7, 1000, 1000, 0, 0, 11, 32958, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - Out of Combat - Cast \'Crystal Channel\ (Dungeon)'),
+(18794, 0, 1, 0, 1, 0, 100, 5, 0, 0, 0, 0, 30, 1, 4, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - Out of Combat - Set Random Phase(1, 4) (No Repeat) (Dungeon)'),
+(18794, 0, 2, 0, 0, 0, 100, 2, 6000, 10000, 4000, 6000, 11, 20795, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - In Combat - Cast \'Fire Blast\' (Normal Dungeon)'),
+(18794, 0, 3, 0, 0, 0, 100, 4, 6000, 10000, 4000, 6000, 11, 14145, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - In Combat - Cast \'Fire Blast\' (Heroic Dungeon)'),
+(18794, 0, 4, 0, 0, 0, 100, 6, 2000, 2000, 10000, 12000, 11, 9574, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - In Combat - Cast \'Flame Buffet\' (Dungeon)'),
+(18794, 0, 5, 0, 0, 0, 100, 6, 4000, 4000, 6000, 8000, 11, 12540, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - In Combat - Cast \'Gouge\' (Dungeon)'),
+(18794, 0, 6, 0, 4, 1, 100, 6, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - On Aggro - Increment Phase By 1 (Phase 1) (No Repeat) (Dungeon)'),
+(18794, 0, 7, 0, 0, 1, 100, 2, 0, 0, 2400, 3800, 11, 15497, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - Combat CMC - Cast \'Frostbolt\' (Phase 1) (Normal Dungeon)'),
+(18794, 0, 8, 0, 0, 1, 100, 4, 0, 0, 2400, 3800, 11, 12675, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - Combat CMC - Cast \'Frostbolt\' (Phase 1) (Heroic Dungeon)'),
+(18794, 0, 9, 0, 0, 1, 100, 2, 7000, 7000, 7000, 12000, 11, 15532, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - In Combat - Cast \'Frost Nova\' (Phase 1) (Normal Dungeon)'),
+(18794, 0, 10, 0, 0, 1, 100, 4, 7000, 7000, 7000, 12000, 11, 15063, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - In Combat - Cast \'Frost Nova\' (Phase 1) (Heroic Dungeon)'),
+(18794, 0, 11, 0, 0, 2, 100, 6, 4000, 4000, 6000, 8000, 11, 12540, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - In Combat - Cast \'Gouge\' (Phase 2) (Dungeon)'),
+(18794, 0, 12, 0, 3, 2, 100, 6, 30, 100, 100, 100, 23, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - Between 30-100% Mana - Decrement Phase By 1 (Phase 2) (Dungeon)'),
+(18794, 0, 13, 0, 4, 4, 100, 0, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - On Aggro - Increment Phase By 1 (Phase 4) (Dungeon)'),
+(18794, 0, 14, 0, 0, 4, 100, 2, 0, 0, 2400, 3800, 11, 33833, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - Combat CMC - Cast \'Arcane Missiles\' (Phase 4) (Normal Dungeon)'),
+(18794, 0, 15, 0, 0, 4, 100, 4, 0, 0, 2400, 3800, 11, 38264, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - Combat CMC - Cast \'Arcane Missiles\' (Phase 4) (Heroic Dungeon)'),
+(18794, 0, 16, 0, 3, 4, 100, 0, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - Between 0-15% Mana - Increment Phase By 1 (Phase 4) (No Repeat) (Dungeon)'),
+(18794, 0, 17, 0, 0, 4, 100, 6, 9000, 12000, 12000, 16000, 11, 33487, 1, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - In Combat - Cast \'Addle Humanoid\' (Phase 4) (Dungeon)'),
+(18794, 0, 18, 0, 0, 8, 100, 6, 4000, 4000, 6000, 8000, 11, 12540, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - In Combat - Cast \'Gouge\' (Phase 8) (Dungeon)'),
+(18794, 0, 19, 0, 3, 8, 100, 6, 30, 100, 100, 100, 23, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - Between 30-100% Mana - Decrement Phase By 1 (Phase 8) (Dungeon)');
diff --git a/sql/updates/world/2016_06_12_13_world_from_335_was_2016_06_12_00_world_335.sql b/sql/updates/world/2016_06_12_13_world_from_335_was_2016_06_12_00_world_335.sql
new file mode 100644
index 00000000000..77833f11bf5
--- /dev/null
+++ b/sql/updates/world/2016_06_12_13_world_from_335_was_2016_06_12_00_world_335.sql
@@ -0,0 +1,29 @@
+/*
+-- 
+SET @Entry := 17093;
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@Entry;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@Entry, @Entry*100);
+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, 20, 0, 100, 0, 9434, 0, 0, 0, 80, @Entry*100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Magistrix Elosai - On Quest \"Testing the Tonic\" rewarded - Run script"),
+(@Entry*100, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 83, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Magistrix Elosai - On Script - Remove questgiver flag"),
+(@Entry*100, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Magistrix Elosai - On Script - Talk (0)"),
+(@Entry*100, 9, 2, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 11, 60888, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Magistrix Elosai - On Script - cast cosmetic emote"),
+(@Entry*100, 9, 3, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 1, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, "Magistrix Elosai - On Script - Talk (1)"),
+(@Entry*100, 9, 4, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Magistrix Elosai - On Script - Talk (2)"),
+(@Entry*100, 9, 5, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 17, 64, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Magistrix Elosai - On Script - Change emote state"),
+(@Entry*100, 9, 6, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 3, 17162, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Magistrix Elosai - On Script - Change model"),
+(@Entry*100, 9, 7, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 1, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Magistrix Elosai - On Script - Talk (3)"),
+(@Entry*100, 9, 8, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 1, 4, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Magistrix Elosai - On Script - Talk (4)"),
+(@Entry*100, 9, 9, 0, 0, 0, 100, 0, 20000, 20000, 0, 0, 3, 17093, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Magistrix Elosai - On Script - Change Entry"),
+(@Entry*100, 9, 10, 0, 0, 0, 100, 0, 0, 0, 0, 0, 17, 30, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Magistrix Elosai - On Script - Change emote state"),
+(@Entry*100, 9, 11, 0, 0, 0, 100, 0, 0, 0, 0, 0, 82, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Magistrix Elosai - On Script - Add questgiver flag");
+
+DELETE FROM `creature_text` WHERE `entry`=@Entry;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@Entry, 0, 0, (SELECT `FemaleText` FROM `broadcast_text` WHERE `ID`=13508), 16, 0, 100, 0, 0, 0, 13508, 0, ""),
+(@Entry, 1, 0, (SELECT `FemaleText` FROM `broadcast_text` WHERE `ID`=13509), 12, 0, 100, 7, 0, 0, 13509, 0, ""),
+(@Entry, 2, 0, (SELECT `FemaleText` FROM `broadcast_text` WHERE `ID`=13510), 12, 0, 100, 0, 0, 0, 13510, 0, ""),
+(@Entry, 3, 0, (SELECT `FemaleText` FROM `broadcast_text` WHERE `ID`=13511), 12, 0, 100, 0, 0, 0, 13511, 0, ""),
+(@Entry, 4, 0, (SELECT `FemaleText` FROM `broadcast_text` WHERE `ID`=14318), 12, 0, 100, 0, 0, 0, 14318, 0, "");
+*/
diff --git a/sql/updates/world/2016_06_12_14_world_from_335_was_2016_06_12_01_world.sql b/sql/updates/world/2016_06_12_14_world_from_335_was_2016_06_12_01_world.sql
new file mode 100644
index 00000000000..62e2c2cc600
--- /dev/null
+++ b/sql/updates/world/2016_06_12_14_world_from_335_was_2016_06_12_01_world.sql
@@ -0,0 +1,45 @@
+-- 
+-- Add missing Emote & Say lines for NPC entry 20098(Jane), 20100(Jessel) and 20244(Nova)
+SET @Jane   := 20098;
+SET @Jessel := 20100;
+SET @Nova   := 20244;
+
+-- Set random movement around a new set spawndist for Nova
+UPDATE `creature` SET `position_x`= 10512.0615,`position_y`= -6499.652,`position_z`= 3.6119,`orientation`= 0.855017,`spawndist`= 8,`MovementType`= 1 WHERE `id`= @Nova;
+UPDATE `creature` SET `position_x`= 10512.0615,`position_y`= -6499.652,`position_z`= 3.6119,`orientation`= 0.855017,`spawndist`= 8,`MovementType`= 1 WHERE `id`= 20246;
+UPDATE `creature` SET `MovementType`=1, `spawndist`=8 WHERE `id` IN (20098,20247,20246);
+
+DELETE FROM `creature_text` WHERE `entry`= @Jane   AND `groupid`= 1 AND `id`= 0;
+DELETE FROM `creature_text` WHERE `entry`= @Jessel AND `groupid`= 2 AND `id`= 0;
+DELETE FROM `creature_text` WHERE `entry`= @Nova   AND `groupid` IN (0,1) AND `id` IN (0,1,2,3);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@Jessel,2,0,'%s wakes up, startled.',                                 16,10,100,0,0,0,17595,0,'Jessel'),
+(@Jane,  1,0,'%s resumes playing on the beach.',                       16,10,100,0,0,0,17599,0,'Jane'),
+(@Nova,  1,0,'I think I can see the Sunwell from here!',               12,10,100,1,0,0,17918,0,'Nova'),
+(@Nova,  1,1,'Can you really hear the ocean from one of these shells?',12,10,100,1,0,0,17919,0,'Nova'),
+(@Nova,  1,2,'Oooh! Look, a shiny one!',                               12,10,100,1,0,0,17920,0,'Nova'),
+(@Nova,  1,3,'Jane will love this one!',                               12,10,100,1,0,0,17921,0,'Nova'),
+(@Nova,  0,0,'%s picks up a sea shell.',                               16,10,100,0,0,0,17922,0,'Nova'),
+(@Nova,  0,1,'%s holds a sea shell up to her ear.',                    16,10,100,0,0,0,17923,0,'Nova'),
+(@Nova,  0,2,'%s shakes the dirt loose from the shell.',               16,10,100,0,0,0,17924,0,'Nova');
+
+-- Add SmartAI script lines for Jane, Jessel and Nova
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`= @Nova;
+DELETE FROM `smart_scripts` WHERE `entryorguid`= @Jane   AND `source_type`= 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`= @Jessel AND `source_type`= 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`= @Jessel*100 AND `source_type`= 9;
+DELETE FROM `smart_scripts` WHERE `entryorguid`= @Nova   AND `source_type`= 0 AND `id` IN (0,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
+(@Nova,  0,0,0,1,0,100,0, 10000, 10000, 25000, 60000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Nova - Out Of Combat - Say Line'),
+(@Nova,  0,1,0,1,0,100,0, 11000, 11000, 25000, 60000,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Nova - Out Of Combat - Say Line'),
+(20100, 0, 0, 0, 1, 0, 100, 0, 0, 0, 300000, 300000, 80, 2010000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Jessel - Ooc - Action list"),
+(2010000, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 11, 50917, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Jessel - Action list - Cast sleep aura"),
+(2010000, 9, 1, 0, 0, 0, 100, 0, 10000, 10000, 0, 0, 28, 50917, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Jessel - Action list - rrmove sleep aura"),
+(2010000, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Jessel - Action list - Say Line 2"),
+(2010000, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 90, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Jessel - Action list - Set bytes 1"),
+(2010000, 9, 4, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Jessel - Action list - Say Line 0"),
+(2010000, 9, 5, 0, 0, 0, 100, 0, 9000, 9000, 0, 0, 1, 0, 0, 0, 0, 0, 0, 19, @Jane, 50, 0, 0, 0, 0, 0, "Jessel - Action list - Say Line 0"),
+(2010000, 9, 6, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Jessel - Action list - Say Line 1"),
+(2010000, 9, 7, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 1, 1, 0, 0, 0, 0, 0, 19, @Jane, 50, 0, 0, 0, 0, 0, "Jessel - Action list - Say Line 1"),
+(2010000, 9, 8, 6, 0, 0, 100, 0, 3000, 3000, 0, 0, 91, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Jessel - Action list - remove bytes 1"),
+(2010000, 9, 9, 0, 0, 0, 100, 0, 0, 0, 0, 0, 11, 50917, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Jessel - Action list - Cast sleep");
diff --git a/sql/updates/world/2016_06_12_15_world_from_335_was_2016_06_12_02_world.sql b/sql/updates/world/2016_06_12_15_world_from_335_was_2016_06_12_02_world.sql
new file mode 100644
index 00000000000..dc1709d6d2f
--- /dev/null
+++ b/sql/updates/world/2016_06_12_15_world_from_335_was_2016_06_12_02_world.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`= 2010000 AND `source_type`= 9;
diff --git a/sql/updates/world/2016_06_12_16_world_from_335_was_2016_06_12_03_world.sql b/sql/updates/world/2016_06_12_16_world_from_335_was_2016_06_12_03_world.sql
new file mode 100644
index 00000000000..c1864e88bc3
--- /dev/null
+++ b/sql/updates/world/2016_06_12_16_world_from_335_was_2016_06_12_03_world.sql
@@ -0,0 +1,3 @@
+-- 
+UPDATE `creature_loot_template` SET `chance`=5.4 WHERE `entry` IN (3100, 3196, 3244, 3123, 3196, 3268) AND `item`=6514;
+UPDATE `creature_loot_template` SET `chance`=0.7 WHERE `entry`=3100 AND `item`=4663;
diff --git a/sql/updates/world/2016_06_12_17_world_from_335_was_2016_06_12_04_world.sql b/sql/updates/world/2016_06_12_17_world_from_335_was_2016_06_12_04_world.sql
new file mode 100644
index 00000000000..718394bc63b
--- /dev/null
+++ b/sql/updates/world/2016_06_12_17_world_from_335_was_2016_06_12_04_world.sql
@@ -0,0 +1,3 @@
+-- 
+-- Set CREATURE_FLAG_EXTRA_NO_PLAYER_DAMAGE_REQ on Iron Sentinel Credit & Iron Dwarf Assailant & Corpulent Horror Credit
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|2097152 WHERE `entry` IN (30296,30297,30696);
diff --git a/sql/updates/world/2016_06_12_18_world_from_335_was_2016_06_12_05_world_355.sql b/sql/updates/world/2016_06_12_18_world_from_335_was_2016_06_12_05_world_355.sql
new file mode 100644
index 00000000000..684f864a5db
--- /dev/null
+++ b/sql/updates/world/2016_06_12_18_world_from_335_was_2016_06_12_05_world_355.sql
@@ -0,0 +1,4 @@
+/*
+-- 
+UPDATE `locales_quest` SET `Title_loc2`='Nessa Chantelombre', `Title_loc3`='Nessa Schattensang', `Title_loc6`='Nessa Cantosombrío', `Title_loc7`='Nessa Cantosombrío', `Title_loc8`='Несса Песня Теней', `Details_loc2`="Une de mes amies, Nessa Chantelombre, est une marchande de poissons, dans le village de Rut'theran. Elle a besoin qu'un colis soit apporté à Sombrivage, et cherche quelqu'un qui serait d'accord pour l'aider.$B$BSi cela vous intéresse et que vous souhaitez rencontrer Nessa, il vous faut prendre le portail qui relie Darnassus et Rut'theran. Vous le trouverez à l'ouest des jardins du temple.", `Details_loc3`="Eine Freundin von mir, Nessa Schattensang, vertreibt Angelzubehör in Rut'theran. Sie hat ein Paket, das dringend nach Dunkelküste gebracht werden muss, und sucht jemanden, der ihr hilft.$B$BWenn Ihr Interesse habt, dann durchschreitet das Portal in Darnassus nach Rut'theran. Ihr findet das Portal westlich der Tempelgärten. ", `Details_loc6`="Una amiga mía, Nessa Cantosombrío, comercia con pescado en la Aldea Rut'theran. Necesita entregar un paquete en Costa Oscura y está buscando a alguien que le ayude.$B$BSi te interesa, coge el portal en Darnassus hasta la Aldea Rut'theran para ir a verla. Encontrarás el portal al oeste de Los Jardines del Templo. ", `Details_loc7`="Una amiga mía, Nessa Cantosombrío, comercia con pescado en la Aldea Rut'theran. Necesita entregar un paquete en Costa Oscura y está buscando a alguien que le ayude.$B$BSi te interesa, coge el portal en Darnassus hasta la Aldea Rut'theran para ir a verla. Encontrarás el portal al oeste de Los Jardines del Templo. ", `Details_loc8`="Моя подруга, Несса Песня Теней, торгует рыбой в деревне Рут'теран. Ей нужно доставить посылку на Темные берега, и она ищет кого-нибудь, кто мог бы ей помочь.$B$BЕсли вы хотите помочь Нессе, то ступайте в деревню Рут'теран через портал в Дарнасе. Портал находится к западу от Храмовых садов.", `Objectives_loc2`='Parler à Nessa Chantelombre.', `Objectives_loc3`='Sprecht mit Nessa Schattensang.', `Objectives_loc6`=' Habla con Nessa Cantosombrío.', `Objectives_loc7`=' Habla con Nessa Cantosombrío.', `Objectives_loc8`='Поговорите с Нессой Песня Теней.' WHERE `Id`=6344;
+*/
diff --git a/sql/updates/world/2016_06_12_19_world_from_335_was_2016_06_12_06_world.sql b/sql/updates/world/2016_06_12_19_world_from_335_was_2016_06_12_06_world.sql
new file mode 100644
index 00000000000..d3522334766
--- /dev/null
+++ b/sql/updates/world/2016_06_12_19_world_from_335_was_2016_06_12_06_world.sql
@@ -0,0 +1,52 @@
+-- Bunthen Plainswind (NPC 11798) and Silva Fil'naveth (NPC 11800), Moonglade Druid Flight Masters
+UPDATE `creature_template` SET `AIName`= 'SmartAI', `ScriptName`= '' WHERE `entry` IN (11798,11800);
+
+DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (4041,4042);
+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
+(4041,0,0,"I'd like to fly to Rut'theran Village.",                             7573,1,1,   0,0,0,0,'',0),
+(4041,1,0,"Do you know where I may find the Half Pendant of Aquatic Agility?",  8035,1,1,4225,0,0,0,'',0),
+(4041,2,0,"Do you know where I may find the Half Pendant of Aquatic Agility?",  8035,1,1,4226,0,0,0,'',0),
+(4042,0,0,"I'd like to fly to Thunder Bluff.",                                 12804,1,1,   0,0,0,0,'',0),
+(4042,1,0,"Do you know where I may find the Half Pendant of Aquatic Endurance?",8036,1,1,4223,0,0,0,'',0),
+(4042,2,0,"Do you know where I may find the Half Pendant of Aquatic Endurance?",8036,1,1,4224,0,0,0,'',0);
+
+-- Add gossip_menu entries to be linked to text_id gossip text (npc_text.id)
+DELETE FROM `gossip_menu` WHERE `text_id` IN (4917,4918,5373,5374,5375,5376);
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
+(4042,4917),
+(4042,4918),
+(4223,5373),
+(4224,5374),
+(4225,5375),
+(4226,5376);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup` IN (4041,4042);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+-- conditions for Silva's gossip menus
+(14,4041,4913,0, 0, 15,0,1024,0,0, 1, 0,0,'', "Show Gossip Menu entry 4041 text_id 4913 if player is NOT a Druid"),
+(14,4041,4914,0, 1, 15,0,1024,0,0, 0, 0,0,'', "Show Gossip Menu entry 4041 text_id 4914 if player is a Druid"),
+(14,4041,4914,0, 1,  6,0, 469,0,0, 0, 0,0,'', "Show Gossip Menu entry 4041 text_id 4914 if player is Alliance"),
+(14,4041,4915,0, 2, 15,0,1024,0,0, 0, 0,0,'', "Show Gossip Menu entry 4041 text_id 4915 if player is a Druid"),
+(14,4041,4915,0, 2,  6,0, 469,0,0, 1, 0,0,'', "Show Gossip Menu entry 4041 text_id 4915 if player is NOT Alliance"),
+(15,4041,   0,0, 3, 15,0,1024,0,0, 0, 0,0,'', "Show Gossip Menu Option menu_id 4041 id 0 if player is a Druid"),
+(15,4041,   0,0, 3,  6,0, 469,0,0, 0, 0,0,'', "Show Gossip Menu Option menu_id 4041 id 0 if player is Alliance"),
+(15,4041,   1,0, 0,  9,0, 272,0,0, 0, 0,0,'', "Show Gossip Menu Option menu_id 4041 id 1 if Quest 272 is taken"),
+(15,4041,   2,0, 0,  9,0,  30,0,0, 0, 0,0,'', "Show Gossip Menu Option menu_id 4041 id 2 if Quest 30 is taken"),
+-- conditions for Bunthen's gossip menus
+(14,4042,4916,0, 0, 15,0,1024,0,0, 1, 0,0,'', "Show Gossip Menu entry 4042 text_id 4916 if player is NOT a Druid"),
+(14,4042,4918,0, 4, 15,0,1024,0,0, 0, 0,0,'', "Show Gossip Menu entry 4042 text_id 4918 if player is a Druid"),
+(14,4042,4918,0, 4,  6,0,  67,0,0, 0, 0,0,'', "Show Gossip Menu entry 4042 text_id 4918 if player is Horde"),
+(14,4042,4917,0, 5, 15,0,1024,0,0, 0, 0,0,'', "Show Gossip Menu entry 4042 text_id 4917 if player is a Druid"),
+(14,4042,4917,0, 5,  6,0,  67,0,0, 1, 0,0,'', "Show Gossip Menu entry 4042 text_id 4917 if player is NOT Horde"),
+(15,4042,   0,0, 6, 15,0,1024,0,0, 0, 0,0,'', "Show Gossip Menu Option menu_id 4042 id 0 if player is a Druid"),
+(15,4042,   0,0, 6,  6,0,  67,0,0, 0, 0,0,'', "Show Gossip Menu Option menu_id 4042 id 0 if player is Horde"),
+(15,4042,   1,0, 0,  9,0, 272,0,0, 0, 0,0,'', "Show Gossip Menu Option menu_id 4042 id 1 if Quest 272 is taken"),
+(15,4042,   2,0, 0,  9,0,  30,0,0, 0, 0,0,'', "Show Gossip Menu Option menu_id 4042 id 2 if Quest 30 is taken");
+
+-- SmartAI for Bunthen & Silva
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (11798, 11800) 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
+(11798,0,0,1,62,0,100,0,4042,0,0,0,72,  0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Bunthen Plainswind - on Gossip Menu Option 4042 id 0 selected - close Gossip"),
+(11798,0,1,0,61,0,100,0,   0,0,0,0,52,316,0,0,0,0,0,7,0,0,0,0,0,0,0,"Bunthen Plainswind - on Gossip Menu Option 4042 id 0 selected - activate Taxi Path 316(Moonglade - Thunder Bluff)"),
+(11800,0,2,3,62,0,100,0,4041,0,0,0,72,  0,0,0,0,0,0,7,0,0,0,0,0,0,0,  "Silva Fil'naveth - on Gossip Menu Option 4041 id 0 selected - close Gossip"),
+(11800,0,3,0,61,0,100,0,   0,0,0,0,52,315,0,0,0,0,0,7,0,0,0,0,0,0,0,  "Silva Fil'naveth - on Gossip Menu Option 4041 id 0 selected - activate Taxi Path 315(Moonglade - Rut'theran Village)");
diff --git a/sql/updates/world/2016_06_12_20_world_from_335_was_2016_06_12_07_world.sql b/sql/updates/world/2016_06_12_20_world_from_335_was_2016_06_12_07_world.sql
new file mode 100644
index 00000000000..259975e8f14
--- /dev/null
+++ b/sql/updates/world/2016_06_12_20_world_from_335_was_2016_06_12_07_world.sql
@@ -0,0 +1,33 @@
+-- "Plucky" Johnson (Magus Tirth's assistant) in quest 1950 "Get the Scoop":
+SET @CHICKEN := 6626;
+SET @HUMAN   := 6666;
+
+UPDATE `creature_template` SET `gossip_menu_id`= 231, `AIName`= 'SmartAI' WHERE `entry`= @HUMAN;
+UPDATE `creature_template` SET `AIName`= 'SmartAI', `ScriptName`= '' WHERE `entry`= @CHICKEN;
+
+DELETE FROM `gossip_menu` WHERE `entry` IN (231,232) AND `text_id` IN (720,738);
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
+(231, 720),
+(232, 738);
+
+DELETE FROM `gossip_menu_option` WHERE `menu_id`= 231 AND `OptionBroadcastTextID`= 2707;
+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
+(231, 0, 0, "Tell me the phrase to Tirth's lockbox.", 2707, 1, 1, 232, 0, 0, 0, '', 0);
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@CHICKEN,@HUMAN) 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`,`comment`) VALUES
+(@CHICKEN,0,0,1,22,0,100,0, 22,0,0,0,11,    9192,   2,0,0,0,0,1,0,0,0,0,0,0,'"Plucky" Johnson - Received Emote 22 - Cast "Plucky" Resumes Human Form'),
+(@CHICKEN,0,1,2,61,0,100,0,  0,0,0,0, 3,  @HUMAN,6194,0,0,0,0,1,0,0,0,0,0,0,'"Plucky" Johnson - Received Emote 22 - Morph To Creature "Plucky" Johnson\'s Human Form'),
+(@CHICKEN,0,2,3,61,0,100,0,  0,0,0,0, 5,       3,   0,0,0,0,0,1,0,0,0,0,0,0,'"Plucky" Johnson - Received Emote 22 - Play Emote 3'),
+(@CHICKEN,0,3,4,61,0,100,0,  0,0,0,0,11,    9220,   0,0,0,0,0,1,0,0,0,0,0,0,'"Plucky" Johnson - Received Emote 22 - Cast "Plucky" Resumes Chicken Form'),
+(@CHICKEN,0,4,0,61,0,100,0,  0,0,0,0, 3,@CHICKEN,5369,0,0,0,0,1,0,0,0,0,0,0,'"Plucky" Johnson - Received Emote 22 - Morph To Creature "Plucky" Johnson'),
+(@CHICKEN,0,5,6,22,0,100,0,  7,0,0,0,11,    9192,   2,0,0,0,0,1,0,0,0,0,0,0,'"Plucky" Johnson - Received Emote 7 - Cast "Plucky" Resumes Human Form'),
+(@CHICKEN,0,6,7,61,0,100,0,  0,0,0,0, 3,  @HUMAN,6194,0,0,0,0,1,0,0,0,0,0,0,'"Plucky" Johnson - Received Emote 7 - Morph To Creature "Plucky" Johnson\'s Human Form'),
+(@CHICKEN,0,7,8,61,0,100,0,  0,0,0,0,82,       1,   0,0,0,0,0,1,0,0,0,0,0,0,'"Plucky" Johnson - Received Emote 7 - Add Npc Flags Gossip'),
+(@CHICKEN,0,8,0,61,0,100,0,  0,0,0,0,69,       0,   0,0,0,0,0,7,0,0,0,0,0,0,'"Plucky" Johnson - Received Emote 7 - Move To Invoker'),
+(@HUMAN,  0,0,1,62,0,100,0,231,0,0,0,72,       0,   0,0,0,0,0,7,0,0,0,0,0,0,'"Plucky" Johnson\'s Human Form - On Gossip Option 0 Selected - Close Gossip'),
+(@HUMAN,  0,1,0,61,0,100,0,  0,0,0,0,15,    1950,   0,0,0,0,0,7,0,0,0,0,0,0,'"Plucky" Johnson\'s Human Form - On Gossip Option 0 Selected - Credit Quest 1950');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`= 15 AND `SourceGroup`= 231;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,231,0, 0,0,9,0,1950,0,0,0,0,0,'', 'Show gossip menu option 231 only if Quest 1950 is taken (active)');
diff --git a/sql/updates/world/2016_06_12_21_world_from_335_was_2016_06_12_08_world.sql b/sql/updates/world/2016_06_12_21_world_from_335_was_2016_06_12_08_world.sql
new file mode 100644
index 00000000000..c39e59c7ec8
--- /dev/null
+++ b/sql/updates/world/2016_06_12_21_world_from_335_was_2016_06_12_08_world.sql
@@ -0,0 +1,3 @@
+--
+UPDATE `quest_template` SET `AllowableRaces`=512 WHERE `ID` IN (8325, 9393, 8328, 9676, 8564, 9392, 8563, 8326, 8327, 8330, 8345, 8336, 8334, 8335, 8338, 8347, 9428, 9189);
+UPDATE `quest_template_addon` SET `PrevQuestID`=0 WHERE `ID`=9704;
diff --git a/sql/updates/world/2016_06_12_22_world_from_335_was_2016_06_12_09_world.sql b/sql/updates/world/2016_06_12_22_world_from_335_was_2016_06_12_09_world.sql
new file mode 100644
index 00000000000..19772c101ab
--- /dev/null
+++ b/sql/updates/world/2016_06_12_22_world_from_335_was_2016_06_12_09_world.sql
@@ -0,0 +1,35 @@
+--
+SET @GUID := -65109;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=18211;
+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,6,0,100,0,0,0,0,0,45,0,1,0,0,0,0,9,18211,0,10,0,0,0,0,"Murkblood Brute - On Just Died - Set Data 0 1"),
+(@GUID,0,1,0,38,0,100,0,0,1,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Murkblood Brute - On Data Set 0 1 - Set Event Phase 1"),
+(@GUID,0,2,0,6,1,100,0,0,0,0,0,82,2,0,0,0,0,0,9,18210,0,10,0,0,0,0,"Murkblood Brute - On Just Died - Add Npc Flag Questgiver (Phase 1)"),
+(@GUID,0,3,0,1,0,100,0,0,0,500,1000,81,0,0,0,0,0,0,9,18210,0,10,0,0,0,0,"Murkblood Brute - On Respawn - Remove Npc Flag Questgiver");
+
+SET @GUID := -65110;
+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,6,0,100,0,0,0,0,0,45,0,1,0,0,0,0,9,18211,0,10,0,0,0,0,"Murkblood Brute - On Just Died - Set Data 0 1"),
+(@GUID,0,1,0,38,0,100,0,0,1,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Murkblood Brute - On Data Set 0 1 - Set Event Phase 1"),
+(@GUID,0,2,0,6,1,100,0,0,0,0,0,82,2,0,0,0,0,0,9,18210,0,10,0,0,0,0,"Murkblood Brute - On Just Died - Add Npc Flag Questgiver (Phase 1)"),
+(@GUID,0,3,0,1,0,100,0,0,0,500,1000,81,0,0,0,0,0,0,9,18210,0,10,0,0,0,0,"Murkblood Brute - On Respawn - Remove Npc Flag Questgiver");
+
+
+SET @GUID := -28663;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=18203;
+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,6,0,100,0,0,0,0,0,45,0,1,0,0,0,0,9,18203,0,10,0,0,0,0,"Murkblood Raider - On Just Died - Set Data 0 1"),
+(@GUID,0,1,0,38,0,100,0,0,1,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Murkblood Raider - On Data Set 0 1 - Set Event Phase 1"),
+(@GUID,0,2,0,6,1,100,0,0,0,0,0,82,2,0,0,0,0,0,9,18209,0,10,0,0,0,0,"Murkblood Raider - On Just Died - Add Npc Flag Questgiver (Phase 1)"),
+(@GUID,0,3,0,1,0,100,0,0,0,500,1000,81,0,0,0,0,0,0,9,18209,0,10,0,0,0,0,"Murkblood Raider - On Respawn - Remove Npc Flag Questgiver");
+
+SET @GUID := -28664;
+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,6,0,100,0,0,0,0,0,45,0,1,0,0,0,0,9,18203,0,10,0,0,0,0,"Murkblood Raider - On Just Died - Set Data 0 1"),
+(@GUID,0,1,0,38,0,100,0,0,1,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Murkblood Raider - On Data Set 0 1 - Set Event Phase 1"),
+(@GUID,0,2,0,6,1,100,0,0,0,0,0,82,2,0,0,0,0,0,9,18209,0,10,0,0,0,0,"Murkblood Raider - On Just Died - Add Npc Flag Questgiver (Phase 1)"),
+(@GUID,0,3,0,1,0,100,0,0,0,500,1000,81,0,0,0,0,0,0,9,18209,0,10,0,0,0,0,"Murkblood Raider - On Respawn - Remove Npc Flag Questgiver");