Add sql´s in fulls and replace .txt file to .sql in previous commit

--HG--
branch : trunk

6 files changed, 127 insertions, 24 deletions

diff --git a/sql/scripts/world_script_texts.sql b/sql/scripts/world_script_texts.sql
index cc678861318..4c6c575dd46 100644
--- a/sql/scripts/world_script_texts.sql
+++ b/sql/scripts/world_script_texts.sql
@@ -1,8 +1,8 @@
 -- Up to TC2 5408
--- 
+--
 -- trinityscript_script_texts.sql Contains data for table `script_texts` mainly used in C++ parts.
 -- valid entries for table are between -1000000 and -1999999
--- 
+--
 
 -- ALTER TABLE `script_texts` ADD COLUMN `npc_entry` mediumint(8)  NOT NULL DEFAULT 0 COMMENT 'creature_template entry' FIRST;
 /*
@@ -27,9 +27,9 @@ CREATE TABLE `script_texts` (
   PRIMARY KEY  (`npc_entry`,`entry`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Script Texts';
 */
--- 
+--
 -- -1 000 000 First 100 entries are reserved for special use, do not add regular text here.
--- 
+--
 DELETE FROM `script_texts` WHERE entry BETWEEN -1999925 AND -1000000;
 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
    (0,-1000000,'<TrinityScript Text Entry Missing!>',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'DEFAULT_TEXT'),
@@ -37,9 +37,9 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
    (0,-1000004,'goes into a berserker rage!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0,'EMOTE_GENERIC_BERSERK'),
    (0,-1000005,'UNUSED',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'REUSE ME'),
 
--- 
+--
 -- Normal text entries. Say/Yell/Whisper/Emote for any regular world object.
--- 
+--
 
 -- -1 000 100 GENERAL MAPS (not typical instance maps)
    (6109,-1000100,'Come, little ones. Face me!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'azuregos SAY_TELEPORT'),
@@ -433,6 +433,20 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
    (5391, -1000504, 'Thank you $N. I will remember you always. You can find my strongbox in my camp, north of Stonard.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'Galen - quest complete'),
    (5391, -1000505, '%s whispers to $N the secret to opening his strongbox.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0,'Galen - emote whisper'),
    (5391, -1000506, '%s disappears into the swamp.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0,'Galen - emote disappear'),
+   (4880, -1000507,'Ok, let''s get started.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'stinky - quest accepted'),
+   (4880, -1000508,'Now let''s look for the herb.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'stinky - say1'),
+   (4880, -1000509,'Nope, not here...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'stinky - say2'),
+   (4880, -1000510,'There must be one around here somewhere...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'stinky - say3'),
+   (4880, -1000511,'Ah, there''s one! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'stinky - say4'),
+   (4880, -1000512,'Come, $N!  Let''s go over there and collect it!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'stinky - say5'),
+   (4880, -1000513,'Ok, now let''s get out of here! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'stinky - say6'),
+   (4880, -1000514,'I can make it from here.  Thanks, $N!  And talk to my employer about a reward!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'stinky - quest complete'),
+   (4880, -1000515,'Help! The beast is on me!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'stinky - aggro'),
+   (4880, -1000516,'%s disappears back into the swamp.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0,'stinky - emote disapper'),
+   (19589,-1000575,'All systems on-line. Prepare yourself, we leave shortly.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'max_a_million SAY_START'),
+   (19589,-1000576,'Be careful in there and come back in one piece!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'bot-specialist_alley SAY_ALLEY_FAREWELL'),
+   (19589,-1000577,'Proceed.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'max_a_million SAY_CONTINUE'),
+   (19589,-1000578,'You are back! Were you able to get all of the machines?',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'bot-specialist_alley SAY_ALLEY_FINISH'),
    (26588,-1800001, 'Um... I think one of those wolves is back...',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,-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'),
@@ -474,7 +488,7 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
    (27316,-1800039, 'You let us worry about how we kill the bastard, Godfrey. ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
    (27316,-1800040, 'Return to Halford with the information the good mayor was kind enough to submit, $N, I will finish here and squeeze whatever else this wretch might know about Thel''zan. Now, I will show Godfrey the rarely shown "option three." ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
    (27316,-1800041, 'Let''s you and I have a chat about some things, Godfrey.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
-   (29434,-1800042, 'Let me know when you''re ready. I''d prefer sooner than later... what with the slowly dying from poison and all.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0, 'injured goblin SAY_QUEST_START'), 
+   (29434,-1800042, 'Let me know when you''re ready. I''d prefer sooner than later... what with the slowly dying from poison and all.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0, 'injured goblin SAY_QUEST_START'),
    (29434,-1800043, 'I''m going to bring the venom sack to Ricket... and then... you know... collapse. Thank you for helping me!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0, 'injured goblin SAY_END_WP_REACHED'),
    (27463,-1800044, 'Ahh..better..', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'RANDOM_SAY_1'),
    (27463,-1800045, 'Whoa.. i nearly died there. Thank you, $Race!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'RANDOM_SAY_2'),
@@ -497,7 +511,7 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
    (12717,-1800062, 'I am going to patrol the area for a while longer and ensure that things are truly safe.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 1, 0, 'muglash SAY_MUG_PATROL'),
    (12717,-1800063, 'Please return to Zoram''gar and report our success to the Warsong runner.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 1, 0, 'muglash SAY_MUG_RETURN'),
 
-   
+
 -- -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'),
    (0,-1033001,'I have just the spell to get this door open. Too bad the cell doors weren''t locked so haphazardly.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,7,1,'prisoner ashcrombe SAY_OPEN_DOOR_AS'),
@@ -1096,7 +1110,7 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
    (15936,-1533116,'The end is upon you.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,8833,1,0,0,'heigan SAY_TAUNT4'),
    (15936,-1533117,'Hungry worms will feast on your rotten flesh!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,8834,1,0,0,'heigan SAY_TAUNT5'),
    (15936,-1533118,'Noo... o...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,8828,1,0,0,'heigan SAY_DEATH'),
-    
+
 -- -1 534 000 THE BATTLE OF MT. HYJAL
    (17772,-1534000,'I''m in jeopardy, help me if you can!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11007,1,0,0,'jaina hyjal ATTACKED 1'),
    (17772,-1534001,'They''ve broken through!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11049,1,0,0,'jaina hyjal ATTACKED 2'),
@@ -1806,7 +1820,7 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
    (24201,-1574018,'There''s no... greater... glory.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13201,1,0,0,'dalronn YELL_DALRONN_DAL_DIEDFIRST'),
    (24201,-1574019,'You may serve me yet.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13202,1,0,0,'dalronn YELL_DALRONN_KILL'),
    (24201,-1574020,'Skarvald, you incompetent slug! Return and make yourself useful!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13203,1,0,0,'dalronn YELL_DALRONN_SKA_DIEDFIRST'),
-   
+
 -- -1 575 000 UTGARDE PINNACLE
 -- Skadi the Ruthless voice
    (26693,-1575004,'What mongrels dare intrude here? Look alive, my brothers! A feast for the one that brings me their heads!' ,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13497,1,0,0, 'Skadi - SAY_AGGRO'),
@@ -2044,7 +2058,7 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
    (26529,-1595029,'Get up! Me not done!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13432,1,0,0,'meathook SAY_SLAY_3'),
    (26529,-1595030,'New toys!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13429,1,0,0,'meathook SAY_SPAWN'),
    (26529,-1595031,'This... not fun...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13433,1,0,0,'meathook SAY_DEATH'),
--- Salramm the Fleshcrafter 
+-- Salramm the Fleshcrafter
    (26530,-1595032,'Ah, the entertainment has arrived!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13472,1,0,0,'salramm SAY_AGGRO'),
    (26530,-1595033,'You are too late, champion of Lordaeron. The dead shall have their day.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13471,1,0,0,'salramm SAY_SPAWN'),
    (26530,-1595034,'The fun is just beginning!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13473,1,0,0,'salramm SAY_SLAY_1'),
@@ -2058,7 +2072,7 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
    (26530,-1595042,'Your flesh betrays you.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13482,1,0,0,'salramm SAY_STEAL_FLESH_3'),
    (26530,-1595043,'Say hello to some friends of mine.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13476,1,0,0,'salramm SAY_SUMMON_GHOULS_1'),
    (26530,-1595044,'Come, citizen of Stratholme! Meet your saviors.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13477,1,0,0,'salramm SAY_SUMMON_GHOULS_2'),
--- The Infinite Corruptor 
+-- The Infinite Corruptor
    (32273,-1595045,'How dare you interfere with our work here!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'infinite SAY_AGGRO'),
    (32273,-1595046,'My work here is finished!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'infinite SAY_FAIL'),
    (32273,-1595047,'My time... has run out...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'infinite SAY_DEATH'),
@@ -2121,7 +2135,7 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
    (26499,-1595118,'We''re going to finish this right now Mal''Ganis... just you and me!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,14317,0,0,0,'culling SAY_PHASE502'),
    (26499,-1595119,'I''ll hunt you to the ends of the earth if I have to! Do you hear me? To the ends of the earth!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,14318,1,0,5,'culling SAY_PHASE503'),
    (26499,-1595120,'You performed well this day. Anything that Mal''Ganis has left behind is yours. Take it as your reward. I must now begin plans for an expedition to Northrend.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,14319,0,0,5,'culling SAY_PHASE504'),
-   
+
 -- -1 599 000 HALLS OF STONE
 /* Maiden of Grief */
    (27975,-1599000,'You shouldn''t have come...now you will die!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13487,1,0,0,'maiden of grief SAY_AGGRO'),
@@ -2589,7 +2603,7 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
 
 /* Sinclari */
    (30658,-1608045,'Prison guards, we are leaving! These adventurers are taking over! Go go go',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'sinclari SAY_SINCLARI_1'),
-  
+
 -- -1 615 000 OBSIDIAN SANCTUM
    (30451,-1615000,'I fear nothing! Least of all you!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,14111,1,0,0,'shadron SAY_SHADRON_AGGRO'),
    (30451,-1615001,'You are insignificant!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,14112,1,0,0,'shadron SAY_SHADRON_SLAY_1'),
@@ -2677,7 +2691,7 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
    (36855,-1631025,'Do you yet grasp of the futility of your actions?',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16869,1,0,0,'SAY_KILL_1'),
    (36855,-1631026,'Embrace the darkness... Darkness eternal!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16870,1,0,0,'SAY_KILL_2'),
    (36855,-1631027,'This charade has gone on long enough.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16872,1,0,0,'SAY_BERSERK'),
-   (36855,-1631028,'All part of the masters plan! Your end is... inevitable!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16871,1,0,0,'SAY_DEATH');
+   (36855,-1631028,'All part of the masters plan! Your end is... inevitable!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16871,1,0,0,'SAY_DEATH'),
 
 -- -1 632 000 ICECROWN CITADEL: FROZEN HALLS: FORGE OF SOULS
 -- Bronjham
diff --git a/sql/scripts/world_script_waypoints.sql b/sql/scripts/world_script_waypoints.sql
index 473acfa0e88..cf5c16c8dff 100644
--- a/sql/scripts/world_script_waypoints.sql
+++ b/sql/scripts/world_script_waypoints.sql
@@ -15,11 +15,11 @@ CREATE TABLE `script_waypoint` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Script Creature waypoints';
 */
 
--- 
+--
 -- Not sure why we don't just run
 -- DELETE FROM `script_waypoint`;
 -- I mean seriously, who has custom waypoint creatures?
--- 
+--
 
 DELETE FROM `script_waypoint` WHERE `entry`=26170;
 INSERT INTO `script_waypoint` VALUES
@@ -1525,7 +1525,7 @@ INSERT INTO `script_waypoint` VALUES
    (22377,9,-2896.50,5396.76,-8.77,0, ''),
    (22377,10,-2896.67,5366.20,-9.59,0, ''),
    (22377,11,-2888.23,5330.39,-11.19,2000, '');
-   
+
 DELETE FROM `script_waypoint` WHERE `entry`=18210;
 INSERT INTO `script_waypoint` VALUES
    (18210,0,-1581.410034,8557.933594,2.726,0, ''),
@@ -1632,8 +1632,8 @@ INSERT INTO `script_waypoint` VALUES
    (29173,7,2257.479,-5296.702,82.165,0, 'being kicked by Lich King'),
    (29173,8,2261.237,-5294.983,82.167,0, 'throw'),
    (29173,9,2259.34,-5294.379,82.167,0, 'event end');
-   
-   
+
+
 DELETE FROM script_waypoint WHERE `entry`=28070;
 INSERT INTO script_waypoint VALUES
    (28070,0,1053.789795,476.639343,207.744,0, ''),
@@ -2293,3 +2293,89 @@ INSERT INTO `script_waypoint` VALUES
 (5391,19,-10074.68, -3436.85, 20.97, 0, ''),
 (5391,20,-10072.86, -3408.92, 20.43, 15000, ''),
 (5391,21,-10108.01, -3406.05, 22.06, 0, '');
+
+-- Waypoints for Maxx A. Million Mk. V
+DELETE FROM script_waypoint WHERE entry = 19589;
+INSERT INTO script_waypoint VALUES
+(19589, 1, 3358.22, 3728.25, 141.204, 0, ''),
+(19589, 2, 3368.05, 3715.51, 142.057, 0, ''),
+(19589, 3, 3389.04, 3701.21, 144.648, 0, ''),
+(19589, 4, 3419.51, 3691.41, 146.598, 0, ''),
+(19589, 5, 3437.83, 3699.2,   147.235, 0, ''),
+(19589, 6, 3444.85, 3700.89, 147.088, 0, ''),
+(19589, 7, 3449.89, 3700.14, 148.118, 0, ''),
+(19589, 8, 3443.55, 3682.09, 149.219, 0, ''),
+(19589, 9, 3452.6,  3674.65,  150.226, 0, ''),
+(19589, 10, 3462.6,  3659.01, 152.436, 0, ''),
+(19589, 11, 3469.18, 3649.47, 153.178, 0, ''),
+(19589, 12, 3475.11, 3639.41, 157.213, 0, ''),
+(19589, 13, 3482.26, 3617.69, 159.126, 0, ''),
+(19589, 14, 3492.7,  3606.27,  156.419, 0, ''),
+(19589, 15, 3493.52, 3595.06,  156.581, 0, ''),
+(19589, 16, 3490.4,  3588.45,  157.764, 0, ''),
+(19589, 17, 3485.21, 3585.69, 159.979, 0, ''),
+(19589, 18, 3504.68, 3594.44, 152.862, 0, ''),
+(19589, 19, 3523.6,  3594.48, 145.393, 0, ''),
+(19589, 20, 3537.01, 3576.71, 135.748, 0, ''),
+(19589, 21, 3551.73, 3573.12, 128.013, 0, ''),
+(19589, 22, 3552.12, 3614.08, 127.847, 0, ''),
+(19589, 23, 3536.14, 3639.78, 126.031, 0, ''),
+(19589, 24, 3522.94, 3646.47, 131.989, 0, ''),
+(19589, 25, 3507.21, 3645.69, 138.1527, 0, ''),
+(19589, 26, 3485.15, 3645.64, 137.755, 0, ''),
+(19589, 27, 3472.18, 3633.88, 140.352, 0, ''),
+(19589, 28, 3435.34, 3613.69, 140.725, 0, ''),
+(19589, 29, 3417.4,  3612.4,   141.143, 0, ''),
+(19589, 30, 3411.04, 3621.14, 142.454, 0, ''),
+(19589, 31, 3404.47, 3636.89, 144.434, 0, ''),
+(19589, 32, 3380.55, 3657.06, 144.332, 0, ''),
+(19589, 33, 3375,     3676.86, 145.298, 0, ''),
+(19589, 34, 3388.87, 3685.48, 146.818, 0, ''),
+(19589, 35, 3393.99, 3699.4,   144.858, 0, ''),
+(19589, 36, 3354.95, 3726.02, 141.428, 0, '');
+
+-- Waypoints for "Stinky" Ignatz
+DELETE FROM script_waypoint WHERE entry=4880;
+INSERT INTO `script_waypoint` VALUES
+(4880,0,-2646.429932,-3436.070068,35.373199,0, ''),
+(4880,1,-2650.82617,-3440.15332,35.138092,0, ''),
+(4880,2,-2662.3147,-3447.67285,35.10891,0, ''),
+(4880,3,-2680.4834,-3454.59766,34.6538124,0, ''),
+(4880,4,-2701.01855,-3457.43628,34.26906,0, ''),
+(4880,5,-2724.063,-3458.63623,33.6734657,0, ''),
+(4880,6,-2745.0127,-3459.28125,32.53458,0, ''),
+(4880,7,-2759.419,-3464.78174,32.714283,3000, ''),
+(4880,8,-2763.63,-3471.50732,33.53883,0, ''),
+(4880,9,-2771.789,-3480.88721,33.2553253,0, ''),
+(4880,10,-2780.66455,-3488.76343,31.8750439,0, ''),
+(4880,11,-2796.144775,-3489.013184,30.858467,3000, ''),
+(4880,12,-2792.117920,-3495.966797,30.732433,0, ''),
+(4880,13,-2789.059814,-3502.372559,30.670414,0, ''),
+(4880,14,-2787.715576,-3515.013428,31.117569,0, ''),
+(4880,15,-2790.841309,-3523.311768,30.573286,0, ''),
+(4880,16,-2796.58545,-3520.61963,29.9187489,0, ''),
+(4880,17,-2798.563,-3518.91064,30.3887444,0, ''),
+(4880,18,-2801.46875,-3516.745,30.1914845,0, ''),
+(4880,19,-2804.356201,-3513.899170,29.550812,0, ''),
+(4880,20,-2807.97559,-3517.99634,29.94883,0, ''),
+(4880,21,-2815.680664,-3521.739014,29.772268,0, ''),
+(4880,22,-2823.386230,-3526.234131,31.71944,0, ''),
+(4880,23,-2836.109619,-3544.695557,32.493855,0, ''),
+(4880,24,-2830.392578,-3568.862305,30.410404,0, ''),
+(4880,25,-2824.842285,-3569.516846,31.281128,0, ''),
+(4880,26,-2818.663818,-3567.801025,30.920368,6000, ''),
+(4880,27,-2817.663818,-3568.935059,30.431194,6000, ''),
+(4880,28,-2820.394043,-3592.223389,30.716301,6000, ''),
+(4880,29,-2820.765625,-3592.497803,30.886147,0, ''),
+(4880,30,-2829.909424,-3588.730713,30.683064,0, ''),
+(4880,31,-2842.322021,-3577.498291,36.848869,0, ''),
+(4880,32,-2851.180420,-3567.579346,38.515850,0, ''),
+(4880,33,-2865.554932,-3551.582275,41.438988,0, ''),
+(4880,34,-2871.234863,-3548.145020,40.761391,0, ''),
+(4880,35,-2877.840332,-3544.147461,38.670235,0, ''),
+(4880,36,-2890.394775,-3542.388672,34.314426,0, ''),
+(4880,37,-2898.729980,-3543.635742,34.319958,6000, ''),
+(4880,38,-2910.064453,-3568.957275,34.250011,0, ''),
+(4880,39,-2932.509766,-3584.618652,37.238464,0, '');
+
+
diff --git a/sql/scripts/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql
index 08303c24cbf..35f43f076e7 100644
--- a/sql/scripts/world_scripts_full.sql
+++ b/sql/scripts/world_scripts_full.sql
@@ -609,6 +609,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_nat_pagle' WHERE `entry`=12919;
 UPDATE `creature_template` SET `ScriptName`='npc_restless_apparition' WHERE `entry`=23861;
 UPDATE `creature_template` SET `ScriptName`='npc_private_hendel' WHERE `entry`=4966;
 UPDATE `creature_template` SET `ScriptName`='npc_zelfrax' WHERE `entry`=23864;
+UPDATE `creature_template` SET `ScriptName`='npc_stinky' WHERE `entry`=4880;
 
 /* EASTERN PLAGUELANDS */
 UPDATE `creature_template` SET `ScriptName`='mobs_ghoul_flayer' WHERE `entry` IN (8530,8531,8532);
@@ -994,6 +995,8 @@ UPDATE `creature_template` SET `ScriptName`='mob_phase_hunter' WHERE `entry`=188
 UPDATE `creature_template` SET `ScriptName`='npc_professor_dabiri' WHERE `entry`=20907;
 UPDATE `creature_template` SET `ScriptName`='npc_bessy' WHERE `entry`=20415;
 UPDATE `creature_template` SET `ScriptName`='npc_commander_dawnforge' WHERE `entry`=19831;
+UPDATE `creature_template` SET `ScriptName`='npc_maxx_a_million_escort', `MovementType`=2 WHERE `entry`=19589;
+
 
 /* THE NEXUS */
 UPDATE `instance_template` SET `script`='instance_nexus' WHERE `map`=576;
diff --git a/sql/updates/9600_world_script_texts.sql b/sql/updates/9600_world_script_texts.sql
index 77a96b48ac9..2233b74de39 100644
--- a/sql/updates/9600_world_script_texts.sql
+++ b/sql/updates/9600_world_script_texts.sql
@@ -1,6 +1,6 @@
 DELETE FROM script_texts WHERE entry BETWEEN -1000578 AND -1000575;
 INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
-(-1000575,'All systems on-line. Prepare yourself, we leave shortly.',0,0,0,0,'max_a_million SAY_START'),
-(-1000576,'Be careful in there and come back in one piece!',0,0,0,0,'bot-specialist_alley SAY_ALLEY_FAREWELL'),
-(-1000577,'Proceed.',0,0,0,0,'max_a_million SAY_CONTINUE'),
-(-1000578,'You are back! Were you able to get all of the machines?',0,0,0,0,'bot-specialist_alley SAY_ALLEY_FINISH');
+(19589,-1000575,'All systems on-line. Prepare yourself, we leave shortly.',0,0,0,0,'max_a_million SAY_START'),
+(19589,-1000576,'Be careful in there and come back in one piece!',0,0,0,0,'bot-specialist_alley SAY_ALLEY_FAREWELL'),
+(19589,-1000577,'Proceed.',0,0,0,0,'max_a_million SAY_CONTINUE'),
+(19589,-1000578,'You are back! Were you able to get all of the machines?',0,0,0,0,'bot-specialist_alley SAY_ALLEY_FINISH');
diff --git a/sql/updates/9604_world_script_waypoint.txt b/sql/updates/9604_world_script_waypoint.sql
index c609929268a..c609929268a 100644
--- a/sql/updates/9604_world_script_waypoint.txt
+++ b/sql/updates/9604_world_script_waypoint.sql
diff --git a/sql/updates/9604_world_scriptname.txt b/sql/updates/9604_world_scriptname.sql
index c5c0580944a..c5c0580944a 100644
--- a/sql/updates/9604_world_scriptname.txt
+++ b/sql/updates/9604_world_scriptname.sql