Added recent sql updates to world.sql and full files...

--HG--
branch : trunk

7 files changed, 62 insertions, 10 deletions

diff --git a/sql/FULL/world_script_texts.sql b/sql/FULL/world_script_texts.sql
index 9f319ea5f9e..51303ce242a 100644
--- a/sql/FULL/world_script_texts.sql
+++ b/sql/FULL/world_script_texts.sql
@@ -423,6 +423,21 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
    (23861,-1000471,'It was... terrible... the demon...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,''),
    (23864,-1000472,'This land was mine long before your wretched kind set foot here.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,''),
    (23864,-1000473,'All who venture here belong to me, including you!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,''),
+   (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'),
+
+
 
 -- -1 033 000 SHADOWFANG KEEP
    (0,-1033000,'Follow me and I''ll open the courtyard door for you.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,7,1,'prisoner ashcrombe SAY_FREE_AS'),
diff --git a/sql/FULL/world_script_waypoints.sql b/sql/FULL/world_script_waypoints.sql
index 24137c26f00..facfea47152 100644
--- a/sql/FULL/world_script_waypoints.sql
+++ b/sql/FULL/world_script_waypoints.sql
@@ -2003,3 +2003,32 @@ INSERT INTO `script_waypoint` VALUES
     (35491,9,755.923,631.506,413.966,0,''),
     (35491,10,744.841,634.505,411.575,0,'');
 
+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/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql
index b06d5a4cca2..b098a166025 100644
--- a/sql/FULL/world_scripts_full.sql
+++ b/sql/FULL/world_scripts_full.sql
@@ -587,6 +587,8 @@ UPDATE `instance_template` SET `script`='instance_gnomeregan' WHERE `map`=90;
 
 /* GRIZZLY HILLS */
 UPDATE `creature_template` SET `ScriptName`='npc_orsonn_and_kodian' WHERE `entry` IN (27274,27275);
+UPDATE `creature_template` SET `ScriptName` = 'npc_emily' WHERE `entry`=26588;
+UPDATE `creature_template` SET `ScriptName` = 'npc_mrfloppy' WHERE `entry`=26589;
 
 /* DRAK'THARON KEEP */
 UPDATE `instance_template` SET `script`='instance_drak_tharon' WHERE `map`=600;
diff --git a/sql/updates/7385_world_scriptname.sql b/sql/updates/7385_world_scriptname.sql
index 87d2b5fdb36..67b64e9d52f 100644
--- a/sql/updates/7385_world_scriptname.sql
+++ b/sql/updates/7385_world_scriptname.sql
@@ -1,2 +1 @@
 UPDATE `gameobject_template` SET `scriptname`='go_tadpole_cage' WHERE `entry`=187373;
-
diff --git a/sql/updates/7387_world_script_waypoints.sql b/sql/updates/7387_world_script_waypoints.sql
index be595a30389..fd77b5088ae 100644
--- a/sql/updates/7387_world_script_waypoints.sql
+++ b/sql/updates/7387_world_script_waypoints.sql
@@ -1,4 +1,4 @@
-DELETE FROM `script_waypoint` wHERE `entry`=26588;
+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'),
diff --git a/sql/updates/7390_world_scriptname.sql b/sql/updates/7390_world_scriptname.sql
index 0c82857311d..43f681d566e 100644
--- a/sql/updates/7390_world_scriptname.sql
+++ b/sql/updates/7390_world_scriptname.sql
@@ -1,4 +1,3 @@
 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/world.sql b/sql/world.sql
index fca4fde2f0b..5ea9dce74b9 100644
--- a/sql/world.sql
+++ b/sql/world.sql
@@ -4786,21 +4786,22 @@ LOCK TABLES `spell_bonus_data` WRITE;
 /*!40000 ALTER TABLE `spell_bonus_data` DISABLE KEYS */;
 INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES
 (49941, -1, -1, 0.04, -1, 'Death Knight - Blood Boil'),
-(48721, -1, -1, 0.04, -1, 'Death Knight - Blood Boil'),
-(55078, -1, 1.15, -1, 0.055, 'Death Knight - Blood Plague'),
+(48721, 0, -1, 0.04, -1, 'Death Knight - Blood Boil'),
+(55078, 0, 0, -1, 0.06325, 'Death Knight - Blood Plague'),
 (50444, -1, -1, 0.105, -1, 'Death Knight - Corpse Explosion Triggered'),
-(52212, -1, -1, 0.0475, -1, 'Death Knight - Death and Decay'),
+(52212, 0, -1, 0.0475, -1, 'Death Knight - Death and Decay'),
 (47632, -1, -1, 0.15, -1, 'Death Knight - Death Coil'),
 (47633, -1, -1, 0.15, -1, 'Death Knight - Death Coil Heal'),
-(55095, -1, 1.15, -1, 0.055, 'Death Knight - Frost Fever'),
+(55095, -1, 0, -1, 0.06325, 'Death Knight - Frost Fever'),
 (58621, -1, -1, 0.08, -1, 'Death Knight - Glyph of Chains of Ice'),
 (49184, -1, -1, 0.1, -1, 'Death Knight - Howling Blast'),
-(45477, -1, -1, 0.1, -1, 'Death Knight - Icy Touch'),
+(45477, 0, -1, 0.1, -1, 'Death Knight - Icy Touch'),
 (56903, 0, 0, 0, 0, 'Death Knight - Lichflame'),
+(51460, 0, -1, -1, -1, 'Death Knight - Necrosis'),
 (50842, -1, -1, 0.04, -1, 'Death Knight - Pestilence'),
 (50401, 0, 0, 0, 0, 'Death Knight - Razor Frost'),
 (47476, -1, -1, 0.06, -1, 'Death Knight - Strangulate'),
-(50536, -1, -1, 0.013, -1, 'Death Knight - Unholy Blight (Rank1)'),
+(50536, -1, 0, -1, -1, 'Death Knight - Unholy Blight (Rank 1)'),
 (339, -1, 0.1, -1, -1, 'Druid - Entangling Roots'),
 (60089, -1, -1, 0.15, -1, 'Druid - Faerie Fire (feral)'),
 (5185, 1.611, -1, -1, -1, 'Druid - Healing Touch'),
@@ -4910,6 +4911,7 @@ INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`a
 (34861, 0.402, -1, -1, -1, 'Priest - Circle of Healing'),
 (19236, 0.8068, -1, -1, -1, 'Priest - Desperate Prayer'),
 (2944, -1, 0.1849, -1, -1, 'Priest - Devouring Plague'),
+(63544, 0, -1, -1, -1, 'Priest - Empowered Renew'),
 (2061, 0.8068, -1, -1, -1, 'Priest - Flash Heal'),
 (2060, 1.6135, -1, -1, -1, 'Priest - Greater Heal'),
 (14914, 0.5711, 0.024, -1, -1, 'Priest - Holy Fire'),
@@ -5028,6 +5030,7 @@ INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`a
 (1120, -1, 0.429, -1, -1, 'Warlock - Drain Soul'),
 (28176, 0, 0, 0, 0, 'Warlock - Fel Armor'),
 (18790, 0, 0, 0, 0, 'Warlock - Fel Stamina'),
+(54181, 0, -1, -1, -1, 'Warlock - Fel Synergy'),
 (48181, 0.4793, -1, -1, -1, 'Warlock - Haunt'),
 (755, -1, 0.4485, -1, -1, 'Warlock - Health Funnel'),
 (1949, -1, 0.0949, -1, -1, 'Warlock - Hellfire'),
@@ -5053,7 +5056,12 @@ INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`a
 (61491, -1, -1, 0.12, -1, 'Warrior - Intercept'),
 (6572, -1, -1, 0.207, -1, 'Warrior - Revenge'),
 (64382, -1, -1, 0.5, -1, 'Warrior - Shattering Throw'),
-(6343, -1, -1, 0.12, -1, 'Warrior - Thunder Clap');
+(6343, -1, -1, 0.12, -1, 'Warrior - Thunder Clap'),
+(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');
 /*!40000 ALTER TABLE `spell_bonus_data` ENABLE KEYS */;
 UNLOCK TABLES;