Merge pull request 'Fix quest New Recruit(13143) & Fix quest King of the Mountain(13280&13283)' from Kiperr/TrinityCore

4 files changed, 20 insertions, 0 deletions

diff --git a/sql/updates/world/2011_09_01_02_spell_script_names.sql b/sql/updates/world/2011_09_03_02_spell_script_names.sql
index b7b6907b7f1..b7b6907b7f1 100644
--- a/sql/updates/world/2011_09_01_02_spell_script_names.sql
+++ b/sql/updates/world/2011_09_03_02_spell_script_names.sql
diff --git a/sql/updates/world/2011_09_03_03_world_creature_template.sql b/sql/updates/world/2011_09_03_03_world_creature_template.sql
new file mode 100644
index 00000000000..73bd1687ef6
--- /dev/null
+++ b/sql/updates/world/2011_09_03_03_world_creature_template.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='npc_vereth_the_cunning' WHERE `entry`=30944;
\ No newline at end of file
diff --git a/sql/updates/world/2011_09_03_04_world_misc.sql b/sql/updates/world/2011_09_03_04_world_misc.sql
new file mode 100644
index 00000000000..f35cebe2014
--- /dev/null
+++ b/sql/updates/world/2011_09_03_04_world_misc.sql
@@ -0,0 +1,14 @@
+UPDATE `creature_template` SET `npcflag`=`npcflag`|0x1000000 WHERE `entry` in(31770,31736);
+UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`exp`=2,`npcflag`=`npcflag`|0x1000000,`VehicleId`=282,`spell1`=59643,`spell2`=4342,`spell3`=4336 WHERE `entry`=31785;
+UPDATE `creature_template` SET `minlevel`=80,`maxlevel`=80,`exp`=2,`npcflag`=`npcflag`|0x1000000,`VehicleId`=282,`spell1`=4338,`spell2`=4342,`spell3`=4336 WHERE `entry`=31784;
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` in (31785,31770,31736,31784);
+INSERT INTO `npc_spellclick_spells` VALUES
+(31785,59656,13283,1,13283,1,0,0,0),
+(31770,59654,0,0,0,1,0,0,0),
+(31736,59592,13280,1,13280,1,0,0,0),
+(31784,59593,0,0,0,1,0,0,0);
+
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (59643,4338);
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(59643, 'spell_q13280_13283_plant_battle_standard'),
+(4338, 'spell_q13280_13283_plant_battle_standard');
\ No newline at end of file
diff --git a/sql/updates/world/2011_09_03_05_world_gossip_menu_option.sql b/sql/updates/world/2011_09_03_05_world_gossip_menu_option.sql
new file mode 100644
index 00000000000..53bc3104c50
--- /dev/null
+++ b/sql/updates/world/2011_09_03_05_world_gossip_menu_option.sql
@@ -0,0 +1,5 @@
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=1293 AND `id`=1; 
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=1293 AND `id`=2;
+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
+(1293,1,0, 'Make this inn my home!',8,66179,0,0,0,0,NULL),
+(1293,2,1, 'I want to browse your goods!',3,66179,0,0,0,0,NULL);
\ No newline at end of file