*Move summon water elemental handler to correct place.

--HG--
branch : trunk

11 files changed, 80 insertions, 2 deletions

diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql
index 40a4a20194a..b06d5a4cca2 100644
--- a/sql/FULL/world_scripts_full.sql
+++ b/sql/FULL/world_scripts_full.sql
@@ -397,6 +397,8 @@ UPDATE `creature_template` SET `ScriptName`='npc_imprisoned_beryl_sorcerer' WHER
 UPDATE `creature_template` SET `ScriptName`='npc_mootoo_the_younger' WHERE `entry`= 25504;
 UPDATE `creature_template` SET `ScriptName`='npc_bonker_togglevolt' WHERE `entry`= 25589;
 UPDATE `creature_template` SET `ScriptName`='npc_fezzix_geartwist' WHERE `entry`=25849;
+UPDATE `creature_template` SET `scriptname`='npc_trapped_mammoth_calf' WHERE `entry`=25850;
+UPDATE `item_template` SET `scriptname`='item_dehta_trap_smasher' WHERE `entry`=35228;
 
 /* BURNING STEPPES */
 UPDATE `creature_template` SET `ScriptName`='npc_ragged_john' WHERE `entry`=9563;
@@ -911,6 +913,9 @@ UPDATE `gameobject_template` SET `ScriptName`='go_blood_filled_orb' WHERE `entry
 /* RAZORFEN DOWNS */
 UPDATE `creature_template` SET `ScriptName`='boss_amnennar_the_coldbringer' WHERE `entry`=7358;
 UPDATE `creature_template` SET `ScriptName`='npc_henry_stern' WHERE `entry`=8696;
+UPDATE `creature_template` SET `ScriptName`='npc_tomb_creature' WHERE `entry` IN (7351,7349);
+UPDATE `instance_template` SET `script`='instance_razorfen_downs' WHERE `map`=129;
+UPDATE `gameobject_template` SET `ScriptName`='go_gong' WHERE `entry`=148917;
 
 /* RAZORFEN KRAUL */
 UPDATE `creature_template` SET `Scriptname`='npc_willix' WHERE `entry`=4508;
diff --git a/sql/updates/7349_world_spell_linked_spell.sql b/sql/updates/7349_world_spell_linked_spell.sql
index df64792e941..9afd55d4d50 100644
--- a/sql/updates/7349_world_spell_linked_spell.sql
+++ b/sql/updates/7349_world_spell_linked_spell.sql
@@ -1,2 +1,3 @@
 -- Summon Water Elemental
-INSERT INTO `spell_linked_spell`(`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES (31687, 70907, 0,'Summon Water Elemental');
\ No newline at end of file
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=31687 AND `spell_effect`=70907;
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES (31687, 70907, 0,'Summon Water Elemental');
diff --git a/sql/updates/7364_world_spell_linked_spell.sql b/sql/updates/7364_world_spell_linked_spell.sql
deleted file mode 100644
index fa24e3b7b04..00000000000
--- a/sql/updates/7364_world_spell_linked_spell.sql
+++ /dev/null
@@ -1 +0,0 @@
-DELETE FROM spell_linked_spell WHERE spell_trigger = 31687;
\ No newline at end of file
diff --git a/sql/updates/7370_world_spell_linked_spell.sql b/sql/updates/7370_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..2c6910501ab
--- /dev/null
+++ b/sql/updates/7370_world_spell_linked_spell.sql
@@ -0,0 +1,2 @@
+-- Remove hack for glyph of Eternal Water
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=31687 AND `spell_effect`=70907;
diff --git a/sql/updates/7373_world_scriptname.sql b/sql/updates/7373_world_scriptname.sql
new file mode 100644
index 00000000000..3588b9b3604
--- /dev/null
+++ b/sql/updates/7373_world_scriptname.sql
@@ -0,0 +1,2 @@
+UPDATE `creature_template` SET `scriptname`='npc_trapped_mammoth_calf' WHERE `entry`=25850;
+UPDATE `item_template` SET `scriptname`='item_dehta_trap_smasher' WHERE `entry`=35228;
diff --git a/sql/updates/7385_world_scriptname.sql b/sql/updates/7385_world_scriptname.sql
new file mode 100644
index 00000000000..87d2b5fdb36
--- /dev/null
+++ b/sql/updates/7385_world_scriptname.sql
@@ -0,0 +1,2 @@
+UPDATE `gameobject_template` SET `scriptname`='go_tadpole_cage' WHERE `entry`=187373;
+
diff --git a/sql/updates/7387_world_script_texts.sql b/sql/updates/7387_world_script_texts.sql
new file mode 100644
index 00000000000..57d8cbf0fe3
--- /dev/null
+++ b/sql/updates/7387_world_script_texts.sql
@@ -0,0 +1,15 @@
+DELETE FROM `script_texts` WHERE `npc_entry`=26588;
+INSERT INTO `script_texts` (`npc_entry`, `entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`, `sound`, `type`, `language`, `emote`, `comment`) VALUES
+(26588, -1800013, 'Thank you for helping me get back to the camp. Go tell Walter that I''m safe now!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, '12027'),
+(26588, -1800012, 'Are you ready, Mr. Floppy? Stay close to me and watch out for those wolves!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, '12027'),
+(26588, -1800011, 'The Ravenous Worg chomps down on Mr. Floppy', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 4, 0, 0, '12027'),
+(26588, -1800010, 'Mr. Floppy revives', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 4, 0, 0, '12027'),
+(26588, -1800009, 'I think I see the camp! We''re almost home, Mr. Floppy! Let''s go!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, '12027'),
+(26588, -1800008, 'Mr. Floppy, you''re ok! Thank you so much for saving Mr. Floppy!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, '12027'),
+(26588, -1800007, 'Don''t go toward the light, Mr. Floppy!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, '12027'),
+(26588, -1800006, 'Let''s get out of here before more wolves find us!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, '12027'),
+(26588, -1800005, 'There''s a big meanie attacking Mr. Floppy! Help! ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, '12027'),
+(26588, -1800004, 'He''s gonna eat Mr. Floppy! You gotta help Mr. Floppy! You just gotta!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, '12027'),
+(26588, -1800003, 'Oh, no! Look, it''s another wolf, and it''s a biiiiiig one!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, '12027'),
+(26588, -1800002, 'He''s going for Mr. Floppy! ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, '12027'),
+(26588, -1800001, 'Um... I think one of those wolves is back...', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, '12027');
diff --git a/sql/updates/7387_world_script_waypoints.sql b/sql/updates/7387_world_script_waypoints.sql
new file mode 100644
index 00000000000..be595a30389
--- /dev/null
+++ b/sql/updates/7387_world_script_waypoints.sql
@@ -0,0 +1,29 @@
+DELETE FROM `script_waypoint` wHERE `entry`=26588;
+INSERT INTO `script_waypoint` (`entry`, `pointid`, `location_x`, `location_y`, `location_z`, `waittime`, `point_comment`) VALUES
+(26588, 1, 4333.18, -3688.4, 263.857, 0, '0'),
+(26588, 2, 4341.38, -3683.77, 257.422, 0, '0'),
+(26588, 3, 4342.67, -3683.21, 257.218, 0, '0'),
+(26588, 4, 4346.22, -3688.72, 257.065, 0, '0'),
+(26588, 5, 4343.8, -3695.27, 257.124, 0, '0'),
+(26588, 6, 4337.74, -3707.2, 257.628, 0, '0'),
+(26588, 7, 4317.58, -3722.8, 256.941, 0, '0'),
+(26588, 8, 4306.64, -3736.46, 258.304, 0, '0'),
+(26588, 9, 4299.96, -3760.02, 254.959, 0, '0'),
+(26588, 10, 4294.21, -3777.34, 249.139, 1000, '0'),
+(26588, 11, 4294.37, -3776.97, 249.259, 10000, '0'),
+(26588, 12, 4300.22, -3794.61, 240.107, 2000, '0'),
+(26588, 13, 4307.25, -3817.76, 231.414, 2000, '0'),
+(26588, 14, 4326.31, -3883.31, 208.457, 2000, '0'),
+(26588, 15, 4346.19, -3905.41, 198.805, 2000, '0'),
+(26588, 16, 4347.39, -3916.43, 196.716, 5000, '0'),
+(26588, 17, 4350.17, -3935.03, 191.824, 1000, '0'),
+(26588, 18, 4347.24, -3939.54, 191.445, 2000, '0'),
+(26588, 19, 4347.24, -3939.54, 191.445, 2000, '0'),
+(26588, 20, 4347.24, -3939.54, 191.445, 5000, '0'),
+(26588, 21, 4347.24, -3939.54, 191.445, 7000, '0'),
+(26588, 22, 4347.24, -3939.54, 191.445, 5000, '0'),
+(26588, 23, 4347.24, -3939.54, 191.445, 5000, '0'),
+(26588, 24, 4347.24, -3939.54, 191.445, 0, '0'),
+(26588, 25, 4353.72, -3965.61, 190.154, 0, '0'),
+(26588, 26, 4363.12, -3995.61, 183.327, 0, '0'),
+(26588, 27, 4371.99, -4010.97, 181.33, 0, '0');
diff --git a/sql/updates/7387_world_scriptname.sql b/sql/updates/7387_world_scriptname.sql
new file mode 100644
index 00000000000..2ea586552d2
--- /dev/null
+++ b/sql/updates/7387_world_scriptname.sql
@@ -0,0 +1,2 @@
+UPDATE `creature_template` SET `ScriptName` = 'npc_emily' WHERE `entry`=26588;
+UPDATE `creature_template` SET `ScriptName` = 'npc_mrfloppy' WHERE `entry`=26589;
diff --git a/sql/updates/7390_world_scriptname.sql b/sql/updates/7390_world_scriptname.sql
new file mode 100644
index 00000000000..0c82857311d
--- /dev/null
+++ b/sql/updates/7390_world_scriptname.sql
@@ -0,0 +1,4 @@
+UPDATE `gameobject_template` SET `ScriptName`='go_gong' WHERE `entry`=148917;
+UPDATE `creature_template` SET `ScriptName`='npc_tomb_creature' WHERE `entry` IN (7351,7349);
+UPDATE `instance_template` SET `script`='instance_razorfen_downs' WHERE `map`=129;
+
diff --git a/sql/updates/7394_world_spell_bonus_data.sql b/sql/updates/7394_world_spell_bonus_data.sql
new file mode 100644
index 00000000000..a6f7717201c
--- /dev/null
+++ b/sql/updates/7394_world_spell_bonus_data.sql
@@ -0,0 +1,17 @@
+-- Some spell bonus data mostly for DK spells and trinket spells
+DELETE FROM `spell_bonus_data` WHERE `entry` IN (63544,54181,55078,55095,50536,52212,51460,48721,45477,54757,45055,60203,60488,45429);
+INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES 
+(63544, 0, -1, -1, -1, 'Priest - Empowered Renew'),
+(54181, 0, -1, -1, -1, 'Warlock - Fel Synergy'),
+(55078, 0, 0, -1, 0.06325, 'Death Knight - Blood Plague'),
+(55095, -1, 0, -1, 0.06325, 'Death Knight - Frost Fever'),
+(50536, -1, 0, -1, -1, 'Death Knight - Unholy Blight (Rank 1)'),
+(52212, 0, -1, 0.0475, -1, 'Death Knight - Death and Decay'),
+(51460, 0, -1, -1, -1, 'Death Knight - Necrosis'),
+(48721, 0, -1, 0.04, -1, 'Death Knight - Blood Boil'),
+(45477, 0, -1, 0.1, -1, 'Death Knight - Icy Touch'),
+(54757, 0, -1, -1, -1, 'Hand-Mounted Pyro Rocket - Pyro Rocket'),
+(45055, 0, -1, -1, -1, 'Timbal\'s Focusing Crystal - Shadow Bolt'),
+(60203, 0, -1, -1, -1, 'Darkmoon Card: Death'),
+(60488, 0, -1, -1, -1, 'Extract of Necromatic Power'),
+(45429, 0, -1, -1, -1, 'Shattered Sun Pendant of Acumen - Arcane Bolt');