Merge [SD2]

r1251 Add waypoints for Hellmaw
r1252 Add missing SQL to *_full for script added in rev 1243
r1253 Increment count value only for alive creature in SL instance script. Some minor cleanup.
r1254 Fix typo, and not set friendly creature in combat with zone. Also add comments and re-order code for readability. Patch by astriconX - skip
r1255 Handle akama channelers in different way, fill list of guids only when needed for event. - skip
r1256 Clean up akama script and apply sd2 code style. - skip
r1257 Correct 2 waypoints and apply sd2 code style to related script.
r1258 Add basic support for quest 1560
r1259 Simplify way to summon druid creatures. Patch by Turok
r1260 Clean up two more world bosses, apply SD2 code style and simplify code. Add missing texts. Patch by Turok.

--HG--
branch : trunk

3 files changed, 33 insertions, 2 deletions

diff --git a/sql/FULL/world_script_waypoints.sql b/sql/FULL/world_script_waypoints.sql
index 3d705cd501d..91b416b5e3f 100644
--- a/sql/FULL/world_script_waypoints.sql
+++ b/sql/FULL/world_script_waypoints.sql
@@ -13,6 +13,18 @@ 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=18731;
+INSERT INTO script_waypoint VALUES
+(18731, 0, -157.366, 2.177, 8.073, 0, ''),
+(18731, 1, -172.266, -18.280, 8.073, 0, ''),
+(18731, 2, -171.051, -38.748, 8.073, 0, ''),
+(18731, 3, -170.718, -59.436, 8.073, 0, ''),
+(18731, 4, -156.659, -72.118, 8.073, 0, ''),
+(18731, 5, -142.292, -59.423, 8.073, 0, ''),
+(18731, 6, -141.779, -38.972, 8.073, 0, ''),
+(18731, 7, -142.922, -18.950, 8.073, 0, ''),
+(18731, 8, -157.366, 2.177, 8.073, 0, '');
+
 DELETE FROM script_waypoint WHERE entry=21027;
 INSERT INTO script_waypoint VALUES
 (21027, 0, -2714.697266, 1326.879395, 34.306953, 0, ''),
@@ -378,7 +390,7 @@ INSERT INTO script_waypoint VALUES
 
 DELETE FROM script_waypoint WHERE entry=2768;
 INSERT INTO script_waypoint VALUES
-(2768, 0, -2066.45, -2085.96, 9.08, 0, ''),
+(2768, 0, -2077.73, -2091.17, 9.49, 0, ''),
 (2768, 1, -2077.99, -2105.33, 13.24, 0, ''),
 (2768, 2, -2074.60, -2109.67, 14.24, 0, ''),
 (2768, 3, -2076.60, -2117.46, 16.67, 0, ''),
@@ -396,7 +408,7 @@ INSERT INTO script_waypoint VALUES
 (2768, 15, -2076.60, -2117.46, 16.67, 0, ''),
 (2768, 16, -2074.60, -2109.67, 14.24, 0, ''),
 (2768, 17, -2077.99, -2105.33, 13.24, 0, ''),
-(2768, 18, -2066.45, -2085.96, 9.08, 0, ''),
+(2768, 18, -2077.73, -2091.17, 9.49, 0, ''),
 (2768, 19, -2066.41, -2086.21, 8.97, 6000, ''),
 (2768, 20, -2066.41, -2086.21, 8.97, 2000, '');
 
diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql
index 26e51a5534f..4bd45feb993 100644
--- a/sql/FULL/world_scripts_full.sql
+++ b/sql/FULL/world_scripts_full.sql
@@ -910,6 +910,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_marin_noggenfogger' WHERE `entr
 UPDATE `creature_template` SET `ScriptName`='npc_steward_of_time' WHERE `entry`=20142;
 UPDATE `creature_template` SET `ScriptName`='npc_stone_watcher_of_norgannon' WHERE `entry`=7918;
 UPDATE `creature_template` SET `ScriptName`='npc_OOX17' WHERE `entry`=7784;
+UPDATE `creature_template` SET `ScriptNam`e='npc_tooga' WHERE `entry`=5955;
 
 /* TELDRASSIL */
 UPDATE `creature_template` SET `ScriptName`='npc_mist' WHERE `entry`=3568;
diff --git a/sql/updates/5012_world_scripts.sql b/sql/updates/5012_world_scripts.sql
new file mode 100644
index 00000000000..fa3b6e7a860
--- /dev/null
+++ b/sql/updates/5012_world_scripts.sql
@@ -0,0 +1,18 @@
+DELETE FROM script_waypoint WHERE entry=18731;
+INSERT INTO script_waypoint VALUES
+(18731, 0, -157.366, 2.177, 8.073, 0, ''),
+(18731, 1, -172.266, -18.280, 8.073, 0, ''),
+(18731, 2, -171.051, -38.748, 8.073, 0, ''),
+(18731, 3, -170.718, -59.436, 8.073, 0, ''),
+(18731, 4, -156.659, -72.118, 8.073, 0, ''),
+(18731, 5, -142.292, -59.423, 8.073, 0, ''),
+(18731, 6, -141.779, -38.972, 8.073, 0, ''),
+(18731, 7, -142.922, -18.950, 8.073, 0, ''),
+(18731, 8, -157.366, 2.177, 8.073, 0, '');
+
+DELETE FROM script_waypoint WHERE entry=2768 AND pointid IN (0, 18);
+INSERT INTO script_waypoint VALUES
+(2768, 0, -2077.73, -2091.17, 9.49, 0, ''),
+(2768, 18, -2077.73, -2091.17, 9.49, 0, '');
+
+UPDATE creature_template SET ScriptName='npc_tooga' WHERE entry=5955;