* 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

8 files changed, 79 insertions, 75 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
diff --git a/sql/world_scripts_full.sql b/sql/world_scripts_full.sql
index 951b58bfd61..1a3c2bfd73d 100644
--- a/sql/world_scripts_full.sql
+++ b/sql/world_scripts_full.sql
@@ -18,9 +18,9 @@ UPDATE `gameobject_template` SET `ScriptName`='go_field_repair_bot_74A' where `e
 UPDATE `gameobject_template` SET `ScriptName`='go_orb_of_command' WHERE `entry`=179879;
 UPDATE `gameobject_template` SET `ScriptName`='go_tablet_of_madness' WHERE `entry`=180368;
 UPDATE `gameobject_template` SET `ScriptName`='go_tablet_of_the_seven' WHERE `entry`=169294;
-UPDATE `gameobject_template` set `ScriptName`='go_manticron_cube' where entry = 181713;
-UPDATE `gameobject_template` SET `ScriptName`='go_mausoleum_trigger' WHERE `entry` = 104593;
-UPDATE `gameobject_template` SET `ScriptName`='go_mausoleum_door' WHERE `entry` = 176594;
+UPDATE `gameobject_template` set `ScriptName`='go_manticron_cube' WHERE `entry`= 181713;
+UPDATE `gameobject_template` SET `ScriptName`='go_mausoleum_trigger' WHERE `entry`= 104593;
+UPDATE `gameobject_template` SET `ScriptName`='go_mausoleum_door' WHERE `entry`= 176594;
 UPDATE `gameobject_template` SET `scriptname`='go_crystal_prison' WHERE `entry`=185126;
 
 /* GUARD */
@@ -81,11 +81,11 @@ UPDATE `creature_template` SET `ScriptName`='npc_prof_leather' WHERE `entry` IN
 UPDATE `creature_template` SET `ScriptName`='npc_prof_tailor' WHERE `entry` IN (22208,22212,22213);
 UPDATE `creature_template` SET `ScriptName`='npc_rogue_trainer' WHERE `entry` IN (918,4163,3328,4583,5165,5167,13283,16684);
 UPDATE `creature_template` SET `ScriptName`='npc_sayge' WHERE `entry`=14822;
-UPDATE `creature_template` SET `ScriptName`='npc_steam_tonk' WHERE `entry` = 19405;
-UPDATE `creature_template` SET `ScriptName`='npc_tonk_mine' WHERE `entry` = 15368;
+UPDATE `creature_template` SET `ScriptName`='npc_steam_tonk' WHERE `entry`= 19405;
+UPDATE `creature_template` SET `ScriptName`='npc_tonk_mine' WHERE `entry`= 15368;
 UPDATE `creature_template` SET `ScriptName`='npc_winter_reveler' WHERE `entry`=15760;
 UPDATE `creature_template` SET `ScriptName`='npc_brewfest_reveler' WHERE `entry`=24484;
-UPDATE `creature_template` SET `ScriptName`='npc_snake_trap_serpents' where entry in (19921, 19833);
+UPDATE `creature_template` SET `ScriptName`='npc_snake_trap_serpents' WHERE `entry` IN (19921, 19833);
 
 /*  */
 /* ZONE */
@@ -98,13 +98,13 @@ UPDATE `creature_template` SET `ScriptName`='npc_ravenholdt' WHERE `entry`=13936
 
 
 /* ARATHI HIGHLANDS */
-UPDATE `creature_template` SET `ScriptName`='npc_professor_phizzlethorpe' where entry=2768;
+UPDATE `creature_template` SET `ScriptName`='npc_professor_phizzlethorpe' WHERE `entry`=2768;
 
 /* ASHENVALE */
 UPDATE `creature_template` SET `ScriptName`='mob_rizzle_sprysprocket' WHERE `entry`=23002;
 UPDATE `creature_template` SET `ScriptName`='mob_depth_charge' WHERE `entry`=23025;
 UPDATE `creature_template` SET `ScriptName`='npc_torek' WHERE `entry`=12858;
-UPDATE `creature_template` SET `ScriptName`='npc_ruul_snowhoof' WHERE `entry` = 12818;
+UPDATE `creature_template` SET `ScriptName`='npc_ruul_snowhoof' WHERE `entry`= 12818;
 
 /*  */
 /* AUCHINDOUN */
@@ -119,8 +119,8 @@ UPDATE `creature_template` SET `ScriptName`='mob_ethereal_beacon' WHERE `entry`=
 UPDATE `creature_template` SET `ScriptName`='boss_exarch_maladaar' WHERE `entry`=18373;
 UPDATE `creature_template` SET `ScriptName`='mob_avatar_of_martyred' WHERE `entry`=18478;
 UPDATE `creature_template` SET `ScriptName`='mob_stolen_soul' WHERE `entry`=18441;
-UPDATE `creature_template` SET `ScriptName`='boss_shirrak_the_dead_watcher' WHERE `entry` = '18371';
-UPDATE `creature_template` SET `ScriptName`='mob_focus_fire' WHERE `entry` = '18374';
+UPDATE `creature_template` SET `ScriptName`='boss_shirrak_the_dead_watcher' WHERE `entry`= '18371';
+UPDATE `creature_template` SET `ScriptName`='mob_focus_fire' WHERE `entry`= '18374';
 
 /* SETHEKK HALLS */
 UPDATE `instance_template` SET `script`='instance_sethekk_halls' WHERE `map`=556;
@@ -147,8 +147,8 @@ UPDATE `creature_template` SET `ScriptName`='npc_engineer_spark_overgrind' WHERE
 UPDATE `creature_template` SET `ScriptName`='npc_injured_draenei' WHERE `entry`=16971;
 UPDATE `creature_template` SET `ScriptName`='npc_susurrus' WHERE `entry`=17435;
 UPDATE `creature_template` SET `ScriptName`='npc_magwin' WHERE `entry`=17312;
-UPDATE `creature_template` SET `ScriptName`='npc_geezle' where entry=17318;
-UPDATE `creature_template` SET `ScriptName`='mob_nestlewood_owlkin' where entry=16518;
+UPDATE `creature_template` SET `ScriptName`='npc_geezle' WHERE `entry`=17318;
+UPDATE `creature_template` SET `ScriptName`='mob_nestlewood_owlkin' WHERE `entry`=16518;
 
 /* BADLANDS */
 
@@ -157,8 +157,8 @@ UPDATE `creature_template` SET `ScriptName`='mob_nestlewood_owlkin' where entry=
 UPDATE `creature_template` SET `ScriptName`='npc_beaten_corpse' WHERE `entry`=10668;
 UPDATE `creature_template` SET `ScriptName`='npc_sputtervalve' WHERE `entry`=3442;
 UPDATE `creature_template` SET `ScriptName`='npc_taskmaster_fizzule' WHERE `entry`=7233;
-UPDATE `creature_template` SET `ScriptName`='npc_twiggy_flathead' WHERE `entry` =6248;
-UPDATE `creature_template` SET `ScriptName`='npc_wizzlecrank_shredder' where entry=3439;
+UPDATE `creature_template` SET `ScriptName`='npc_twiggy_flathead' WHERE `entry`=6248;
+UPDATE `creature_template` SET `ScriptName`='npc_wizzlecrank_shredder' WHERE `entry`=3439;
 
 /* BLACK TEMPLE */
 UPDATE `instance_template` SET `script`='instance_black_temple' WHERE `map`=564;
@@ -342,9 +342,9 @@ UPDATE `creature_template` SET `ScriptName`='boss_fathomguard_caribdis' WHERE `e
 UPDATE `creature_template` SET `ScriptName`='boss_morogrim_tidewalker' WHERE `entry`=21213;
 UPDATE `creature_template` SET `ScriptName`='mob_water_globule' WHERE `entry`=21913;
 /* The Lurker Below */
-UPDATE `creature_template` SET `ScriptName`='boss_the_lurker_below' WHERE `entry` = '21217';
-UPDATE `creature_template` SET `ScriptName`='mob_coilfang_ambusher' WHERE `entry` = '21865';
-UPDATE `creature_template` SET `ScriptName`='mob_coilfang_guardian' WHERE `entry` = '21873';
+UPDATE `creature_template` SET `ScriptName`='boss_the_lurker_below' WHERE `entry`= '21217';
+UPDATE `creature_template` SET `ScriptName`='mob_coilfang_ambusher' WHERE `entry`= '21865';
+UPDATE `creature_template` SET `ScriptName`='mob_coilfang_guardian' WHERE `entry`= '21873';
 /* Lady Vashj event */
 UPDATE `creature_template` SET `ScriptName`='boss_lady_vashj' WHERE `entry`=21212;
 UPDATE `creature_template` SET `ScriptName`='mob_enchanted_elemental' WHERE `entry`=21958;
@@ -405,8 +405,8 @@ UPDATE `creature_template` SET `ScriptName`='mobs_mana_tapped' WHERE `entry` IN
 UPDATE `creature_template` SET `ScriptName`='npc_prospector_anvilward' WHERE `entry`=15420;
 UPDATE `creature_template` SET `ScriptName`='npc_second_trial_paladin' WHERE `entry` IN (17809,17810,17811,17812);
 UPDATE `creature_template` SET `ScriptName`='npc_second_trial_controller' WHERE `entry` IN (17807);
-UPDATE `creature_template` SET `ScriptName`='npc_apprentice_mirveda' where entry=15402;
-UPDATE `creature_template` SET `ScriptName`='npc_infused_crystal' where entry=16364;
+UPDATE `creature_template` SET `ScriptName`='npc_apprentice_mirveda' WHERE `entry`=15402;
+UPDATE `creature_template` SET `ScriptName`='npc_infused_crystal' WHERE `entry`=16364;
 UPDATE `gameobject_template` SET `ScriptName`='go_second_trial' WHERE `entry` IN (182052);
 
 /* FELWOOD */
@@ -421,7 +421,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_blood_knight_dawnstar' WHERE `e
 UPDATE `creature_template` SET `ScriptName`='npc_budd_nedreck' WHERE `entry`=23559;
 UPDATE `creature_template` SET `ScriptName`='npc_rathis_tomber' WHERE `entry`=16224;
 UPDATE `creature_template` SET `Scriptname`='npc_ranger_lilatha' WHERE entry=16295;
-update `gameobject_template` SET `ScriptName`='go_gilded_brazier' where entry = 181956;
+update `gameobject_template` SET `ScriptName`='go_gilded_brazier' WHERE `entry`= 181956;
 
 /* GNOMEREGAN */
 
@@ -453,10 +453,10 @@ UPDATE `creature_template` SET `ScriptName`='mob_shadowmoon_channeler' WHERE `en
 /* Vazruden,Omor the Unscarred,Watchkeeper Gargolmar */
 UPDATE `creature_template` SET `ScriptName`='boss_omor_the_unscarred' WHERE `entry`=17308;
 UPDATE `creature_template` SET `ScriptName`='boss_watchkeeper_gargolmar' WHERE `entry`=17306;
-UPDATE `creature_template` SET `ScriptName`='boss_vazruden_the_herald' WHERE `entry` = '17307';
-UPDATE `creature_template` SET `ScriptName`='boss_vazruden' WHERE `entry` = '17537';
-UPDATE `creature_template` SET `ScriptName`='boss_nazan' WHERE `entry` = '17536';
-UPDATE `creature_template` SET `ScriptName`='mob_hellfire_sentry' WHERE `entry` = '17517';
+UPDATE `creature_template` SET `ScriptName`='boss_vazruden_the_herald' WHERE `entry`= '17307';
+UPDATE `creature_template` SET `ScriptName`='boss_vazruden' WHERE `entry`= '17537';
+UPDATE `creature_template` SET `ScriptName`='boss_nazan' WHERE `entry`= '17536';
+UPDATE `creature_template` SET `ScriptName`='mob_hellfire_sentry' WHERE `entry`= '17517';
 	
 /* SHATTERED HALLS */
 /* Nethekurse and his spawned shadowfissure */
@@ -471,9 +471,9 @@ UPDATE `instance_template` SET `script`='instance_shattered_halls' WHERE `map`=5
 /* MAGTHERIDON'S LAIR */
 UPDATE `instance_template` SET `script`='instance_magtheridons_lair' WHERE `map`=544;
 UPDATE `gameobject_template` SET `ScriptName`='go_manticron_cube' WHERE `entry`=181713;
-UPDATE `creature_template` SET `ScriptName`='boss_magtheridon' WHERE `entry` =17257;
+UPDATE `creature_template` SET `ScriptName`='boss_magtheridon' WHERE `entry`=17257;
 UPDATE `creature_template` SET `ScriptName`='mob_hellfire_channeler' WHERE `entry`=17256;
-update `creature_template` SET `ScriptName`='mob_abyssal' where entry = 17454;
+update `creature_template` SET `ScriptName`='mob_abyssal' WHERE `entry`= 17454;
 
 /* HELLFIRE PENINSULA */
 UPDATE `creature_template` SET `ScriptName`='boss_doomlord_kazzak' WHERE `entry`=18728;
@@ -495,7 +495,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_royal_historian_archesonus' WHE
 UPDATE `creature_template` SET `ScriptName`='npc_ayren_cloudbreaker' WHERE `entry`=25059;
 UPDATE `creature_template` SET `ScriptName`='npc_converted_sentry' WHERE `entry`=24981;
 UPDATE `creature_template` SET `ScriptName`='npc_unrestrained_dragonhawk' WHERE `entry`=25236;
-UPDATE `creature_template` SET `ScriptName`='npc_greengill_slave' where entry=25084;
+UPDATE `creature_template` SET `ScriptName`='npc_greengill_slave' WHERE `entry`=25084;
 UPDATE `item_template` SET `ScriptName`='item_arcane_charges' WHERE `entry`=34475;
 
 /* KARAZHAN */
@@ -536,7 +536,7 @@ UPDATE `creature_template` SET `ScriptName`='netherspite_infernal' WHERE `entry`
 UPDATE `creature_template` SET `ScriptName`='npc_berthold' WHERE `entry`=16153;
 UPDATE `creature_template` SET `ScriptName`='npc_barnes' WHERE `entry`=16812;
 UPDATE `creature_template` SET `ScriptName`='npc_grandmother' WHERE `entry`=17603;
-UPDATE `creature_template` SET `ScriptName`='npc_image_of_medivh' where entry = 17651;
+UPDATE `creature_template` SET `ScriptName`='npc_image_of_medivh' WHERE `entry`= 17651;
 
 /* LOCH MODAN */
 UPDATE `creature_template` SET `ScriptName`='npc_mountaineer_pebblebitty' WHERE `entry`=3836;
@@ -591,7 +591,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_bunthen_plainswind' WHERE `entr
 UPDATE `creature_template` SET `ScriptName`='npc_great_bear_spirit' WHERE `entry`=11956;
 UPDATE `creature_template` SET `ScriptName`='npc_silva_filnaveth' WHERE `entry`=11800;
 UPDATE `creature_template` SET `ScriptName`='npc_clintar_dreamwalker' WHERE `entry`=22834;
-UPDATE `creature_template` SET `ScriptName`='npc_clintar_spirit' WHERE `entry` = 22916;
+UPDATE `creature_template` SET `ScriptName`='npc_clintar_spirit' WHERE `entry`= 22916;
 
 /* MULGORE */
 UPDATE `creature_template` SET `ScriptName`='npc_skorn_whitecloud' WHERE `entry`=3052;
@@ -635,8 +635,8 @@ UPDATE `gameobject_template` SET `ScriptName`='go_manaforge_control_console' WHE
 UPDATE `creature_template` SET `ScriptName`='npc_manaforge_control_console' WHERE `entry` IN (20209,20417,20418,20440);
 UPDATE `creature_template` SET `ScriptName`='npc_protectorate_nether_drake' WHERE `entry`=20903;
 UPDATE `creature_template` SET `ScriptName`='npc_veronia' WHERE `entry`=20162;
-UPDATE `creature_template` SET `ScriptName`='mob_phase_hunter' WHERE `entry` =18879;
-UPDATE `creature_template` SET `ScriptName`='npc_professor_dabiri' where entry=20907;
+UPDATE `creature_template` SET `ScriptName`='mob_phase_hunter' WHERE `entry`=18879;
+UPDATE `creature_template` SET `ScriptName`='npc_professor_dabiri' WHERE `entry`=20907;
 UPDATE `creature_template` SET `ScriptName`='npc_bessy' WHERE entry = 20415;
 
 /* ONYXIA'S LAIR */
@@ -673,9 +673,9 @@ UPDATE `creature_template` SET `ScriptName`='boss_houndmaster_loksey' WHERE `ent
 UPDATE `creature_template` SET `ScriptName`='boss_interrogator_vishas' WHERE `entry`=3983;
 UPDATE `creature_template` SET `ScriptName`='boss_scarlet_commander_mograine' WHERE `entry`=3976;
 UPDATE `creature_template` SET `ScriptName`='boss_scorn' WHERE `entry`=14693;
-UPDATE `creature_template` SET `ScriptName`='boss_headless_horseman' WHERE `entry` = 23682;
-UPDATE `creature_template` SET `ScriptName`='mob_head' WHERE `entry` = 23775;
-UPDATE `creature_template` SET `ScriptName`='mob_pulsing_pumpkin' WHERE `entry` = 23694;
+UPDATE `creature_template` SET `ScriptName`='boss_headless_horseman' WHERE `entry`= 23682;
+UPDATE `creature_template` SET `ScriptName`='mob_head' WHERE `entry`= 23775;
+UPDATE `creature_template` SET `ScriptName`='mob_pulsing_pumpkin' WHERE `entry`= 23694;
 UPDATE `creature_template` SET `ScriptName`='mob_wisp_invis' WHERE `entry`=23686;
 UPDATE `creature_template` SET `ScriptName`='mob_wisp_invis' WHERE `entry`=24034;
 UPDATE `creature_template` SET `ScriptName`='mob_scarlet_trainee' WHERE `entry`=6575;
@@ -722,16 +722,17 @@ UPDATE `creature_template` SET `ScriptName`='mob_illidari_spawn' WHERE `entry` I
 UPDATE `creature_template` SET `ScriptName`='mob_torloth_the_magnificent' WHERE `entry`='22076';
 UPDATE `creature_template` SET `ScriptName`='npc_lord_illidan_stormrage' WHERE `entry`=22083;
 UPDATE `creature_template` SET `ScriptName`='npc_earthmender_wilda' WHERE `entry`=21027;
+UPDATE `creature_template` SET `ScriptName`='npc_enraged_spirit' WHERE `entry` IN (21050, 21061, 21060, 21059);
 
 /* SHATTRATH */
 UPDATE `creature_template` SET `ScriptName`='npc_raliq_the_drunk' WHERE `entry`=18585;
 UPDATE `creature_template` SET `ScriptName`='npc_salsalabim' WHERE `entry`=18584;
 UPDATE `creature_template` SET `ScriptName`='npc_shattrathflaskvendors' WHERE `entry` IN (23483,23484);
 UPDATE `creature_template` SET `ScriptName`='npc_zephyr' WHERE `entry`=25967;
-UPDATE `creature_template` SET `ScriptName`='npc_kservant' WHERE `entry` = 19685;
-UPDATE `creature_template` SET `ScriptName`='npc_dirty_larry' where entry=19720;
+UPDATE `creature_template` SET `ScriptName`='npc_kservant' WHERE `entry`= 19685;
+UPDATE `creature_template` SET `ScriptName`='npc_dirty_larry' WHERE `entry`=19720;
 UPDATE `creature_template` SET `ScriptName`='npc_ishanah' WHERE `entry`=18538;
-UPDATE `creature_template` SET `ScriptName`='npc_khadgar' where entry=18166;
+UPDATE `creature_template` SET `ScriptName`='npc_khadgar' WHERE `entry`=18166;
 
 /* SILITHUS */
 UPDATE `creature_template` SET `ScriptName`='npcs_rutgar_and_frankal' WHERE `entry` IN (15170,15171);
@@ -743,13 +744,13 @@ UPDATE `creature_template` SET `ScriptName`='npc_blood_knight_stillblade' WHERE
 
 /* SILVERPINE FOREST */
 UPDATE `creature_template` SET `ScriptName`='npc_astor_hadren' WHERE `entry`=6497;
-UPDATE `creature_template` SET `ScriptName`='npc_deathstalker_erland' where entry=1978;
+UPDATE `creature_template` SET `ScriptName`='npc_deathstalker_erland' WHERE `entry`=1978;
 
 /* STOCKADES */
 
 /* STONETALON MOUNTAINS */
 UPDATE `creature_template` SET `ScriptName`='npc_braug_dimspirit' WHERE `entry`=4489;
-UPDATE `creature_template` SET `ScriptName`='npc_kaya_flathoof' where entry=11856;
+UPDATE `creature_template` SET `ScriptName`='npc_kaya_flathoof' WHERE `entry`=11856;
 
 /* STORMWIND CITY */
 UPDATE `creature_template` SET `ScriptName`='npc_archmage_malin' WHERE `entry`=2708;
@@ -785,12 +786,12 @@ UPDATE `creature_template` SET `ScriptName`='mob_freed_soul' WHERE `entry`=11136
 /* SUNWELL PLATEAU */
 update `instance_template` set `script` = 'instance_sunwell_plateau' where map = 580;
 UPDATE `creature_template` SET `ScriptName` = 'boss_brutallus' WHERE entry = 24882;
-UPDATE `creature_template` SET `ScriptName` = 'boss_felmyst' WHERE `entry` = 25038;
-UPDATE `creature_template` SET `ScriptName` = 'mob_felmyst_vapor' WHERE `entry` = 25265;
-UPDATE `creature_template` SET `ScriptName` = 'mob_felmyst_trail' WHERE `entry` = 25267;
-update `creature_template` set `ScriptName` = 'boss_sacrolash' where entry = 25165;
-update `creature_template` set `ScriptName` = 'boss_alythess' where entry = 25166;
-update `creature_template` set `ScriptName` = 'mob_shadow_image' where entry = 25214;
+UPDATE `creature_template` SET `ScriptName` = 'boss_felmyst' WHERE `entry`= 25038;
+UPDATE `creature_template` SET `ScriptName` = 'mob_felmyst_vapor' WHERE `entry`= 25265;
+UPDATE `creature_template` SET `ScriptName` = 'mob_felmyst_trail' WHERE `entry`= 25267;
+update `creature_template` set `ScriptName` = 'boss_sacrolash' WHERE `entry`= 25165;
+update `creature_template` set `ScriptName` = 'boss_alythess' WHERE `entry`= 25166;
+update `creature_template` set `ScriptName` = 'mob_shadow_image' WHERE `entry`= 25214;
 
 /* SWAMP OF SORROWS */
 
@@ -801,7 +802,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_custodian_of_time' WHERE `entry
 UPDATE `creature_template` SET `ScriptName`='npc_marin_noggenfogger' WHERE `entry`=7564;
 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 `ScriptName` = 'npc_OOX17' WHERE `entry`= 7784;
 
 /* TELDRASSIL */
 
@@ -834,8 +835,8 @@ UPDATE `creature_template` SET `ScriptName`='npc_millhouse_manastorm' WHERE `ent
 
 /* THE EYE */
 UPDATE `instance_template` SET `script`='instance_the_eye' WHERE `map`=550;
-UPDATE `gameobject_template` SET `ScriptName` = 'go_kael_orb' WHERE `entry` = 188173;
-UPDATE `gameobject_template` SET `ScriptName` = 'go_movie_orb' WHERE `entry` = 187578;
+UPDATE `gameobject_template` SET `ScriptName` = 'go_kael_orb' WHERE `entry`= 188173;
+UPDATE `gameobject_template` SET `ScriptName` = 'go_movie_orb' WHERE `entry`= 187578;
 /* The Eye Trash Mobs */
 UPDATE `creature_template` SET `ScriptName`='mob_crystalcore_devastator' WHERE `entry`=20040;
 /* Void Reaver event */
@@ -888,10 +889,10 @@ UPDATE `creature_template` SET `ScriptName`='mob_netherweb_victim' WHERE `entry`
 UPDATE `creature_template` SET `ScriptName`='mob_rotting_forest_rager' WHERE `entry`=22307;
 UPDATE `creature_template` SET `ScriptName`='npc_floon' WHERE `entry`=18588;
 UPDATE `creature_template` SET `ScriptName`='npc_skyguard_handler_irena' WHERE `entry`=23413;
-UPDATE `creature_template` SET `ScriptName`='npc_isla_starmane' where entry=18760;
+UPDATE `creature_template` SET `ScriptName`='npc_isla_starmane' WHERE `entry`=18760;
 
 /* THOUSAND NEEDLES */
-UPDATE `creature_template` SET `ScriptName` = 'npc_swiftmountain' WHERE `entry` = 10427;
+UPDATE `creature_template` SET `ScriptName` = 'npc_swiftmountain' WHERE `entry`= 10427;
 
 /* THUNDER BLUFF */
 UPDATE `creature_template` SET `ScriptName`='npc_cairne_bloodhoof' WHERE `entry`=3057;
@@ -911,7 +912,7 @@ UPDATE `gameobject_template` SET `ScriptName`='go_altar_of_the_keepers' WHERE `e
 UPDATE `gameobject_template` SET `ScriptName`='go_altar_of_archaedas' WHERE `entry`=133234;
 
 /* UN'GORO CRATER */
-UPDATE `creature_template` SET `ScriptName` = 'npc_ame' WHERE `entry` = 9623;
+UPDATE `creature_template` SET `ScriptName` = 'npc_ame' WHERE `entry`= 9623;
 
 /* UNDERCITY */
 UPDATE `creature_template` SET `ScriptName`='npc_lady_sylvanas_windrunner' WHERE `entry`=10181;
@@ -941,7 +942,7 @@ UPDATE `creature_template` SET `ScriptName`='npcs_ashyen_and_keleth' WHERE `entr
 UPDATE `creature_template` SET `ScriptName`='npc_cooshcoosh' WHERE `entry`=18586;
 UPDATE `creature_template` SET `ScriptName`='npc_elder_kuruti' WHERE `entry`=18197;
 UPDATE `creature_template` SET `ScriptName`='npc_mortog_steamhead' WHERE `entry`=23373;
-UPDATE `creature_template` SET `ScriptName`='npc_kayra_longmane' where entry=17969;
+UPDATE `creature_template` SET `ScriptName`='npc_kayra_longmane' WHERE `entry`=17969;
 
 /* ZUL'AMAN */
 UPDATE `instance_template` SET `script`='instance_zulaman' WHERE `map`=568;
diff --git a/sql/world_scripts_structure.sql b/sql/world_scripts_structure.sql
index dff8a54a806..3d4ae9911cb 100644
--- a/sql/world_scripts_structure.sql
+++ b/sql/world_scripts_structure.sql
@@ -1,5 +1,5 @@
 DROP TABLE IF EXISTS `custom_texts`;
-CREATE TABLE `custom_texts` (
+CREATE TABLE IF NOT EXISTS `custom_texts` (
   `entry` mediumint(8) NOT NULL,
   `content_default` text NOT NULL,
   `content_loc1` text,
@@ -10,9 +10,10 @@ CREATE TABLE `custom_texts` (
   `content_loc6` text,
   `content_loc7` text,
   `content_loc8` text,
-  `sound` mediumint(8) unsigned NOT NULL default '0',
-  `type` tinyint unsigned NOT NULL default '0',
-  `language` tinyint unsigned NOT NULL default '0',
+  `sound` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `language` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `emote` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `comment` text,
   PRIMARY KEY (`entry`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Custom Texts';
@@ -69,15 +70,16 @@ CREATE TABLE `eventai_texts` (
   `content_loc6` text,
   `content_loc7` text,
   `content_loc8` text,
-  `sound` mediumint(8) unsigned NOT NULL default '0',
-  `type` tinyint unsigned NOT NULL default '0',
-  `language` tinyint unsigned NOT NULL default '0',
+  `sound` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `language` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `emote` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `comment` text,
   PRIMARY KEY (`entry`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Script Texts';
 
 DROP TABLE IF EXISTS `script_texts`;
-CREATE TABLE `script_texts` (
+CREATE TABLE IF NOT EXISTS `script_texts` (
   `entry` mediumint(8) NOT NULL,
   `content_default` text NOT NULL,
   `content_loc1` text,
@@ -88,14 +90,16 @@ CREATE TABLE `script_texts` (
   `content_loc6` text,
   `content_loc7` text,
   `content_loc8` text,
-  `sound` mediumint(8) unsigned NOT NULL default '0',
-  `type` tinyint unsigned NOT NULL default '0',
-  `language` tinyint unsigned NOT NULL default '0',
+  `sound` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `language` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `emote` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `comment` text,
   PRIMARY KEY  (`entry`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Script Texts';
 
+DROP TABLE IF EXISTS `sd2_db_version`;
 DROP TABLE IF EXISTS `script_db_version`;
 CREATE TABLE `script_db_version` (
-  `version` varchar(255) NOT NULL default '' COMMENT 'Script Database version string'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+`version` varchar(255) NOT NULL default '' COMMENT 'Database version string'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
\ No newline at end of file