*drop spell_elixir table

*add spell_group table for storage of groups of spell (kinda obvious, isn't it?) and populate the table with converted spell_elixir table data
*the table is going to be maintained by core team
*fix percentage display at spell_ranks table loading
*add TARGET_UNIT_CASTER to allowed learn spell targets in npc_trainer table, thanks to Aokromes for noticing the issue.

--HG--
branch : trunk

4 files changed, 380 insertions, 141 deletions

diff --git a/sql/updates/7280_world_command.sql b/sql/updates/7280_world_command.sql
new file mode 100644
index 00000000000..150370a298b
--- /dev/null
+++ b/sql/updates/7280_world_command.sql
@@ -0,0 +1,2 @@
+DELETE FROM `command` WHERE `name` = 'reload spell_group';
+INSERT INTO `command` VALUES ('reload spell_group','3','Syntax: .reload spell_group\nReload spell_group table.');
diff --git a/sql/updates/7280_world_spell_elixir.sql b/sql/updates/7280_world_spell_elixir.sql
new file mode 100644
index 00000000000..e2b24691fc6
--- /dev/null
+++ b/sql/updates/7280_world_spell_elixir.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS `spell_elixir`;
diff --git a/sql/updates/7280_world_spell_group.sql b/sql/updates/7280_world_spell_group.sql
new file mode 100644
index 00000000000..ee19c117ffe
--- /dev/null
+++ b/sql/updates/7280_world_spell_group.sql
@@ -0,0 +1,187 @@
+DROP TABLE IF EXISTS `spell_group`;
+CREATE TABLE `spell_group` (
+  `id` int(11) unsigned NOT NULL DEFAULT 0,
+  `spell_id` int(11) unsigned NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`, `spell_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Spell System';
+INSERT INTO `spell_group` (`id`, `spell_id`) VALUES
+ -- SPELL_GROUP_ELIXIR_BATTLE
+(1, 2367),
+(1, 2374),
+(1, 3160),
+(1, 3164),
+(1, 7844),
+(1, 8212),
+(1, 10667),
+(1, 10669),
+(1, 11328),
+(1, 11334),
+(1, 11390),
+(1, 11405),
+(1, 11406),
+(1, 11474),
+(1, 16322),
+(1, 16323),
+(1, 16329),
+(1, 17038),
+(1, 17537),
+(1, 17538),
+(1, 17539),
+(1, 17624),
+(1, 17626),
+(1, 17627),
+(1, 17628),
+(1, 17629),
+(1, 21920),
+(1, 26276),
+(1, 28486),
+(1, 28488),
+(1, 28490),
+(1, 28491),
+(1, 28493),
+(1, 28497),
+(1, 28501),
+(1, 28503),
+(1, 28518),
+(1, 28519),
+(1, 28520),
+(1, 28521),
+(1, 28540),
+(1, 33720),
+(1, 33721),
+(1, 33726),
+(1, 38954),
+(1, 40567),
+(1, 40568),
+(1, 40572),
+(1, 40573),
+(1, 40575),
+(1, 40576),
+(1, 41608),
+(1, 41609),
+(1, 41610),
+(1, 41611),
+(1, 42735),
+(1, 45373),
+(1, 46837),
+(1, 46839),
+(1, 53746),
+(1, 53748),
+(1, 53749),
+(1, 53752),
+(1, 53755),
+(1, 53758),
+(1, 53760),
+(1, 54212),
+(1, 54452),
+(1, 54494),
+(1, 60340),
+(1, 60341),
+(1, 60344),
+(1, 60345),
+(1, 60346),
+(1, 62380),
+(1, 67016),
+(1, 67017),
+(1, 67018),
+ -- SPELL_GROUP_ELIXIR_GUARDIAN
+(2, 673),
+(2, 2378),
+(2, 2380),
+(2, 3166),
+(2, 3219),
+(2, 3220),
+(2, 3222),
+(2, 3223),
+(2, 3593),
+(2, 10668),
+(2, 10692),
+(2, 10693),
+(2, 11319),
+(2, 11348),
+(2, 11349),
+(2, 11364),
+(2, 11371),
+(2, 11396),
+(2, 15231),
+(2, 15233),
+(2, 16321),
+(2, 16325),
+(2, 16326),
+(2, 16327),
+(2, 17535),
+(2, 17624),
+(2, 17626),
+(2, 17627),
+(2, 17628),
+(2, 17629),
+(2, 24361),
+(2, 24363),
+(2, 24382),
+(2, 24383),
+(2, 24417),
+(2, 27652),
+(2, 27653),
+(2, 28502),
+(2, 28509),
+(2, 28514),
+(2, 28518),
+(2, 28519),
+(2, 28520),
+(2, 28521),
+(2, 28540),
+(2, 29348),
+(2, 39625),
+(2, 39626),
+(2, 39627),
+(2, 39628),
+(2, 40567),
+(2, 40568),
+(2, 40572),
+(2, 40573),
+(2, 40575),
+(2, 40576),
+(2, 41608),
+(2, 41609),
+(2, 41610),
+(2, 41611),
+(2, 42735),
+(2, 46837),
+(2, 46839),
+(2, 53747),
+(2, 53751),
+(2, 53752),
+(2, 53755),
+(2, 53758),
+(2, 53760),
+(2, 53763),
+(2, 53764),
+(2, 54212),
+(2, 60343),
+(2, 60347),
+(2, 62380),
+(2, 67016),
+(2, 67017),
+(2, 67018),
+ -- SPELL_GROUP_ELIXIR_UNSTABLE
+(3, 40567),
+(3, 40568),
+(3, 40572),
+(3, 40573),
+(3, 40575),
+(3, 40576),
+ -- SPELL_GROUP_ELIXIR_SHATTRATH
+(4, 41608),
+(4, 41609),
+(4, 41610),
+(4, 41611),
+(4, 46837),
+(4, 46839),
+ -- SPELL_GROUP_WELL_FED
+(5, 18191),
+(5, 18192),
+(5, 18193),
+(5, 18194),
+(5, 18222),
+(5, 22730),
+(5, 25661);
\ No newline at end of file
diff --git a/sql/world.sql b/sql/world.sql
index 6f0961e6d87..05336b33a0b 100644
--- a/sql/world.sql
+++ b/sql/world.sql
@@ -606,7 +606,7 @@ INSERT INTO `command` VALUES
 ('reload spell_area','3','Syntax: .reload spell_area\nReload spell_area table.'),
 ('reload spell_bonus_data','3','Syntax: .reload spell_bonus_data\nReload spell_bonus_data table.'),
 ('reload spell_disabled','3','Syntax: .reload spell_disabled\nReload spell_disabled table.'),
-('reload spell_elixir','3','Syntax: .reload spell_elixir\nReload spell_elixir table.'),
+('reload spell_group','3','Syntax: .reload spell_group\nReload spell_group table.'),
 ('reload spell_learn_spell','3','Syntax: .reload spell_learn_spell\nReload spell_learn_spell table.'),
 ('reload spell_linked_spell','3','Usage: .reload spell_linked_spell\r\nReloads the spell_linked_spell DB table.'),
 ('reload spell_loot_template','3','Syntax: .reload spell_loot_template\nReload spell_loot_template table.'),
@@ -5092,16 +5092,16 @@ LOCK TABLES `spell_disabled` WRITE;
 UNLOCK TABLES;
 
 --
--- Table structure for table `spell_elixir`
+-- Table structure for table `spell_group`
 --
 
-DROP TABLE IF EXISTS `spell_elixir`;
+DROP TABLE IF EXISTS `spell_group`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `spell_elixir` (
-  `entry` int(11) unsigned NOT NULL DEFAULT '0' COMMENT 'SpellId of potion',
-  `mask` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT 'Mask 0x1 battle 0x2 guardian 0x3 flask 0x7 unstable flasks 0xB shattrath flasks',
-  PRIMARY KEY (`entry`)
+CREATE TABLE `spell_group` (
+  `id` int(11) unsigned NOT NULL DEFAULT 0,
+  `spell_id` int(11) unsigned NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`, `spell_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Spell System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -5109,141 +5109,190 @@ CREATE TABLE `spell_elixir` (
 -- Dumping data for table `spell_elixir`
 --
 
-LOCK TABLES `spell_elixir` WRITE;
+LOCK TABLES `spell_group` WRITE;
 /*!40000 ALTER TABLE `spell_elixir` DISABLE KEYS */;
-INSERT INTO `spell_elixir` VALUES
-(673, 0x2),
-(2367, 0x1),
-(2374, 0x1),
-(2378, 0x2),
-(2380, 0x2),
-(3160, 0x1),
-(3164, 0x1),
-(3166, 0x2),
-(3219, 0x2),
-(3220, 0x2),
-(3222, 0x2),
-(3223, 0x2),
-(3593, 0x2),
-(7844, 0x1),
-(8212, 0x1),
-(10667, 0x1),
-(10668, 0x2),
-(10669, 0x1),
-(10692, 0x2),
-(10693, 0x2),
-(11319, 0x2),
-(11328, 0x1),
-(11334, 0x1),
-(11348, 0x2),
-(11349, 0x2),
-(11364, 0x2),
-(11371, 0x2),
-(11390, 0x1),
-(11396, 0x2),
-(11405, 0x1),
-(11406, 0x1),
-(11474, 0x1),
-(15231, 0x2),
-(15233, 0x2),
-(16321, 0x2),
-(16322, 0x1),
-(16323, 0x1),
-(16325, 0x2),
-(16326, 0x2),
-(16327, 0x2),
-(16329, 0x1),
-(17038, 0x1),
-(17535, 0x2),
-(17537, 0x1),
-(17538, 0x1),
-(17539, 0x1),
-(17624, 0x3),
-(17626, 0x3),
-(17627, 0x3),
-(17628, 0x3),
-(17629, 0x3),
-(21920, 0x1),
-(24361, 0x2),
-(24363, 0x2),
-(24382, 0x2),
-(24383, 0x2),
-(24417, 0x2),
-(26276, 0x1),
-(27652, 0x2),
-(27653, 0x2),
-(28486, 0x1),
-(28488, 0x1),
-(28490, 0x1),
-(28491, 0x1),
-(28493, 0x1),
-(28497, 0x1),
-(28501, 0x1),
-(28502, 0x2),
-(28503, 0x1),
-(28509, 0x2),
-(28514, 0x2),
-(28518, 0x3),
-(28519, 0x3),
-(28520, 0x3),
-(28521, 0x3),
-(28540, 0x3),
-(29348, 0x2),
-(33720, 0x1),
-(33721, 0x1),
-(33726, 0x1),
-(38954, 0x1),
-(39625, 0x2),
-(39626, 0x2),
-(39627, 0x2),
-(39628, 0x2),
-(40567, 0x7),
-(40568, 0x7),
-(40572, 0x7),
-(40573, 0x7),
-(40575, 0x7),
-(40576, 0x7),
-(41608, 0xB),
-(41609, 0xB),
-(41610, 0xB),
-(41611, 0xB),
-(42735, 0x3),
-(45373, 0x1),
-(46837, 0xB),
-(46839, 0xB),
-(53746, 0x1),
-(53747, 0x2),
-(53748, 0x1),
-(53749, 0x1),
-(53751, 0x2),
-(53752, 0x3),
-(53755, 0x3),
-(53758, 0x3),
-(53760, 0x3),
-(53763, 0x2),
-(53764, 0x2),
-(54212, 0x3),
-(54452, 0x1),
-(54494, 0x1),
-(60340, 0x1),
-(60341, 0x1),
-(60343, 0x2),
-(60344, 0x1),
-(60345, 0x1),
-(60346, 0x1),
-(60347, 0x2),
-(62380, 0x3),
-(18191,0x10),
-(18192,0x10),
-(18193,0x10),
-(18194,0x10),
-(18222,0x10),
-(22730,0x10),
-(25661,0x10),
-(67016,0x3),
-(67017,0x3),
-(67018,0x3);
-/*!40000 ALTER TABLE `spell_elixir` ENABLE KEYS */;
+INSERT INTO `spell_group` (`id`, `spell_id`) VALUES
+ -- SPELL_GROUP_ELIXIR_BATTLE
+(1, 2367),
+(1, 2374),
+(1, 3160),
+(1, 3164),
+(1, 7844),
+(1, 8212),
+(1, 10667),
+(1, 10669),
+(1, 11328),
+(1, 11334),
+(1, 11390),
+(1, 11405),
+(1, 11406),
+(1, 11474),
+(1, 16322),
+(1, 16323),
+(1, 16329),
+(1, 17038),
+(1, 17537),
+(1, 17538),
+(1, 17539),
+(1, 17624),
+(1, 17626),
+(1, 17627),
+(1, 17628),
+(1, 17629),
+(1, 21920),
+(1, 26276),
+(1, 28486),
+(1, 28488),
+(1, 28490),
+(1, 28491),
+(1, 28493),
+(1, 28497),
+(1, 28501),
+(1, 28503),
+(1, 28518),
+(1, 28519),
+(1, 28520),
+(1, 28521),
+(1, 28540),
+(1, 33720),
+(1, 33721),
+(1, 33726),
+(1, 38954),
+(1, 40567),
+(1, 40568),
+(1, 40572),
+(1, 40573),
+(1, 40575),
+(1, 40576),
+(1, 41608),
+(1, 41609),
+(1, 41610),
+(1, 41611),
+(1, 42735),
+(1, 45373),
+(1, 46837),
+(1, 46839),
+(1, 53746),
+(1, 53748),
+(1, 53749),
+(1, 53752),
+(1, 53755),
+(1, 53758),
+(1, 53760),
+(1, 54212),
+(1, 54452),
+(1, 54494),
+(1, 60340),
+(1, 60341),
+(1, 60344),
+(1, 60345),
+(1, 60346),
+(1, 62380),
+(1, 67016),
+(1, 67017),
+(1, 67018),
+ -- SPELL_GROUP_ELIXIR_GUARDIAN
+(2, 673),
+(2, 2378),
+(2, 2380),
+(2, 3166),
+(2, 3219),
+(2, 3220),
+(2, 3222),
+(2, 3223),
+(2, 3593),
+(2, 10668),
+(2, 10692),
+(2, 10693),
+(2, 11319),
+(2, 11348),
+(2, 11349),
+(2, 11364),
+(2, 11371),
+(2, 11396),
+(2, 15231),
+(2, 15233),
+(2, 16321),
+(2, 16325),
+(2, 16326),
+(2, 16327),
+(2, 17535),
+(2, 17624),
+(2, 17626),
+(2, 17627),
+(2, 17628),
+(2, 17629),
+(2, 24361),
+(2, 24363),
+(2, 24382),
+(2, 24383),
+(2, 24417),
+(2, 27652),
+(2, 27653),
+(2, 28502),
+(2, 28509),
+(2, 28514),
+(2, 28518),
+(2, 28519),
+(2, 28520),
+(2, 28521),
+(2, 28540),
+(2, 29348),
+(2, 39625),
+(2, 39626),
+(2, 39627),
+(2, 39628),
+(2, 40567),
+(2, 40568),
+(2, 40572),
+(2, 40573),
+(2, 40575),
+(2, 40576),
+(2, 41608),
+(2, 41609),
+(2, 41610),
+(2, 41611),
+(2, 42735),
+(2, 46837),
+(2, 46839),
+(2, 53747),
+(2, 53751),
+(2, 53752),
+(2, 53755),
+(2, 53758),
+(2, 53760),
+(2, 53763),
+(2, 53764),
+(2, 54212),
+(2, 60343),
+(2, 60347),
+(2, 62380),
+(2, 67016),
+(2, 67017),
+(2, 67018),
+ -- SPELL_GROUP_ELIXIR_UNSTABLE
+(3, 40567),
+(3, 40568),
+(3, 40572),
+(3, 40573),
+(3, 40575),
+(3, 40576),
+ -- SPELL_GROUP_ELIXIR_SHATTRATH
+(4, 41608),
+(4, 41609),
+(4, 41610),
+(4, 41611),
+(4, 46837),
+(4, 46839),
+ -- SPELL_GROUP_WELL_FED
+(5, 18191),
+(5, 18192),
+(5, 18193),
+(5, 18194),
+(5, 18222),
+(5, 22730),
+(5, 25661);
+/*!40000 ALTER TABLE `spell_group` ENABLE KEYS */;
 UNLOCK TABLES;
 
 --