* Added revision info to full tables up to revision are updated

* Removed some sqls from mangos already present in rev 3235
* Used trinity sql coding style

--HG--
branch : trunk

15 files changed, 19 insertions, 29 deletions

diff --git a/sql/trinityscript_script_texts.sql b/sql/trinityscript_script_texts.sql
index c3fb5d05a85..8cb34a7ee38 100644
--- a/sql/trinityscript_script_texts.sql
+++ b/sql/trinityscript_script_texts.sql
@@ -1,3 +1,4 @@
+-- Up to TC2 3515
 -- 
 -- trinityscript_script_texts.sql Contains data for table `script_texts` mainly used in C++ parts.
 -- valid entries for table are between -1000000 and -1999999
@@ -321,7 +322,9 @@ INSERT INTO `script_texts` (`entry`, `content_default`, `content_loc1`, `content
 (-1000403, 'We showed that one!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 7, 0, 'stilwell SAY_DS_DOWN_1'),
 (-1000404, 'One more down!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 7, 0, 'stilwell SAY_DS_DOWN_2'),
 (-1000405, 'We\'ve done it! We won!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 7, 0, 'stilwell SAY_DS_DOWN_3'),
-(-1000406, 'Meet me down by the orchard--I just need to put my gun away.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 7, 0, 'stilwell SAY_DS_PROLOGUE');
+(-1000406, 'Meet me down by the orchard--I just need to put my gun away.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 7, 0, 'stilwell SAY_DS_PROLOGUE'),
+(-1000411, 'Mist! I feared I would never see you again! Yes, I am well, do not worry for me. You must rest and recover your health.', 0, 0, 7, 0, 'mist SAY_AT_HOME'),
+(-1000412, 'growls in acknowledgement before straightening and making her way off into the forest.', 0, 2, 0, 0, 'mist EMOTE_AT_HOME');
 
 -- -1 033 000 SHADOWFANG KEEP
 INSERT INTO `script_texts` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`, `sound`, `type`, `language`, `emote`, `comment`) VALUES
diff --git a/sql/updates/7879_01_mangos_spell_proc_event.sql b/sql/updates/3500_mangos_7879_01_world_spell_proc_event.sql
index 0675b1904c4..66d712860a1 100644
--- a/sql/updates/7879_01_mangos_spell_proc_event.sql
+++ b/sql/updates/3500_mangos_7879_01_world_spell_proc_event.sql
@@ -1,5 +1,4 @@
-ALTER TABLE db_version CHANGE COLUMN required_7855_01_mangos_pools required_7879_01_mangos_spell_proc_event bit;
-
+/*ALTER TABLE db_version CHANGE COLUMN required_7855_01_mangos_pools required_7879_01_mangos_spell_proc_event bit;*/
 
 DELETE FROM spell_proc_event WHERE entry IN (31571, 31572);
 INSERT INTO spell_proc_event VALUES
diff --git a/sql/updates/3508_mangos_7886_01_world_petcreateinfo_spell.sql b/sql/updates/3508_mangos_7886_01_world_petcreateinfo_spell.sql
new file mode 100644
index 00000000000..13fbf2d57ce
--- /dev/null
+++ b/sql/updates/3508_mangos_7886_01_world_petcreateinfo_spell.sql
@@ -0,0 +1,3 @@
+/*ALTER TABLE db_version CHANGE COLUMN required_7884_02_mangos_playercreateinfo_action required_7886_01_mangos_petcreateinfo_spell bit;*/
+
+DROP TABLE IF EXISTS `petcreateinfo_spell`;
\ No newline at end of file
diff --git a/sql/updates/3508_mangos_7887_01_characters_character_pet.sql b/sql/updates/3508_mangos_7887_01_characters_character_pet.sql
new file mode 100644
index 00000000000..8b1a3bed568
--- /dev/null
+++ b/sql/updates/3508_mangos_7887_01_characters_character_pet.sql
@@ -0,0 +1,4 @@
+/*ALTER TABLE character_db_version CHANGE COLUMN required_7884_05_characters_character_action required_7887_01_characters_character_pet bit;*/
+
+ALTER TABLE `character_pet`
+  DROP TeachSpelldata;
\ No newline at end of file
diff --git a/sql/updates/7884_01_mangos_playercreateinfo_spell.sql b/sql/updates/7884_01_mangos_playercreateinfo_spell.sql
deleted file mode 100644
index f16e7e40ebc..00000000000
--- a/sql/updates/7884_01_mangos_playercreateinfo_spell.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE db_version CHANGE COLUMN required_7879_01_mangos_spell_proc_event required_7884_01_mangos_playercreateinfo_spell bit;
-
-DELETE FROM playercreateinfo_spell WHERE Spell = '28734';
\ No newline at end of file
diff --git a/sql/updates/7884_02_mangos_playercreateinfo_action.sql b/sql/updates/7884_02_mangos_playercreateinfo_action.sql
deleted file mode 100644
index c95375213c1..00000000000
--- a/sql/updates/7884_02_mangos_playercreateinfo_action.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE db_version CHANGE COLUMN required_7884_01_mangos_playercreateinfo_spell required_7884_02_mangos_playercreateinfo_action bit;
-
-DELETE FROM playercreateinfo_action WHERE action = '28734';
-UPDATE playercreateinfo_action SET button = '3' WHERE race = '10' AND class IN ('8', '9', '5', '2', '3') AND button = '4';
-UPDATE playercreateinfo_action SET button = '4' WHERE race = '10' AND class = '4' AND button = '5';
diff --git a/sql/updates/7884_03_characters_character_spell.sql b/sql/updates/7884_03_characters_character_spell.sql
deleted file mode 100644
index f428689f01d..00000000000
--- a/sql/updates/7884_03_characters_character_spell.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE character_db_version CHANGE COLUMN required_7802_02_characters_character_achievement_progress required_7884_03_characters_character_spell bit;
-
-DELETE FROM character_spell WHERE spell = '28734';
diff --git a/sql/updates/7884_04_characters_character_aura.sql b/sql/updates/7884_04_characters_character_aura.sql
deleted file mode 100644
index cfe19211d3f..00000000000
--- a/sql/updates/7884_04_characters_character_aura.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE character_db_version CHANGE COLUMN required_7884_03_characters_character_spell required_7884_04_characters_character_aura bit;
-
-DELETE FROM character_aura WHERE spell = '28734';
diff --git a/sql/updates/7884_05_characters_character_action.sql b/sql/updates/7884_05_characters_character_action.sql
deleted file mode 100644
index 8aa77cc6f3c..00000000000
--- a/sql/updates/7884_05_characters_character_action.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE character_db_version CHANGE COLUMN required_7884_04_characters_character_aura required_7884_05_characters_character_action bit;
-
-DELETE FROM  character_action WHERE action = '28734' AND type = '0';
\ No newline at end of file
diff --git a/sql/updates/7886_01_mangos_petcreateinfo_spell.sql b/sql/updates/7886_01_mangos_petcreateinfo_spell.sql
deleted file mode 100644
index 673d1b317f9..00000000000
--- a/sql/updates/7886_01_mangos_petcreateinfo_spell.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE db_version CHANGE COLUMN required_7884_02_mangos_playercreateinfo_action required_7886_01_mangos_petcreateinfo_spell bit;
-
-DROP TABLE IF EXISTS `petcreateinfo_spell`;
-
diff --git a/sql/updates/7887_01_characters_character_pet.sql b/sql/updates/7887_01_characters_character_pet.sql
deleted file mode 100644
index 2d61410ec11..00000000000
--- a/sql/updates/7887_01_characters_character_pet.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE character_db_version CHANGE COLUMN required_7884_05_characters_character_action required_7887_01_characters_character_pet bit;
-
-ALTER TABLE `character_pet`
-  DROP TeachSpelldata;
diff --git a/sql/world_script_waypoints.sql b/sql/world_script_waypoints.sql
index 48a890ac5fd..04e4c59c4d6 100644
--- a/sql/world_script_waypoints.sql
+++ b/sql/world_script_waypoints.sql
@@ -1,3 +1,5 @@
+-- Up to TC2 3515
+
 -- This file contains all waypoints used by escortAI scripts
 DROP TABLE IF EXISTS script_waypoint;
 CREATE TABLE script_waypoint (
diff --git a/sql/world_scripts_full.sql b/sql/world_scripts_full.sql
index b8423969e7d..2b7ad26c8de 100644
--- a/sql/world_scripts_full.sql
+++ b/sql/world_scripts_full.sql
@@ -1,3 +1,5 @@
+-- Up to TC2 3515
+
 /* WORLD BOSS */
 UPDATE `creature_template` SET `ScriptName`='boss_ysondre' WHERE `entry`=14887;
 UPDATE `creature_template` SET `ScriptName`='boss_emeriss' WHERE `entry`=14889;
diff --git a/sql/world_scripts_structure.sql b/sql/world_scripts_structure.sql
index a9fea4e7514..2aff81ba6c3 100644
--- a/sql/world_scripts_structure.sql
+++ b/sql/world_scripts_structure.sql
@@ -1,3 +1,5 @@
+-- Up to ACID 0.0.9
+
 DROP TABLE IF EXISTS `creature_ai_scripts`;
 CREATE TABLE `creature_ai_scripts` (
   `id` int(11) unsigned NOT NULL COMMENT 'Identifier' AUTO_INCREMENT,
diff --git a/sql/world_spell_full.sql b/sql/world_spell_full.sql
index ad631166731..a1c551f0bcc 100644
--- a/sql/world_spell_full.sql
+++ b/sql/world_spell_full.sql
@@ -1,4 +1,4 @@
--- Up to TC2 3312
+-- Up to TC2 3515
 
 -- --------
 -- LINKED