Merge [SD2]

r1261 Add GO script to complete lyceum event in BRD. Patch by Turok
      Some minor cleanup.
r1262 Apply SD2 code style to example scripts. Patch by DasBlub
r1263 Remove AI for some of the npc's in tomb of seven event (BRD). Note that ACID is required for event to work properly (set instance data). Patch by Turok
r1264 Fix typo in filename in previous commit.
r1265 Added support for quest 2742

--HG--
branch : trunk

3 files changed, 62 insertions, 6 deletions

diff --git a/sql/FULL/world_script_waypoints.sql b/sql/FULL/world_script_waypoints.sql
index 5aae839f3ec..b697fe7e249 100644
--- a/sql/FULL/world_script_waypoints.sql
+++ b/sql/FULL/world_script_waypoints.sql
@@ -13,6 +13,33 @@ CREATE TABLE script_waypoint (
   PRIMARY KEY (entry, pointid)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Script Creature waypoints';
 
+DELETE FROM script_waypoint WHERE entry=7780;
+INSERT INTO script_waypoint VALUES
+(7780, 0, 261.058868, -2757.876221, 122.553, 0, ''),
+(7780, 1, 259.812195, -2758.249023, 122.555, 0, 'SAY_RIN_FREE'),
+(7780, 2, 253.823441, -2758.619141, 122.562, 0, ''),
+(7780, 3, 241.394791, -2769.754883, 123.309, 0, ''),
+(7780, 4, 218.915588, -2783.397461, 123.355, 0, ''),
+(7780, 5, 209.088196, -2789.676270, 122.001, 0, ''),
+(7780, 6, 204.453568, -2792.205811, 120.620, 0, ''),
+(7780, 7, 182.012604, -2809.995361, 113.887, 0, 'summon'),
+(7780, 8, 164.411591, -2825.162842, 107.779, 0, ''),
+(7780, 9, 149.727600, -2833.704346, 106.224, 0, ''),
+(7780, 10, 142.448074, -2838.807373, 109.665, 0, ''),
+(7780, 11, 133.274963, -2845.135254, 112.606, 0, ''),
+(7780, 12, 111.247459, -2861.065674, 116.305, 0, ''),
+(7780, 13, 96.104073, -2874.886230, 114.397, 0, 'summon'),
+(7780, 14, 73.369942, -2881.184570, 117.666, 0, ''),
+(7780, 15, 58.579178, -2889.151611, 116.253, 0, ''),
+(7780, 16, 33.214249, -2906.343994, 115.083, 0, ''),
+(7780, 17, 19.586519, -2908.712402, 117.276, 7500, 'SAY_RIN_COMPLETE'),
+(7780, 18, 10.282522, -2911.607422, 118.394, 0, ''),
+(7780, 19, -37.580383, -2942.730225, 117.145, 0, ''),
+(7780, 20, -68.599411, -2953.694824, 116.685, 0, ''),
+(7780, 21, -102.054253, -2956.965576, 116.677, 0, ''),
+(7780, 22, -135.993637, -2955.743652, 115.788, 0, ''),
+(7780, 23, -171.561600, -2951.417480, 115.451, 0, '');
+
 DELETE FROM script_waypoint WHERE entry=18731;
 INSERT INTO script_waypoint VALUES
 (18731, 0, -157.366, 2.177, 8.073, 0, ''),
diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql
index fa83cee479a..4dc09df0c27 100644
--- a/sql/FULL/world_scripts_full.sql
+++ b/sql/FULL/world_scripts_full.sql
@@ -238,24 +238,20 @@ UPDATE `instance_template` SET `script`='instance_blackrock_depths' WHERE `map`=
 UPDATE `creature_template` SET `ScriptName`='boss_emperor_dagran_thaurissan' WHERE `entry`=9019;
 UPDATE `creature_template` SET `ScriptName`='boss_moira_bronzebeard' WHERE `entry`=8929;
 UPDATE `creature_template` SET `ScriptName`='boss_ambassador_flamelash' WHERE `entry`=9156;
-UPDATE `creature_template` SET `ScriptName`='boss_angerrel' WHERE `entry`=9035;
 UPDATE `creature_template` SET `ScriptName`='boss_anubshiah' WHERE `entry`=9031;
 UPDATE `creature_template` SET `ScriptName`='boss_doomrel' WHERE `entry`=9039;
-UPDATE `creature_template` SET `ScriptName`='boss_doperel' WHERE `entry`=9040;
-UPDATE `creature_template` SET `ScriptName`='boss_general_angerforge' WHERE `entry`=9033;
 UPDATE `creature_template` SET `ScriptName`='boss_gloomrel' WHERE `entry`=9037;
+UPDATE `creature_template` SET `ScriptName`='boss_general_angerforge' WHERE `entry`=9033;
 UPDATE `creature_template` SET `ScriptName`='boss_gorosh_the_dervish' WHERE `entry`=9027;
 UPDATE `creature_template` SET `ScriptName`='boss_grizzle' WHERE `entry`=9028;
-UPDATE `creature_template` SET `ScriptName`='boss_haterel' WHERE `entry`=9034;
 UPDATE `creature_template` SET `ScriptName`='boss_high_interrogator_gerstahn' WHERE `entry`=9018;
 UPDATE `creature_template` SET `ScriptName`='boss_magmus' WHERE `entry`=9938;
-UPDATE `creature_template` SET `ScriptName`='boss_seethrel' WHERE `entry`=9038;
-UPDATE `creature_template` SET `ScriptName`='boss_vilerel' WHERE `entry`=9036;
 UPDATE `creature_template` SET `ScriptName`='npc_lokhtos_darkbargainer' WHERE `entry`=12944;
 UPDATE `creature_template` SET `ScriptName`='npc_kharan_mighthammer' WHERE `entry`=9021;
 UPDATE `creature_template` SET `ScriptName`='npc_grimstone' WHERE `entry`=10096;
 UPDATE `creature_template` SET `ScriptName`='npc_rocknot' WHERE `entry`=9503;
 UPDATE `creature_template` SET `ScriptName`='mob_phalanx' WHERE `entry`=9502;
+UPDATE `gameobject_template` SET `ScriptName`='go_shadowforge_brazier' WHERE `entry` IN (174744, 174745);
 
 /* BLACKROCK SPIRE */
 
@@ -549,6 +545,7 @@ UPDATE `gameobject_template` SET `ScriptName`='go_haaleshi_altar' WHERE `entry`=
 /* HILLSBRAD FOOTHILLS */
 
 /* HINTERLANDS */
+UPDATE `creature_template` SET `ScriptName`='npc_rinji' WHERE `entry`=7780;
 
 /* IRONFORGE */
 UPDATE `creature_template` SET `ScriptName`='npc_royal_historian_archesonus' WHERE `entry`=8879;
diff --git a/sql/updates/5015_world_scripts.sql b/sql/updates/5015_world_scripts.sql
new file mode 100644
index 00000000000..db817c5634e
--- /dev/null
+++ b/sql/updates/5015_world_scripts.sql
@@ -0,0 +1,32 @@
+UPDATE gameobject_template SET ScriptName='go_shadowforge_brazier' WHERE entry IN (174744, 174745);
+
+UPDATE creature_template SET ScriptName='' WHERE entry IN (9034, 9035, 9036, 9038, 9040);
+
+UPDATE creature_template SET ScriptName='npc_rinji' WHERE entry=7780;
+
+DELETE FROM script_waypoint WHERE entry=7780;
+INSERT INTO script_waypoint VALUES
+(7780, 0, 261.058868, -2757.876221, 122.553, 0, ''),
+(7780, 1, 259.812195, -2758.249023, 122.555, 0, 'SAY_RIN_FREE'),
+(7780, 2, 253.823441, -2758.619141, 122.562, 0, ''),
+(7780, 3, 241.394791, -2769.754883, 123.309, 0, ''),
+(7780, 4, 218.915588, -2783.397461, 123.355, 0, ''),
+(7780, 5, 209.088196, -2789.676270, 122.001, 0, ''),
+(7780, 6, 204.453568, -2792.205811, 120.620, 0, ''),
+(7780, 7, 182.012604, -2809.995361, 113.887, 0, 'summon'),
+(7780, 8, 164.411591, -2825.162842, 107.779, 0, ''),
+(7780, 9, 149.727600, -2833.704346, 106.224, 0, ''),
+(7780, 10, 142.448074, -2838.807373, 109.665, 0, ''),
+(7780, 11, 133.274963, -2845.135254, 112.606, 0, ''),
+(7780, 12, 111.247459, -2861.065674, 116.305, 0, ''),
+(7780, 13, 96.104073, -2874.886230, 114.397, 0, 'summon'),
+(7780, 14, 73.369942, -2881.184570, 117.666, 0, ''),
+(7780, 15, 58.579178, -2889.151611, 116.253, 0, ''),
+(7780, 16, 33.214249, -2906.343994, 115.083, 0, ''),
+(7780, 17, 19.586519, -2908.712402, 117.276, 7500, 'SAY_RIN_COMPLETE'),
+(7780, 18, 10.282522, -2911.607422, 118.394, 0, ''),
+(7780, 19, -37.580383, -2942.730225, 117.145, 0, ''),
+(7780, 20, -68.599411, -2953.694824, 116.685, 0, ''),
+(7780, 21, -102.054253, -2956.965576, 116.677, 0, ''),
+(7780, 22, -135.993637, -2955.743652, 115.788, 0, ''),
+(7780, 23, -171.561600, -2951.417480, 115.451, 0, '');