* Again big clean up of sql files

* Fixed 1414_world_scripts.sql to proper format
* Deleted not needed 1414_world.sql after 1325_world.sql was deleted

--HG--
branch : trunk

11 files changed, 51 insertions, 62 deletions

diff --git a/sql/updates/1312_world.sql b/sql/updates/1312_world.sql
index 3a0b5a6777a..01a27d0fa48 100644
--- a/sql/updates/1312_world.sql
+++ b/sql/updates/1312_world.sql
@@ -13,5 +13,4 @@ INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,
 -- REPLACE INTO `creature_template` (`entry`, `heroic_entry`, `modelid_A`, `modelid_A2`, `modelid_H`, `modelid_H2`, `name`, `subname`, `IconName`, `minlevel`, `maxlevel`, `minhealth`, `maxhealth`, `minmana`, `maxmana`, `armor`, `faction_A`, `faction_H`, `npcflag`, `speed`, `scale`, `rank`, `mindmg`, `maxdmg`, `dmgschool`, `attackpower`, `baseattacktime`, `rangeattacktime`, `unit_flags`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `class`, `race`, `minrangedmg`, `maxrangedmg`, `rangedattackpower`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `resistance1`, `resistance2`, `resistance3`, `resistance4`, `resistance5`, `resistance6`, `spell1`, `spell2`, `spell3`, `spell4`, `PetSpellDataId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `InhabitType`, `RacialLeader`, `RegenHealth`, `equipment_id`, `mechanic_immune_mask`, `flags_extra`, `ScriptName`) VALUES
 -- (23953, 0, 25338, 0, 25338, 0, 'Prince Keleseth', NULL, NULL, 70, 80, 192200, 417056, 0, 0, 6700, 16, 16, 2, 1, 1, 0, 445, 1200, 0, 58, 2000, 2200, 0, 0, 0, 0, 0, 0, 0, 1, 2, 100, 6, 76, 23953, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '0', 0, 3, 3, 0, 0, 0, 0, 'boss_keleseth'),
 -- (23965, 0, 25865, 0, 25865, 0, 'Frost Tomb', NULL, NULL, 70, 80, 7345, 10465, 0, 0, 6700, 16, 16, 0, 1, 1, 0, 445, 1200, 0, 58, 2000, 2200, 0, 0, 0, 0, 0, 0, 0, 1, 2, 100, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '0', 0, 3, 3, 0, 0, 0, 0, 'mob_frost_tomb'),
--- (23970, 0, 27651, 0, 27651, 0, 'Vrykul Skeleton', NULL, NULL, 70, 80, 7345, 10465, 0, 0, 6700, 16, 16, 0, 1, 1, 0, 445, 1200, 0, 58, 2000, 2200, 0, 0, 0, 0, 0, 0, 0, 1, 2, 100, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '0', 0, 3, 3, 0, 716, 0, 0, '0');
-
+-- (23970, 0, 27651, 0, 27651, 0, 'Vrykul Skeleton', NULL, NULL, 70, 80, 7345, 10465, 0, 0, 6700, 16, 16, 0, 1, 1, 0, 445, 1200, 0, 58, 2000, 2200, 0, 0, 0, 0, 0, 0, 0, 1, 2, 100, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '0', 0, 3, 3, 0, 716, 0, 0, '0');
\ No newline at end of file
diff --git a/sql/updates/1327_world.sql b/sql/updates/1327_world.sql
index 61ae8ded684..e7925102863 100644
--- a/sql/updates/1327_world.sql
+++ b/sql/updates/1327_world.sql
@@ -1,4 +1,4 @@
 ALTER TABLE `creature_template` ADD COLUMN `spell5` mediumint(8) unsigned NOT NULL default '0' AFTER `spell4`;
 ALTER TABLE `creature_template` ADD COLUMN `spell6` mediumint(8) unsigned NOT NULL default '0' AFTER `spell5`;
 ALTER TABLE `creature_template` ADD COLUMN `spell7` mediumint(8) unsigned NOT NULL default '0' AFTER `spell6`;
-ALTER TABLE `creature_template` ADD COLUMN `spell8` mediumint(8) unsigned NOT NULL default '0' AFTER `spell7`;
+ALTER TABLE `creature_template` ADD COLUMN `spell8` mediumint(8) unsigned NOT NULL default '0' AFTER `spell7`;
\ No newline at end of file
diff --git a/sql/updates/1396_mangos_7267_01_characters_auctionhouse.sql b/sql/updates/1396_mangos_7267_01_characters_auctionhouse.sql
new file mode 100644
index 00000000000..7f9e9758946
--- /dev/null
+++ b/sql/updates/1396_mangos_7267_01_characters_auctionhouse.sql
@@ -0,0 +1,4 @@
+/*ALTER TABLE character_db_version CHANGE COLUMN required_7255_01_characters_characters required_7267_01_characters_auctionhouse bit;*/
+
+ALTER TABLE auctionhouse
+  DROP COLUMN location;
\ No newline at end of file
diff --git a/sql/updates/1414_world.sql b/sql/updates/1414_world.sql
deleted file mode 100644
index 9ac90c40385..00000000000
--- a/sql/updates/1414_world.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE `quest_template` DROP COLUMN `RewChoiceItemId7`;
-ALTER TABLE `quest_template` DROP COLUMN `RewChoiceItemCount7`;
diff --git a/sql/updates/1414_world_scripts.sql b/sql/updates/1414_world_scripts.sql
index a6b2e374460..3ee9245bc51 100644
--- a/sql/updates/1414_world_scripts.sql
+++ b/sql/updates/1414_world_scripts.sql
@@ -1,21 +1,16 @@
--- r826_scriptdev2_script_texts.sql
-ALTER TABLE eventai_texts ADD COLUMN emote tinyint(3) UNSIGNED DEFAULT '0' NOT NULL AFTER language;
-
-
 -- r847_scriptdev2_script_texts.sql
-UPDATE script_texts SET emote=15 WHERE entry=-1000123;
-UPDATE script_texts SET emote=1 WHERE entry=-1560028;
-UPDATE script_texts SET emote=1 WHERE entry=-1560031;
-UPDATE script_texts SET emote=5 WHERE entry=-1560032;
-UPDATE script_texts SET emote=16 WHERE entry=-1000119;
-UPDATE script_texts SET emote=254 WHERE entry=-1249002;
-UPDATE script_texts SET emote=293 WHERE entry=-1249003;
-UPDATE script_texts SET emote=1 WHERE entry=-1033000;
-
+UPDATE `script_texts` SET emote=15 WHERE `entry`=-1000123;
+UPDATE `script_texts` SET emote=1 WHERE `entry`=-1560028;
+UPDATE `script_texts` SET emote=1 WHERE `entry`=-1560031;
+UPDATE `script_texts` SET emote=5 WHERE `entry`=-1560032;
+UPDATE `script_texts` SET emote=16 WHERE `entry`=-1000119;
+UPDATE `script_texts` SET emote=254 WHERE `entry`=-1249002;
+UPDATE `script_texts` SET emote=293 WHERE `entry`=-1249003;
+UPDATE `script_texts` SET emote=1 WHERE `entry`=-1033000;
 
 -- r848_scriptdev2_script_texts.sql
-DELETE FROM script_texts WHERE entry BETWEEN -1540047 AND -1540042;
-INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1540047 AND -1540042;
+INSERT INTO `script_texts` (entry,content_default,sound,type,language,emote,comment) VALUES
 (-1540042,'Ours is the true Horde! The only Horde!',10323,1,0,0,'kargath SAY_AGGRO1'),
 (-1540043,'I\'ll carve the meat from your bones!',10324,1,0,0,'kargath SAY_AGGRO2'),
 (-1540044,'I am called Bladefist for a reason, as you will see!',10325,1,0,0,'kargath SAY_AGGRO3'),
@@ -23,8 +18,8 @@ INSERT INTO script_texts (entry,content_default,sound,type,language,emote,commen
 (-1540046,'I am the only Warchief!',10327,1,0,0,'kargath SAY_SLAY2'),
 (-1540047,'The true Horde... will.. prevail...',10328,1,0,0,'kargath SAY_DEATH');
 
-DELETE FROM script_texts WHERE entry BETWEEN -1533118 AND -1533109;
-INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533118 AND -1533109;
+INSERT INTO `script_texts` (entry,content_default,sound,type,language,emote,comment) VALUES
 (-1533109,'You are mine now!',8825,1,0,0,'heigan SAY_AGGRO1'),
 (-1533110,'I see you!',8826,1,0,0,'heigan SAY_AGGRO2'),
 (-1533111,'You...are next!',8827,1,0,0,'heigan SAY_AGGRO3'),
@@ -36,29 +31,27 @@ INSERT INTO script_texts (entry,content_default,sound,type,language,emote,commen
 (-1533117,'Hungry worms will feast on your rotten flesh!',8834,1,0,0,'heigan SAY_TAUNT5'),
 (-1533118,'Noo... o...',8828,1,0,0,'heigan SAY_DEATH');
 
-
 -- r849_scriptdev2_script_texts.sql
-DELETE FROM script_texts WHERE entry=-1070000;
-INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
+DELETE FROM `script_texts` WHERE `entry`=-1070000;
+INSERT INTO `script_texts` (entry,content_default,sound,type,language,emote,comment) VALUES
 (-1070000,'None may steal the secrets of the makers!',5851,1,0,0,'ironaya SAY_AGGRO');
 
-DELETE FROM script_texts WHERE entry BETWEEN -1129004 AND -1129000;
-INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1129004 AND -1129000;
+INSERT INTO `script_texts` (entry,content_default,sound,type,language,emote,comment) VALUES
 (-1129000,'You\'ll never leave this place... alive.',5825,1,0,0,'amnennar SAY_AGGRO'),
 (-1129001,'To me, my servants!',5828,1,0,0,'amnennar SAY_SUMMON60'),
 (-1129002,'Come, spirits, attend your master!',5829,1,0,0,'amnennar SAY_SUMMON30'),
 (-1129003,'I am the hand of the Lich King!',5827,1,0,0,'amnennar SAY_HP'),
 (-1129004,'Too...easy!',5826,1,0,0,'amnennar SAY_KILL');
 
-DELETE FROM script_texts WHERE entry IN (-1230001,-1230002);
-INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
+DELETE FROM `script_texts` WHERE `entry` IN (-1230002,-1230001);
+INSERT INTO `script_texts` (entry,content_default,sound,type,language,emote,comment) VALUES
 (-1230001,'Come to aid the Throne!',0,1,0,0,'dagran SAY_AGGRO'),
 (-1230002,'Hail to the king, baby!',0,1,0,0,'dagran SAY_SLAY');
 
-
 -- r852_scriptdev2_script_texts.sql
-DELETE FROM script_texts WHERE entry BETWEEN -1189021 AND -1189011;
-INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1189021 AND -1189011;
+INSERT INTO `script_texts` (entry,content_default,sound,type,language,emote,comment) VALUES
 (-1189011,'Tell me... tell me everything!',5847,1,0,0,'vishas SAY_AGGRO'),
 (-1189012,'Naughty secrets!',5849,1,0,0,'vishas SAY_HEALTH1'),
 (-1189013,'I\'ll rip the secrets from your flesh!',5850,1,0,0,'vishas SAY_HEALTH2'),
@@ -71,10 +64,9 @@ INSERT INTO script_texts (entry,content_default,sound,type,language,emote,commen
 (-1189020,'Burn in righteous fire!',5843,1,0,0,'doan SAY_SPECIALAE'),
 (-1189021,'Release the hounds!',5841,1,0,0,'loksey SAY_AGGRO');
 
-
 -- r854_scriptdev2_script_texts.sql
-DELETE FROM script_texts WHERE entry BETWEEN -1070001 AND -1070006;
-INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1070006 AND -1070001;
+INSERT INTO `script_texts` (entry,content_default,sound,type,language,emote,comment) VALUES
 (-1070001,'Taste blade, mongrel!',0,0,0,0,'SAY_GUARD_SIL_AGGRO1'),
 (-1070002,'Please tell me that you didn\'t just do what I think you just did. Please tell me that I\'m not going to have to hurt you...',0,0,0,0,'SAY_GUARD_SIL_AGGRO2'),
 (-1070003,'As if we don\'t have enough problems, you go and create more!',0,0,0,0,'SAY_GUARD_SIL_AGGRO3'),
@@ -82,26 +74,25 @@ INSERT INTO script_texts (entry,content_default,sound,type,language,emote,commen
 (-1070005,'looks at you unexpectadly.',0,2,0,0,'cluck EMOTE_H_HELLO'),
 (-1070006,'starts pecking at the feed.',0,2,0,0,'cluck EMOTE_CLUCK_TEXT2');
 
-
 -- r855_scriptdev2_script_texts.sql
-DELETE FROM script_texts WHERE entry IN (-1000004,-1000001);
-INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
+DELETE FROM `script_texts` WHERE `entry` IN (-1000004,-1000001);
+INSERT INTO `script_texts` (entry,content_default,sound,type,language,emote,comment) VALUES
 (-1000001,'goes into a killing frenzy!',0,2,0,0,'EMOTE_GENERIC_FRENZY_KILL'),
 (-1000004,'goes into a berserker rage!',0,2,0,0,'EMOTE_GENERIC_BERSERK');
 
-DELETE FROM script_texts WHERE entry = -1000005;
-INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
+DELETE FROM `script_texts` WHERE `entry` = -1000005;
+INSERT INTO `script_texts` (entry,content_default,sound,type,language,emote,comment) VALUES
 (-1000005,'Greetings citizen',0,0,7,0,'general_marcus SAY_GREETING');
 
-DELETE FROM script_texts WHERE entry BETWEEN -1329003 AND -1329000;
-INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1329003 AND -1329000;
+INSERT INTO `script_texts` (entry,content_default,sound,type,language,emote,comment) VALUES
 (-1329000,'Thanks to Egan',0,0,0,0,'freed_soul SAY_ZAPPED0'),
 (-1329001,'Rivendare must die',0,0,0,0,'freed_soul SAY_ZAPPED1'),
 (-1329002,'Who you gonna call?',0,0,0,0,'freed_soul SAY_ZAPPED2'),
 (-1329003,'Don\'t cross those beams!',0,0,0,0,'freed_soul SAY_ZAPPED3');
 
-DELETE FROM script_texts WHERE entry BETWEEN -1999925 AND -1999900;
-INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1999925 AND -1999900;
+INSERT INTO `script_texts` (entry,content_default,sound,type,language,emote,comment) VALUES
 (-1999900,'Let the games begin.',8280,1,0,0,'example_creature SAY_AGGRO'),
 (-1999901,'I see endless suffering. I see torment. I see rage. I see everything.',8831,1,0,0,'example_creature SAY_RANDOM_0'),
 (-1999902,'Muahahahaha',8818,1,0,0,'example_creature SAY_RANDOM_1'),
@@ -127,6 +118,4 @@ INSERT INTO script_texts (entry,content_default,sound,type,language,emote,commen
 (-1999922,'Normal select, guess you\'re not interested.',0,0,0,0,'example_gossip_codebox SAY_NOT_INTERESTED'),
 (-1999923,'Wrong!',0,0,0,0,'example_gossip_codebox SAY_WRONG'),
 (-1999924,'You\'re right, you are allowed to see my inner secrets.',0,0,0,0,'example_gossip_codebox SAY_CORRECT'),
-(-1999925,'Hi!',0,0,0,0,'example_areatrigger SAY_HI');
-
-
+(-1999925,'Hi!',0,0,0,0,'example_areatrigger SAY_HI');
\ No newline at end of file
diff --git a/sql/updates/1423_mangos_7290_01_world_command.sql b/sql/updates/1423_mangos_7290_01_world_command.sql
new file mode 100644
index 00000000000..ededbe1f468
--- /dev/null
+++ b/sql/updates/1423_mangos_7290_01_world_command.sql
@@ -0,0 +1,5 @@
+/*ALTER TABLE db_version CHANGE COLUMN required_7252_02_mangos_mangos_string required_7290_01_mangos_command bit;*/
+
+DELETE FROM `command` WHERE `name` = 'npc setdeathstate';
+INSERT INTO `command` VALUES
+('npc setdeathstate',2,'Syntax: .npc setdeathstate on/off\r\n\r\nSet default death state (dead/alive) for npc at spawn.');
\ No newline at end of file
diff --git a/sql/updates/7292_01_mangos_points_of_interest.sql b/sql/updates/1426_mangos_7292_01_world_points_of_interest.sql
index 800a31e707b..be997458488 100644
--- a/sql/updates/7292_01_mangos_points_of_interest.sql
+++ b/sql/updates/1426_mangos_7292_01_world_points_of_interest.sql
@@ -1,4 +1,4 @@
-ALTER TABLE db_version CHANGE COLUMN required_7290_01_mangos_command required_7292_01_mangos_points_of_interest bit;
+/*ALTER TABLE db_version CHANGE COLUMN required_7290_01_mangos_command required_7292_01_mangos_points_of_interest bit;*/
 
 DROP TABLE IF EXISTS `points_of_interest`; 
 CREATE TABLE `points_of_interest` (
@@ -10,4 +10,4 @@ CREATE TABLE `points_of_interest` (
   `data` mediumint(8) unsigned NOT NULL default '0',
   `icon_name` text NOT NULL,
   PRIMARY KEY  (`entry`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
\ No newline at end of file
diff --git a/sql/updates/7292_02_mangos_locales_points_of_interest.sql b/sql/updates/1426_mangos_7292_02_world_locales_points_of_interest.sql
index ec763a3fc67..135fe1ce4d2 100644
--- a/sql/updates/7292_02_mangos_locales_points_of_interest.sql
+++ b/sql/updates/1426_mangos_7292_02_world_locales_points_of_interest.sql
@@ -1,4 +1,4 @@
-ALTER TABLE db_version CHANGE COLUMN required_7292_01_mangos_points_of_interest required_7292_02_mangos_locales_points_of_interest bit;
+/*ALTER TABLE db_version CHANGE COLUMN required_7292_01_mangos_points_of_interest required_7292_02_mangos_locales_points_of_interest bit;*/
 
 DROP TABLE IF EXISTS `locales_points_of_interest`; 
 CREATE TABLE `locales_points_of_interest` (
@@ -12,4 +12,4 @@ CREATE TABLE `locales_points_of_interest` (
   `icon_name_loc7` text,
   `icon_name_loc8` text,
   PRIMARY KEY  (`entry`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
\ No newline at end of file
diff --git a/sql/updates/7267_01_characters_auctionhouse.sql b/sql/updates/7267_01_characters_auctionhouse.sql
deleted file mode 100644
index ddcbecec792..00000000000
--- a/sql/updates/7267_01_characters_auctionhouse.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE character_db_version CHANGE COLUMN required_7255_01_characters_characters required_7267_01_characters_auctionhouse bit;
-
-ALTER TABLE auctionhouse
-  DROP COLUMN location;
-
diff --git a/sql/updates/7290_01_mangos_command.sql b/sql/updates/7290_01_mangos_command.sql
deleted file mode 100644
index b84a579e431..00000000000
--- a/sql/updates/7290_01_mangos_command.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE db_version CHANGE COLUMN required_7252_02_mangos_mangos_string required_7290_01_mangos_command bit;
-
-DELETE FROM `command` WHERE `name` = 'npc setdeathstate';
-INSERT INTO `command` VALUES
-('npc setdeathstate',2,'Syntax: .npc setdeathstate on/off\r\n\r\nSet default death state (dead/alive) for npc at spawn.');
diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt
index 724c26a7fdf..b5c5bfd9387 100644
--- a/sql/updates/CMakeLists.txt
+++ b/sql/updates/CMakeLists.txt
@@ -34,5 +34,9 @@ INSTALL(FILES
 1312_world.sql
 1327_world.sql
 1351_world.sql
+1396_mangos_7267_01_characters_auctionhouse.sql
 1414_world_scripts.sql
-DESTINATION share/trinity/sql/updates)
+1423_mangos_7290_01_world_command.sql
+1426_mangos_7292_01_world_points_of_interest.sql
+1426_mangos_7292_02_world_locales_points_of_interest.sql
+DESTINATION share/trinity/sql/updates)
\ No newline at end of file