* Updated script structure according to newest ACID 0.0.6 for trinity

* Updated some of world sql files - not all of them yet
* Cleaned up full script sql

--HG--
branch : trunk

6 files changed, 9 insertions, 10 deletions

diff --git a/sql/updates/679_world_scripts.sql b/sql/updates/679_world_scripts.sql
index 15d43204734..408eb77b046 100644
--- a/sql/updates/679_world_scripts.sql
+++ b/sql/updates/679_world_scripts.sql
@@ -1 +1 @@
-update creature_template set scriptname='npc_deathstalker_erland' where entry=1978;
\ No newline at end of file
+UPDATE `creature_template` SET `ScriptName`='npc_deathstalker_erland' WHERE `entry`=1978;
\ No newline at end of file
diff --git a/sql/updates/683_world_scripts.sql b/sql/updates/683_world_scripts.sql
index 6463adad08e..13f18008438 100644
--- a/sql/updates/683_world_scripts.sql
+++ b/sql/updates/683_world_scripts.sql
@@ -1,2 +1,2 @@
-update quest_template set specialflags=2 where entry=665;
-update creature_template set scriptname='npc_professor_phizzlethorpe' where entry=2768;
\ No newline at end of file
+UPDATE `quest_template` SET `SpecialFlags`=2 WHERE `entry`=665;
+UPDATE `creature_template` SET `ScriptName`='npc_professor_phizzlethorpe' WHERE `entry`=2768;
\ No newline at end of file
diff --git a/sql/updates/686_world_scripts.sql b/sql/updates/686_world_scripts.sql
index 80d0468c361..b793036e463 100644
--- a/sql/updates/686_world_scripts.sql
+++ b/sql/updates/686_world_scripts.sql
@@ -1,7 +1,7 @@
 UPDATE `creature_template` SET `Scriptname`='npc_willix' WHERE entry=4508;
 
-DELETE FROM script_texts WHERE entry BETWEEN -1047000 and -1047010;
-INSERT INTO script_texts (entry, content_default, sound, type, language, comment) VALUES
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1047000 and -1047010;
+INSERT INTO `script_texts` (entry, content_default, sound, type, language, comment) VALUES
 (-1047000, 'Phew! Finally,out here. However, it will not become easy. Detain your eyes after annoyance.', 0, 0, 0, 'Willix'),
 (-1047001, 'There on top resides Charlga Razorflank. The damned old Crone.', 0, 0, 0, 'Willix'),
 (-1047002, 'Help! Get this Raging Agam\'ar from me!', 0, 0, 0, 'Willix'),
diff --git a/sql/updates/691_world_scripts.sql b/sql/updates/691_world_scripts.sql
index 6c26e149e8c..922f4b24fab 100644
--- a/sql/updates/691_world_scripts.sql
+++ b/sql/updates/691_world_scripts.sql
@@ -1 +1 @@
-update creature_template set scriptname='npc_earthmender_wilda' where entry=21027;
\ No newline at end of file
+UPDATE `creature_template` SET `ScriptName`='npc_earthmender_wilda' WHERE `entry`=21027;
\ No newline at end of file
diff --git a/sql/updates/970_world_scripts.sql b/sql/updates/970_world_scripts.sql
index 9e66e60f65d..3394b71ab20 100644
--- a/sql/updates/970_world_scripts.sql
+++ b/sql/updates/970_world_scripts.sql
@@ -1,9 +1,8 @@
-DELETE FROM script_texts WHERE entry BETWEEN -1000401 AND -1000396;
-INSERT INTO script_texts (entry, content_default, type, language, comment) VALUES
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000401 AND -1000396;
+INSERT INTO `script_texts` (entry, content_default, type, language, comment) VALUES
 (-1000396, 'Muahahahaha! You fool! You\'ve released me from my banishment in the interstices between space and time!', 0, 0, 'mobs_nether_drake - SAY_NIHIL_1'),
 (-1000397, 'All of Draenor shall quick beneath my feet! I will destroy this world and reshape it in my image!', 0, 0, 'mobs_nether_drake - SAY_NIHIL_2'),
 (-1000398, 'Where shall I begin? I cannot bother myself with a worm such as yourself. There is a world to be conquered!', 0, 0, 'mobs_nether_Drake - SAY_NIHIL_3'),
 (-1000399, 'No doubt the fools that banished me are long dead. I shall take wing survey my demense. Pray to whatever gods you hold dear that we do not meet again.', 0, 0, 'mobs_nether_drake - SAY_NIHIL_4'),
 (-1000400, 'NOOOOooooooo!', 1, 0, 'mobs_nether_drake - SAY_NIHIL_INTERRUPT'),
-
 (-1000401, 'Good $N, you are under the spell\'s influence. I must analyze it quickly, then we can talk.', 0, 7, 'npc_daranelle - SAY_DARANELLE');
diff --git a/sql/updates/973_world_scripts.sql b/sql/updates/973_world_scripts.sql
index 42b970aaed6..ea997f917ff 100644
--- a/sql/updates/973_world_scripts.sql
+++ b/sql/updates/973_world_scripts.sql
@@ -1 +1 @@
-update creature_template set scriptname = 'npc_enraged_spirit' where entry in (21050, 21061, 21060, 21059);
\ No newline at end of file
+UPDATE `creature_template` SET `ScriptName`='npc_enraged_spirit' WHERE `entry` IN (21050, 21061, 21060, 21059);
\ No newline at end of file