Added missing sql data to fulls.

Proper renaming and reformatting for some sql files.
Removed not-core-related data. You can find it in the usual place: http://trinitydatabase.org/index.php?/forum/122-core-related-db-content/

--HG--
branch : trunk

3 files changed, 214 insertions, 29 deletions

diff --git a/sql/FULL/world_script_texts.sql b/sql/FULL/world_script_texts.sql
index a3df5b9b5dc..5083d3b54be 100644
--- a/sql/FULL/world_script_texts.sql
+++ b/sql/FULL/world_script_texts.sql
@@ -464,7 +464,30 @@ 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,-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'),
+   (27463,-1800046, 'Thank you. $Class!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'RANDOM_SAY_3'),
+   (28787,-1800047, 'Let''s get the hell out of here', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL),
+   (28787,-1800048, 'Listen up, Venture Company goons! Rule #1: Never keep the prisoner near the explosives.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL),
+   (28787,-1800049, 'Or THIS is what you get. ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL),
+   (28787,-1800050, 'It''s getting a little hot over here. Shall we move on? ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL),
+   (28787,-1800051, 'Oh, look, it''s another cartload of explosives! Let''s help them dispose of it. ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL),
+   (28787,-1800052, 'You really shouldn''t play with this stuff. Someone could get hurt.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL),
+   (28787,-1800053, 'We made it! Thank you for getting me out of that hell hole. Tell Hemet to expect me! ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL),
+   (12717,-1800054, 'Are you sure that you are ready? If we do not have a group of your allies to aid us, we will surely fail.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 1, 0, 'muglash SAY_MUG_START1'),
+   (12717,-1800055, 'This will be a though fight, $N. Follow me closely.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 1, 0, 'muglash SAY_MUG_START2'),
+   (12717,-1800056, 'This is the brazier, $N. Put it out. Vorsha is a beast, worthy of praise from no one!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 1, 0, 'muglash SAY_MUG_BRAZIER'),
+   (12717,-1800057, 'Now we must wait. It won''t be long before the naga realize what we have done.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 1, 0, 'muglash SAY_MUG_BRAZIER_WAIT'),
+   (12717,-1800058, 'Be on your guard, $N!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 1, 0, 'muglash SAY_MUG_ON_GUARD'),
+   (12717,-1800059, 'Perhaps we will get a moment to rest. But I will not give up until we have faced off against Vorsha!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 1, 0, 'muglash SAY_MUG_REST'),
+   (12717,-1800060, 'We have done it!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 1, 0, 'muglash SAY_MUG_DONE'),
+   (12717,-1800061, 'You have my deepest gratitude. I thank you.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 1, 0, 'muglash SAY_MUG_GRATITUDE'),
+   (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'),
diff --git a/sql/FULL/world_script_waypoints.sql b/sql/FULL/world_script_waypoints.sql
index 62d43741188..1c2dfe09eb4 100644
--- a/sql/FULL/world_script_waypoints.sql
+++ b/sql/FULL/world_script_waypoints.sql
@@ -2005,33 +2005,33 @@ INSERT INTO `script_waypoint` VALUES
 
 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');
+(26588,1,4333.18,-3688.4,263.857,0, ''),
+(26588,2,4341.38,-3683.77,257.422,0, ''),
+(26588,3,4342.67,-3683.21,257.218,0, ''),
+(26588,4,4346.22,-3688.72,257.065,0, ''),
+(26588,5,4343.8,-3695.27,257.124,0, ''),
+(26588,6,4337.74,-3707.2,257.628,0, ''),
+(26588,7,4317.58,-3722.8,256.941,0, ''),
+(26588,8,4306.64,-3736.46,258.304,0, ''),
+(26588,9,4299.96,-3760.02,254.959,0, ''),
+(26588,10,4294.21,-3777.34,249.139,1000, ''),
+(26588,11,4294.37,-3776.97,249.259,10000, ''),
+(26588,12,4300.22,-3794.61,240.107,2000, ''),
+(26588,13,4307.25,-3817.76,231.414,2000, ''),
+(26588,14,4326.31,-3883.31,208.457,2000, ''),
+(26588,15,4346.19,-3905.41,198.805,2000, ''),
+(26588,16,4347.39,-3916.43,196.716,5000, ''),
+(26588,17,4350.17,-3935.03,191.824,1000, ''),
+(26588,18,4347.24,-3939.54,191.445,2000, ''),
+(26588,19,4347.24,-3939.54,191.445,2000, ''),
+(26588,20,4347.24,-3939.54,191.445,5000, ''),
+(26588,21,4347.24,-3939.54,191.445,7000, ''),
+(26588,22,4347.24,-3939.54,191.445,5000, ''),
+(26588,23,4347.24,-3939.54,191.445,5000, ''),
+(26588,24,4347.24,-3939.54,191.445,0, ''),
+(26588,25,4353.72,-3965.61,190.154,0, ''),
+(26588,26,4363.12,-3995.61,183.327,0, ''),
+(26588,27,4371.99,-4010.97,181.33,0, '');
 
 -- script_waypoints for Arthas movements inside Culling
 DELETE FROM `script_waypoint` WHERE `entry`=26499;
@@ -2124,3 +2124,136 @@ INSERT INTO `script_waypoint` (`entry`,`pointid`,`location_x`,`location_y`,`loca
 (27316,25,3801.11,-678.964,213.753,5000, ''),
 (27316,26,3801.11,-678.964,213.753,5000, ''),
 (27316,27,3801.11,-678.964,213.753,10000, '');
+
+-- Quest 12832 - Bitter Departure
+DELETE FROM `script_waypoint` WHERE `entry` =29434;
+INSERT INTO `script_waypoint` (`entry`, `pointid`, `location_x`, `location_y`, `location_z`, `waittime`, `point_comment`) VALUES
+(29434, 1, 6645.47, -1263.66, 396.938, 0, ''),
+(29434, 2, 6662.06, -1274.13, 397.319, 0, ''),
+(29434, 3, 6666.29, -1254.59, 396.11, 0, ''),
+(29434, 4, 6669.33, -1240.06, 397.789, 0, ''),
+(29434, 5, 6654.31, -1205.01, 399.823, 0, ''),
+(29434, 6, 6657.03, -1170.15, 398.755, 0, ''),
+(29434, 7, 6667.33, -1146.28, 399.014, 0, ''),
+(29434, 8, 6670.9, -1138.68, 397.125, 0, ''),
+(29434, 9, 6685.09, -1103.95, 396.828, 0, ''),
+(29434, 10, 6688.71, -1094.32, 395.019, 0, ''),
+(29434, 11, 6684.75, -1084.31, 396.916, 0, ''),
+(29434, 12, 6679.3, -1074.4, 404.284, 0, ''),
+(29434, 13, 6691.91, -1051.96, 407.983, 0, ''),
+(29434, 14, 6696.28, -1016.54, 414.823, 0, ''),
+(29434, 15, 6675.32, -1005.06, 414.844, 0, ''),
+(29434, 16, 6661.01, -1007.41, 414.946, 0, ''),
+(29434, 17, 6643.75, -1010.24, 420.508, 0, ''),
+(29434, 18, 6620.76, -1012.59, 424.378, 0, ''),
+(29434, 19, 6610.33, -996.992, 428.116, 0, ''),
+(29434, 20, 6581.3, -1005.9, 434.257, 0, ''),
+(29434, 21, 6570.74, -1013, 434.076, 0, ''),
+(29434, 22, 6551.68, -1012.38, 433.218, 0, ''),
+(29434, 23, 6530.83, -1024.99, 433.04, 0, ''),
+(29434, 24, 6510.05, -1031.23, 435.824, 0, ''),
+(29434, 25, 6491.5, -1032.46, 434.226, 0, ''),
+(29434, 26, 6475.58, -1023.13, 434.759, 0, ''),
+(29434, 27, 6451.81, -1025.43, 431.502, 10000, '');
+
+-- Quest 9446 - Tomb of the Lightbringer
+DELETE FROM `script_waypoint` WHERE `entry`=17238;
+INSERT INTO `script_waypoint` (`entry`, `pointid`, `location_x`, `location_y`, `location_z`, `waittime`, `point_comment`) VALUES
+(17238, 1, 953.061, -1432.52, 63.2255, 0, ''),
+(17238, 2, 969.607, -1438.15, 65.3669, 0, ''),
+(17238, 3, 980.073, -1441.5, 65.3997, 0, ''),
+(17238, 4, 995.001, -1450.47, 61.3227, 0, ''),
+(17238, 5, 1032.7, -1473.49, 63.7699, 0, ''),
+(17238, 6, 1039.69, -1491.42, 65.2801, 0, ''),
+(17238, 7, 1038.8, -1523.32, 64.4661, 0, ''),
+(17238, 8, 1035.43, -1572.97, 61.5412, 0, ''),
+(17238, 9, 1034.45, -1612.83, 61.6186, 0, ''),
+(17238, 10, 1040.12, -1663.41, 60.923, 0, ''),
+(17238, 11, 1059.75, -1703.75, 60.5768, 0, ''),
+(17238, 12, 1091.83, -1735.24, 60.8057, 0, ''),
+(17238, 13, 1131.75, -1755.32, 61.0073, 0, ''),
+(17238, 14, 1159.77, -1762.64, 60.5699, 0, ''),
+(17238, 15, 1153.79, -1772, 60.6475, 0, ''),
+(17238, 16, 1115.4, -1787.21, 61.0759, 0, ''),
+(17238, 17, 1091.88, -1799.06, 61.6055, 0, ''),
+(17238, 18, 1056.22, -1805.65, 71.8112, 0, ''),
+(17238, 19, 1024.03, -1807.93, 77.025, 0, ''),
+(17238, 20, 1012.74, -1811.67, 77.5636, 0, ''),
+(17238, 21, 1006.74, -1813.59, 80.4872, 0, ''),
+(17238, 22, 983.15, -1823.05, 80.4872, 0, ''),
+(17238, 23, 974.954, -1825.33, 81.3482, 5000, ''),
+(17238, 24, 974.954, -1825.33, 81.3482, 5000, ''),
+(17238, 25, 974.954, -1825.33, 81.3482, 5000, ''),
+(17238, 26, 974.954, -1825.33, 81.3482, 5000, '');
+
+-- Quest 1440 - Return to Vahlarriel
+DELETE FROM `script_waypoint` WHERE `entry`=5644;
+INSERT INTO `script_waypoint` (`entry`, `pointid`, `location_x`, `location_y`, `location_z`, `waittime`, `point_comment`) VALUES
+(5644, 1, -339.679, 1752.04, 139.482, 0, ''),
+(5644, 2, -328.957, 1734.95, 139.327, 0, ''),
+(5644, 3, -350.747, 1731.12, 139.338, 0, ''),
+(5644, 4, -365.064, 1739.04, 139.376, 0, ''),
+(5644, 5, -371.105, 1746.03, 139.374, 0, ''),
+(5644, 6, -383.141, 1738.62, 138.93, 0, ''),
+(5644, 7, -390.445, 1733.98, 136.353, 0, ''),
+(5644, 8, -401.368, 1726.77, 131.071, 0, ''),
+(5644, 9, -416.016, 1721.19, 129.807, 0, ''),
+(5644, 10, -437.139, 1709.82, 126.342, 0, ''),
+(5644, 11, -459.862, 1687.92, 116.059, 0, ''),
+(5644, 12, -460.686, 1679.55, 111.976, 0, ''),
+(5644, 13, -461.485, 1670.94, 109.033, 0, ''),
+(5644, 14, -468.53, 1645.51, 102.811, 0, ''),
+(5644, 15, -474.529, 1615.97, 97.228, 0, ''),
+(5644, 16, -474.329, 1590.01, 94.4982, 0, '');
+
+-- Quest 12688 - Engineering a Disaster
+DELETE FROM `script_waypoint` WHERE `entry` =28787;
+INSERT INTO `script_waypoint` (`entry`, `pointid`, `location_x`, `location_y`, `location_z`, `waittime`, `point_comment`) VALUES
+(28787, 0, 5919.43, 5374.88, -98.8816, 5000, ''),
+(28787, 1, 5919.43, 5374.88, -98.8816, 5000, ''),
+(28787, 2, 5925.17, 5372.37, -98.8815, 0, ''),
+(28787, 3, 5928.32, 5377, -99.0266, 0, ''),
+(28787, 4, 5917.24, 5383.36, -106.31, 0, ''),
+(28787, 5, 5907.49, 5389.62, -106.31, 0, ''),
+(28787, 6, 5899.66, 5405.25, -96.5535, 0, ''),
+(28787, 7, 5890.27, 5395.42, -95.5519, 0, ''),
+(28787, 8, 5887.57, 5384.4, -95.4326, 5000, ''),
+(28787, 9, 5878.52, 5384.61, -93.3333, 0, ''),
+(28787, 10, 5873.17, 5360.43, -98.4124, 0, ''),
+(28787, 11, 5859.23, 5353.29, -98.8777, 0, ''),
+(28787, 12, 5841.27, 5334.14, -100.446, 0, ''),
+(28787, 13, 5819.81, 5300.27, -96.8567, 0, '');
+
+-- Quest 6641 - Vorsha the Lasher
+DELETE FROM `script_waypoint` WHERE `entry`=12717;
+INSERT INTO `script_waypoint` (`entry`, `pointid`, `location_x`,`location_y`, `location_z`, `waittime`, `point_comment`) VALUES
+(12717, 0, 3346.25, 1007.88, 3.59, 0, 'SAY_MUG_START2'),
+(12717, 1, 3367.39, 1011.51, 3.72, 0, ''),
+(12717, 2, 3418.64, 1013.96, 2.905, 0, ''),
+(12717, 3, 3426.84, 1015.1, 3.449, 0, ''),
+(12717, 4, 3437.03, 1020.79, 2.742, 0, ''),
+(12717, 5, 3460.56, 1024.26, 1.353, 0, ''),
+(12717, 6, 3479.87, 1037.96, 1.023, 0, ''),
+(12717, 7, 3490.53, 1043.35, 3.338, 0, ''),
+(12717, 8, 3504.28, 1047.77, 8.205, 0, ''),
+(12717, 9, 3510.73, 1049.79, 12.143, 0, ''),
+(12717, 10, 3514.41, 1051.17, 13.235, 0, ''),
+(12717, 11, 3516.94, 1052.91, 12.918, 0, ''),
+(12717, 12, 3523.64, 1056.3, 7.563, 0, ''),
+(12717, 13, 3531.94, 1059.86, 6.175, 0, ''),
+(12717, 14, 3535.48, 1069.96, 1.697, 0, ''),
+(12717, 15, 3546.98, 1093.49, 0.68, 0, ''),
+(12717, 16, 3549.73, 1101.88, -1.123, 0, ''),
+(12717, 17, 3555.14, 1116.99, -4.326, 0, ''),
+(12717, 18, 3571.94, 1132.18, -0.634, 0, ''),
+(12717, 19, 3574.28, 1137.58, 3.684, 0, ''),
+(12717, 20, 3579.31, 1137.25, 8.205, 0, ''),
+(12717, 21, 3590.22, 1143.65, 8.291, 0, ''),
+(12717, 22, 3595.97, 1145.83, 6.773, 0, ''),
+(12717, 23, 3603.65, 1146.92, 9.763, 0, ''),
+(12717, 24, 3607.08, 1146.01, 10.692, 5000, 'SAY_MUG_BRAZIER'),
+(12717, 25, 3614.52, 1142.63, 10.248, 0, ''),
+(12717, 26, 3616.66, 1140.84, 10.682, 3000, 'SAY_MUG_PATROL'),
+(12717, 27, 3621.08, 1138.11, 10.369, 0, 'SAY_MUG_RETURN'),
+(12717, 28, 3615.48, 1145.53, 9.614, 0, ''),
+(12717, 29, 3607.19, 1152.72, 8.871, 0, '');
diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql
index 90f99cd67ac..a663a4ae5e7 100644
--- a/sql/FULL/world_scripts_full.sql
+++ b/sql/FULL/world_scripts_full.sql
@@ -8,6 +8,7 @@ UPDATE `gameobject_template` SET `ScriptName`='';
 
 /* AREA TRIGGERS */
 DELETE FROM `areatrigger_scripts` WHERE `entry` IN (5284,5285,5286,5287,4871,4872,4873,5108,5332,5338,5334,5340);
+DELETE FROM `areatrigger_scripts` WHERE `entry` BETWEEN 1726 AND 1740;
 INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES 
 (5284, 'at_aldurthar_gate'),
 (5285, 'at_aldurthar_gate'),
@@ -20,7 +21,23 @@ INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
 (5332, 'at_last_rites'),
 (5338, 'at_last_rites'),
 (5334, 'at_last_rites'),
-(5340, 'at_last_rites');
+(5340, 'at_last_rites'),
+(1726, 'at_scent_larkorwi'),
+(1727, 'at_scent_larkorwi'),
+(1728, 'at_scent_larkorwi'),
+(1729, 'at_scent_larkorwi'),
+(1730, 'at_scent_larkorwi'),
+(1731, 'at_scent_larkorwi'),
+(1732, 'at_scent_larkorwi'),
+(1733, 'at_scent_larkorwi'),
+(1734, 'at_scent_larkorwi'),
+(1735, 'at_scent_larkorwi'),
+(1736, 'at_scent_larkorwi'),
+(1737, 'at_scent_larkorwi'),
+(1738, 'at_scent_larkorwi'),
+(1739, 'at_scent_larkorwi'),
+(1740, 'at_scent_larkorwi');
+
 
 /* WORLD BOSS */
 UPDATE `creature_template` SET `ScriptName`='boss_ysondre' WHERE `entry`=14887;
@@ -112,6 +129,7 @@ UPDATE `item_template` SET `ScriptName`='item_mysterious_egg' WHERE `entry` IN(3
 UPDATE `item_template` SET `ScriptName`='item_disgusting_jar' WHERE `entry` IN(44717);
 UPDATE `item_template` SET `ScriptName`='item_harvesters_gift' WHERE `entry`=39253;
 UPDATE `item_template` SET `ScriptName`='item_petrov_cluster_bombs' WHERE `entry`=33098;
+UPDATE `item_template` SET `ScriptName`='item_Trident_of_Nazjan' WHERE `entry`=35850;
 
 /* NPC (usually creatures to be found in more than one specific zone) */
 UPDATE `creature_template` SET `ScriptName`='npc_air_force_bots' WHERE `entry` IN (2614,2615,21974,21993,21996,21997,21999,22001,22002,22003,22063,22065,22066,22068,22069,22070,22071,22078,22079,22080,22086,22087,22088,22090,22124,22125,22126);
@@ -168,6 +186,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_wormhole' WHERE `entry`=35646;
 UPDATE `creature_template` SET `ScriptName`='npc_pet_trainer' WHERE `entry` IN (10090,3698,17484,4320,3545,16712,3622,16675,3620,10086,2879,3306,543,2878,3688,10089,16271,10088,3624);
 UPDATE `creature_template` SET `ScriptName`='npc_locksmith' WHERE `entry` IN (29665,29725,29728);
 UPDATE `creature_template` SET `ScriptName`='npc_tabard_vendor' WHERE `entry`=28776;
+UPDATE `creature_template` SET `ScriptName`='npc_experience'WHERE `entry` IN (35364,35365);
 
 /*  */
 /* ZONE */
@@ -190,6 +209,8 @@ UPDATE `creature_template` SET `ScriptName`='npc_professor_phizzlethorpe' WHERE
 /* ASHENVALE */
 UPDATE `creature_template` SET `ScriptName`='npc_torek' WHERE `entry`=12858;
 UPDATE `creature_template` SET `ScriptName`='npc_ruul_snowhoof' WHERE `entry`=12818;
+UPDATE `gameobject_template` SET `ScriptName`='go_naga_brazier' WHERE `entry`=178247;
+UPDATE `creature_template` SET `ScriptName`='npc_muglash' WHERE `entry`=12717;
 
 /* AUCHINDOUN */
 
@@ -390,6 +411,8 @@ UPDATE `creature_template` SET `ScriptName`='npc_overseer_nuaar' WHERE `entry`=2
 UPDATE `creature_template` SET `ScriptName`='npc_saikkal_the_elder' WHERE `entry`=22932;
 UPDATE `gameobject_template` SET `ScriptName`='go_fel_crystalforge' WHERE `entry`=185919;
 UPDATE `gameobject_template` SET `ScriptName`='go_bashir_crystalforge' WHERE `entry`=185921;
+UPDATE `creature_template` SET `ScriptName`='npc_ogre_brute' WHERE `entry`=19995;
+UPDATE `creature_template` SET `ScriptName`='npc_bloodmaul_brutebane' WHERE `entry`=21241;
 
 /* BLASTED LANDS */
 UPDATE `creature_template` SET `ScriptName`='npc_deathly_usher' WHERE `entry`=8816;
@@ -659,6 +682,7 @@ UPDATE `gameobject_template` SET `ScriptName`='go_amberpine_outhouse' WHERE `ent
 UPDATE `creature_template` SET `ScriptName`='npc_outhouse_bunny' WHERE `entry`=27326;
 UPDATE `creature_template` SET `ScriptName`='npc_tallhorn_stag' WHERE `entry`=26363;
 UPDATE `creature_template` SET `ScriptName`='npc_amberpine_woodsman' WHERE `entry`=27293;
+UPDATE `creature_template` SET `ScriptName`='npc_wounded_skirmisher' WHERE `entry`=27463;
 
 /* DRAK'THARON KEEP */
 UPDATE `instance_template` SET `script`='instance_drak_tharon' WHERE `map`=600;
@@ -1127,6 +1151,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_injured_rainspeaker_oracle' WHE
 UPDATE `creature_template` SET `ScriptName`='npc_vekjik' WHERE `entry`=28315;
 UPDATE `creature_template` SET `ScriptName`='npc_avatar_of_freya' WHERE `entry`=27801;
 UPDATE `creature_template` SET `ScriptName`='npc_bushwhacker' WHERE `entry`=28317;
+UPDATE `creature_template` SET `ScriptName`='npc_engineer_helice' WHERE `entry`=28787;
 
 /* SILITHUS */
 UPDATE `creature_template` SET `ScriptName`='npcs_rutgar_and_frankal' WHERE `entry` IN (15170,15171);
@@ -1136,6 +1161,7 @@ UPDATE `gameobject_template` SET `ScriptName`='go_crystalline_tear' WHERE `entry
 UPDATE `creature_template` SET `ScriptName`='mob_qiraj_war_spawn' WHERE `entry` IN (15414,15422,15424,15423);
 UPDATE `creature_template` SET `ScriptName`='npc_anachronos_the_ancient' WHERE `entry`=15381;
 UPDATE `creature_template` SET `ScriptName`='npc_anachronos_quest_trigger' WHERE `entry`=15454;
+UPDATE `gameobject_template` SET `ScriptName`='go_hive_pod' WHERE `entry`=178553;
 
 /* SILVERMOON */
 UPDATE `creature_template` SET `ScriptName`='npc_blood_knight_stillblade' WHERE `entry`=17768;
@@ -1157,6 +1183,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_frostborn_scout' WHERE `entry`=
 UPDATE `creature_template` SET `ScriptName`='npc_thorim' WHERE `entry`=29445;
 UPDATE `creature_template` SET `ScriptName`='npc_goblin_prisoner' WHERE `entry`=29466;
 UPDATE `gameobject_template` SET ScriptName='go_rusty_cage' WHERE `entry`=191544;
+UPDATE `creature_template` SET `ScriptName`='npc_injured_goblin' WHERE `entry`=29434;
 
 /* STORMWIND CITY */
 UPDATE `creature_template` SET `ScriptName`='npc_archmage_malin' WHERE `entry`=2708;
@@ -1470,7 +1497,8 @@ UPDATE `instance_template` SET `script`='instance_wailing_caverns' WHERE map=43;
 UPDATE `creature_template` SET `ScriptName`='npcs_dithers_and_arbington' WHERE `entry` IN (11056,11057);
 UPDATE `creature_template` SET `ScriptName`='npc_the_scourge_cauldron' WHERE `entry`=11152;
 UPDATE `creature_template` SET `ScriptName`='npc_myranda_the_hag' WHERE `entry`=11872;
-UPDATE `creature_template` SET `ScriptName`='npc_andorhal_tower' WHERE `entry` in (10902,10903,10904,10905);
+UPDATE `creature_template` SET `ScriptName`='npc_andorhal_tower' WHERE `entry` IN (10902,10903,10904,10905);
+UPDATE `creature_template` SET `ScriptName`='npc_anchorite_truuen' WHERE `entry`=17238;
 
 /* WESTFALL */
 UPDATE `creature_template` SET `ScriptName`='npc_defias_traitor' WHERE `entry`=467;
@@ -1533,6 +1561,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_yggdras' WHERE `entry`=30014;
 UPDATE `creature_template` SET `ScriptName`='npc_released_offspring_harkoa' WHERE `entry`=28526;
 UPDATE `creature_template` SET `ScriptName`='npc_stinkbeard' WHERE `entry`=30017;
 UPDATE `creature_template` SET `ScriptName`='npc_crusade_recruit' WHERE `entry`=28090;
+UPDATE `gameobject_template` SET `ScriptName`='go_scourge_enclosure' WHERE `entry`=191548;
 
 /* ZUL'FARRAK */
 UPDATE `creature_template` SET `ScriptName`='npc_sergeant_bly' WHERE `entry`=7604;