From 2b4806f0dad975302d8e77842567abed1f39c61d Mon Sep 17 00:00:00 2001
From: Malcrom <malcromdev@gmail.com>
Date: Mon, 3 Jun 2013 21:00:16 -0230
Subject: DB/Conditions: Fix gossip conditions for riding trainers.

---
 .../world/2013_06_03_02_world_conditions.sql       | 264 +++++++++++++++++++++
 1 file changed, 264 insertions(+)
 create mode 100644 sql/updates/world/2013_06_03_02_world_conditions.sql

(limited to 'sql/updates')

diff --git a/sql/updates/world/2013_06_03_02_world_conditions.sql b/sql/updates/world/2013_06_03_02_world_conditions.sql
new file mode 100644
index 00000000000..6b542fef131
--- /dev/null
+++ b/sql/updates/world/2013_06_03_02_world_conditions.sql
@@ -0,0 +1,264 @@
+-- Gossip Condition for Ultham Ironhorn "Dwarf riding trainer"
+SET @GOSSIP  := 4014;
+SET @TEXTYES := 4871;
+SET @TEXTNO  := 5858;
+SET @FACTION := 47;
+SET @RACE    := 4;
+SET @NOTRACE := 1787;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,@GOSSIP,@TEXTYES,0,16,@RACE,0,0,0,'','Show gossip text if player is a Dwarf'),
+(14,@GOSSIP,@TEXTYES,1,5,@FACTION,128,0,0,'','Show gossip text if player is Exalted with Ironforge'),
+(14,@GOSSIP,@TEXTNO,0,16,@NOTRACE,0,0,0,'','Show gossip text if player is not a Dwarf'),
+(14,@GOSSIP,@TEXTNO,0,5,@FACTION,127,0,0,'','Show gossip text if player is Not Exalted with Ironforge'),
+(15,@GOSSIP,0,0,16,@RACE,0,0,0,'','Show gossip option if player is a Dwarf'),
+(15,@GOSSIP,0,1,5,@FACTION,128,0,0,'','Show gossip option if player is a Exalted with Ironforge');
+-- Add Any Missing Gossip Menu item
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES);
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO);
+-- Add Any Missing Gossip Option
+DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`)VALUES
+(@GOSSIP,0,3,"I seek training to ride a steed.",5,16,0,0,0,0,'');
+UPDATE `creature_template` SET `gossip_menu_id`=@GOSSIP WHERE `entry`=4772;
+
+-- Gossip Condition for Velma Warnam "Forsaken riding trainer"
+SET @GOSSIP  := 4015;
+SET @TEXTYES := 4873;
+SET @TEXTNO  := 5859;
+SET @FACTION := 68;
+SET @RACE    := 16;
+SET @NOTRACE := 1775;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,@GOSSIP,@TEXTYES,0,16,@RACE,0,0,0,'','Show gossip text if player is a Forsaken'),
+(14,@GOSSIP,@TEXTYES,1,5,@FACTION,128,0,0,'','Show gossip text if player is Exalted with Undercity'),
+(14,@GOSSIP,@TEXTNO,0,16,@NOTRACE,0,0,0,'','Show gossip text if player is not a Forsaken'),
+(14,@GOSSIP,@TEXTNO,0,5,@FACTION,127,0,0,'','Show gossip text if player is Not Exalted with Undercity'),
+(15,@GOSSIP,0,0,16,@RACE,0,0,0,'','Show gossip option if player is a Forsaken'),
+(15,@GOSSIP,0,1,5,@FACTION,128,0,0,'','Show gossip option if player is a Exalted with Undercity');
+-- Add Any Missing Gossip Menu item
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES);
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO);
+-- Add Any Missing Gossip Option
+DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`)VALUES
+(@GOSSIP,0,3,"I seek training to ride a steed.",5,16,0,0,0,0,'');
+
+-- Gossip Condition for Benjy Featherwhistle "Gnomeregan riding trainer"
+SET @GOSSIP  := 4016;
+SET @TEXTYES := 4878;
+SET @TEXTNO  := 5860;
+SET @FACTION := 54;
+SET @RACE    := 64;
+SET @NOTRACE := 1727;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,@GOSSIP,@TEXTYES,0,16,@RACE,0,0,0,'','Show gossip text if player is a Gnome'),
+(14,@GOSSIP,@TEXTYES,1,5,@FACTION,128,0,0,'','Show gossip text if player is Exalted with Gnomeregan'),
+(14,@GOSSIP,@TEXTNO,0,16,@NOTRACE,0,0,0,'','Show gossip text if player is not a Gnome'),
+(14,@GOSSIP,@TEXTNO,0,5,@FACTION,127,0,0,'','Show gossip text if player is Not Exalted with Gnomeregan'),
+(15,@GOSSIP,0,0,16,@RACE,0,0,0,'','Show gossip option if player is a Gnome'),
+(15,@GOSSIP,0,1,5,@FACTION,128,0,0,'','Show gossip option if player is a Exalted with Gnomeregan');
+-- Add Any Missing Gossip Menu item
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES);
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO);
+-- Add Any Missing Gossip Option
+DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`)VALUES
+(@GOSSIP,0,3,"I seek training to ride a steed.",5,16,0,0,0,0,'');
+
+-- Gossip Condition for Randel Hunter "Human riding trainer"
+SET @GOSSIP  := 4018;
+SET @TEXTYES := 4876;
+SET @TEXTNO  := 5861;
+SET @FACTION := 72;
+SET @RACE    := 1;
+SET @NOTRACE := 1790;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,@GOSSIP,@TEXTYES,0,16,@RACE,0,0,0,'','Show gossip text if player is a Human'),
+(14,@GOSSIP,@TEXTYES,1,5,@FACTION,128,0,0,'','Show gossip text if player is Exalted with Stormwind'),
+(14,@GOSSIP,@TEXTNO,0,16,@NOTRACE,0,0,0,'','Show gossip text if player is not a Human'),
+(14,@GOSSIP,@TEXTNO,0,5,@FACTION,127,0,0,'','Show gossip text if player is Not Exalted with Stormwind'),
+(15,@GOSSIP,0,0,16,@RACE,0,0,0,'','Show gossip option if player is a Human'),
+(15,@GOSSIP,0,1,5,@FACTION,128,0,0,'','Show gossip option if player is a Exalted with Stormwind');
+-- Add Any Missing Gossip Menu item
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES);
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO);
+-- Add Any Missing Gossip Option
+DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`)VALUES
+(@GOSSIP,0,3,"I seek training to ride a steed.",5,16,0,0,0,0,'');
+
+-- Gossip Condition for Jartsam "Night Elf riding trainer"
+SET @GOSSIP  := 4019;
+SET @TEXTYES := 4877;
+SET @TEXTNO  := 5862;
+SET @FACTION := 69;
+SET @RACE    := 8;
+SET @NOTRACE := 1783;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,@GOSSIP,@TEXTYES,0,16,@RACE,0,0,0,'','Show gossip text if player is a Night Elf'),
+(14,@GOSSIP,@TEXTYES,1,5,@FACTION,128,0,0,'','Show gossip text if player is Exalted with Darnassus'),
+(14,@GOSSIP,@TEXTNO,0,16,@NOTRACE,0,0,0,'','Show gossip text if player is not a Night Elf'),
+(14,@GOSSIP,@TEXTNO,0,5,@FACTION,127,0,0,'','Show gossip text if player is Not Exalted with Darnassus'),
+(15,@GOSSIP,0,0,16,@RACE,0,0,0,'','Show gossip option if player is a Night Elf'),
+(15,@GOSSIP,0,1,5,@FACTION,128,0,0,'','Show gossip option if player is a Exalted with Darnassus');
+-- Add Any Missing Gossip Menu item
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES);
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO);
+-- Add Any Missing Gossip Option
+DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`)VALUES
+(@GOSSIP,0,3,"I seek training to ride a steed.",5,16,0,0,0,0,'');
+
+-- Gossip Condition for Kildar "Orc riding trainer"
+SET @GOSSIP  := 4020;
+SET @TEXTYES := 4879;
+SET @TEXTNO  := 5863;
+SET @FACTION := 76;
+SET @RACE    := 2;
+SET @NOTRACE := 1789;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,@GOSSIP,@TEXTYES,0,16,@RACE,0,0,0,'','Show gossip text if player is an Orc'),
+(14,@GOSSIP,@TEXTYES,1,5,@FACTION,128,0,0,'','Show gossip text if player is Exalted with Orgrimmar'),
+(14,@GOSSIP,@TEXTNO,0,16,@NOTRACE,0,0,0,'','Show gossip text if player is not an Orc'),
+(14,@GOSSIP,@TEXTNO,0,5,@FACTION,127,0,0,'','Show gossip text if player is Not Exalted with Orgrimmar'),
+(15,@GOSSIP,0,0,16,@RACE,0,0,0,'','Show gossip option if player is an Orc'),
+(15,@GOSSIP,0,1,5,@FACTION,128,0,0,'','Show gossip option if player is a Exalted with Orgrimmar');
+-- Add Any Missing Gossip Menu item
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES);
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO);
+-- Add Any Missing Gossip Option
+DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`)VALUES
+(@GOSSIP,0,3,"I seek training to ride a steed.",5,16,0,0,0,0,'');
+
+-- Gossip Condition for Kar Stormsinger "Tauren riding trainer"
+SET @GOSSIP  := 4021;
+SET @TEXTYES := 4874;
+SET @TEXTNO  := 5864;
+SET @FACTION := 81;
+SET @RACE    := 32;
+SET @NOTRACE := 1759;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,@GOSSIP,@TEXTYES,0,16,@RACE,0,0,0,'','Show gossip text if player is a Tauren'),
+(14,@GOSSIP,@TEXTYES,1,5,@FACTION,128,0,0,'','Show gossip text if player is Exalted with Thunder Bluff'),
+(14,@GOSSIP,@TEXTNO,0,16,@NOTRACE,0,0,0,'','Show gossip text if player is not a Tauren'),
+(14,@GOSSIP,@TEXTNO,0,5,@FACTION,127,0,0,'','Show gossip text if player is Not Exalted with Thunder Bluff'),
+(15,@GOSSIP,0,0,16,@RACE,0,0,0,'','Show gossip option if player is a Tauren'),
+(15,@GOSSIP,0,1,5,@FACTION,128,0,0,'','Show gossip option if player is a Exalted with Thunder Bluff');
+-- Add Any Missing Gossip Menu item
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES);
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO);
+-- Add Any Missing Gossip Option
+DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`)VALUES
+(@GOSSIP,0,3,"I seek training to ride a steed.",5,16,0,0,0,0,'');
+
+-- Gossip Condition for Xar'Ti  "Troll riding trainer"
+SET @GOSSIP  := 4022;
+SET @TEXTYES := 4875;
+SET @TEXTNO  := 5865;
+SET @FACTION := 530;
+SET @RACE    := 128;
+SET @NOTRACE := 1663;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,@GOSSIP,@TEXTYES,0,16,@RACE,0,0,0,'','Show gossip text if player is a Troll'),
+(14,@GOSSIP,@TEXTYES,1,5,@FACTION,128,0,0,'','Show gossip text if player is Exalted with Darkspear Trolls'),
+(14,@GOSSIP,@TEXTNO,0,16,@NOTRACE,0,0,0,'','Show gossip text if player is not a Troll'),
+(14,@GOSSIP,@TEXTNO,0,5,@FACTION,127,0,0,'','Show gossip text if player is Not Exalted with Darkspear Trolls'),
+(15,@GOSSIP,0,0,16,@RACE,0,0,0,'','Show gossip option if player is a Troll'),
+(15,@GOSSIP,0,1,5,@FACTION,128,0,0,'','Show gossip option if player is a Exalted with Darkspear Trolls');
+-- Add Any Missing Gossip Menu item
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES);
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO);
+-- Add Any Missing Gossip Option
+DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`)VALUES
+(@GOSSIP,0,3,"I seek training to ride a steed.",5,16,0,0,0,0,'');
+UPDATE `creature_template` SET `gossip_menu_id`=@GOSSIP WHERE `entry`=7953;
+
+-- Gossip Condition for Perascamin  "Blood Elf riding trainer"
+SET @GOSSIP  := 8275;
+SET @TEXTYES := 10308;
+SET @TEXTNO  := 10310;
+SET @FACTION := 911;
+SET @RACE    := 512;
+SET @NOTRACE := 1279;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,@GOSSIP,@TEXTYES,0,16,@RACE,0,0,0,'','Show gossip text if player is a Blood Elf'),
+(14,@GOSSIP,@TEXTYES,1,5,@FACTION,128,0,0,'','Show gossip text if player is Exalted with Silvermoon City'),
+(14,@GOSSIP,@TEXTNO,0,16,@NOTRACE,0,0,0,'','Show gossip text if player is not a Blood Elf'),
+(14,@GOSSIP,@TEXTNO,0,5,@FACTION,127,0,0,'','Show gossip text if player is Not Exalted with Silvermoon City'),
+(15,@GOSSIP,0,0,16,@RACE,0,0,0,'','Show gossip option if player is a Blood Elf'),
+(15,@GOSSIP,0,1,5,@FACTION,128,0,0,'','Show gossip option if player is a Exalted with Silvermoon City');
+-- Add Any Missing Gossip Menu item
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES);
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO);
+-- Add Any Missing Gossip Option
+DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`)VALUES
+(@GOSSIP,0,3,"I seek training to ride a steed.",5,16,0,0,0,0,'');
+UPDATE `creature_template` SET `gossip_menu_id`=@GOSSIP WHERE `entry`=16280;
+
+-- Gossip Condition for Aalun "Draenei riding trainer"
+SET @GOSSIP  := 8553;
+SET @TEXTYES := 10792;
+SET @TEXTNO  := 10705;
+SET @FACTION := 930;
+SET @RACE    := 1024;
+SET @NOTRACE := 767;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,@GOSSIP,@TEXTYES,0,16,@RACE,0,0,0,'','Show gossip text if player is a Draenei'),
+(14,@GOSSIP,@TEXTYES,1,5,@FACTION,128,0,0,'','Show gossip text if player is Exalted with Exodar'),
+(14,@GOSSIP,@TEXTNO,0,16,@NOTRACE,0,0,0,'','Show gossip text if player is not a Draenei'),
+(14,@GOSSIP,@TEXTNO,0,5,@FACTION,127,0,0,'','Show gossip text if player is Not Exalted with Exodar'),
+(15,@GOSSIP,0,0,16,@RACE,0,0,0,'','Show gossip option if player is a Draenei'),
+(15,@GOSSIP,0,1,5,@FACTION,128,0,0,'','Show gossip option if player is a Exalted with Exodar');
+-- Add Any Missing Gossip Menu item
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES);
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO);
+-- Add Any Missing Gossip Option
+DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`)VALUES
+(@GOSSIP,0,3,"I seek training to ride a steed.",5,16,0,0,0,0,'');
+
+-- Gossip Condition for Olrokk "Riding trainer"
+SET @GOSSIP  := 8628;
+SET @TEXT    := 10817;
+-- Add Any Missing Gossip Menu item
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXT;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXT);
+-- Add Any Missing Gossip Option
+DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`)VALUES
+(@GOSSIP,0,3,"Train me.",5,16,0,0,0,0,'');
+UPDATE `creature_template` SET `gossip_menu_id`=@GOSSIP WHERE `entry`=20500;
-- 
cgit v1.2.3


From eea6ab54cc9b45535af1b21adb137d89e91999e7 Mon Sep 17 00:00:00 2001
From: Malcrom <malcromdev@gmail.com>
Date: Mon, 3 Jun 2013 21:39:20 -0230
Subject: DB/Conditions: Add conditions for rogue quest.

---
 .../world/2013_06_03_03_world_conditions.sql       | 95 ++++++++++++++++++++++
 1 file changed, 95 insertions(+)
 create mode 100644 sql/updates/world/2013_06_03_03_world_conditions.sql

(limited to 'sql/updates')

diff --git a/sql/updates/world/2013_06_03_03_world_conditions.sql b/sql/updates/world/2013_06_03_03_world_conditions.sql
new file mode 100644
index 00000000000..3edbde56d5b
--- /dev/null
+++ b/sql/updates/world/2013_06_03_03_world_conditions.sql
@@ -0,0 +1,95 @@
+-- Add option conditions for Rogue trainers
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (15) AND `SourceEntry`=4 AND `SourceGroup` IN (85,141,381,410,411,436,3984,4502,4512,4513,4540,4541,4542,4561,4562,4575,4576,4577,4658,4659,4676,4690,5061,6650);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`NegativeCondition`,`ScriptName`,`Comment`) VALUES
+(15,85,4,0,15,8,0,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,85,4,0,27,24,3,0,0,0,'','Show gossip option if player is level 24 or higher'),
+(15,85,4,0,2,17126,1,0,0,0,'','Show gossip option if player has Elegant Letter'),
+(15,85,4,0,28,6681,0,0,0,1,'','Show gossip option if player has not completed quest 6681'),
+(15,141,4,0,15,8,0,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,141,4,0,27,24,3,0,0,0,'','Show gossip option if player is level 24 or higher'),
+(15,141,4,0,2,17126,1,0,0,0,'','Show gossip option if player has Elegant Letter'),
+(15,141,4,0,28,6681,0,0,0,1,'','Show gossip option if player has not completed quest 6681'),
+(15,410,4,0,15,8,0,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,410,4,0,27,24,3,0,0,0,'','Show gossip option if player is level 24 or higher'),
+(15,410,4,0,2,17126,1,0,0,0,'','Show gossip option if player has Elegant Letter'),
+(15,410,4,0,28,6681,0,0,0,1,'','Show gossip option if player has not completed quest 6681'),
+(15,411,4,0,15,8,0,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,411,4,0,27,24,3,0,0,0,'','Show gossip option if player is level 24 or higher'),
+(15,411,4,0,2,17126,1,0,0,0,'','Show gossip option if player has Elegant Letter'),
+(15,411,4,0,28,6681,0,0,0,1,'','Show gossip option if player has not completed quest 6681'),
+(15,436,4,0,15,8,0,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,436,4,0,27,24,3,0,0,0,'','Show gossip option if player is level 24 or higher'),
+(15,436,4,0,2,17126,1,0,0,0,'','Show gossip option if player has Elegant Letter'),
+(15,436,4,0,28,6681,0,0,0,1,'','Show gossip option if player has not completed quest 6681'),
+(15,3984,4,0,15,8,0,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,3984,4,0,27,24,3,0,0,0,'','Show gossip option if player is level 24 or higher'),
+(15,3984,4,0,2,17126,1,0,0,0,'','Show gossip option if player has Elegant Letter'),
+(15,3984,4,0,28,6681,0,0,0,1,'','Show gossip option if player has not completed quest 6681'),
+(15,4502,4,0,15,8,0,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4502,4,0,27,24,3,0,0,0,'','Show gossip option if player is level 24 or higher'),
+(15,4502,4,0,2,17126,1,0,0,0,'','Show gossip option if player has Elegant Letter'),
+(15,4502,4,0,28,6681,0,0,0,1,'','Show gossip option if player has not completed quest 6681'),
+(15,4512,4,0,15,8,0,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4512,4,0,27,24,3,0,0,0,'','Show gossip option if player is level 24 or higher'),
+(15,4512,4,0,2,17126,1,0,0,0,'','Show gossip option if player has Elegant Letter'),
+(15,4512,4,0,28,6681,0,0,0,1,'','Show gossip option if player has not completed quest 6681'),
+(15,4513,4,0,15,8,0,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4513,4,0,27,24,3,0,0,0,'','Show gossip option if player is level 24 or higher'),
+(15,4513,4,0,2,17126,1,0,0,0,'','Show gossip option if player has Elegant Letter'),
+(15,4513,4,0,28,6681,0,0,0,1,'','Show gossip option if player has not completed quest 6681'),
+(15,4540,4,0,15,8,0,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4540,4,0,27,24,3,0,0,0,'','Show gossip option if player is level 24 or higher'),
+(15,4540,4,0,2,17126,1,0,0,0,'','Show gossip option if player has Elegant Letter'),
+(15,4540,4,0,28,6681,0,0,0,1,'','Show gossip option if player has not completed quest 6681'),
+(15,4541,4,0,15,8,0,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4541,4,0,27,24,3,0,0,0,'','Show gossip option if player is level 24 or higher'),
+(15,4541,4,0,2,17126,1,0,0,0,'','Show gossip option if player has Elegant Letter'),
+(15,4541,4,0,28,6681,0,0,0,1,'','Show gossip option if player has not completed quest 6681'),
+(15,4542,4,0,15,8,0,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4542,4,0,27,24,3,0,0,0,'','Show gossip option if player is level 24 or higher'),
+(15,4542,4,0,2,17126,1,0,0,0,'','Show gossip option if player has Elegant Letter'),
+(15,4542,4,0,28,6681,0,0,0,1,'','Show gossip option if player has not completed quest 6681'),
+(15,4561,4,0,15,8,0,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4561,4,0,27,24,3,0,0,0,'','Show gossip option if player is level 24 or higher'),
+(15,4561,4,0,2,17126,1,0,0,0,'','Show gossip option if player has Elegant Letter'),
+(15,4561,4,0,28,6681,0,0,0,1,'','Show gossip option if player has not completed quest 6681'),
+(15,4562,4,0,15,8,0,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4562,4,0,27,24,3,0,0,0,'','Show gossip option if player is level 24 or higher'),
+(15,4562,4,0,2,17126,1,0,0,0,'','Show gossip option if player has Elegant Letter'),
+(15,4562,4,0,28,6681,0,0,0,1,'','Show gossip option if player has not completed quest 6681'),
+(15,4575,4,0,15,8,0,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4575,4,0,27,24,3,0,0,0,'','Show gossip option if player is level 24 or higher'),
+(15,4575,4,0,2,17126,1,0,0,0,'','Show gossip option if player has Elegant Letter'),
+(15,4575,4,0,28,6681,0,0,0,1,'','Show gossip option if player has not completed quest 6681'),
+(15,4576,4,0,15,8,0,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4576,4,0,27,24,3,0,0,0,'','Show gossip option if player is level 24 or higher'),
+(15,4576,4,0,2,17126,1,0,0,0,'','Show gossip option if player has Elegant Letter'),
+(15,4576,4,0,28,6681,0,0,0,1,'','Show gossip option if player has not completed quest 6681'),
+(15,4577,4,0,15,8,0,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4577,4,0,27,24,3,0,0,0,'','Show gossip option if player is level 24 or higher'),
+(15,4577,4,0,2,17126,1,0,0,0,'','Show gossip option if player has Elegant Letter'),
+(15,4577,4,0,28,6681,0,0,0,1,'','Show gossip option if player has not completed quest 6681'),
+(15,4658,4,0,15,8,0,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4658,4,0,27,24,3,0,0,0,'','Show gossip option if player is level 24 or higher'),
+(15,4658,4,0,2,17126,1,0,0,0,'','Show gossip option if player has Elegant Letter'),
+(15,4658,4,0,28,6681,0,0,0,1,'','Show gossip option if player has not completed quest 6681'),
+(15,4659,4,0,15,8,0,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4659,4,0,27,24,3,0,0,0,'','Show gossip option if player is level 24 or higher'),
+(15,4659,4,0,2,17126,1,0,0,0,'','Show gossip option if player has Elegant Letter'),
+(15,4659,4,0,28,6681,0,0,0,1,'','Show gossip option if player has not completed quest 6681'),
+(15,4676,4,0,15,8,0,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4676,4,0,27,24,3,0,0,0,'','Show gossip option if player is level 24 or higher'),
+(15,4676,4,0,2,17126,1,0,0,0,'','Show gossip option if player has Elegant Letter'),
+(15,4676,4,0,28,6681,0,0,0,1,'','Show gossip option if player has not completed quest 6681'),
+(15,4690,4,0,15,8,0,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4690,4,0,27,24,3,0,0,0,'','Show gossip option if player is level 24 or higher'),
+(15,4690,4,0,2,17126,1,0,0,0,'','Show gossip option if player has Elegant Letter'),
+(15,4690,4,0,28,6681,0,0,0,1,'','Show gossip option if player has not completed quest 6681'),
+(15,5061,4,0,15,8,0,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,5061,4,0,27,24,3,0,0,0,'','Show gossip option if player is level 24 or higher'),
+(15,5061,4,0,2,17126,1,0,0,0,'','Show gossip option if player has Elegant Letter'),
+(15,5061,4,0,28,6681,0,0,0,1,'','Show gossip option if player has not completed quest 6681'),
+(15,6650,4,0,15,8,0,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,6650,4,0,27,24,3,0,0,0,'','Show gossip option if player is level 24 or higher'),
+(15,6650,4,0,2,17126,1,0,0,0,'','Show gossip option if player has Elegant Letter'),
+(15,6650,4,0,28,6681,0,0,0,1,'','Show gossip option if player has not completed quest 6681');
-- 
cgit v1.2.3


From 148b8e3129768db8e80f4a9c7d96f4b5b280ba86 Mon Sep 17 00:00:00 2001
From: Malcrom <malcromdev@gmail.com>
Date: Mon, 3 Jun 2013 22:30:42 -0230
Subject: DB/Conditions: Fix a mistake in sql.

---
 sql/updates/world/2013_06_02_03_world_conditions.sql | 14 +++++++-------
 sql/updates/world/2013_06_03_04_world_conditions.sql |  8 ++++++++
 2 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 sql/updates/world/2013_06_03_04_world_conditions.sql

(limited to 'sql/updates')

diff --git a/sql/updates/world/2013_06_02_03_world_conditions.sql b/sql/updates/world/2013_06_02_03_world_conditions.sql
index c2d730ffc6d..f38ce3caf3e 100644
--- a/sql/updates/world/2013_06_02_03_world_conditions.sql
+++ b/sql/updates/world/2013_06_02_03_world_conditions.sql
@@ -1,5 +1,5 @@
 -- Add option conditions for Paladin trainers
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (15) AND `SourceGroup` IN (2304,4556,4557,4469,4470,4471,4662,4663,4664,4677,4678,7260,8111);
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (15) AND `SourceGroup` IN (2304,4556,4557,4469,4470,4471,4662,4463,4464,4677,4678,7260,8111);
 INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
 (15,2304,0,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
 (15,2304,1,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
@@ -22,12 +22,12 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,
 (15,4662,0,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
 (15,4662,1,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
 (15,4662,2,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
-(15,4663,0,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
-(15,4663,1,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
-(15,4663,2,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
-(15,4664,0,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
-(15,4664,1,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
-(15,4664,2,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4463,0,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4463,1,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4463,2,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4464,0,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4464,1,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4464,2,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
 (15,4677,0,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
 (15,4677,1,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
 (15,4677,2,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
diff --git a/sql/updates/world/2013_06_03_04_world_conditions.sql b/sql/updates/world/2013_06_03_04_world_conditions.sql
new file mode 100644
index 00000000000..f18492fc34a
--- /dev/null
+++ b/sql/updates/world/2013_06_03_04_world_conditions.sql
@@ -0,0 +1,8 @@
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (15) AND `SourceGroup` IN (4463,4464,4663,4664);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,4463,0,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4463,1,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4463,2,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4464,0,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4464,1,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4464,2,0,15,2,0,0,0,'','Show gossip option if player is a Paladin');
-- 
cgit v1.2.3


From 9084311ebdfdce2571c36e12440087a4a351b5b8 Mon Sep 17 00:00:00 2001
From: Malcrom <malcromdev@gmail.com>
Date: Mon, 3 Jun 2013 23:34:31 -0230
Subject: DB/Gossip: Add gossip for Shaman trainers

---
 sql/updates/world/2013_06_03_05_world_gossip.sql | 301 +++++++++++++++++++++++
 1 file changed, 301 insertions(+)
 create mode 100644 sql/updates/world/2013_06_03_05_world_gossip.sql

(limited to 'sql/updates')

diff --git a/sql/updates/world/2013_06_03_05_world_gossip.sql b/sql/updates/world/2013_06_03_05_world_gossip.sql
new file mode 100644
index 00000000000..7f21d072162
--- /dev/null
+++ b/sql/updates/world/2013_06_03_05_world_gossip.sql
@@ -0,0 +1,301 @@
+-- XXXXXXXXXXXXXXXXXXXXX
+-- X  Shaman Trainers  X
+-- XXXXXXXXXXXXXXXXXXXXX
+
+UPDATE `creature_template` SET `gossip_menu_id`=7357 WHERE `entry`=23127;
+UPDATE `creature_template` SET `gossip_menu_id`=7377 WHERE `entry`=17204;
+UPDATE `creature_template` SET `gossip_menu_id`=4104 WHERE `entry`=986;
+
+-- Gossip Condition for Shaman Trainers
+SET @GOSSIP := 4103;
+SET @TEXTYES := 5005;
+SET @TEXTNO := 5006;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,@GOSSIP,@TEXTYES,0,15,64,0,0,0,'','Show gossip text if player is a Shaman'),
+(14,@GOSSIP,@TEXTNO,0,15,1471,0,0,0,'','Show gossip text if player is not a Shaman');
+-- Add Any Missing Gossip Menu item
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES);
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO);
+-- Add Any Missing Gossip Option
+DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`)VALUES
+(@GOSSIP,0,3,"Teach me the ways of the spirits.",5,16,0,0,0,0,''),
+(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''),
+(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,'');
+
+-- Gossip Condition for Shaman Trainers
+SET @GOSSIP := 4104;
+SET @TEXTYES := 5005;
+SET @TEXTNO := 5006;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,@GOSSIP,@TEXTYES,0,15,64,0,0,0,'','Show gossip text if player is a Shaman'),
+(14,@GOSSIP,@TEXTNO,0,15,1471,0,0,0,'','Show gossip text if player is not a Shaman');
+-- Add Any Missing Gossip Menu item
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES);
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO);
+-- Add Any Missing Gossip Option
+DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`)VALUES
+(@GOSSIP,0,3,"Teach me the ways of the spirits.",5,16,0,0,0,0,''),
+(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''),
+(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,'');
+
+-- Gossip Condition for Shaman Trainers
+SET @GOSSIP := 4515;
+SET @TEXTYES := 5007;
+SET @TEXTNO := 5008;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,@GOSSIP,@TEXTYES,0,15,64,0,0,0,'','Show gossip text if player is a Shaman'),
+(14,@GOSSIP,@TEXTNO,0,15,1471,0,0,0,'','Show gossip text if player is not a Shaman');
+-- Add Any Missing Gossip Menu item
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES);
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO);
+-- Add Any Missing Gossip Option
+DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`)VALUES
+(@GOSSIP,0,3,"Teach me the ways of the spirits.",5,16,0,0,0,0,''),
+(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''),
+(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,'');
+
+-- Gossip Condition for Shaman Trainers
+SET @GOSSIP := 4516;
+SET @TEXTYES := 5005;
+SET @TEXTNO := 5006;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,@GOSSIP,@TEXTYES,0,15,64,0,0,0,'','Show gossip text if player is a Shaman'),
+(14,@GOSSIP,@TEXTNO,0,15,1471,0,0,0,'','Show gossip text if player is not a Shaman');
+-- Add Any Missing Gossip Menu item
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES);
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO);
+-- Add Any Missing Gossip Option
+DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`)VALUES
+(@GOSSIP,0,3,"Teach me the ways of the spirits.",5,16,0,0,0,0,''),
+(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''),
+(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,'');
+
+-- Gossip Condition for Shaman Trainers
+SET @GOSSIP := 4528;
+SET @TEXTYES := 5005;
+SET @TEXTNO := 5006;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,@GOSSIP,@TEXTYES,0,15,64,0,0,0,'','Show gossip text if player is a Shaman'),
+(14,@GOSSIP,@TEXTNO,0,15,1471,0,0,0,'','Show gossip text if player is not a Shaman');
+-- Add Any Missing Gossip Menu item
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES);
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO);
+-- Add Any Missing Gossip Option
+DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`)VALUES
+(@GOSSIP,0,3,"Teach me the ways of the spirits.",5,16,0,0,0,0,''),
+(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''),
+(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,'');
+
+-- Gossip Condition for Shaman Trainers
+SET @GOSSIP := 4529;
+SET @TEXTYES := 5005;
+SET @TEXTNO := 5006;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,@GOSSIP,@TEXTYES,0,15,64,0,0,0,'','Show gossip text if player is a Shaman'),
+(14,@GOSSIP,@TEXTNO,0,15,1471,0,0,0,'','Show gossip text if player is not a Shaman');
+-- Add Any Missing Gossip Menu item
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES);
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO);
+-- Add Any Missing Gossip Option
+DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`)VALUES
+(@GOSSIP,0,3,"Teach me the ways of the spirits.",5,16,0,0,0,0,''),
+(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''),
+(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,'');
+
+-- Gossip Condition for Shaman Trainers
+SET @GOSSIP := 4530;
+SET @TEXTYES := 5005;
+SET @TEXTNO := 5006;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,@GOSSIP,@TEXTYES,0,15,64,0,0,0,'','Show gossip text if player is a Shaman'),
+(14,@GOSSIP,@TEXTNO,0,15,1471,0,0,0,'','Show gossip text if player is not a Shaman');
+-- Add Any Missing Gossip Menu item
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES);
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO);
+-- Add Any Missing Gossip Option
+DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`)VALUES
+(@GOSSIP,0,3,"Teach me the ways of the spirits.",5,16,0,0,0,0,''),
+(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''),
+(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,'');
+
+-- Gossip Condition for Shaman Trainers
+SET @GOSSIP := 4652;
+SET @TEXTYES := 5005;
+SET @TEXTNO := 5006;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,@GOSSIP,@TEXTYES,0,15,64,0,0,0,'','Show gossip text if player is a Shaman'),
+(14,@GOSSIP,@TEXTNO,0,15,1471,0,0,0,'','Show gossip text if player is not a Shaman');
+-- Add Any Missing Gossip Menu item
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES);
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO);
+-- Add Any Missing Gossip Option
+DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`)VALUES
+(@GOSSIP,0,3,"Teach me the ways of the spirits.",5,16,0,0,0,0,''),
+(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''),
+(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,'');
+
+-- Gossip Condition for Shaman Trainers
+SET @GOSSIP := 5123;
+SET @TEXTYES := 5005;
+SET @TEXTNO := 5006;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,@GOSSIP,@TEXTYES,0,15,64,0,0,0,'','Show gossip text if player is a Shaman'),
+(14,@GOSSIP,@TEXTNO,0,15,1471,0,0,0,'','Show gossip text if player is not a Shaman');
+-- Add Any Missing Gossip Menu item
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES);
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO);
+-- Add Any Missing Gossip Option
+DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`)VALUES
+(@GOSSIP,0,3,"",5,16,0,0,0,0,''),
+(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''),
+(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,'');
+
+-- Gossip Condition for Shaman Trainers
+SET @GOSSIP := 7357;
+SET @TEXTYES := 8786;
+SET @TEXTNO := 8785;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,@GOSSIP,@TEXTYES,0,15,64,0,0,0,'','Show gossip text if player is a Shaman'),
+(14,@GOSSIP,@TEXTNO,0,15,1471,0,0,0,'','Show gossip text if player is not a Shaman');
+-- Add Any Missing Gossip Menu item
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES);
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO);
+-- Add Any Missing Gossip Option
+DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`)VALUES
+(@GOSSIP,0,3,"Teach me the ways of the spirits.",5,16,0,0,0,0,''),
+(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''),
+(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,'');
+
+-- Gossip Condition for Shaman Trainers
+SET @GOSSIP := 7467;
+SET @TEXTYES := 9050;
+SET @TEXTNO := 8785;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,@GOSSIP,@TEXTYES,0,15,64,0,0,0,'','Show gossip text if player is a Shaman'),
+(14,@GOSSIP,@TEXTNO,0,15,1471,0,0,0,'','Show gossip text if player is not a Shaman');
+-- Add Any Missing Gossip Menu item
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES);
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO);
+-- Add Any Missing Gossip Option
+DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`)VALUES
+(@GOSSIP,0,3,"Teach me the ways of the spirits.",5,16,0,0,0,0,''),
+(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''),
+(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,'');
+
+-- Gossip Condition for Shaman Trainers
+SET @GOSSIP := 7522;
+SET @TEXTYES := 9122;
+SET @TEXTNO := 8785;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,@GOSSIP,@TEXTYES,0,15,64,0,0,0,'','Show gossip text if player is a Shaman'),
+(14,@GOSSIP,@TEXTNO,0,15,1471,0,0,0,'','Show gossip text if player is not a Shaman');
+-- Add Any Missing Gossip Menu item
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES);
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO);
+-- Add Any Missing Gossip Option
+DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`)VALUES
+(@GOSSIP,0,3,"Teach me the ways of the spirits.",5,16,0,0,0,0,''),
+(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''),
+(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,'');
+
+-- Gossip Condition for Shaman Trainers
+SET @GOSSIP := 8110;
+SET @TEXTYES := 10043;
+SET @TEXTNO := 10040;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,@GOSSIP,@TEXTYES,0,15,64,0,0,0,'','Show gossip text if player is a Shaman'),
+(14,@GOSSIP,@TEXTNO,0,15,1471,0,0,0,'','Show gossip text if player is not a Shaman');
+-- Add Any Missing Gossip Menu item
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES);
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO);
+-- Add Any Missing Gossip Option
+DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`)VALUES
+(@GOSSIP,0,3,"Teach me the ways of the spirits.",5,16,0,0,0,0,''),
+(@GOSSIP,1,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''),
+(@GOSSIP,2,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,'');
+
+-- Gossip Condition for Shaman Trainers
+SET @GOSSIP := 7377;
+SET @TEXTYES := 8829;
+SET @TEXTNO := 8828;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=@GOSSIP;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,@GOSSIP,@TEXTYES,0,15,64,0,0,0,'','Show gossip text if player is a Shaman'),
+(14,@GOSSIP,@TEXTNO,0,15,1471,0,0,0,'','Show gossip text if player is not a Shaman');
+-- Add Any Missing Gossip Menu item
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTYES;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTYES);
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXTNO;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXTNO);
+DELETE FROM `gossip_menu` WHERE `entry` BETWEEN 7502 AND 7509;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
+(7502,9098),(7503,9099),(7504,9100),(7505,9101),
+(7506,9102),(7507,9103),(7508,9104),(7509,9105);
+-- Add Any Missing Gossip Option
+DELETE FROM `gossip_menu_option` WHERE menu_id BETWEEN 7502 AND 7508;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`)VALUES
+(7502,0,0,"Yes, please continue.",1,1,7503,0,0,0,''),
+(7503,0,0,"Yes, please, if you do not mind.",1,1,7504,0,0,0,''),
+(7504,0,0,"Nobundo, please continue.",1,1,7505,0,0,0,''),
+(7505,0,0,"What did it say to you?",1,1,7506,0,0,0,''),
+(7506,0,0,"What was that?",1,1,7507,0,0,0,''),
+(7507,0,0,"What did you do then?",1,1,7508,0,0,0,''),
+(7508,0,0,"Please, go on.",1,1,7509,0,0,0,'');
+DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`)VALUES
+(@GOSSIP,0,3,"Teach me the ways of the spirits.",5,16,0,0,0,0,''),
+(@GOSSIP,1,0,"Tell me of your past, Farseer.",1,1,7502,0,0,0,''),
+(@GOSSIP,2,0,"I wish to unlearn my talents.",16,16,4461,0,0,0,''),
+(@GOSSIP,3,0,"I wish to know about Dual Talent Specialization.",1,1,10371,0,0,0,'');
-- 
cgit v1.2.3


From b8a457d0aea73f95d7f56ebdd2a96534142802a1 Mon Sep 17 00:00:00 2001
From: fedehacker <fedehacker@trinity.contrib>
Date: Tue, 4 Jun 2013 10:14:11 +0200
Subject: DB/Creature: only show Blix Fixwidget during Brewfest

Closes #9923
---
 sql/updates/world/2013_04_06_04_world_game_event_creature.sql | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 sql/updates/world/2013_04_06_04_world_game_event_creature.sql

(limited to 'sql/updates')

diff --git a/sql/updates/world/2013_04_06_04_world_game_event_creature.sql b/sql/updates/world/2013_04_06_04_world_game_event_creature.sql
new file mode 100644
index 00000000000..fb4fc759528
--- /dev/null
+++ b/sql/updates/world/2013_04_06_04_world_game_event_creature.sql
@@ -0,0 +1,2 @@
+DELETE FROM `game_event_creature` WHERE `guid`=152120 AND `eventEntry`=24;
+INSERT INTO `game_event_creature` (`guid`, `eventEntry`) VALUES (152120,24);
-- 
cgit v1.2.3


From fae3015044bf36b648db64887c3f54934b1e2a70 Mon Sep 17 00:00:00 2001
From: kirkhammett <kirkhammett@trinity.contrib>
Date: Tue, 4 Jun 2013 10:17:08 +0200
Subject: DB/SAI:

Fix Zul'Aman - Npc Amani Bear Mount bug
Closes #9878
Fix Deep in the bowels of the Underhalls
Closes #9868
Closes #3415
---
 sql/updates/world/2013_04_06_05_world_sai.sql | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 sql/updates/world/2013_04_06_05_world_sai.sql

(limited to 'sql/updates')

diff --git a/sql/updates/world/2013_04_06_05_world_sai.sql b/sql/updates/world/2013_04_06_05_world_sai.sql
new file mode 100644
index 00000000000..7b9c1b644bd
--- /dev/null
+++ b/sql/updates/world/2013_04_06_05_world_sai.sql
@@ -0,0 +1,22 @@
+UPDATE `smart_scripts` SET `event_flags`=1 WHERE  `entryorguid`=23580 AND `source_type`=0 AND `id`=0 AND `link`=1;
+
+-- Deep in the bowels of the Underhalls - 13042
+SET @OSTERKILGR         := 30409; -- Apprentice Osterkilgr
+SET @SPELL_BLAST        := 60290; -- Blast Wave
+SET @SPELL_FIREBALL     := 14034; -- Fireball
+SET @QUEST              := 13042; -- Deep in the Bowels of the Underhalls
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@OSTERKILGR;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@OSTERKILGR;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@OSTERKILGR;
+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
+(@OSTERKILGR,0,0,0,0,0,100,0,5000,7000,5000,7000,11,@SPELL_BLAST,0,0,0,0,0,5,0,0,0,0,0,0,0,'Apprentice Osterkilgr - In Combat - cast Blast Wave'),
+(@OSTERKILGR,0,1,0,0,0,100,0,1000,2000,1000,2000,11,@SPELL_FIREBALL,0,0,0,0,0,5,0,0,0,0,0,0,0,'Apprentice Osterkilgr - In Combat - cast Fireball'),
+(@OSTERKILGR,0,2,0,2,0,100,1,40,80,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Apprentice Osterkilgr - @80%HP - say text 0'),
+(@OSTERKILGR,0,3,4,2,0,100,1,0,40,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Apprentice Osterkilgr - @40%HP - say text 1'),
+(@OSTERKILGR,0,4,0,61,0,100,0,0,0,0,0,33,30412,0,0,0,0,0,7,0,0,0,0,0,0,0,'Apprentice Osterkilgr - At 40% HP - give kill credit');
+DELETE FROM `creature_ai_texts` WHERE `entry` IN (-10020,-10021);
+DELETE FROM `creature_text` WHERE `entry`=@OSTERKILGR;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(@OSTERKILGR,0,0,'You''ve come for the doctor''s plans! You''ll only find death!',12,0,0,0,0,0,'Apprentice Osterkilgr - Say 0'),
+(@OSTERKILGR,1,0,'The doctor entrusted me with the plans to Nergeld, our flesh giant amalgamation made entirely of vargul! It will be the most powerful creation of its kind and a whole legion of them will be created to destroy your pitiful forces!',12,0,0,0,0,0,'Apprentice Osterkilgr - Say 1');
-- 
cgit v1.2.3


From f03f443150b5bc9db38bda708600185179f9bda8 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Tue, 4 Jun 2013 14:53:04 +0200
Subject: SQL: Corrected file names after recent pull request

---
 .../2013_04_06_04_world_game_event_creature.sql    |  2 --
 sql/updates/world/2013_04_06_05_world_sai.sql      | 22 ----------------------
 .../2013_06_06_00_world_game_event_creature.sql    |  2 ++
 sql/updates/world/2013_06_06_01_world_sai.sql      | 22 ++++++++++++++++++++++
 4 files changed, 24 insertions(+), 24 deletions(-)
 delete mode 100644 sql/updates/world/2013_04_06_04_world_game_event_creature.sql
 delete mode 100644 sql/updates/world/2013_04_06_05_world_sai.sql
 create mode 100644 sql/updates/world/2013_06_06_00_world_game_event_creature.sql
 create mode 100644 sql/updates/world/2013_06_06_01_world_sai.sql

(limited to 'sql/updates')

diff --git a/sql/updates/world/2013_04_06_04_world_game_event_creature.sql b/sql/updates/world/2013_04_06_04_world_game_event_creature.sql
deleted file mode 100644
index fb4fc759528..00000000000
--- a/sql/updates/world/2013_04_06_04_world_game_event_creature.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-DELETE FROM `game_event_creature` WHERE `guid`=152120 AND `eventEntry`=24;
-INSERT INTO `game_event_creature` (`guid`, `eventEntry`) VALUES (152120,24);
diff --git a/sql/updates/world/2013_04_06_05_world_sai.sql b/sql/updates/world/2013_04_06_05_world_sai.sql
deleted file mode 100644
index 7b9c1b644bd..00000000000
--- a/sql/updates/world/2013_04_06_05_world_sai.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-UPDATE `smart_scripts` SET `event_flags`=1 WHERE  `entryorguid`=23580 AND `source_type`=0 AND `id`=0 AND `link`=1;
-
--- Deep in the bowels of the Underhalls - 13042
-SET @OSTERKILGR         := 30409; -- Apprentice Osterkilgr
-SET @SPELL_BLAST        := 60290; -- Blast Wave
-SET @SPELL_FIREBALL     := 14034; -- Fireball
-SET @QUEST              := 13042; -- Deep in the Bowels of the Underhalls
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@OSTERKILGR;
-DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@OSTERKILGR;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@OSTERKILGR;
-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
-(@OSTERKILGR,0,0,0,0,0,100,0,5000,7000,5000,7000,11,@SPELL_BLAST,0,0,0,0,0,5,0,0,0,0,0,0,0,'Apprentice Osterkilgr - In Combat - cast Blast Wave'),
-(@OSTERKILGR,0,1,0,0,0,100,0,1000,2000,1000,2000,11,@SPELL_FIREBALL,0,0,0,0,0,5,0,0,0,0,0,0,0,'Apprentice Osterkilgr - In Combat - cast Fireball'),
-(@OSTERKILGR,0,2,0,2,0,100,1,40,80,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Apprentice Osterkilgr - @80%HP - say text 0'),
-(@OSTERKILGR,0,3,4,2,0,100,1,0,40,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Apprentice Osterkilgr - @40%HP - say text 1'),
-(@OSTERKILGR,0,4,0,61,0,100,0,0,0,0,0,33,30412,0,0,0,0,0,7,0,0,0,0,0,0,0,'Apprentice Osterkilgr - At 40% HP - give kill credit');
-DELETE FROM `creature_ai_texts` WHERE `entry` IN (-10020,-10021);
-DELETE FROM `creature_text` WHERE `entry`=@OSTERKILGR;
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(@OSTERKILGR,0,0,'You''ve come for the doctor''s plans! You''ll only find death!',12,0,0,0,0,0,'Apprentice Osterkilgr - Say 0'),
-(@OSTERKILGR,1,0,'The doctor entrusted me with the plans to Nergeld, our flesh giant amalgamation made entirely of vargul! It will be the most powerful creation of its kind and a whole legion of them will be created to destroy your pitiful forces!',12,0,0,0,0,0,'Apprentice Osterkilgr - Say 1');
diff --git a/sql/updates/world/2013_06_06_00_world_game_event_creature.sql b/sql/updates/world/2013_06_06_00_world_game_event_creature.sql
new file mode 100644
index 00000000000..fb4fc759528
--- /dev/null
+++ b/sql/updates/world/2013_06_06_00_world_game_event_creature.sql
@@ -0,0 +1,2 @@
+DELETE FROM `game_event_creature` WHERE `guid`=152120 AND `eventEntry`=24;
+INSERT INTO `game_event_creature` (`guid`, `eventEntry`) VALUES (152120,24);
diff --git a/sql/updates/world/2013_06_06_01_world_sai.sql b/sql/updates/world/2013_06_06_01_world_sai.sql
new file mode 100644
index 00000000000..7b9c1b644bd
--- /dev/null
+++ b/sql/updates/world/2013_06_06_01_world_sai.sql
@@ -0,0 +1,22 @@
+UPDATE `smart_scripts` SET `event_flags`=1 WHERE  `entryorguid`=23580 AND `source_type`=0 AND `id`=0 AND `link`=1;
+
+-- Deep in the bowels of the Underhalls - 13042
+SET @OSTERKILGR         := 30409; -- Apprentice Osterkilgr
+SET @SPELL_BLAST        := 60290; -- Blast Wave
+SET @SPELL_FIREBALL     := 14034; -- Fireball
+SET @QUEST              := 13042; -- Deep in the Bowels of the Underhalls
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@OSTERKILGR;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@OSTERKILGR;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@OSTERKILGR;
+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
+(@OSTERKILGR,0,0,0,0,0,100,0,5000,7000,5000,7000,11,@SPELL_BLAST,0,0,0,0,0,5,0,0,0,0,0,0,0,'Apprentice Osterkilgr - In Combat - cast Blast Wave'),
+(@OSTERKILGR,0,1,0,0,0,100,0,1000,2000,1000,2000,11,@SPELL_FIREBALL,0,0,0,0,0,5,0,0,0,0,0,0,0,'Apprentice Osterkilgr - In Combat - cast Fireball'),
+(@OSTERKILGR,0,2,0,2,0,100,1,40,80,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Apprentice Osterkilgr - @80%HP - say text 0'),
+(@OSTERKILGR,0,3,4,2,0,100,1,0,40,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Apprentice Osterkilgr - @40%HP - say text 1'),
+(@OSTERKILGR,0,4,0,61,0,100,0,0,0,0,0,33,30412,0,0,0,0,0,7,0,0,0,0,0,0,0,'Apprentice Osterkilgr - At 40% HP - give kill credit');
+DELETE FROM `creature_ai_texts` WHERE `entry` IN (-10020,-10021);
+DELETE FROM `creature_text` WHERE `entry`=@OSTERKILGR;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(@OSTERKILGR,0,0,'You''ve come for the doctor''s plans! You''ll only find death!',12,0,0,0,0,0,'Apprentice Osterkilgr - Say 0'),
+(@OSTERKILGR,1,0,'The doctor entrusted me with the plans to Nergeld, our flesh giant amalgamation made entirely of vargul! It will be the most powerful creation of its kind and a whole legion of them will be created to destroy your pitiful forces!',12,0,0,0,0,0,'Apprentice Osterkilgr - Say 1');
-- 
cgit v1.2.3


From e91e4024db6844f3117f5b0cbc6135c6dd154274 Mon Sep 17 00:00:00 2001
From: Malcrom <malcromdev@gmail.com>
Date: Tue, 4 Jun 2013 12:27:34 -0230
Subject: DB/Conditions: Fix a couple condition errors and rename 2 sql files

---
 .../2013_06_04_00_world_game_event_creature.sql    |  2 ++
 sql/updates/world/2013_06_04_01_world_sai.sql      | 22 ++++++++++++++++++++++
 .../world/2013_06_04_02_world_conditions.sql       |  5 +++++
 .../2013_06_06_00_world_game_event_creature.sql    |  2 --
 sql/updates/world/2013_06_06_01_world_sai.sql      | 22 ----------------------
 5 files changed, 29 insertions(+), 24 deletions(-)
 create mode 100644 sql/updates/world/2013_06_04_00_world_game_event_creature.sql
 create mode 100644 sql/updates/world/2013_06_04_01_world_sai.sql
 create mode 100644 sql/updates/world/2013_06_04_02_world_conditions.sql
 delete mode 100644 sql/updates/world/2013_06_06_00_world_game_event_creature.sql
 delete mode 100644 sql/updates/world/2013_06_06_01_world_sai.sql

(limited to 'sql/updates')

diff --git a/sql/updates/world/2013_06_04_00_world_game_event_creature.sql b/sql/updates/world/2013_06_04_00_world_game_event_creature.sql
new file mode 100644
index 00000000000..fb4fc759528
--- /dev/null
+++ b/sql/updates/world/2013_06_04_00_world_game_event_creature.sql
@@ -0,0 +1,2 @@
+DELETE FROM `game_event_creature` WHERE `guid`=152120 AND `eventEntry`=24;
+INSERT INTO `game_event_creature` (`guid`, `eventEntry`) VALUES (152120,24);
diff --git a/sql/updates/world/2013_06_04_01_world_sai.sql b/sql/updates/world/2013_06_04_01_world_sai.sql
new file mode 100644
index 00000000000..7b9c1b644bd
--- /dev/null
+++ b/sql/updates/world/2013_06_04_01_world_sai.sql
@@ -0,0 +1,22 @@
+UPDATE `smart_scripts` SET `event_flags`=1 WHERE  `entryorguid`=23580 AND `source_type`=0 AND `id`=0 AND `link`=1;
+
+-- Deep in the bowels of the Underhalls - 13042
+SET @OSTERKILGR         := 30409; -- Apprentice Osterkilgr
+SET @SPELL_BLAST        := 60290; -- Blast Wave
+SET @SPELL_FIREBALL     := 14034; -- Fireball
+SET @QUEST              := 13042; -- Deep in the Bowels of the Underhalls
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@OSTERKILGR;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@OSTERKILGR;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@OSTERKILGR;
+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
+(@OSTERKILGR,0,0,0,0,0,100,0,5000,7000,5000,7000,11,@SPELL_BLAST,0,0,0,0,0,5,0,0,0,0,0,0,0,'Apprentice Osterkilgr - In Combat - cast Blast Wave'),
+(@OSTERKILGR,0,1,0,0,0,100,0,1000,2000,1000,2000,11,@SPELL_FIREBALL,0,0,0,0,0,5,0,0,0,0,0,0,0,'Apprentice Osterkilgr - In Combat - cast Fireball'),
+(@OSTERKILGR,0,2,0,2,0,100,1,40,80,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Apprentice Osterkilgr - @80%HP - say text 0'),
+(@OSTERKILGR,0,3,4,2,0,100,1,0,40,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Apprentice Osterkilgr - @40%HP - say text 1'),
+(@OSTERKILGR,0,4,0,61,0,100,0,0,0,0,0,33,30412,0,0,0,0,0,7,0,0,0,0,0,0,0,'Apprentice Osterkilgr - At 40% HP - give kill credit');
+DELETE FROM `creature_ai_texts` WHERE `entry` IN (-10020,-10021);
+DELETE FROM `creature_text` WHERE `entry`=@OSTERKILGR;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(@OSTERKILGR,0,0,'You''ve come for the doctor''s plans! You''ll only find death!',12,0,0,0,0,0,'Apprentice Osterkilgr - Say 0'),
+(@OSTERKILGR,1,0,'The doctor entrusted me with the plans to Nergeld, our flesh giant amalgamation made entirely of vargul! It will be the most powerful creation of its kind and a whole legion of them will be created to destroy your pitiful forces!',12,0,0,0,0,0,'Apprentice Osterkilgr - Say 1');
diff --git a/sql/updates/world/2013_06_04_02_world_conditions.sql b/sql/updates/world/2013_06_04_02_world_conditions.sql
new file mode 100644
index 00000000000..793a88b9d70
--- /dev/null
+++ b/sql/updates/world/2013_06_04_02_world_conditions.sql
@@ -0,0 +1,5 @@
+-- Add option conditions for Hunter trainers
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (15) AND `SourceGroup` IN (7368) AND `SourceEntry` IN (3,4);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,7368,3,0,9,9454,0,0,0,'','Acteon - Show gossip option if player has quest 9454'),
+(15,7368,4,0,9,10324,,0,0,'','Acteon - Show gossip option if player has quest 10324');
diff --git a/sql/updates/world/2013_06_06_00_world_game_event_creature.sql b/sql/updates/world/2013_06_06_00_world_game_event_creature.sql
deleted file mode 100644
index fb4fc759528..00000000000
--- a/sql/updates/world/2013_06_06_00_world_game_event_creature.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-DELETE FROM `game_event_creature` WHERE `guid`=152120 AND `eventEntry`=24;
-INSERT INTO `game_event_creature` (`guid`, `eventEntry`) VALUES (152120,24);
diff --git a/sql/updates/world/2013_06_06_01_world_sai.sql b/sql/updates/world/2013_06_06_01_world_sai.sql
deleted file mode 100644
index 7b9c1b644bd..00000000000
--- a/sql/updates/world/2013_06_06_01_world_sai.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-UPDATE `smart_scripts` SET `event_flags`=1 WHERE  `entryorguid`=23580 AND `source_type`=0 AND `id`=0 AND `link`=1;
-
--- Deep in the bowels of the Underhalls - 13042
-SET @OSTERKILGR         := 30409; -- Apprentice Osterkilgr
-SET @SPELL_BLAST        := 60290; -- Blast Wave
-SET @SPELL_FIREBALL     := 14034; -- Fireball
-SET @QUEST              := 13042; -- Deep in the Bowels of the Underhalls
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@OSTERKILGR;
-DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@OSTERKILGR;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@OSTERKILGR;
-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
-(@OSTERKILGR,0,0,0,0,0,100,0,5000,7000,5000,7000,11,@SPELL_BLAST,0,0,0,0,0,5,0,0,0,0,0,0,0,'Apprentice Osterkilgr - In Combat - cast Blast Wave'),
-(@OSTERKILGR,0,1,0,0,0,100,0,1000,2000,1000,2000,11,@SPELL_FIREBALL,0,0,0,0,0,5,0,0,0,0,0,0,0,'Apprentice Osterkilgr - In Combat - cast Fireball'),
-(@OSTERKILGR,0,2,0,2,0,100,1,40,80,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Apprentice Osterkilgr - @80%HP - say text 0'),
-(@OSTERKILGR,0,3,4,2,0,100,1,0,40,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Apprentice Osterkilgr - @40%HP - say text 1'),
-(@OSTERKILGR,0,4,0,61,0,100,0,0,0,0,0,33,30412,0,0,0,0,0,7,0,0,0,0,0,0,0,'Apprentice Osterkilgr - At 40% HP - give kill credit');
-DELETE FROM `creature_ai_texts` WHERE `entry` IN (-10020,-10021);
-DELETE FROM `creature_text` WHERE `entry`=@OSTERKILGR;
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(@OSTERKILGR,0,0,'You''ve come for the doctor''s plans! You''ll only find death!',12,0,0,0,0,0,'Apprentice Osterkilgr - Say 0'),
-(@OSTERKILGR,1,0,'The doctor entrusted me with the plans to Nergeld, our flesh giant amalgamation made entirely of vargul! It will be the most powerful creation of its kind and a whole legion of them will be created to destroy your pitiful forces!',12,0,0,0,0,0,'Apprentice Osterkilgr - Say 1');
-- 
cgit v1.2.3


From 803e004111efe1e7e96d811f98b90d674c1b1c79 Mon Sep 17 00:00:00 2001
From: Malcrom <malcromdev@gmail.com>
Date: Tue, 4 Jun 2013 12:33:53 -0230
Subject: DB/Conditions: Fix stupid mistake.

---
 sql/updates/world/2013_06_04_02_world_conditions.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/updates')

diff --git a/sql/updates/world/2013_06_04_02_world_conditions.sql b/sql/updates/world/2013_06_04_02_world_conditions.sql
index 793a88b9d70..1f850571a04 100644
--- a/sql/updates/world/2013_06_04_02_world_conditions.sql
+++ b/sql/updates/world/2013_06_04_02_world_conditions.sql
@@ -2,4 +2,4 @@
 DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (15) AND `SourceGroup` IN (7368) AND `SourceEntry` IN (3,4);
 INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
 (15,7368,3,0,9,9454,0,0,0,'','Acteon - Show gossip option if player has quest 9454'),
-(15,7368,4,0,9,10324,,0,0,'','Acteon - Show gossip option if player has quest 10324');
+(15,7368,4,0,9,10324,0,0,0,'','Acteon - Show gossip option if player has quest 10324');
-- 
cgit v1.2.3


From 3f35182369c04e627c613fef698efb91bd779683 Mon Sep 17 00:00:00 2001
From: Vincent-Michael <Vincent_Michael@gmx.de>
Date: Tue, 4 Jun 2013 21:13:55 +0200
Subject: DB/Conditions: Fix db error

---
 sql/updates/world/2013_06_04_03_world_conditions.sql | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 sql/updates/world/2013_06_04_03_world_conditions.sql

(limited to 'sql/updates')

diff --git a/sql/updates/world/2013_06_04_03_world_conditions.sql b/sql/updates/world/2013_06_04_03_world_conditions.sql
new file mode 100644
index 00000000000..63d3b5ec210
--- /dev/null
+++ b/sql/updates/world/2013_06_04_03_world_conditions.sql
@@ -0,0 +1 @@
+UPDATE `conditions` SET `ConditionValue1`=3781,`ConditionValue2`=0 WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=1403 AND `SourceEntry`=3 AND `ConditionTypeOrReference`=8;
-- 
cgit v1.2.3


From 948a57233935e6d8e19b3b36238501b5b0deb611 Mon Sep 17 00:00:00 2001
From: kirkhammett <kirkhammett@trinity.contrib>
Date: Wed, 5 Jun 2013 12:25:21 +0200
Subject: DB/SAI: some fixes for The Art of Being a Water Terror

Closes #9870
---
 sql/updates/world/2013_06_06_00_world_sai.sql | 61 +++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 sql/updates/world/2013_06_06_00_world_sai.sql

(limited to 'sql/updates')

diff --git a/sql/updates/world/2013_06_06_00_world_sai.sql b/sql/updates/world/2013_06_06_00_world_sai.sql
new file mode 100644
index 00000000000..9dc2b4bfcf1
--- /dev/null
+++ b/sql/updates/world/2013_06_06_00_world_sai.sql
@@ -0,0 +1,61 @@
+-- The Art of Being a Water Terror (13091)
+SET @NPC_WATER_TERROR           := 30645; -- Water Terror
+SET @AURA_HEALTH                := 57664; -- The Art of Being a Water Terror: Mod Health Regen %
+SET @JOT_WARRIOR                := 29880; -- Jotunheim Warrior
+SET @SPEAR_SISTER               := 30243; -- Njorndar Spear-Sister
+SET @VAL_VARGUL                 := 30250; -- Valhalas Vargul
+SET @WATER_MAGUS                := 30632; -- Mjordin Water Magus
+SET @SLEEP_WATCHER              := 30725; -- Jotunheim Sleep-Watcher
+
+UPDATE `creature_template` SET `speed_walk`=4,`speed_run`=2.14285707473755,`AIName`='SmartAI',`exp`=2,`spell1`=57643,`spell2`=57652,`spell3`=57665,`spell4`=57668,`VehicleId`=250,`minlevel`=80,`maxlevel`=80,`faction_A`=116,`faction_H`=116,`unit_flags`=0x8008 WHERE `entry`=@NPC_WATER_TERROR;
+
+DELETE FROM `creature_template_addon` WHERE `entry`=@NPC_WATER_TERROR;
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`auras`) VALUES
+(@NPC_WATER_TERROR,0,0x0,0x101,'');
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@NPC_WATER_TERROR 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
+(@NPC_WATER_TERROR,0,0,1,54,0,100,0,0,0,0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'On Just Summoned - Set State Passive - Self'),
+(@NPC_WATER_TERROR,0,1,0,61,0,100,0,0,0,0,0,75,@AURA_HEALTH,0,0,0,0,0,1,0,0,0,0,0,0,0,'On Just Summoned - Add Aura - Self');
+
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`  IN (@JOT_WARRIOR,@WATER_MAGUS,@SPEAR_SISTER);
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry` IN (@JOT_WARRIOR,@WATER_MAGUS,@SPEAR_SISTER);
+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 
+(@JOT_WARRIOR,0,0,0,0,0,100,0,0,0,30000,30000,11,23262,2,0,0,0,0,2,0,0,0,0,0,0,0,'Jotunheim Warrior - IC - Cast Demoralize'),
+(@JOT_WARRIOR,0,1,0,0,0,100,0,2000,3000,5000,7000,11,43410,2,0,0,0,0,2,0,0,0,0,0,0,0,'Jotunheim Warrior - IC - Cast Chop'),
+(@JOT_WARRIOR,0,2,0,6,0,100,0,0,0,0,0,33,30644,0,0,0,0,0,7,0,0,0,0,0,0,0,'Jotunheim Warrior - On Death - Give Kill Credit credit'),
+(@SPEAR_SISTER,0,0,0,0,0,100,0,2000,3000,3000,4000,11,38029,2,0,0,0,0,2,0,0,0,0,0,0,0,'Njorndar Spear-Sister - IC - Cast Stab'),
+(@SPEAR_SISTER,0,1,0,6,0,100,0,0,0,0,0,33,30644,0,0,0,0,0,7,0,0,0,0,0,0,0,'Njorndar Spear-Sister - On Death - Give Kill Credit credit'),
+(@WATER_MAGUS,0,0,0,11,0,100,0,0,0,0,0,11,7855,0,0,0,0,0,1,0,0,0,0,0,0,0,'Mjordin Water Magus - On Spawn - Summon Water Terror (Self)'),
+(@WATER_MAGUS,0,1,0,0,0,100,0,0,0,3000,4000,11,9672,0,0,0,0,0,2,0,0,0,0,0,0,0,'Mjordin Water Magus - IC - Cast Frostbolt'),
+(@WATER_MAGUS,0,2,0,0,0,100,0,3000,3000,7000,9000,11,15532,0,0,0,0,0,1,0,0,0,0,0,0,0,'Mjordin Water Magus - IC - Cast Frost Nova'),
+(@WATER_MAGUS,0,3,0,6,0,100,0,0,0,0,0,33,30644,0,0,0,0,0,7,0,0,0,0,0,0,0,'Mjordin Water Magus - On Death - Give Kill Credit credit');
+-- Valhalas Vargul
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@VAL_VARGUL;
+DELETE FROM `smart_scripts` WHERE `entryorguid` =@VAL_VARGUL;
+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
+(@VAL_VARGUL,0,0,0,9,0,100,0,0,5,3000,5000,11,15496,0,0,0,0,0,2,0,0,0,0,0,0,0,'Valhalas Vargul - IC - Cast Cleave'),
+(@VAL_VARGUL,0,1,0,6,0,100,0,0,0,0,0,33,30644,0,0,0,0,0,7,0,0,0,0,0,0,0,'Valhalas Vargul - On Death - Give Kill Credit credit');
+
+-- Jotunheim Sleep-Watcher 
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@SLEEP_WATCHER;
+DELETE FROM `smart_scripts` WHERE `entryorguid` =@SLEEP_WATCHER;
+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
+(@SLEEP_WATCHER,0,0,0,9,0,100,0,0,5,15000,25000,11,60870,0,0,0,0,0,2,0,0,0,0,0,0,0,'Jotunheim Sleep-Watcher - IC - Cast Bludgeoning Strike'),
+(@SLEEP_WATCHER,0,1,0,9,0,100,0,0,5000,30000,45000,11,13730,0,0,0,0,0,1,0,0,0,0,0,0,0,'Jotunheim Sleep-Watcher - IC - Cast Demoralizing Shout'),
+(@SLEEP_WATCHER,0,2,0,6,0,100,0,0,0,0,0,33,30644,0,0,0,0,0,7,0,0,0,0,0,0,0,'Jotunheim Sleep-Watcher - On Death - Give Kill Credit credit');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry` IN(@JOT_WARRIOR,@WATER_MAGUS,@SPEAR_SISTER,@VAL_VARGUL,@SLEEP_WATCHER);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,3,@JOT_WARRIOR,0,0,1,0,57615,0,0,0,0,'','Only run AI if player is possessing a water terror'),
+(22,4,@WATER_MAGUS,0,0,1,0,57615,0,0,0,0,'','Only run AI if player is  possessing  a water terror'),
+(22,2,@SPEAR_SISTER,0,0,1,0,57615,0,0,0,0,'','Only run AI if player is  possessing  a water terror'),
+(22,2,@VAL_VARGUL,0,0,1,0,57615,0,0,0,0,'','Only run AI if player is possessing  a water terror'),
+(22,3,@SLEEP_WATCHER,0,0,1,0,57615,0,0,0,0,'','Only run AI if player is possessing  a water terror');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=16 AND `SourceEntry`=@NPC_WATER_TERROR;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(16,0,@NPC_WATER_TERROR,0,0,23,0,4526,0,0,0,0,0,'','Water Terror (Vehicle) Allowed in Njorndar Village'),
+(16,0,@NPC_WATER_TERROR,0,1,23,0,4524,0,0,0,0,0,'','Water Terror (Vehicle) Allowed in Valhalas'),
+(16,0,@NPC_WATER_TERROR,0,2,23,0,4496,0,0,0,0,0,'','Water Terror (Vehicle) Allowed in Jotunheim');
-- 
cgit v1.2.3


From 1adf4624bb3eea00d799370bce4c2c21111db8ad Mon Sep 17 00:00:00 2001
From: Pitcrawler <pitcrawler@server.fake>
Date: Wed, 5 Jun 2013 16:37:15 +0200
Subject: DB/Quests: Fix Foolish Endeavors, closes #1880 closes #9849

Thanks to @dr-j for a major part of the work!

Also rename a file.
---
 sql/updates/world/2013_06_05_00_world_sai.sql  |  61 +++++++
 sql/updates/world/2013_06_05_01_world_misc.sql | 240 +++++++++++++++++++++++++
 sql/updates/world/2013_06_06_00_world_sai.sql  |  61 -------
 3 files changed, 301 insertions(+), 61 deletions(-)
 create mode 100644 sql/updates/world/2013_06_05_00_world_sai.sql
 create mode 100644 sql/updates/world/2013_06_05_01_world_misc.sql
 delete mode 100644 sql/updates/world/2013_06_06_00_world_sai.sql

(limited to 'sql/updates')

diff --git a/sql/updates/world/2013_06_05_00_world_sai.sql b/sql/updates/world/2013_06_05_00_world_sai.sql
new file mode 100644
index 00000000000..9dc2b4bfcf1
--- /dev/null
+++ b/sql/updates/world/2013_06_05_00_world_sai.sql
@@ -0,0 +1,61 @@
+-- The Art of Being a Water Terror (13091)
+SET @NPC_WATER_TERROR           := 30645; -- Water Terror
+SET @AURA_HEALTH                := 57664; -- The Art of Being a Water Terror: Mod Health Regen %
+SET @JOT_WARRIOR                := 29880; -- Jotunheim Warrior
+SET @SPEAR_SISTER               := 30243; -- Njorndar Spear-Sister
+SET @VAL_VARGUL                 := 30250; -- Valhalas Vargul
+SET @WATER_MAGUS                := 30632; -- Mjordin Water Magus
+SET @SLEEP_WATCHER              := 30725; -- Jotunheim Sleep-Watcher
+
+UPDATE `creature_template` SET `speed_walk`=4,`speed_run`=2.14285707473755,`AIName`='SmartAI',`exp`=2,`spell1`=57643,`spell2`=57652,`spell3`=57665,`spell4`=57668,`VehicleId`=250,`minlevel`=80,`maxlevel`=80,`faction_A`=116,`faction_H`=116,`unit_flags`=0x8008 WHERE `entry`=@NPC_WATER_TERROR;
+
+DELETE FROM `creature_template_addon` WHERE `entry`=@NPC_WATER_TERROR;
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`auras`) VALUES
+(@NPC_WATER_TERROR,0,0x0,0x101,'');
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@NPC_WATER_TERROR 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
+(@NPC_WATER_TERROR,0,0,1,54,0,100,0,0,0,0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'On Just Summoned - Set State Passive - Self'),
+(@NPC_WATER_TERROR,0,1,0,61,0,100,0,0,0,0,0,75,@AURA_HEALTH,0,0,0,0,0,1,0,0,0,0,0,0,0,'On Just Summoned - Add Aura - Self');
+
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`  IN (@JOT_WARRIOR,@WATER_MAGUS,@SPEAR_SISTER);
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry` IN (@JOT_WARRIOR,@WATER_MAGUS,@SPEAR_SISTER);
+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 
+(@JOT_WARRIOR,0,0,0,0,0,100,0,0,0,30000,30000,11,23262,2,0,0,0,0,2,0,0,0,0,0,0,0,'Jotunheim Warrior - IC - Cast Demoralize'),
+(@JOT_WARRIOR,0,1,0,0,0,100,0,2000,3000,5000,7000,11,43410,2,0,0,0,0,2,0,0,0,0,0,0,0,'Jotunheim Warrior - IC - Cast Chop'),
+(@JOT_WARRIOR,0,2,0,6,0,100,0,0,0,0,0,33,30644,0,0,0,0,0,7,0,0,0,0,0,0,0,'Jotunheim Warrior - On Death - Give Kill Credit credit'),
+(@SPEAR_SISTER,0,0,0,0,0,100,0,2000,3000,3000,4000,11,38029,2,0,0,0,0,2,0,0,0,0,0,0,0,'Njorndar Spear-Sister - IC - Cast Stab'),
+(@SPEAR_SISTER,0,1,0,6,0,100,0,0,0,0,0,33,30644,0,0,0,0,0,7,0,0,0,0,0,0,0,'Njorndar Spear-Sister - On Death - Give Kill Credit credit'),
+(@WATER_MAGUS,0,0,0,11,0,100,0,0,0,0,0,11,7855,0,0,0,0,0,1,0,0,0,0,0,0,0,'Mjordin Water Magus - On Spawn - Summon Water Terror (Self)'),
+(@WATER_MAGUS,0,1,0,0,0,100,0,0,0,3000,4000,11,9672,0,0,0,0,0,2,0,0,0,0,0,0,0,'Mjordin Water Magus - IC - Cast Frostbolt'),
+(@WATER_MAGUS,0,2,0,0,0,100,0,3000,3000,7000,9000,11,15532,0,0,0,0,0,1,0,0,0,0,0,0,0,'Mjordin Water Magus - IC - Cast Frost Nova'),
+(@WATER_MAGUS,0,3,0,6,0,100,0,0,0,0,0,33,30644,0,0,0,0,0,7,0,0,0,0,0,0,0,'Mjordin Water Magus - On Death - Give Kill Credit credit');
+-- Valhalas Vargul
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@VAL_VARGUL;
+DELETE FROM `smart_scripts` WHERE `entryorguid` =@VAL_VARGUL;
+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
+(@VAL_VARGUL,0,0,0,9,0,100,0,0,5,3000,5000,11,15496,0,0,0,0,0,2,0,0,0,0,0,0,0,'Valhalas Vargul - IC - Cast Cleave'),
+(@VAL_VARGUL,0,1,0,6,0,100,0,0,0,0,0,33,30644,0,0,0,0,0,7,0,0,0,0,0,0,0,'Valhalas Vargul - On Death - Give Kill Credit credit');
+
+-- Jotunheim Sleep-Watcher 
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@SLEEP_WATCHER;
+DELETE FROM `smart_scripts` WHERE `entryorguid` =@SLEEP_WATCHER;
+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
+(@SLEEP_WATCHER,0,0,0,9,0,100,0,0,5,15000,25000,11,60870,0,0,0,0,0,2,0,0,0,0,0,0,0,'Jotunheim Sleep-Watcher - IC - Cast Bludgeoning Strike'),
+(@SLEEP_WATCHER,0,1,0,9,0,100,0,0,5000,30000,45000,11,13730,0,0,0,0,0,1,0,0,0,0,0,0,0,'Jotunheim Sleep-Watcher - IC - Cast Demoralizing Shout'),
+(@SLEEP_WATCHER,0,2,0,6,0,100,0,0,0,0,0,33,30644,0,0,0,0,0,7,0,0,0,0,0,0,0,'Jotunheim Sleep-Watcher - On Death - Give Kill Credit credit');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry` IN(@JOT_WARRIOR,@WATER_MAGUS,@SPEAR_SISTER,@VAL_VARGUL,@SLEEP_WATCHER);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,3,@JOT_WARRIOR,0,0,1,0,57615,0,0,0,0,'','Only run AI if player is possessing a water terror'),
+(22,4,@WATER_MAGUS,0,0,1,0,57615,0,0,0,0,'','Only run AI if player is  possessing  a water terror'),
+(22,2,@SPEAR_SISTER,0,0,1,0,57615,0,0,0,0,'','Only run AI if player is  possessing  a water terror'),
+(22,2,@VAL_VARGUL,0,0,1,0,57615,0,0,0,0,'','Only run AI if player is possessing  a water terror'),
+(22,3,@SLEEP_WATCHER,0,0,1,0,57615,0,0,0,0,'','Only run AI if player is possessing  a water terror');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=16 AND `SourceEntry`=@NPC_WATER_TERROR;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(16,0,@NPC_WATER_TERROR,0,0,23,0,4526,0,0,0,0,0,'','Water Terror (Vehicle) Allowed in Njorndar Village'),
+(16,0,@NPC_WATER_TERROR,0,1,23,0,4524,0,0,0,0,0,'','Water Terror (Vehicle) Allowed in Valhalas'),
+(16,0,@NPC_WATER_TERROR,0,2,23,0,4496,0,0,0,0,0,'','Water Terror (Vehicle) Allowed in Jotunheim');
diff --git a/sql/updates/world/2013_06_05_01_world_misc.sql b/sql/updates/world/2013_06_05_01_world_misc.sql
new file mode 100644
index 00000000000..6e11d0ce0d3
--- /dev/null
+++ b/sql/updates/world/2013_06_05_01_world_misc.sql
@@ -0,0 +1,240 @@
+SET @GUID       := 131282;
+
+SET @QUEST      := 11705;
+SET @VARIDUS    := 25618;
+SET @PRISONER   := 25624;
+SET @ABERRATION := 25625;
+SET @GETRY      := 25729;
+SET @NECROLORD  := 25730;
+SET @SAURFANG   := 25751;
+
+UPDATE `creature_template` SET `minlevel`=65, `maxlevel`=70, `exp`=2, `faction_A`=14, `faction_H`=14, `unit_flags`=33554688, `AIName`='SmartAI' WHERE `entry`=@PRISONER;
+UPDATE `creature_template` SET `faction_A`=1982, `faction_H`=1982, `unit_flags`=0, `AIName`='SmartAI' WHERE `entry`=@ABERRATION;
+UPDATE `creature_template` SET `speed_run`=2.28571, `faction_A`=1982, `faction_H`=1982, `unit_flags`=33536, `AIName`='SmartAI' WHERE `entry`=@NECROLORD;
+UPDATE `creature_template` SET `faction_A`=1982, `faction_H`=1982, `unit_flags`=768, `AIName`= 'SmartAI', `ScriptName`='' WHERE `entry`=@VARIDUS;
+UPDATE `creature_template` SET `faction_A`=1980, `faction_H`=1980, `minlevel`=70, `maxlevel`=70, `exp`=2, `unit_flags`=33024, `mindmg`=474, `maxdmg`=574, `AIName`= 'SmartAI' WHERE `entry`=@SAURFANG;
+UPDATE `creature_template` SET `unit_flags`=32768, `AIName`= 'SmartAI' WHERE `entry`=@GETRY;
+
+UPDATE `creature_model_info` SET `bounding_radius`=0.4092, `combat_reach`=1.65 WHERE `modelid`=23360;
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN(@GETRY,@PRISONER,@VARIDUS);
+INSERT INTO `creature_template_addon` (`entry`,`bytes2`,`auras`) VALUES
+(@VARIDUS,0x1,'45908'),
+(@PRISONER,0x1,''),
+(@GETRY,0x101,'');
+
+DELETE FROM `creature` WHERE `id` IN (@PRISONER,@VARIDUS);
+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 
+(@GUID+0, @PRISONER, 571, 1, 1, 0, 0, 3092.136, 6516.039, 82.06012, 5.183628, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+1, @PRISONER, 571, 1, 1, 0, 0, 3089.2, 6526.226, 81.77282, 1.902409, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+2, @PRISONER, 571, 1, 1, 0, 0, 3096.962, 6510.87, 82.08541, 0.5585054, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+3, @PRISONER, 571, 1, 1, 0, 0, 3093.876, 6522.219, 81.79565, 0.01745329, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+4, @PRISONER, 571, 1, 1, 0, 0, 3098.928, 6517.495, 81.77497, 3.001966, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+5, @PRISONER, 571, 1, 1, 0, 0, 3103.036, 6504.89, 82.04672, 3.944444, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+6, @PRISONER, 571, 1, 1, 0, 0, 3104.042, 6511.731, 81.80676, 3.455752, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+7, @PRISONER, 571, 1, 1, 0, 0, 3093.038, 6547.074, 80.75952, 5.899213, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+8, @PRISONER, 571, 1, 1, 0, 0, 3096.117, 6544.481, 80.7102, 1.605703, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+9, @PRISONER, 571, 1, 1, 0, 0, 3099.3, 6541.367, 80.77256, 4.799655, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+10, @PRISONER, 571, 1, 1, 0, 0, 3090.39, 6541.875, 81.06445, 3.054326, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+11, @PRISONER, 571, 1, 1, 0, 0, 3102.454, 6538.238, 80.83416, 1.58825, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+12, @PRISONER, 571, 1, 1, 0, 0, 3093.245, 6538.743, 81.06524, 3.455752, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+13, @PRISONER, 571, 1, 1, 0, 0, 3105.601, 6534.979, 80.85965, 0.1570796, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+14, @PRISONER, 571, 1, 1, 0, 0, 3096.462, 6535.528, 81.13345, 4.921828, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+15, @PRISONER, 571, 1, 1, 0, 0, 3087.603, 6536.683, 81.36699, 4.18879, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+16, @PRISONER, 571, 1, 1, 0, 0, 3108.599, 6531.898, 80.8754, 5.462881, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+17, @PRISONER, 571, 1, 1, 0, 0, 3100.571, 6532.094, 81.16553, 6.230825, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+18, @PRISONER, 571, 1, 1, 0, 0, 3122.098, 6518.814, 80.70912, 1.815142, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+19, @PRISONER, 571, 1, 1, 0, 0, 3116.981, 6515.013, 81.07998, 5.899213, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+20, @PRISONER, 571, 1, 1, 0, 0, 3126.142, 6514.962, 80.68482, 1.954769, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+21, @PRISONER, 571, 1, 1, 0, 0, 3112.065, 6511.906, 81.3951, 5.148721, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+22, @PRISONER, 571, 1, 1, 0, 0, 3129.413, 6511.592, 80.7066, 2.722714, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+23, @PRISONER, 571, 1, 1, 0, 0, 3122.214, 6510.255, 81.00794, 2.86234, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+24, @PRISONER, 571, 1, 1, 0, 0, 3116.414, 6507.338, 81.34387, 5.811946, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+25, @PRISONER, 571, 1, 1, 0, 0, 3109.384, 6506.753, 81.68826, 6.038839, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+26, @PRISONER, 571, 1, 1, 0, 0, 3126.804, 6505.612, 81.01304, 3.909538, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+27, @PRISONER, 571, 1, 1, 0, 0, 3120.997, 6502.847, 81.33372, 3.228859, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+28, @PRISONER, 571, 1, 1, 0, 0, 3114.636, 6501.495, 81.61775, 0.3490658, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+29, @PRISONER, 571, 1, 1, 0, 0, 3109.11, 6498.783, 81.92492, 2.635447, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+30, @PRISONER, 571, 1, 1, 0, 0, 3126.413, 6498.179, 81.30205, 6.248279, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+31, @PRISONER, 571, 1, 1, 0, 0, 3120.758, 6495.855, 81.59259, 2.495821, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+32, @PRISONER, 571, 1, 1, 0, 0, 3115.22, 6492.261, 81.93079, 5.5676, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+33, @PRISONER, 571, 1, 1, 0, 0, 3126.15, 6489.568, 81.65459, 2.146755, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+34, @PRISONER, 571, 1, 1, 0, 0, 3120.454, 6486.966, 81.9426, 1.902409, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+35, @PRISONER, 571, 1, 1, 0, 0, 3095.756, 6528.297, 81.4939, 4.433136, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+36, @PRISONER, 571, 1, 1, 0, 0, 3091.309, 6532.723, 81.41476, 4.502949, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+37, @PRISONER, 571, 1, 1, 0, 0, 3104.285, 6519.577, 81.50758, 6.178465, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+38, @PRISONER, 571, 1, 1, 0, 0, 3112.36, 6527.987, 80.87508, 3.630285, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+39, @PRISONER, 571, 1, 1, 0, 0, 3104.28, 6528.084, 81.18883, 3.420845, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+40, @PRISONER, 571, 1, 1, 0, 0, 3116.763, 6524.073, 80.84852, 6.021386, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+41, @PRISONER, 571, 1, 1, 0, 0, 3099.789, 6524.306, 81.51059, 3.368485, 15, 0, 0, 1848, 0, 0, 0, 0, 0),
+(@GUID+42, @VARIDUS, 571, 1, 1, 0, 0, 3126.529, 6532.781, 80.06363, 5.576992, 60, 0, 0, 0, 0, 0, 0, 0, 0);
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@GETRY,@VARIDUS,@NECROLORD,@PRISONER,@ABERRATION) AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@VARIDUS*100 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
+(@VARIDUS,0,0,0,38,0,100,0,0,1,0,0,69,1,0,0,0,0,0,8,0,0,0,3119.973,6539.042,80.1591, 0, 'Varidus the Flenser - On data 0 1 set - Move to position'),
+(@VARIDUS,0,1,2,34,0,100,0,0,1,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.031711, 'Varidus the Flenser - On movement inform - Set orientation'),
+(@VARIDUS,0,2,3,61,0,100,0,0,0,0,0,1,11,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Varidus the Flenser - On movement inform - Say line'),
+(@VARIDUS,0,3,0,61,0,100,0,0,0,0,0,89,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Varidus the Flenser - On movement inform - Stop Random movement'),
+(@VARIDUS,0,4,0,38,0,100,0,0,2,0,0,1,0,3000,0,0,0,0,1,0,0,0,0,0,0,0, 'Varidus the Flenser - On data 0 2 set - Say line'),
+(@VARIDUS,0,5,0,52,0,100,0,0,@VARIDUS,0,0,66,0,0,0,0,0,0,12,1,0,0,0,0,0,0, 'Varidus the Flenser - On text 0 over - Turn to'),
+(@VARIDUS,0,6,7,38,0,100,0,0,3,0,0,1,1,0,0,0,0,0,12,1,0,0,0,0,0,0, 'Varidus the Flenser - On data 0 3 set - Say line'),
+(@VARIDUS,0,7,8,61,0,100,0,0,0,0,0,12,@NECROLORD,1,300000,0,0,0,8,0,0,0,3137.506,6532.551,80.40143,2.280419, 'Varidus the Flenser - On data 0 3 set - Summon En''kilah Necrolord'),
+(@VARIDUS,0,8,0,61,0,100,0,0,0,0,0,100,1,0,0,0,0,0,19,@NECROLORD,50,0,0,0,0,0, 'Varidus the Flenser - On data 0 3 set - Send targetlist'),
+(@VARIDUS,0,9,0,38,0,100,0,0,4,0,0,80,@VARIDUS*100,2,0,0,0,0,1,0,0,0,0,0,0,0, 'Varidus the Flenser - On data 0 4 set - Run script'),
+(@VARIDUS,0,10,11,52,0,100,0,10,@VARIDUS,0,0,19,768,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Varidus the Flenser - On text 10 over - Remove unit_flags IMMUNE_TO_PC, IMMUNE_TO_NPC'),
+(@VARIDUS,0,11,0,61,0,100,0,0,0,0,0,28,45908,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Varidus the Flenser - On text 10 over - Remove aura Shield of Suffering'),
+(@VARIDUS,0,12,0,9,0,100,0,0,10,5000,8000,11,32711,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Varidus the Flenser - On target within 10y - Spellcast Shadow Nova'),
+(@VARIDUS,0,13,0,0,0,100,0,10000,12000,10000,15000,11,50329,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Varidus the Flenser - On update IC - Spellcast Shied of Suffering'),
+(@VARIDUS,0,14,15,6,0,100,0,0,0,0,0,45,1,3,0,0,0,0,19,@GETRY,100,0,0,0,0,0, 'Varidus the Flenser - On death - Set data 1 3 Shadowstalker Getry'),
+(@VARIDUS,0,15,0,61,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Varidus the Flenser - On death - Despawn'),
+(@VARIDUS,0,16,0,11,0,100,0,0,0,0,0,89,10,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Varidus the Flenser - On spawn - Random movement'),
+
+(@PRISONER,0,0,1,6,0,100,0,0,0,0,0,11,45802,2,0,0,0,0,1,0,0,0,0,0,0,0, 'Infested Prisoner - On death - Spellcast Summoned Aberration'),
+(@PRISONER,0,1,0,61,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Infested Prisoner - On death - Despawn'),
+
+(@ABERRATION,0,0,1,11,0,100,0,0,0,0,0,53,0,@ABERRATION,0,0,0,0,1,0,0,0,0,0,0,0, 'Warsong Aberration - On spawn - Start WP movement'),
+(@ABERRATION,0,1,0,61,0,100,0,0,0,0,0,8,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Warsong Aberration - On spawn - Set reaction aggressive'),
+(@ABERRATION,0,2,0,9,0,100,0,0,5,990,3000,11,50306,2,0,0,0,0,7,0,0,0,0,0,0,0, 'Warsong Aberration - On target within 5y - Spellcast Thrash Kick'),
+
+(@GETRY,0,0,1,19,0,100,0,@QUEST,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Shadowstalker Getry - On quest accept - Store targetlist'),
+(@GETRY,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, 'Shadowstalker Getry - On quest accept - Remove npcflag questgiver'),
+(@GETRY,0,2,3,61,0,100,0,0,0,0,0,1,0,3000,0,0,0,0,1,0,0,0,0,0,0,0, 'Shadowstalker Getry - On quest accept - Say line'),
+(@GETRY,0,3,4,61,0,100,0,0,0,0,0,11,45924,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Shadowstalker Getry - On quest accept - Spellcast On Getry''s Quest'),
+(@GETRY,0,4,5,61,0,100,0,0,0,0,0,11,45924,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Shadowstalker Getry - On quest accept - Spellcast On Getry''s Quest'),
+(@GETRY,0,5,0,61,0,100,0,0,0,0,0,45,0,1,0,0,0,0,19,@VARIDUS,50,0,0,0,0,0, 'Shadowstalker Getry - On quest accept - Set data 0 1 Varidus the Flenser'),
+(@GETRY,0,6,7,52,0,100,0,0,@GETRY,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Shadowstalker Getry - On text 0 over - Say line'),
+(@GETRY,0,7,0,61,0,100,0,0,0,0,0,53,0,@GETRY,0,0,0,0,1,0,0,0,0,0,0,0, 'Shadowstalker Getry - On text 0 over - Start WP'),
+(@GETRY,0,8,0,11,0,100,0,0,0,0,0,81,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Shadowstalker Getry - On spawn - Set npcflag questgiver'),
+(@GETRY,0,9,0,40,0,100,0,8,@GETRY,0,0,11,34189,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Shadowstalker Getry - On WP8 reached - Spellcast Stealth'),
+(@GETRY,0,10,11,40,0,100,0,9,@GETRY,0,0,45,0,2,0,0,0,0,19,@VARIDUS,30,0,0,0,0,0, 'Shadowstalker Getry - On WP 9 reached - Set data 0 2 Varidus the Flenser'),
+(@GETRY,0,11,0,61,0,100,0,0,0,0,0,100,1,0,0,0,0,0,19,@VARIDUS,30,0,0,0,0,0, 'Shadowstalker Getry - On WP10 reached - Send targetlist to Varidus the Flenser'),
+(@GETRY,0,12,13,40,0,100,0,10,@GETRY,0,0,66,0,0,0,0,0,0,19,@VARIDUS,20,0,0,0,0,0, 'Shadowstalker Getry - On WP10 reached - Turn to'),
+(@GETRY,0,13,14,61,0,100,0,0,0,0,0,101,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Shadowstalker Getry - On WP10 reached - Set home position'),
+(@GETRY,0,14,15,61,0,100,0,0,0,0,0,28,34189,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Shadowstalker Getry - On WP10 reached - Remove aura Stealth'),
+(@GETRY,0,15,16,61,0,100,0,0,0,0,0,11,45922,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Shadowstalker Getry - On WP10 reached - Spellcast Shadow Prison'),
+(@GETRY,0,16,17,61,0,100,0,0,0,0,0,86,45922,0,12,1,0,0,12,1,0,0,0,0,0,0, 'Shadowstalker Getry - On WP10 reached - Crosscast Shadow Prison'),
+(@GETRY,0,17,0,61,0,100,0,0,0,0,0,45,0,3,0,0,0,0,19,@VARIDUS,20,0,0,0,0,0, 'Shadowstalker Getry - On WP10 reached - Set Data 0 3 Varidus the Flenser'),
+(@GETRY,0,18,19,38,0,100,0,1,1,0,0,19,768,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Shadowstalker Getry - On data 1 1 set - Remove unit_flags IMMUNE_TO_PC, IMMUNE_TO_NPC'),
+(@GETRY,0,19,0,61,0,100,0,0,0,0,0,49,0,0,0,0,0,0,19,@VARIDUS,20,0,0,0,0,0, 'Shadowstalker Getry - On data 1 1 set - Start attack'),
+(@GETRY,0,20,21,38,0,100,0,1,3,0,0,15,@QUEST,0,0,0,0,0,12,1,0,0,0,0,0,0, 'Shadowstalker Getry - On data 1 3 set - Quest credit'),
+(@GETRY,0,21,0,61,0,100,0,0,0,0,0,1,2,5000,0,0,0,0,1,0,0,0,0,0,0,0, 'Shadowstalker Getry - On data 1 3 set - Say line'),
+(@GETRY,0,22,0,52,0,100,0,2,@GETRY,0,0,1,3,5000,0,0,0,0,1,0,0,0,0,0,0,0, 'Shadowstalker Getry - On text 2 over - Say line'),
+(@GETRY,0,23,0,52,0,100,0,3,@GETRY,0,0,45,1,2,0,0,0,0,19,@SAURFANG,20,0,0,0,0,0, 'Shadowstalker Getry - On text 3 over - Set data 1 2 High Overlord Saurfang'),
+(@GETRY,0,24,0,38,0,100,0,1,4,0,0,53,0,@GETRY*100,0,0,0,0,1,0,0,0,0,0,0,0, 'Shadowstalker Getry - On data 1 4 set - Start WP movement'),
+(@GETRY,0,26,27,40,0,100,0,10,@GETRY*100,0,0,81,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Shadowstalker Getry - On WP10 reached (Return) - Set npcflag questgiver'),
+(@GETRY,0,27,28,61,0,100,0,0,0,0,0,18,756,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Shadowstalker Getry - On WP10 reached (Return) - Set unit_flags IMMUNE_TO_PC, IMMUNE_TO_NPC'),
+(@GETRY,0,28,0,61,0,100,0,0,0,0,0,101,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Shadowstalker Getry - On WP10 reached (Return) - Set homeposition'),
+(@GETRY,0,29,30,8,0,100,0,45950,0,0,0,28,45922,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Shadowstalker Getry - On spellhit Saurfangs Rage - Remove aura Shadow Prison'),
+(@GETRY,0,30,0,61,0,100,0,0,0,0,0,28,45922,0,0,0,0,0,12,1,0,0,0,0,0,0, 'Shadowstalker Getry - On spellhit Saurfangs Rage - Remove aura Shadow Prison'),
+
+(@NECROLORD,0,0,0,11,0,100,0,0,0,0,0,53,0,@NECROLORD,0,0,0,0,1,0,0,0,0,0,0,0, 'En''kilah Necrolord - On spawn - Start WP movement'),
+(@NECROLORD,0,1,2,40,0,100,0,2,@NECROLORD,0,0,101,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'En''kilah Necrolord - On reached WP1 - Set home position'),
+(@NECROLORD,0,2,0,61,0,100,0,0,0,0,0,45,0,4,0,0,0,0,19,@VARIDUS,10,0,0,0,0,0, 'En''kilah Necrolord - On reached WP1 - Set data 0 4 Varidus the Flenser'),
+(@NECROLORD,0,3,4,38,0,100,0,0,1,0,0,66,0,0,0,0,0,0,19,@VARIDUS,10,0,0,0,0,0, 'En''kilah Necrolord - On data 0 1 set - Turn to'),
+(@NECROLORD,0,4,0,61,0,100,0,0,0,0,0,36,@SAURFANG,0,0,0,0,0,1,0,0,0,0,0,0,0, 'En''kilah Necrolord - On data 0 1 set - Change entry to High Overlord Saurfang'),
+(@NECROLORD,0,5,0,38,0,100,0,0,2,0,0,1,0,2500,0,0,0,0,12,1,0,0,0,0,0,0, 'High Overlord Saurfang - On data 0 2 set - Say line'),
+(@NECROLORD,0,6,0,52,0,100,0,0,@SAURFANG,0,0,66,0,0,0,0,0,0,12,1,0,0,0,0,0,0, 'High Overlord Saurfang - On text 0 over - Turn to'),
+(@NECROLORD,0,7,0,38,0,100,0,0,3,0,0,1,1,4000,0,0,0,0,12,1,0,0,0,0,0,0, 'High Overlord Saurfang - On data 0 3 set - Say line'),
+(@NECROLORD,0,8,0,52,0,100,0,1,@SAURFANG,0,0,66,0,0,0,0,0,0,19,@VARIDUS,10,0,0,0,0,0, 'High Overlord Saurfang - On text 1 over - Turn to'),
+(@NECROLORD,0,9,0,38,0,100,0,0,4,0,0,1,2,5000,0,0,0,0,1,0,0,0,0,0,0,0, 'High Overlord Saurfang - On data 0 4 set - Say line'),
+(@NECROLORD,0,10,0,52,0,100,0,2,@SAURFANG,0,0,1,3,12000,0,0,0,0,1,0,0,0,0,0,0,0, 'High Overlord Saurfang - On text 2 over - Say line'),
+(@NECROLORD,0,11,0,52,0,100,0,3,@SAURFANG,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0, 'High Overlord Saurfang - On text 3 over - Say line'),
+(@NECROLORD,0,13,14,38,0,100,0,1,1,0,0,19,256,0,0,0,0,0,1,0,0,0,0,0,0,0, 'High Overlord Saurfang - On data 1 1 set - Remove unit_flags IMMUNE_TO_NPC'),
+(@NECROLORD,0,14,15,61,0,100,0,0,0,0,0,11,45950,0,0,0,0,0,1,0,0,0,0,0,0,0, 'High Overlord Saurfang - On data 1 1 set - Spellcast Saurfang''s Rage'),
+(@NECROLORD,0,15,0,61,0,100,0,0,0,0,0,1,5,1000,0,0,0,0,1,0,0,0,0,0,0,0, 'High Overlord Saurfang - On data 1 1 set - Say line'),
+(@NECROLORD,0,16,0,52,0,100,0,5,@SAURFANG,0,0,1,6,1000,0,0,0,0,1,0,0,0,0,0,0,0, 'High Overlord Saurfang - On text 5 over - Say line'),
+(@NECROLORD,0,17,0,61,0,100,0,0,0,0,0,41,3000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'High Overlord Saurfang - On text 7 over - Despawn after 3 seconds'),
+(@NECROLORD,0,18,0,9,0,100,0,0,5,20000,25000,11,41097,0,0,0,0,0,1,0,0,0,0,0,0,0, 'High Overlord Saurfang - On target within 5y - Spellcast Whirlwind'),
+(@NECROLORD,0,19,0,0,0,100,0,3000,7000,3000,8000,11,16044,0,0,0,0,0,1,0,0,0,0,0,0,0, 'High Overlord Saurfang - On update IC - Spellcast Cleave'),
+(@NECROLORD,0,20,0,0,0,100,0,2000,7000,5000,7000,11,24573,0,0,0,0,0,2,0,0,0,0,0,0,0, 'High Overlord Saurfang - On update IC - Spellcast Mortal Strike'),
+(@NECROLORD,0,21,0,9,0,100,0,8,25,5000,5000,11,15749,0,0,0,0,0,2,0,0,0,0,0,0,0, 'High Overlord Saurfang - On target within 8-25y - Spellcast Shield Charge'),
+(@NECROLORD,0,22,0,38,0,100,0,0,5,0,0,66,0,0,0,0,0,0,12,1,0,0,0,0,0,0, 'High Overlord Saurfang - On data 0 5 set - Turn to'),
+(@NECROLORD,0,23,0,38,0,100,0,1,2,0,0,1,7,3000,0,0,0,0,1,0,0,0,0,0,0,0, 'High Overlord Saurfang - On data 1 2 set - Say line'),
+(@NECROLORD,0,24,17,52,0,100,0,7,@SAURFANG,0,0,45,1,4,0,0,0,0,19,@GETRY,20,0,0,0,0,0, 'High Overlord Saurfang - On text 7 over - Set data 1 4 Shadowstalker Getry'),
+
+(@VARIDUS*100,9,0,0,0,0,100,0,0,0,0,0,45,0,5,0,0,0,0,19,@NECROLORD,10,0,0,0,0,0, 'Varidus the Flenser script - Set data 0 5 En''kilah Necrolord'),
+(@VARIDUS*100,9,1,0,0,0,100,0,0,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Varidus the Flenser script - Say line'),
+(@VARIDUS*100,9,2,0,0,0,100,0,5000,5000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Varidus the Flenser script - Say line'),
+(@VARIDUS*100,9,3,0,0,0,100,0,3000,3000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Varidus the Flenser script - Say line'),
+(@VARIDUS*100,9,4,0,0,0,100,0,4000,4000,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Varidus the Flenser script - Say line'),
+(@VARIDUS*100,9,5,0,0,0,100,0,6000,6000,0,0,66,0,0,0,0,0,0,19,@NECROLORD,10,0,0,0,0,0, 'Varidus the Flenser script - Turn to'),
+(@VARIDUS*100,9,6,0,0,0,100,0,1000,1000,0,0,1,6,0,0,0,0,0,12,1,0,0,0,0,0,0, 'Varidus the Flenser script - Say line'),
+(@VARIDUS*100,9,7,0,0,0,100,0,6000,6000,0,0,45,0,1,0,0,0,0,19,@NECROLORD,10,0,0,0,0,0, 'Varidus the Flenser script - Set data 0 1 En''kilah Necrolord'),
+(@VARIDUS*100,9,8,0,0,0,100,0,1000,1000,0,0,45,0,2,0,0,0,0,19,@SAURFANG,10,0,0,0,0,0, 'Varidus the Flenser script - Set data 0 2 High Overlord Saurfang'),
+(@VARIDUS*100,9,9,0,0,0,100,0,1500,1500,0,0,1,7,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Varidus the Flenser script - Say line'),
+(@VARIDUS*100,9,10,0,0,0,100,0,2000,2000,0,0,45,0,3,0,0,0,0,19,@SAURFANG,10,0,0,0,0,0, 'Varidus the Flenser script - Set data 0 3 High Overlord Saurfang'),
+(@VARIDUS*100,9,11,0,0,0,100,0,5000,5000,0,0,45,0,4,0,0,0,0,19,@SAURFANG,10,0,0,0,0,0, 'Varidus the Flenser script - Set data 0 4 High Overlord Saurfang'),
+(@VARIDUS*100,9,12,0,0,0,100,0,13000,13000,0,0,1,8,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Varidus the Flenser script - Say line'),
+(@VARIDUS*100,9,13,0,0,0,100,0,10000,10000,0,0,1,9,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Varidus the Flenser script - Say line'),
+(@VARIDUS*100,9,14,0,0,0,100,0,2000,2000,0,0,1,10,2000,0,0,0,0,1,0,0,0,0,0,0,0, 'Varidus the Flenser - On text 9 over - Say line'),
+(@VARIDUS*100,9,15,0,0,0,100,0,0,0,0,0,11,45949,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Varidus the Flenser script - Spellcast Release Aberration'),
+(@VARIDUS*100,9,16,0,0,0,100,0,0,0,0,0,45,1,1,0,0,0,0,19,@GETRY,20,0,0,0,0,0, 'Varidus the Flenser script - Set data 1 1 Shadowstalker Getry'),
+(@VARIDUS*100,9,17,0,0,0,100,0,0,0,0,0,45,1,1,0,0,0,0,19,@SAURFANG,20,0,0,0,0,0, 'Varidus the Flenser script - Set data 1 1 Saurfang');
+
+DELETE FROM `creature_text` WHERE `entry` IN (@GETRY,@VARIDUS,@SAURFANG);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(@GETRY,0,0,'This is it, $N. The start of the end of the world. And you''re here to see it off...',12,1,100,1,0,0,'Shadowstalker Getry'),
+(@GETRY,1,0,'Let''s go...',12,1,100,0,0,0,'Shadowstalker Getry'),
+(@GETRY,2,0,'I... I can''t believe it... Saurfang... I... I am honored... honored to have fought along side you, sir.',12,1,100,0,0,0,'Shadowstalker Getry'),
+(@GETRY,3,0,'You should return to Warsong Hold now, friend. Hellscream will surely want to hear of what just happened here... of Saurfang...',12,1,100,0,0,0,'Shadowstalker Getry'),
+(@VARIDUS,0,0,'Is this it? Is this all the mighty Horde could muster?',12,0,100,6,0,0,'Varidus the Flenser'),
+(@VARIDUS,1,0,'Pathetic.',12,0,100,11,0,0,'Varidus the Flenser'),
+(@VARIDUS,2,0,'I''ve never understood your type. The hero...',12,0,100,1,0,0,'Varidus the Flenser'),
+(@VARIDUS,3,0,'Why won''t you just let go? Why do you fight the inevitable?',12,0,100,6,0,0,'Varidus the Flenser'),
+(@VARIDUS,4,0,'The Lich King cannot be stopped. Accept it.',12,0,100,274,0,0,'Varidus the Flenser'),
+(@VARIDUS,5,0,'This world is coming to an end. Let. It. Burn.',12,0,100,397,0,0,'Varidus the Flenser'),
+(@VARIDUS,6,0,'Take $g him:her; away and prepare $g him:her; for reanimation.',12,0,100,1,0,0,'Varidus the Flenser'),
+(@VARIDUS,7,0,'What''s this now?',12,0,100,1,0,0,'Varidus the Flenser'),
+(@VARIDUS,8,0,'Then you are a fool.',12,0,100,25,0,0,'Varidus the Flenser'),
+(@VARIDUS,9,0,'You? A lone orc? Against me and...',12,0,100,397,0,0,'Varidus the Flenser'),
+(@VARIDUS,10,0,'RISE!',14,0,100,0,0,0,'Varidus the Flenser'),
+(@VARIDUS,11,0,'I will reanimate them all as servants of the Lich King! Bring them here...',14,0,100,0,0,0,'Varidus the Flenser'),
+(@SAURFANG,0,0,'I''ll rip your shriveled heart out with my bare hands before any harm comes to $N, necromancer.',12,1,100,5,0,0,'High Overlord Saurfang'),
+(@SAURFANG,1,0,'You were never alone, $N.',12,1,100,1,0,0,'High Overlord Saurfang'),
+(@SAURFANG,2,0,'This world that you seek to destroy is our home.',12,1,100,1,0,0,'High Overlord Saurfang'),
+(@SAURFANG,3,0,'We will fight you with every fiber of our being - until we are nothing more than dust and debris. We will fight until the end.',12,1,100,1,0,0,'High Overlord Saurfang'),
+(@SAURFANG,4,0,'A fool who is about to end you, necrolord. There will be nothing left of you for the Lich King to reanimate!',12,1,100,397,0,0,'High Overlord Saurfang'),
+(@SAURFANG,5,0,'%s''s eyes glow red for a brief moment.',16,0,100,0,0,0,'High Overlord Saurfang'),
+(@SAURFANG,6,0,'Is that the best you can do?',12,1,100,0,0,0,'High Overlord Saurfang'),
+(@SAURFANG,7,0,'You''ll make no mention of me. Either of you!',12,1,100,0,0,0,'High Overlord Saurfang');
+
+DELETE FROM `waypoints` WHERE `entry` IN (@GETRY,@NECROLORD,@GETRY*100,@ABERRATION);
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES 
+(@GETRY, 1, 3109.214111,6587.148438,91.369102, 'Shadowstalker Getry'),
+(@GETRY, 2, 3115.414062,6595.680176,91.362068, 'Shadowstalker Getry'),
+(@GETRY, 3, 3125.109863,6590.983887,91.378548, 'Shadowstalker Getry'),
+(@GETRY, 4, 3123.863281,6582.144043,88.786133, 'Shadowstalker Getry'),
+(@GETRY, 5, 3117.805664,6583.018555,86.219604, 'Shadowstalker Getry'),
+(@GETRY, 6, 3118.874512,6590.157715,83.402168, 'Shadowstalker Getry'),
+(@GETRY, 7, 3127.298340,6589.030273,79.707741, 'Shadowstalker Getry'),
+(@GETRY, 8, 3122.869,6578.715,78.051, 'Shadowstalker Getry'),
+(@GETRY, 9, 3123.309,6560.647,78.61833, 'Shadowstalker Getry'),
+(@GETRY, 10,  3122.208,6549.245,79.64079, 'Shadowstalker Getry'),
+(@ABERRATION, 1, 3119.973,6539.042,80.1591, 'Warsong Aberration'),
+(@NECROLORD, 1, 3125.963,6536.96,79.93521, 'En''kilah Necrolord'),
+(@NECROLORD, 2, 3120.883,6542.995,79.95628, 'En''kilah Necrolord'),
+(@GETRY*100, 1, 3123.355957,6575.417969,78.330284, 'Shadowstalker Getry'), 
+(@GETRY*100, 2, 3126.639404,6584.798828,77.656845, 'Shadowstalker Getry'), 
+(@GETRY*100, 3, 3127.298340,6589.030273,79.707741, 'Shadowstalker Getry'),
+(@GETRY*100, 4, 3118.874512,6590.157715,83.402168, 'Shadowstalker Getry'),
+(@GETRY*100, 5, 3117.805664,6583.018555,86.219604, 'Shadowstalker Getry'),
+(@GETRY*100, 6, 3123.863281,6582.144043,88.786133, 'Shadowstalker Getry'),
+(@GETRY*100, 7, 3125.109863,6590.983887,91.378548, 'Shadowstalker Getry'),
+(@GETRY*100, 8, 3115.414062,6595.680176,91.362068, 'Shadowstalker Getry'),
+(@GETRY*100, 9, 3109.214111,6587.148438,91.369102, 'Shadowstalker Getry'),
+(@GETRY*100, 10, 3113.419922,6576.810059,97.090698, 'Shadowstalker Getry');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=45949;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry`=@GETRY;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13,1,45949,0,0,31,0,3,@PRISONER,0,0,0,'','Spell Release Aberration targets Infested Prisoner'),
+(22,37,@GETRY,0,0,36,1,0,0,0,0,0,'','Only execute SAI if Shadowstalker Getry alive');
+
+DELETE FROM `creature_equip_template` WHERE `entry`=@SAURFANG;
+INSERT INTO `creature_equip_template` (`entry`, `id`, `itemEntry1`, `itemEntry2`, `itemEntry3`) VALUES 
+(@SAURFANG,1,21580,0,0);
+
+DELETE FROM `disables` WHERE `sourceType`=0 AND `entry`=45949;
+INSERT INTO `disables` (`sourceType`, `entry`, `flags`, `params_0`, `params_1`, `comment`) VALUES 
+(0,45949,64,'','','Ignore LOS on Release Aberration');
diff --git a/sql/updates/world/2013_06_06_00_world_sai.sql b/sql/updates/world/2013_06_06_00_world_sai.sql
deleted file mode 100644
index 9dc2b4bfcf1..00000000000
--- a/sql/updates/world/2013_06_06_00_world_sai.sql
+++ /dev/null
@@ -1,61 +0,0 @@
--- The Art of Being a Water Terror (13091)
-SET @NPC_WATER_TERROR           := 30645; -- Water Terror
-SET @AURA_HEALTH                := 57664; -- The Art of Being a Water Terror: Mod Health Regen %
-SET @JOT_WARRIOR                := 29880; -- Jotunheim Warrior
-SET @SPEAR_SISTER               := 30243; -- Njorndar Spear-Sister
-SET @VAL_VARGUL                 := 30250; -- Valhalas Vargul
-SET @WATER_MAGUS                := 30632; -- Mjordin Water Magus
-SET @SLEEP_WATCHER              := 30725; -- Jotunheim Sleep-Watcher
-
-UPDATE `creature_template` SET `speed_walk`=4,`speed_run`=2.14285707473755,`AIName`='SmartAI',`exp`=2,`spell1`=57643,`spell2`=57652,`spell3`=57665,`spell4`=57668,`VehicleId`=250,`minlevel`=80,`maxlevel`=80,`faction_A`=116,`faction_H`=116,`unit_flags`=0x8008 WHERE `entry`=@NPC_WATER_TERROR;
-
-DELETE FROM `creature_template_addon` WHERE `entry`=@NPC_WATER_TERROR;
-INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`auras`) VALUES
-(@NPC_WATER_TERROR,0,0x0,0x101,'');
-
-DELETE FROM `smart_scripts` WHERE `entryorguid`=@NPC_WATER_TERROR 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
-(@NPC_WATER_TERROR,0,0,1,54,0,100,0,0,0,0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'On Just Summoned - Set State Passive - Self'),
-(@NPC_WATER_TERROR,0,1,0,61,0,100,0,0,0,0,0,75,@AURA_HEALTH,0,0,0,0,0,1,0,0,0,0,0,0,0,'On Just Summoned - Add Aura - Self');
-
-
-DELETE FROM `smart_scripts` WHERE `entryorguid`  IN (@JOT_WARRIOR,@WATER_MAGUS,@SPEAR_SISTER);
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry` IN (@JOT_WARRIOR,@WATER_MAGUS,@SPEAR_SISTER);
-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 
-(@JOT_WARRIOR,0,0,0,0,0,100,0,0,0,30000,30000,11,23262,2,0,0,0,0,2,0,0,0,0,0,0,0,'Jotunheim Warrior - IC - Cast Demoralize'),
-(@JOT_WARRIOR,0,1,0,0,0,100,0,2000,3000,5000,7000,11,43410,2,0,0,0,0,2,0,0,0,0,0,0,0,'Jotunheim Warrior - IC - Cast Chop'),
-(@JOT_WARRIOR,0,2,0,6,0,100,0,0,0,0,0,33,30644,0,0,0,0,0,7,0,0,0,0,0,0,0,'Jotunheim Warrior - On Death - Give Kill Credit credit'),
-(@SPEAR_SISTER,0,0,0,0,0,100,0,2000,3000,3000,4000,11,38029,2,0,0,0,0,2,0,0,0,0,0,0,0,'Njorndar Spear-Sister - IC - Cast Stab'),
-(@SPEAR_SISTER,0,1,0,6,0,100,0,0,0,0,0,33,30644,0,0,0,0,0,7,0,0,0,0,0,0,0,'Njorndar Spear-Sister - On Death - Give Kill Credit credit'),
-(@WATER_MAGUS,0,0,0,11,0,100,0,0,0,0,0,11,7855,0,0,0,0,0,1,0,0,0,0,0,0,0,'Mjordin Water Magus - On Spawn - Summon Water Terror (Self)'),
-(@WATER_MAGUS,0,1,0,0,0,100,0,0,0,3000,4000,11,9672,0,0,0,0,0,2,0,0,0,0,0,0,0,'Mjordin Water Magus - IC - Cast Frostbolt'),
-(@WATER_MAGUS,0,2,0,0,0,100,0,3000,3000,7000,9000,11,15532,0,0,0,0,0,1,0,0,0,0,0,0,0,'Mjordin Water Magus - IC - Cast Frost Nova'),
-(@WATER_MAGUS,0,3,0,6,0,100,0,0,0,0,0,33,30644,0,0,0,0,0,7,0,0,0,0,0,0,0,'Mjordin Water Magus - On Death - Give Kill Credit credit');
--- Valhalas Vargul
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@VAL_VARGUL;
-DELETE FROM `smart_scripts` WHERE `entryorguid` =@VAL_VARGUL;
-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
-(@VAL_VARGUL,0,0,0,9,0,100,0,0,5,3000,5000,11,15496,0,0,0,0,0,2,0,0,0,0,0,0,0,'Valhalas Vargul - IC - Cast Cleave'),
-(@VAL_VARGUL,0,1,0,6,0,100,0,0,0,0,0,33,30644,0,0,0,0,0,7,0,0,0,0,0,0,0,'Valhalas Vargul - On Death - Give Kill Credit credit');
-
--- Jotunheim Sleep-Watcher 
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@SLEEP_WATCHER;
-DELETE FROM `smart_scripts` WHERE `entryorguid` =@SLEEP_WATCHER;
-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
-(@SLEEP_WATCHER,0,0,0,9,0,100,0,0,5,15000,25000,11,60870,0,0,0,0,0,2,0,0,0,0,0,0,0,'Jotunheim Sleep-Watcher - IC - Cast Bludgeoning Strike'),
-(@SLEEP_WATCHER,0,1,0,9,0,100,0,0,5000,30000,45000,11,13730,0,0,0,0,0,1,0,0,0,0,0,0,0,'Jotunheim Sleep-Watcher - IC - Cast Demoralizing Shout'),
-(@SLEEP_WATCHER,0,2,0,6,0,100,0,0,0,0,0,33,30644,0,0,0,0,0,7,0,0,0,0,0,0,0,'Jotunheim Sleep-Watcher - On Death - Give Kill Credit credit');
-
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry` IN(@JOT_WARRIOR,@WATER_MAGUS,@SPEAR_SISTER,@VAL_VARGUL,@SLEEP_WATCHER);
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
-(22,3,@JOT_WARRIOR,0,0,1,0,57615,0,0,0,0,'','Only run AI if player is possessing a water terror'),
-(22,4,@WATER_MAGUS,0,0,1,0,57615,0,0,0,0,'','Only run AI if player is  possessing  a water terror'),
-(22,2,@SPEAR_SISTER,0,0,1,0,57615,0,0,0,0,'','Only run AI if player is  possessing  a water terror'),
-(22,2,@VAL_VARGUL,0,0,1,0,57615,0,0,0,0,'','Only run AI if player is possessing  a water terror'),
-(22,3,@SLEEP_WATCHER,0,0,1,0,57615,0,0,0,0,'','Only run AI if player is possessing  a water terror');
-
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=16 AND `SourceEntry`=@NPC_WATER_TERROR;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
-(16,0,@NPC_WATER_TERROR,0,0,23,0,4526,0,0,0,0,0,'','Water Terror (Vehicle) Allowed in Njorndar Village'),
-(16,0,@NPC_WATER_TERROR,0,1,23,0,4524,0,0,0,0,0,'','Water Terror (Vehicle) Allowed in Valhalas'),
-(16,0,@NPC_WATER_TERROR,0,2,23,0,4496,0,0,0,0,0,'','Water Terror (Vehicle) Allowed in Jotunheim');
-- 
cgit v1.2.3


From fda3905799908b0a3e0e51a4a55d6de64a9cb88a Mon Sep 17 00:00:00 2001
From: Vincent-Michael <Vincent_Michael@gmx.de>
Date: Fri, 7 Jun 2013 19:02:09 +0200
Subject: DB/Creature: Fix startup error

---
 sql/updates/world/2013_06_07_00_world_creature_ai_scripts.sql | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 sql/updates/world/2013_06_07_00_world_creature_ai_scripts.sql

(limited to 'sql/updates')

diff --git a/sql/updates/world/2013_06_07_00_world_creature_ai_scripts.sql b/sql/updates/world/2013_06_07_00_world_creature_ai_scripts.sql
new file mode 100644
index 00000000000..c6abfaf4039
--- /dev/null
+++ b/sql/updates/world/2013_06_07_00_world_creature_ai_scripts.sql
@@ -0,0 +1 @@
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=25730;
-- 
cgit v1.2.3


From 1f785905d548257b56d83f180f3d8e94e8de0634 Mon Sep 17 00:00:00 2001
From: Pitcrawler <pitcrawler@server.fake>
Date: Sat, 8 Jun 2013 16:21:24 +0200
Subject: DB/Quests: Fix Danger! Explosives!, closes #6850 closes #9458

---
 sql/updates/world/2013_06_08_00_world_misc.sql | 54 ++++++++++++++++++++++++++
 src/server/scripts/Spells/spell_generic.cpp    | 42 ++++++++++++++++++++
 2 files changed, 96 insertions(+)
 create mode 100644 sql/updates/world/2013_06_08_00_world_misc.sql

(limited to 'sql/updates')

diff --git a/sql/updates/world/2013_06_08_00_world_misc.sql b/sql/updates/world/2013_06_08_00_world_misc.sql
new file mode 100644
index 00000000000..856f77111d5
--- /dev/null
+++ b/sql/updates/world/2013_06_08_00_world_misc.sql
@@ -0,0 +1,54 @@
+-- Fix quest: Danger! Explosives! (11218)
+
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (23974,29881);
+UPDATE `gameobject_template` SET `flags`=`flags`|4 WHERE `entry` IN (186403,186404,186466,186467,186468);
+UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry` IN (186403,186470);
+
+DELETE FROM `spell_area` WHERE `spell`=27769;
+INSERT INTO `spell_area` (`spell`,`area`,`autocast`) VALUES
+(27769,4071,1);
+
+DELETE FROM `creature_text` WHERE `entry`=29881;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(29881,0,0,'They are coming for you.',15,0,100,0,0,14376,'An Unknown Voice'),
+(29881,0,1,'Give into your fear.',15,0,100,0,0,14377,'An Unknown Voice'),
+(29881,0,2,'Kill them all... before they kill you.',15,0,100,0,0,14378,'An Unknown Voice'),
+(29881,0,3,'They have turned against you. Now... take your revenge.',15,0,100,0,0,14379,'An Unknown Voice'),
+(29881,0,4,'Tell yourself again that these are not truly your friends.',15,0,100,0,0,14380,'An Unknown Voice'),
+(29881,0,5,'There is no escape, Not in this life. Not in the next.',15,0,100,0,0,14381,'An Unknown Voice'),
+(29881,0,6,'You are a pawn of forces unseen.',15,0,100,0,0,14382,'An Unknown Voice'),
+(29881,0,7,'It WAS your fault.',15,0,100,0,0,14383,'An Unknown Voice');
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (23974,29881) AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (186403,186470) AND `source_type`=1;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (23974*100+0,23974*100+1,23974*100+2,23974*100+3,186403*100) 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
+(23974,0,0,0,8,0,100,0,42697,0,0,0,87,23974*100+0,23974*100+1,23974*100+2,23974*100+3,0,0,1,0,0,0,0,0,0,0,'Whisper Gulch Ore Bunny - On spellhit Spell Danger! Explosive!: Ore Trap - Run random script'),
+
+(29881,0,0,0,8,0,100,0,29072,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'An Unknown Voice - On spellhit Whisper Gulch: Yogg-Saron Whisper Dummy - Say line'),
+
+(186403,1,0,1,38,0,100,0,0,1,0,0,44,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Whisper Gulch Ore - On data 0 1 set - Set phasemask 2'),
+(186403,1,1,0,61,0,100,0,0,0,0,0,80,186403*100,2,0,0,0,0,1,0,0,0,0,0,0,0,'Whisper Gulch Ore - On data 0 1 set - Run script'),
+
+(186470,1,0,0,70,0,100,0,1,0,0,0,45,0,1,0,0,0,0,20,186403,5,0,0,0,0,0,'Whisper Gulch Ore Trap - On state changed - Set data 0 1 Whisper Gulch Ore'),
+
+(23974*100+0,9,0,0,0,0,100,0,0,0,0,0,50,186404,120000,0,0,0,0,1,0,0,0,0,0,0,0,'Whisper Gulch Ore Bunny script 0 - Summon Whisper Gulch Gem'),
+(23974*100+0,9,1,0,0,0,100,0,4000,4000,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Whisper Gulch Ore Bunny script 0 - Despawn'),
+(23974*100+1,9,0,0,0,0,100,0,0,0,0,0,50,186466,120000,0,0,0,0,1,0,0,0,0,0,0,0,'Whisper Gulch Ore Bunny script 0 - Summon Whisper Gulch Gem'),
+(23974*100+1,9,1,0,0,0,100,0,4000,4000,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Whisper Gulch Ore Bunny script 0 - Despawn'),
+(23974*100+2,9,0,0,0,0,100,0,0,0,0,0,50,186467,120000,0,0,0,0,1,0,0,0,0,0,0,0,'Whisper Gulch Ore Bunny script 0 - Summon Whisper Gulch Gem'),
+(23974*100+2,9,1,0,0,0,100,0,4000,4000,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Whisper Gulch Ore Bunny script 0 - Despawn'),
+(23974*100+3,9,0,0,0,0,100,0,0,0,0,0,50,186468,120000,0,0,0,0,1,0,0,0,0,0,0,0,'Whisper Gulch Ore Bunny script 0 - Summon Whisper Gulch Ore Fragment'),
+(23974*100+3,9,1,0,0,0,100,0,4000,4000,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Whisper Gulch Ore Bunny script 0 - Despawn'),
+
+(186403*100,9,0,0,0,0,100,0,300000,300000,0,0,44,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Whisper Gulch Ore script - Set phasemask 1');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (29072,42697,42703);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13,1,29072,0,0,31,0,3,29881,0,0,0,'','Spell Whisper Gulch: Yogg-Saron Whisper Dummy targets An Unknown Voice'),
+(13,1,42697,0,0,31,0,3,23974,0,0,0,'','Spell Danger! Explosive!: Ore Trap targets Whisper Gulch Ore Bunny'),
+(13,1,42703,0,0,31,0,5,186470,0,0,0,'','Spell Steelring''s Foolproof Dynamite effect0 targets Whisper Gulch Ore Trap');
+
+DELETE FROM `spell_script_names` WHERE `spell_id`=27769;
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(27769,'spell_gen_whisper_gulch_yogg_saron_whisper');
diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index c60f4f07821..f2b65c106ea 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -3562,6 +3562,47 @@ class spell_gen_orc_disguise : public SpellScriptLoader
         }
 };
 
+enum WhisperGulchYoggSaronWhisper
+{
+    SPELL_YOGG_SARON_WHISPER_DUMMY = 29072,
+    CREATURE_UNKNOWN_VOICE         = 29881
+};
+
+class spell_gen_whisper_gulch_yogg_saron_whisper : public SpellScriptLoader
+{
+    public:
+        spell_gen_whisper_gulch_yogg_saron_whisper() : SpellScriptLoader("spell_gen_whisper_gulch_yogg_saron_whisper") { }
+
+        class spell_gen_whisper_gulch_yogg_saron_whisper_AuraScript : public AuraScript
+        {
+            PrepareAuraScript(spell_gen_whisper_gulch_yogg_saron_whisper_AuraScript);
+
+            bool Validate(SpellInfo const* /*spellInfo*/)
+            {
+                if (!sSpellMgr->GetSpellInfo(SPELL_YOGG_SARON_WHISPER_DUMMY))
+                    return false;
+                return true;
+            }
+
+            void HandleEffectPeriodic(AuraEffect const* /*aurEff*/)
+            {
+                PreventDefaultAction();
+                if (Unit* caster = GetCaster())
+                    caster->CastSpell(caster->FindNearestCreature(CREATURE_UNKNOWN_VOICE,100), SPELL_YOGG_SARON_WHISPER_DUMMY, true);
+            }
+
+            void Register()
+            {
+                OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_whisper_gulch_yogg_saron_whisper_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
+            }
+        };
+
+        AuraScript* GetAuraScript() const
+        {
+            return new spell_gen_whisper_gulch_yogg_saron_whisper_AuraScript();
+        }
+};
+
 void AddSC_generic_spell_scripts()
 {
     new spell_gen_absorb0_hitlimit1();
@@ -3642,4 +3683,5 @@ void AddSC_generic_spell_scripts()
     new spell_gen_replenishment();
     new spell_gen_aura_service_uniform();
     new spell_gen_orc_disguise();
+    new spell_gen_whisper_gulch_yogg_saron_whisper();
 }
-- 
cgit v1.2.3


From fb28dcb3c4dc5d0c1fc9f1da2b3de7c82f5a5713 Mon Sep 17 00:00:00 2001
From: Pitcrawler <pitcrawler@server.fake>
Date: Sun, 9 Jun 2013 18:10:03 +0200
Subject: DB/Quests: Fix The Explorer's League Outpost

Move a corescript to SAI
---
 sql/updates/world/2013_06_09_00_world_misc.sql     | 41 +++++++++++++++++
 .../scripts/Northrend/zone_howling_fjord.cpp       | 51 ----------------------
 2 files changed, 41 insertions(+), 51 deletions(-)
 create mode 100644 sql/updates/world/2013_06_09_00_world_misc.sql

(limited to 'sql/updates')

diff --git a/sql/updates/world/2013_06_09_00_world_misc.sql b/sql/updates/world/2013_06_09_00_world_misc.sql
new file mode 100644
index 00000000000..0f81ec4de06
--- /dev/null
+++ b/sql/updates/world/2013_06_09_00_world_misc.sql
@@ -0,0 +1,41 @@
+-- Fix quests: The Explorers' League Outpost (11448), We Can Rebuild It (11483)
+
+SET @MCGOYVER := 24040;
+SET @GOSSIP   := 8991;
+
+UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@MCGOYVER;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@MCGOYVER 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
+(@MCGOYVER,0,0,3,62,0,100,0,@GOSSIP,0,0,0,11,51221,0,0,0,0,0,7,0,0,0,0,0,0,0, 'McGoyver - On gossip option select - Spellcast Taxi to Explorers'' League Outpost'),
+(@MCGOYVER,0,1,3,62,0,100,0,9023,0,0,0,11,44280,0,0,0,0,0,7,0,0,0,0,0,0,0, 'McGoyver - On gossip option select - Spellcast Taxi to Explorers'' League Outpost'),
+(@MCGOYVER,0,2,3,62,0,100,0,@GOSSIP,1,0,0,11,51221,0,0,0,0,0,7,0,0,0,0,0,0,0, 'McGoyver - On gossip option select - Spellcast Taxi to Explorers'' League Outpost'),
+(@MCGOYVER,0,3,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'McGoyver - On gossip option select - Close gossip'),
+(@MCGOYVER,0,4,0,62,0,100,0,@GOSSIP,2,0,0,11,44512,0,0,0,0,0,7,0,0,0,0,0,0,0, 'McGoyver - On gossip option select - Spellcast Create Dark Iron Ingots');
+
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=-51221;
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+(-51221,44280,0,'On spellfade Taxi to Explorers'' League Outpost - Spellcast Taxi to Explorers'' League');
+
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=12144;
+DELETE FROM `gossip_menu` WHERE `entry`=9023 AND `text_id`=12193;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
+(@GOSSIP,12144),
+(9023,12193);
+
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=@GOSSIP AND `id` IN (0,1,2);
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=9023 AND `id`=0;
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`) VALUES
+(@GOSSIP,0,0,'Official Explorers'' League business, McGoyver. Take me to the Explorers'' League Outpost!',1,1,0,0,0,0,''),
+(@GOSSIP,1,0,'Official Explorers'' League business, McGoyver. Take me to the Explorers'' League Outpost!',1,1,0,0,0,0,''),
+(@GOSSIP,2,0,'Walt sent me to pick up some dark iron ingots.',1,1,9023,0,0,0,''),
+(9023,0,0,'Yarp.',1,1,0,0,0,0,'');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=@GOSSIP;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=@GOSSIP;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry`=@MCGOYVER;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,@GOSSIP,12191,0,0,8,11278,0,0,0,0,'','McGoyver show different gossip if player has rewarded quest Return to Valgarde'),
+(15,@GOSSIP,0,0,0,28,11448,0,0,0,0,'','McGoyver show gossip option only if player has completed but not rewarded quest The Explorers'' League Outpost'),
+(15,@GOSSIP,1,0,0,8,11448,0,0,0,0,'','McGoyver show gossip option only if player has rewarded quest The Explorers'' League Outpost'),
+(15,@GOSSIP,2,0,0,9,11483,0,0,0,0,'','McGoyver show gossip option only if player has taken quest We Can Rebuild It'),
+(22,5,@MCGOYVER,0,0,2,34135,1,1,1,0,'','SAI triggers only if player has no Dark Iron Ingots');
diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp
index 65d69e368b8..268e904e292 100644
--- a/src/server/scripts/Northrend/zone_howling_fjord.cpp
+++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp
@@ -275,56 +275,6 @@ public:
     }
 };
 
-/*######
-## npc_mcgoyver
-######*/
-
-#define GOSSIP_ITEM_MG_I  "Walt sent me to pick up some dark iron ingots."
-#define GOSSIP_ITEM_MG_II "Yarp."
-
-enum eMcGoyver
-{
-    QUEST_WE_CAN_REBUILD_IT             = 11483,
-
-    SPELL_CREATURE_DARK_IRON_INGOTS     = 44512,
-    SPELL_TAXI_EXPLORERS_LEAGUE         = 44280,
-
-    GOSSIP_TEXTID_MCGOYVER              = 12193
-};
-
-class npc_mcgoyver : public CreatureScript
-{
-public:
-    npc_mcgoyver() : CreatureScript("npc_mcgoyver") { }
-
-    bool OnGossipHello(Player* player, Creature* creature)
-    {
-        if (player->GetQuestStatus(QUEST_WE_CAN_REBUILD_IT) == QUEST_STATUS_INCOMPLETE)
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_MG_I, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-
-        player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
-        return true;
-    }
-
-    bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
-    {
-        player->PlayerTalkClass->ClearMenus();
-        switch (action)
-        {
-            case GOSSIP_ACTION_INFO_DEF+1:
-                player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_MG_II, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
-                player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_MCGOYVER, creature->GetGUID());
-                player->CastSpell(player, SPELL_CREATURE_DARK_IRON_INGOTS, true);
-                break;
-            case GOSSIP_ACTION_INFO_DEF+2:
-                player->CastSpell(player, SPELL_TAXI_EXPLORERS_LEAGUE, true);
-                player->CLOSE_GOSSIP_MENU();
-                break;
-        }
-        return true;
-    }
-};
-
 /*######
 ## npc_daegarn
 ######*/
@@ -435,6 +385,5 @@ void AddSC_howling_fjord()
     new npc_apothecary_hanes;
     new npc_plaguehound_tracker;
     new npc_razael_and_lyana;
-    new npc_mcgoyver;
     new npc_daegarn;
  }
-- 
cgit v1.2.3


From 3e29d89a71bf7c5809f9e370f2a8a9727fc51b0c Mon Sep 17 00:00:00 2001
From: Pitcrawler <pitcrawler@server.fake>
Date: Sun, 9 Jun 2013 18:39:33 +0200
Subject: DB/Quests: Fix To Westguard Keep!

Add missing taxiflight gossip option
---
 sql/updates/world/2013_06_09_01_world_misc.sql | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 sql/updates/world/2013_06_09_01_world_misc.sql

(limited to 'sql/updates')

diff --git a/sql/updates/world/2013_06_09_01_world_misc.sql b/sql/updates/world/2013_06_09_01_world_misc.sql
new file mode 100644
index 00000000000..bcf605ecc0e
--- /dev/null
+++ b/sql/updates/world/2013_06_09_01_world_misc.sql
@@ -0,0 +1,15 @@
+-- Fix quest To Westguard Keep! (11291)
+
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=9618;
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
+(9618,0,0,'Admiral Keller sent me, Emilune. Please send me to Westguard Keep!',1,1,0,0,0,0,0,'');
+
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=27930;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=27930 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
+(27930,0,0,1,62,0,100,0,9618,0,0,0,11,50028,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Emilune Winterwind - On gossip option select - Spellcast Gryphon Taxi to Westguard Keep'),
+(27930,0,1,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Emilune Winterwind - On gossip option select - Close gossip');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=9618;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,9618,0,0,28,11291,0,0,0,'','Emilune Winterwind show gossip option only if player has rewarded but not completed quest To Westguard Keep!');
-- 
cgit v1.2.3


From 86811d5d66e18b837eba6c488910c552d88bd32b Mon Sep 17 00:00:00 2001
From: Vincent-Michael <Vincent_Michael@gmx.de>
Date: Sun, 9 Jun 2013 20:37:42 +0200
Subject: SQL: Fix sql import error

---
 sql/updates/world/2013_06_09_01_world_misc.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sql/updates')

diff --git a/sql/updates/world/2013_06_09_01_world_misc.sql b/sql/updates/world/2013_06_09_01_world_misc.sql
index bcf605ecc0e..7408d88dc1b 100644
--- a/sql/updates/world/2013_06_09_01_world_misc.sql
+++ b/sql/updates/world/2013_06_09_01_world_misc.sql
@@ -1,8 +1,8 @@
 -- Fix quest To Westguard Keep! (11291)
 
 DELETE FROM `gossip_menu_option` WHERE `menu_id`=9618;
-INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`action_script_id`,`box_coded`,`box_money`,`box_text`) VALUES
-(9618,0,0,'Admiral Keller sent me, Emilune. Please send me to Westguard Keep!',1,1,0,0,0,0,0,'');
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`) VALUES
+(9618,0,0,'Admiral Keller sent me, Emilune. Please send me to Westguard Keep!',1,1,0,0,0,0,'');
 
 UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=27930;
 DELETE FROM `smart_scripts` WHERE `entryorguid`=27930 AND `source_type`=0;
-- 
cgit v1.2.3


From dfb950af533dde3f04704aa239ea924ad68dba1f Mon Sep 17 00:00:00 2001
From: Malcrom <malcromdev@gmail.com>
Date: Mon, 10 Jun 2013 12:36:15 -0230
Subject: DB/SAI/Conditions: Add SmartAI to Quarter Master Miranda Breechlock
 to give player item when selecting I need another Argent Dawn Commission.
 closes #6352

---
 sql/updates/world/2013_06_10_00_world_sai.sql | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 sql/updates/world/2013_06_10_00_world_sai.sql

(limited to 'sql/updates')

diff --git a/sql/updates/world/2013_06_10_00_world_sai.sql b/sql/updates/world/2013_06_10_00_world_sai.sql
new file mode 100644
index 00000000000..0cf752e5038
--- /dev/null
+++ b/sql/updates/world/2013_06_10_00_world_sai.sql
@@ -0,0 +1,15 @@
+-- Add SmartAI to Quarter Master Miranda Breechlock to give player item when selecting I need another Argent Dawn Commission.
+SET @ENTRY := 11536;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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,1,62,0,100,0,3461,0,0,0,11,17777,2,0,0,0,0,7,0,0,0,0,0,0,0, 'Miranda Breechlock - On gossip select - Cast Create Commission'),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Miranda Breechlock - On gossip select - Close Gossip');
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup` =3461;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES 
+(15,3461,0,0,0,2,0,12846,1,0,1,0,'','I need another Argent Dawn Commission. - Must not already have Argent Dawn Commission'),
+(15,3461,0,0,0,8,0,5401,0,0,0,0,'','I need another Argent Dawn Commission. - Must have completed Argent Dawn Commission Quest Alliance'),
+(15,3461,0,0,1,2,0,12846,1,0,1,0,'','I need another Argent Dawn Commission. - Must not already have Argent Dawn Commission'),
+(15,3461,0,0,1,8,0,5503,0,0,0,0,'','I need another Argent Dawn Commission. - Must have completed Argent Dawn Commission Quest Mage'),
+(15,3461,0,0,2,2,0,12846,1,0,1,0,'','I need another Argent Dawn Commission. - Must not already have Argent Dawn Commission'),
+(15,3461,0,0,2,8,0,5405,0,0,0,0,'','I need another Argent Dawn Commission. - Must have completed Argent Dawn Commission Quest Horde');
-- 
cgit v1.2.3


From cf8060f62dbfb2423527076a6b451445f990dde6 Mon Sep 17 00:00:00 2001
From: Malcrom <malcromdev@gmail.com>
Date: Mon, 10 Jun 2013 15:40:24 -0230
Subject: DB/Gossip: Complete gossip for Quarter Master Miranda Breechlock

---
 sql/updates/world/2013_06_10_01_world_gossip.sql | 33 ++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 sql/updates/world/2013_06_10_01_world_gossip.sql

(limited to 'sql/updates')

diff --git a/sql/updates/world/2013_06_10_01_world_gossip.sql b/sql/updates/world/2013_06_10_01_world_gossip.sql
new file mode 100644
index 00000000000..eed996b22ba
--- /dev/null
+++ b/sql/updates/world/2013_06_10_01_world_gossip.sql
@@ -0,0 +1,33 @@
+-- Gossip for Quarter Master Miranda Breechlock
+SET @GOSSIP := 7208;
+SET @TEXT := 8498;
+-- Add Any Missing Gossip Menu item
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIP AND `text_id`=@TEXT;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIP,@TEXT);
+DELETE FROM `gossip_menu` WHERE `entry`=7209 AND `text_id`=8499;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (7209,8499);
+DELETE FROM `gossip_menu` WHERE `entry`=7210 AND `text_id`=8500;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (7210,8500);
+DELETE FROM `gossip_menu` WHERE `entry`=7212 AND `text_id`=8502;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (7212,8502);
+DELETE FROM `gossip_menu` WHERE `entry`=7213 AND `text_id`=8503;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (7213,8503);
+
+-- Add Any Missing Gossip Option
+DELETE FROM `gossip_menu_option` WHERE menu_id=@GOSSIP;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`)VALUES
+(@GOSSIP,0,0,"Friendly",1,1,7213,0,0,0,''),
+(@GOSSIP,1,0,"Honored",1,1,7209,0,0,0,''),
+(@GOSSIP,2,0,"Revered",1,1,7210,0,0,0,''),
+(@GOSSIP,3,0,"Exalted",1,1,7212,0,0,0,'');
+
+UPDATE `gossip_menu_option` SET `action_menu_id`=7208 WHERE `menu_id`=3461 AND `id`=2;
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup` =3461 AND `SourceEntry` IN (1,2);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES 
+(15,3461,1,0,0,8,0,5401,0,0,0,0,'','I would like to buy from you. - Must have completed Argent Dawn Commission Quest Alliance'),
+(15,3461,1,0,1,8,0,5503,0,0,0,0,'','I would like to buy from you. - Must have completed Argent Dawn Commission Quest Mage'),
+(15,3461,1,0,2,8,0,5405,0,0,0,0,'','I would like to buy from you. - Must have completed Argent Dawn Commission Quest Horde'),
+(15,3461,2,0,0,8,0,5401,0,0,0,0,'','Miranda, could you please tell me the insignia cost of items - Must have completed Argent Dawn Commission Quest Alliance'),
+(15,3461,2,0,1,8,0,5503,0,0,0,0,'','Miranda, could you please tell me the insignia cost of items - Must have completed Argent Dawn Commission Quest Mage'),
+(15,3461,2,0,2,8,0,5405,0,0,0,0,'','Miranda, could you please tell me the insignia cost of items - Must have completed Argent Dawn Commission Quest Horde');
-- 
cgit v1.2.3


From 935a1cf607782916fdb8e3a77489738a3d07b66f Mon Sep 17 00:00:00 2001
From: Malcrom <malcromdev@gmail.com>
Date: Mon, 10 Jun 2013 20:13:24 -0230
Subject: DB/SAI: Move Quel'dorei Magewraith from EAI to SAI. Added quest
 complete action to fix quest 9595. closes #3047

---
 sql/updates/world/2013_06_10_02_world_sai.sql | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 sql/updates/world/2013_06_10_02_world_sai.sql

(limited to 'sql/updates')

diff --git a/sql/updates/world/2013_06_10_02_world_sai.sql b/sql/updates/world/2013_06_10_02_world_sai.sql
new file mode 100644
index 00000000000..bc8107cbc8f
--- /dev/null
+++ b/sql/updates/world/2013_06_10_02_world_sai.sql
@@ -0,0 +1,21 @@
+-- Add SmartAI for Quel'dorei Magewraith
+SET @ENTRY := 17612;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@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,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Quel''dorei Magewraith - On reset - Prevent combat movement'),
+(@ENTRY,0,1,2,4,0,100,1,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Quel''dorei Magewraith - On aggro - Set phase 1'),
+(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,11,11921,1,0,0,0,0,2,0,0,0,0,0,0,0, 'Quel''dorei Magewraith - On aggro - Cast Fireball'),
+(@ENTRY,0,3,0,9,1,100,0,0,40,4000,5000,11,11921,1,0,0,0,0,2,0,0,0,0,0,0,0, 'Quel''dorei Magewraith - Combat - Cast Fireball (phase 1)'),
+(@ENTRY,0,4,0,9,1,100,0,0,40,9000,13000,11,31595,1,0,0,0,0,2,0,0,0,0,0,0,0, 'Quel''dorei Magewraith - Combat - Cast Arcant Bolt (phase 1)'),
+(@ENTRY,0,5,6,3,0,100,1,0,15,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Quel''dorei Magewraith - Mana at 15% - Allow combat movement'),
+(@ENTRY,0,6,0,61,0,100,1,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Quel''dorei Magewraith - Mana at 15% - Set phase 2'),
+(@ENTRY,0,7,0,9,1,100,1,35,80,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Quel''dorei Magewraith - At 35 yards - Allow combat movement (phase 1)'),
+(@ENTRY,0,8,0,9,1,100,1,5,15,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Quel''dorei Magewraith - At 15 yards - Prevent combat movement (phase 1)'),
+(@ENTRY,0,9,0,9,1,100,1,0,5,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Quel''dorei Magewraith - At 5 yards - Allow combat movement (phase 1)'),
+(@ENTRY,0,10,0,3,2,100,1,20,100,100,100,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Quel''dorei Magewraith - Mana at 20% - Set phase 1 (phase 2)'),
+(@ENTRY,0,11,0,0,0,100,0,3000,6000,7000,11000,11,31604,1,0,0,0,0,2,0,0,0,0,0,0,0, 'Quel''dorei Magewraith - Combat - Cast Arcant Weakness'),
+(@ENTRY,0,12,0,9,0,100,0,0,30,16000,20000,11,11436,1,0,0,0,0,2,0,0,0,0,0,0,0, 'Quel''dorei Magewraith - Combat - Cast Slow'),
+(@ENTRY,0,13,0,0,0,100,0,11000,18000,11000,18000,11,31596,4,0,0,0,0,2,0,0,0,0,0,0,0, 'Quel''dorei Magewraith - Combat - Cast Counterspell'),
+(@ENTRY,0,14,0,6,0,100,1,0,0,0,0,15,9595,0,0,0,0,0,16,0,0,0,0,0,0,0, 'Quel''dorei Magewraith - On death - Complete quest 9595');
-- 
cgit v1.2.3