* Big cleanup in sql folder

* Redone Full sql with scripts
* Recommend you only reimport world_scripts_full + 3089_world_trinity_string of course

--HG--
branch : trunk

10 files changed, 11 insertions, 8 deletions

diff --git a/sql/updates/2.4.3_updates/1437_TC1_world_scripts.sql b/sql/updates/2.4.3_updates/1437_world_scripts.sql
index 7d53254cc5b..7d53254cc5b 100644
--- a/sql/updates/2.4.3_updates/1437_TC1_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/1437_world_scripts.sql
diff --git a/sql/updates/2996_world_trinity_string.sql b/sql/updates/2996_world_trinity_string.sql
index 761ad5d99ee..5bc66239ba2 100644
--- a/sql/updates/2996_world_trinity_string.sql
+++ b/sql/updates/2996_world_trinity_string.sql
@@ -42,4 +42,4 @@ INSERT INTO `trinity_string` VALUES
 (1329, 'The Alliance Team is running out of reinforcements!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (1330, 'The Horde Team is running out of reinforcements!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (1331, 'The Frostwolf General is Dead!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(1332, 'The Stormpike General is Dead!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+(1332, 'The Stormpike General is Dead!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
\ No newline at end of file
diff --git a/sql/updates/2997_world_trinity_string.sql b/sql/updates/2997_world_trinity_string.sql
index 51a3547ec30..e27f7d1fd9c 100644
--- a/sql/updates/2997_world_trinity_string.sql
+++ b/sql/updates/2997_world_trinity_string.sql
@@ -1,3 +1,3 @@
 DELETE FROM `trinity_string` WHERE `entry` = 5010;
 INSERT INTO `trinity_string` VALUES
-(5010,'linkGUID: %u, Entry: %u (%s)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+(5010,'linkGUID: %u, Entry: %u (%s)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
\ No newline at end of file
diff --git a/sql/updates/3005_world_scripts.sql b/sql/updates/3005_world_scripts.sql
deleted file mode 100644
index d2d5e4d0d84..00000000000
--- a/sql/updates/3005_world_scripts.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-update creature_template set scriptname = 'npc_unworthy_initiate' where entry in (29519,29520,29565,29566,29567);
-update creature_template set scriptname = 'npc_unworthy_initiate_anchor' where entry = 29521;
-update gameobject_template set scriptname = 'go_acherus_soul_prison' where entry in (191577,191580,191581,191582,191583,191584,191585,191586,191587,191588,191589,191590);
\ No newline at end of file
diff --git a/sql/updates/3008_1437_TC1_world_scripts.sql b/sql/updates/3008_1437_TC1_world_scripts.sql
new file mode 100644
index 00000000000..f4e4b7a1e9a
--- /dev/null
+++ b/sql/updates/3008_1437_TC1_world_scripts.sql
@@ -0,0 +1 @@
+UPDATE `gameobject_template` SET `ScriptName`='go_ethereum_prison' WHERE `entry` IN (184418,184419,184420,184421,184422,184423,184424,184425,184426,184427,184428,184429,184430,184431);
\ No newline at end of file
diff --git a/sql/updates/3030_world_scripts.sql b/sql/updates/3030_world_scripts.sql
new file mode 100644
index 00000000000..301e13244a8
--- /dev/null
+++ b/sql/updates/3030_world_scripts.sql
@@ -0,0 +1,3 @@
+UPDATE `creature_template` SET `ScriptName`='npc_unworthy_initiate' WHERE `entry` IN (29519,29520,29565,29566,29567);
+UPDATE `creature_template` SET `ScriptName`='npc_unworthy_initiate_anchor' WHERE `entry`=29521;
+UPDATE `gameobject_template` SET `ScriptName`='go_acherus_soul_prison' WHERE `entry` IN (191577,191580,191581,191582,191583,191584,191585,191586,191587,191588,191589,191590);
\ No newline at end of file
diff --git a/sql/updates/3039_world_spell_linked_spell.sql b/sql/updates/3039_world_spell_linked_spell.sql
index 82df917bf11..cc5bbc139ae 100644
--- a/sql/updates/3039_world_spell_linked_spell.sql
+++ b/sql/updates/3039_world_spell_linked_spell.sql
@@ -1,4 +1,3 @@
 DELETE FROM `spell_linked_spell` WHERE `spell_trigger` = 38528 AND `spell_effect` = -32124;
-
 INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
-(38528, -32124, 2, 'Protection of Elune - Denouement Wisp');
+(38528, -32124, 2, 'Protection of Elune - Denouement Wisp');
\ No newline at end of file
diff --git a/sql/updates/TC1_1463_world_scripts.sql b/sql/updates/3070_TC1_1463_world_scripts.sql
index cccf264f9ef..cccf264f9ef 100644
--- a/sql/updates/TC1_1463_world_scripts.sql
+++ b/sql/updates/3070_TC1_1463_world_scripts.sql
diff --git a/sql/updates/TC1_1465_world_scripts.sql b/sql/updates/3075_TC1_1465_world_scripts.sql
index ca1d88f5b5c..8ffe4aa1333 100644
--- a/sql/updates/TC1_1465_world_scripts.sql
+++ b/sql/updates/3075_TC1_1465_world_scripts.sql
@@ -1 +1 @@
-UPDATE `creature_template` SET `ScriptName` = 'mob_fiendish_imp' WHERE `entry` = 17267;
+UPDATE `creature_template` SET `ScriptName` = 'mob_fiendish_imp' WHERE `entry` = 17267;
\ No newline at end of file
diff --git a/sql/updates/3089_world_trinity_string.sql b/sql/updates/3089_world_trinity_string.sql
new file mode 100644
index 00000000000..274ad62e546
--- /dev/null
+++ b/sql/updates/3089_world_trinity_string.sql
@@ -0,0 +1,3 @@
+DELETE FROM `trinity_string` WHERE `entry` IN (101);

+INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES

+(101, 'Map: %u (%s) Zone: %u (%s) Area: %u (%s) Phase: %u\nX: %f Y: %f Z: %f Orientation: %f\ngrid[%u,%u]cell[%u,%u] InstanceID: %u\n ZoneX: %f ZoneY: %f\nGroundZ: %f FloorZ: %f Have height data (Map: %u VMap: %u)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
\ No newline at end of file