Added missing data to fulls and better format for sql update files.

--HG--
branch : trunk

5 files changed, 45 insertions, 18 deletions

diff --git a/sql/scripts/world_script_waypoints.sql b/sql/scripts/world_script_waypoints.sql
index 1c2dfe09eb4..3a5734d6d0e 100644
--- a/sql/scripts/world_script_waypoints.sql
+++ b/sql/scripts/world_script_waypoints.sql
@@ -2257,3 +2257,13 @@ INSERT INTO `script_waypoint` (`entry`, `pointid`, `location_x`,`location_y`, `l
 (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, '');
+
+-- Waypoints for Mimiron Inferno
+DELETE FROM `script_waypoint` WHERE `entry`=33370;
+INSERT INTO `script_waypoint` (`entry`, `pointid`, `location_x`, `location_y`, `location_z`, `waittime`, `point_comment`) VALUES
+(33370, 1, 331.674, -68.6878, 409.804, 0, '0'),
+(33370, 2, 274.578, -92.1829, 409.804, 0, '0'),
+(33370, 3, 226.433, -66.6652, 409.793, 0, '0'),
+(33370, 4, 206.092, -34.7447, 409.801, 0, '0'),
+(33370, 5, 240.208, 1.10346, 409.802, 0, '0'),
+(33370, 6, 337.199, 11.7051, 409.802, 0, '0');
diff --git a/sql/scripts/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql
index eb99451c348..2ec85dd2b47 100644
--- a/sql/scripts/world_scripts_full.sql
+++ b/sql/scripts/world_scripts_full.sql
@@ -36,7 +36,9 @@ INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
 (1737, 'at_scent_larkorwi'),
 (1738, 'at_scent_larkorwi'),
 (1739, 'at_scent_larkorwi'),
-(1740, 'at_scent_larkorwi');
+(1740, 'at_scent_larkorwi'),
+(5369, 'at_RX_214_repair_o_matic_station'),
+(5423, 'at_RX_214_repair_o_matic_station');
 
 
 /* WORLD BOSS */
@@ -1430,6 +1432,19 @@ UPDATE `creature_template` SET `ScriptName`='boss_kologarn' WHERE `entry`=32930;
 UPDATE `creature_template` SET `ScriptName`='boss_algalon' WHERE `entry`=32871;
 UPDATE `creature_template` SET `ScriptName`='mob_collapsing_star' WHERE `entry`=32955;
 UPDATE `gameobject_template` SET `ScriptName`='ulduar_teleporter' WHERE `entry`=194569;
+UPDATE `creature_template` SET `ScriptName`= 'npc_thorims_hammer' WHERE `entry`=33365;
+UPDATE `creature_template` SET `ScriptName`= 'npc_mimirons_inferno' WHERE `entry`=33370;
+UPDATE `creature_template` SET `ScriptName`= 'npc_hodirs_fury' WHERE `entry`=33312;
+UPDATE `creature_template` SET `ScriptName`= 'npc_freyas_ward' WHERE `entry`=33367;
+UPDATE `creature_template` SET `ScriptName`= 'npc_lorekeeper' WHERE `entry`=33686;
+UPDATE `creature_template` SET `ScriptName`= 'npc_brann_bronzebeard' WHERE `entry`=33579;
+UPDATE `creature_template` SET `ScriptName`= 'npc_freya_ward_summon' WHERE `entry`=34275;
+UPDATE `creature_template` SET `ScriptName`= 'npc_mechanolift' WHERE `entry`=33214;
+UPDATE `gameobject_template` SET `ScriptName`= 'go_ulduar_tower' WHERE `entry`=194375;
+UPDATE `gameobject_template` SET `ScriptName`= 'go_ulduar_tower' WHERE `entry`=194371;
+UPDATE `gameobject_template` SET `ScriptName`= 'go_ulduar_tower' WHERE `entry`=194370;
+UPDATE `gameobject_template` SET `ScriptName`= 'go_ulduar_tower' WHERE `entry`=194377;
+
 
 /* UN'GORO CRATER */
 UPDATE `creature_template` SET `ScriptName`='npc_ame' WHERE `entry`=9623;
diff --git a/sql/updates/8770_world_areatrigger_scripts.sql b/sql/updates/8770_world_areatrigger_scripts.sql
index 158ad414759..044725b3a5f 100644
--- a/sql/updates/8770_world_areatrigger_scripts.sql
+++ b/sql/updates/8770_world_areatrigger_scripts.sql
@@ -1,3 +1,4 @@
-INSERT INTO areatrigger_scripts VALUES
-(5369,'at_RX_214_repair_o_matic_station'),
-(5423,'at_RX_214_repair_o_matic_station');
\ No newline at end of file
+DELETE FROM `areatrigger_scripts` WHERE `entry` IN (5369,5423);
+INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
+(5369, 'at_RX_214_repair_o_matic_station'),
+(5423, 'at_RX_214_repair_o_matic_station');
diff --git a/sql/updates/8770_world_script_waypoints.sql b/sql/updates/8770_world_script_waypoints.sql
index a66c25db739..c2418f6da33 100644
--- a/sql/updates/8770_world_script_waypoints.sql
+++ b/sql/updates/8770_world_script_waypoints.sql
@@ -1,8 +1,9 @@
--- waypoint for mimron inferno
+-- Waypoints for Mimron Inferno
+DELETE FROM `script_waypoint` WHERE `entry`=33370;
 INSERT INTO `script_waypoint` (`entry`, `pointid`, `location_x`, `location_y`, `location_z`, `waittime`, `point_comment`) VALUES
 (33370, 1, 331.674, -68.6878, 409.804, 0, '0'),
 (33370, 2, 274.578, -92.1829, 409.804, 0, '0'),
 (33370, 3, 226.433, -66.6652, 409.793, 0, '0'),
 (33370, 4, 206.092, -34.7447, 409.801, 0, '0'),
 (33370, 5, 240.208, 1.10346, 409.802, 0, '0'),
-(33370, 6, 337.199, 11.7051, 409.802, 0, '0');
\ No newline at end of file
+(33370, 6, 337.199, 11.7051, 409.802, 0, '0');
diff --git a/sql/updates/8770_world_scriptname.sql b/sql/updates/8770_world_scriptname.sql
index 95277633d0e..e173f7e41f2 100644
--- a/sql/updates/8770_world_scriptname.sql
+++ b/sql/updates/8770_world_scriptname.sql
@@ -1,12 +1,12 @@
-UPDATE `creature_template` SET `ScriptName` = 'npc_thorims_hammer' WHERE `entry` =33365;
-UPDATE `creature_template` SET `MovementType` =2, `ScriptName` = 'npc_mimirons_inferno' WHERE `entry` =33370;
-UPDATE `creature_template` SET `ScriptName` = 'npc_hodirs_fury' WHERE `entry` =33312;
-UPDATE `creature_template` SET `ScriptName` = 'npc_freyas_ward' WHERE `entry` =33367;
-UPDATE `creature_template` SET `ScriptName` = 'npc_lorekeeper' WHERE `entry` =33686;
-UPDATE `creature_template` SET `ScriptName` = 'npc_brann_bronzebeard' WHERE `entry` =33579;
-UPDATE `creature_template` SET `ScriptName` = 'npc_freya_ward_summon' WHERE `entry` =34275;
-UPDATE `creature_template` SET `ScriptName` = 'npc_mechanolift' WHERE `entry` =33214;
-UPDATE `gameobject_template` SET `ScriptName` = 'go_ulduar_tower' WHERE `entry` =194375;
-UPDATE `gameobject_template` SET `ScriptName` = 'go_ulduar_tower' WHERE `entry` =194371;
-UPDATE `gameobject_template` SET `ScriptName` = 'go_ulduar_tower' WHERE `entry` =194370;
-UPDATE `gameobject_template` SET `ScriptName` = 'go_ulduar_tower' WHERE `entry` =194377;
\ No newline at end of file
+UPDATE `creature_template` SET `ScriptName`= 'npc_thorims_hammer' WHERE `entry`=33365;
+UPDATE `creature_template` SET `ScriptName`= 'npc_mimirons_inferno' WHERE `entry`=33370;
+UPDATE `creature_template` SET `ScriptName`= 'npc_hodirs_fury' WHERE `entry`=33312;
+UPDATE `creature_template` SET `ScriptName`= 'npc_freyas_ward' WHERE `entry`=33367;
+UPDATE `creature_template` SET `ScriptName`= 'npc_lorekeeper' WHERE `entry`=33686;
+UPDATE `creature_template` SET `ScriptName`= 'npc_brann_bronzebeard' WHERE `entry`=33579;
+UPDATE `creature_template` SET `ScriptName`= 'npc_freya_ward_summon' WHERE `entry`=34275;
+UPDATE `creature_template` SET `ScriptName`= 'npc_mechanolift' WHERE `entry`=33214;
+UPDATE `gameobject_template` SET `ScriptName`= 'go_ulduar_tower' WHERE `entry`=194375;
+UPDATE `gameobject_template` SET `ScriptName`= 'go_ulduar_tower' WHERE `entry`=194371;
+UPDATE `gameobject_template` SET `ScriptName`= 'go_ulduar_tower' WHERE `entry`=194370;
+UPDATE `gameobject_template` SET `ScriptName`= 'go_ulduar_tower' WHERE `entry`=194377;