Some good old fashioned proper Trinity Standard sql renaming and formatting.

Also added missing data to world.sql.

--HG--
branch : trunk

6 files changed, 25 insertions, 14 deletions

diff --git a/sql/updates/7090_world_scriptname.sql b/sql/updates/7090_world_scriptname.sql
index a67bc5cbceb..7f6bf7cfa32 100644
--- a/sql/updates/7090_world_scriptname.sql
+++ b/sql/updates/7090_world_scriptname.sql
@@ -1,2 +1 @@
 UPDATE `item_template` SET `ScriptName`='item_petrov_cluster_bombs' WHERE `entry`=33098;
-
diff --git a/sql/updates/7134_world_command.sql b/sql/updates/7134_world_command.sql
index a0727046d48..528e8d776dd 100644
--- a/sql/updates/7134_world_command.sql
+++ b/sql/updates/7134_world_command.sql
@@ -7,4 +7,4 @@ VALUES
 ('titles current',2,'Syntax: .titles current #title\r\nSet title #title (id or shift-link) as current selected titl for selected player. If title not in known title list for player then it will be added to list.'),
 ('titles remove',2,'Syntax: .titles remove #title\r\nRemove title #title (id or shift-link) from known titles list for selected player.'),
 ('titles setmask',2,'Syntax: .titles setmask #mask\r\n\r\nAllows user to use all titles from #mask.\r\n\r\n #mask=0 disables the title-choose-field'),
-('lookup title',2,'Syntax: .lookup title $$namepart\r\n\r\nLooks up a title by $namepart, and returns all matches with their title ID\'s and index\'s.');
\ No newline at end of file
+('lookup title',2,'Syntax: .lookup title $$namepart\r\n\r\nLooks up a title by $namepart, and returns all matches with their title ID\'s and index\'s.');
diff --git a/sql/updates/7147_world_creature_classlevelstats.sql b/sql/updates/7147_world_creature_classlevelstats.sql
index 6b10bb9806c..dff9eb89316 100644
--- a/sql/updates/7147_world_creature_classlevelstats.sql
+++ b/sql/updates/7147_world_creature_classlevelstats.sql
@@ -1,4 +1,3 @@
 ALTER TABLE `creature_classlevelstats`
 DROP COLUMN `basedmg`,
 DROP COLUMN `baserangeddmg`;
-
diff --git a/sql/updates/7147_world_creature_template.sql b/sql/updates/7147_world_creature_template.sql
index 7202edab18a..9c92fa05388 100644
--- a/sql/updates/7147_world_creature_template.sql
+++ b/sql/updates/7147_world_creature_template.sql
@@ -7,4 +7,3 @@ ADD COLUMN `attackpower` int(10) unsigned NOT NULL DEFAULT '0' AFTER `dmgschool`
 ADD COLUMN `minrangedmg` float NOT NULL DEFAULT '0' AFTER `trainer_race`,
 ADD COLUMN `maxrangedmg` float NOT NULL DEFAULT '0' AFTER `minrangedmg`,
 ADD COLUMN `rangedattackpower` smallint(5) unsigned NOT NULL DEFAULT '0' AFTER `maxrangedmg`;
-
diff --git a/sql/updates/7168_world_spell_stack_masks.sql b/sql/updates/7167_world_spell_stack_masks.sql
index 2e7d449593c..2e7d449593c 100644
--- a/sql/updates/7168_world_spell_stack_masks.sql
+++ b/sql/updates/7167_world_spell_stack_masks.sql
diff --git a/sql/world.sql b/sql/world.sql
index 3235d76a1dd..bd974458c06 100644
--- a/sql/world.sql
+++ b/sql/world.sql
@@ -6732,7 +6732,30 @@ LOCK TABLES `spell_scripts` WRITE;
 UNLOCK TABLES;
 
 --
--- Table structure for table `spell_target_position`
+-- Table structure for table `spell_stack_masks`
+--
+
+DROP TABLE IF EXISTS `spell_stack_masks`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_stack_masks` (
+  `id` int(32) unsigned NOT NULL default '0',
+  `mask` int(64) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `spell_stack_masks`
+--
+
+LOCK TABLES `spell_stack_masks` WRITE;
+/*!40000 ALTER TABLE `spell_stack_masks` DISABLE KEYS */;
+/*!40000 ALTER TABLE `spell_stack_masks` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Dumping data for table `spell_target_position`
 --
 
 DROP TABLE IF EXISTS `spell_target_position`;
@@ -7456,15 +7479,6 @@ INSERT INTO `trinity_string` (`entry`,`content_default`,`content_loc1`,`content_
 (753, 'The battle for Warsong Gulch begins in 2 minutes.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (754, 'The battle for Arathi Basin begins in 2 minutes.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (755, 'The battle for Eye of the Storm begins in 2 minutes.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(756, 'Battle begins!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(757, '%s has successfully defended the fortress!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(758, '%s has taken over the fortress!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(759, 'The %s siege workshop has been damaged by the %s!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(760, 'The %s siege workshop has been destroyed by the %s!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(761, 'The %s tower has been damaged!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(762, 'The %s tower has been destroyed!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(771, 'You have reached Rank 1: Corporal', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(772, 'You have reached Rank 2: First Lieutenant', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (785, 'Arena testing turned %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (786, '|cffff0000[Automatic]:|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (787, '|cffffff00[|c1f40af20Announce by|r |cffff0000%s|cffffff00]:|r %s|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),