From abdddf36ff16ab5be7080349c86217bb69a06ddf Mon Sep 17 00:00:00 2001
From: Drahy <none@none>
Date: Sun, 8 Mar 2009 12:05:57 +0100
Subject: * Trinity sql coding style * Renamed 1725 to 1730 * Added scripts to
 full script file

--HG--
branch : trunk
---
 sql/updates/1725_world.sql        | 5 -----
 sql/updates/1727_world.sql        | 2 +-
 sql/updates/1727_world_script.sql | 6 +++---
 sql/updates/1729_world.sql        | 6 +++---
 sql/updates/1730_world.sql        | 4 ++++
 sql/updates/CMakeLists.txt        | 3 +++
 sql/world_scripts_full.sql        | 3 +++
 7 files changed, 17 insertions(+), 12 deletions(-)
 delete mode 100644 sql/updates/1725_world.sql
 create mode 100644 sql/updates/1730_world.sql

(limited to 'sql')

diff --git a/sql/updates/1725_world.sql b/sql/updates/1725_world.sql
deleted file mode 100644
index 9758dd0a678..00000000000
--- a/sql/updates/1725_world.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- Faerie fire
-INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `comments`) VALUES
-('60089', '0', '0', '0.05', 'Druid - Faerie Fire (Bear Form)');
--- Glyph of Devastate
-INSERT INTO `spell_proc_event` VALUES (58388, 0x00, 4, 0x00000040, 0x00000000, 0x00000000, 0x00000110, 0x00000000, 0.000000, 0.000000, 0);
\ No newline at end of file
diff --git a/sql/updates/1727_world.sql b/sql/updates/1727_world.sql
index 0d041f2efb0..07089e166b0 100644
--- a/sql/updates/1727_world.sql
+++ b/sql/updates/1727_world.sql
@@ -1 +1 @@
-insert into spell_script_target values (42857,1,23954);
\ No newline at end of file
+INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES (42857,1,23954);
\ No newline at end of file
diff --git a/sql/updates/1727_world_script.sql b/sql/updates/1727_world_script.sql
index 670ea52ec33..b1bd036c9ca 100644
--- a/sql/updates/1727_world_script.sql
+++ b/sql/updates/1727_world_script.sql
@@ -1,3 +1,3 @@
-update creature_template set scriptname = 'boss_ingvar_the_plunderer' where entry = 23954;
-update creature_template set scriptname = 'mob_annhylde_the_caller' where entry = 24068;
-update creature_template set scriptname = 'mob_ingvar_throw_dummy' where entry = 23997;
\ No newline at end of file
+UPDATE `creature_template` SET `ScriptName`='boss_ingvar_the_plunderer' WHERE `entry`=23954;
+UPDATE `creature_template` SET `ScriptName`='mob_annhylde_the_caller' WHERE `entry`=24068;
+UPDATE `creature_template` SET `ScriptName`='mob_ingvar_throw_dummy' WHERE `entry`=23997;
\ No newline at end of file
diff --git a/sql/updates/1729_world.sql b/sql/updates/1729_world.sql
index 8e0c4abe669..9691e1e7059 100644
--- a/sql/updates/1729_world.sql
+++ b/sql/updates/1729_world.sql
@@ -1,4 +1,4 @@
 -- Judgements of the Wise
-INSERT INTO `spell_proc_event` VALUES (31876, 0x00, 10, 0x20180400, 0x0000008, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0);
-INSERT INTO `spell_proc_event` VALUES (31877, 0x00, 10, 0x20180400, 0x0000008, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0);
-INSERT INTO `spell_proc_event` VALUES (31878, 0x00, 10, 0x20180400, 0x0000008, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0);
+REPLACE INTO `spell_proc_event` VALUES (31876, 0x00, 10, 0x20180400, 0x0000008, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0);
+REPLACE INTO `spell_proc_event` VALUES (31877, 0x00, 10, 0x20180400, 0x0000008, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0);
+REPLACE INTO `spell_proc_event` VALUES (31878, 0x00, 10, 0x20180400, 0x0000008, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0);
\ No newline at end of file
diff --git a/sql/updates/1730_world.sql b/sql/updates/1730_world.sql
new file mode 100644
index 00000000000..7bf2425186f
--- /dev/null
+++ b/sql/updates/1730_world.sql
@@ -0,0 +1,4 @@
+-- Faerie fire
+INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `comments`) VALUES ('60089', '0', '0', '0.05', 'Druid - Faerie Fire (Bear Form)');
+-- Glyph of Devastate
+INSERT INTO `spell_proc_event` VALUES (58388, 0x00, 4, 0x00000040, 0x00000000, 0x00000000, 0x00000110, 0x00000000, 0.000000, 0.000000, 0);
\ No newline at end of file
diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt
index dca714ef413..0ca75b20f73 100644
--- a/sql/updates/CMakeLists.txt
+++ b/sql/updates/CMakeLists.txt
@@ -66,5 +66,8 @@ INSTALL(FILES
 1703_world.sql
 1709_mangos_7393_01_world_game_event.sql
 1724_mangos_7399_01_world_trinity_string.sql
+1727_world.sql
+1727_world_script.sql
 1729_world.sql
+1730_world.sql
 DESTINATION share/trinity/sql/updates)
\ No newline at end of file
diff --git a/sql/world_scripts_full.sql b/sql/world_scripts_full.sql
index bd43ba4c4a5..b2608973228 100644
--- a/sql/world_scripts_full.sql
+++ b/sql/world_scripts_full.sql
@@ -908,6 +908,9 @@ UPDATE `instance_template` SET `script`='instance_utgarde_keep' WHERE `map`= '57
 UPDATE `creature_template` SET `ScriptName`='mob_vrykul_skeleton' WHERE `entry`=23970;
 UPDATE `creature_template` SET `ScriptName`= 'boss_skarvald_the_constructor' WHERE `entry` IN (24200,27390);
 UPDATE `creature_template` SET `ScriptName`= 'boss_dalronn_the_controller' WHERE `entry` IN (24201,27389);
+UPDATE `creature_template` SET `ScriptName`='boss_ingvar_the_plunderer' WHERE `entry`=23954;
+UPDATE `creature_template` SET `ScriptName`='mob_annhylde_the_caller' WHERE `entry`=24068;
+UPDATE `creature_template` SET `ScriptName`='mob_ingvar_throw_dummy' WHERE `entry`=23997;
 
 /* WAILING CAVERNS */
 
-- 
cgit v1.2.3