*Add `spell_dbc` table to store dbc entries not present in client

*Remove workaround from Demonic Circle code and use the sql table instead.

--HG--
branch : trunk

3 files changed, 212 insertions, 0 deletions

diff --git a/sql/FULL/world_spell_full.sql b/sql/FULL/world_spell_full.sql
index cebeef42aaa..fbcf3db0020 100644
--- a/sql/FULL/world_spell_full.sql
+++ b/sql/FULL/world_spell_full.sql
@@ -1846,6 +1846,14 @@ INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`
 (6343, -1, -1, 0.12, -1, 'Warrior - Thunder Clap');
 
 -- --------
+-- SPELL DBC
+-- --------
+
+TRUNCATE TABLE `spell_dbc`;
+INSERT INTO `spell_dbc` (`Id`, `DurationIndex`, `Effect1`, `EffectImplicitTargetA1`, `EffectApplyAuraName1`, `Comment`) VALUES 
+(62388, 21, 6, 1, 4, 'Demonic Circle: Teleport(48020) - casterAuraSpell');
+
+-- --------
 -- SPELL ELIXIR
 -- --------
 
diff --git a/sql/updates/5410_world_sql_dbc.sql b/sql/updates/5410_world_sql_dbc.sql
new file mode 100644
index 00000000000..31f648dcad4
--- /dev/null
+++ b/sql/updates/5410_world_sql_dbc.sql
@@ -0,0 +1,101 @@
+DROP TABLE IF EXISTS `spell_dbc`;
+CREATE TABLE `spell_dbc` (
+	`Id` INT UNSIGNED NOT NULL,
+	`Dispel` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`Mechanic` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`Attributes` INT UNSIGNED NOT NULL DEFAULT 0,
+	`AttributesEx` INT UNSIGNED NOT NULL DEFAULT 0,
+	`AttributesEx2` INT UNSIGNED NOT NULL DEFAULT 0,
+	`AttributesEx3` INT UNSIGNED NOT NULL DEFAULT 0,
+	`AttributesEx4` INT UNSIGNED NOT NULL DEFAULT 0,
+	`AttributesEx5` INT UNSIGNED NOT NULL DEFAULT 0,
+	`Targets` INT UNSIGNED NOT NULL DEFAULT 0,
+	`CastingTimeIndex` TINYINT UNSIGNED NOT NULL DEFAULT 1,
+	`AuraInterruptFlags` INT UNSIGNED NOT NULL DEFAULT 0,
+	`ProcFlags` INT UNSIGNED NOT NULL DEFAULT 0,
+	`ProcChance` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`ProcCharges` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`MaxLevel` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`BaseLevel` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`SpellLevel` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`DurationIndex` SMALLINT UNSIGNED NOT NULL DEFAULT 0,
+	`RangeIndex` TINYINT UNSIGNED NOT NULL DEFAULT 1,
+	`StackAmount` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`EquippedItemClass` INT NOT NULL DEFAULT -1,
+	`EquippedItemSubClassMask` INT NOT NULL DEFAULT 0 DEFAULT 0,
+	`EquippedItemInventoryTypeMask` INT NOT NULL DEFAULT 0 DEFAULT 0,
+	`Effect1` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`Effect2` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`Effect3` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectDieSides1` INT NOT NULL DEFAULT 0,
+	`EffectDieSides2` INT NOT NULL DEFAULT 0,
+	`EffectDieSides3` INT NOT NULL DEFAULT 0,
+	`EffectBaseDice1` INT NOT NULL DEFAULT 0,
+	`EffectBaseDice2` INT NOT NULL DEFAULT 0,
+	`EffectBaseDice3` INT NOT NULL DEFAULT 0,
+	`EffectDicePerLevel1` FLOAT NOT NULL DEFAULT 0,
+	`EffectDicePerLevel2` FLOAT NOT NULL DEFAULT 0,
+	`EffectDicePerLevel3` FLOAT NOT NULL DEFAULT 0,
+	`EffectRealPointsPerLevel1` FLOAT NOT NULL DEFAULT 0,
+	`EffectRealPointsPerLevel2` FLOAT NOT NULL DEFAULT 0,
+	`EffectRealPointsPerLevel3` FLOAT NOT NULL DEFAULT 0,
+	`EffectBasePoints1` INT NOT NULL DEFAULT 0,
+	`EffectBasePoints2` INT NOT NULL DEFAULT 0,
+	`EffectBasePoints3` INT NOT NULL DEFAULT 0,
+	`EffectMechanic1` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectMechanic2` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectMechanic3` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectImplicitTargetA1` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectImplicitTargetA2` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectImplicitTargetA3` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectImplicitTargetB1` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectImplicitTargetB2` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectImplicitTargetB3` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectRadiusIndex1` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectRadiusIndex2` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectRadiusIndex3` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectApplyAuraName1` SMALLINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectApplyAuraName2` SMALLINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectApplyAuraName3` SMALLINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectAmplitude1` INT NOT NULL DEFAULT 0,
+	`EffectAmplitude2` INT NOT NULL DEFAULT 0,
+	`EffectAmplitude3` INT NOT NULL DEFAULT 0,
+	`EffectMultipleValue1` FLOAT NOT NULL DEFAULT 0,
+	`EffectMultipleValue2` FLOAT NOT NULL DEFAULT 0,
+	`EffectMultipleValue3` FLOAT NOT NULL DEFAULT 0,
+	`EffectMiscValue1` INT NOT NULL DEFAULT 0,
+	`EffectMiscValue2` INT NOT NULL DEFAULT 0,
+	`EffectMiscValue3` INT NOT NULL DEFAULT 0,
+	`EffectMiscValueB1` INT NOT NULL DEFAULT 0,
+	`EffectMiscValueB2` INT NOT NULL DEFAULT 0,
+	`EffectMiscValueB3` INT NOT NULL DEFAULT 0,
+	`EffectTriggerSpell1` INT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectTriggerSpell2` INT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectTriggerSpell3` INT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectSpellClassMaskA1` INT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectSpellClassMaskA2` INT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectSpellClassMaskA3` INT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectSpellClassMaskB1` INT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectSpellClassMaskB2` INT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectSpellClassMaskB3` INT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectSpellClassMaskC1` INT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectSpellClassMaskC2` INT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectSpellClassMaskC3` INT UNSIGNED NOT NULL DEFAULT 0,
+	`MaxTargetLevel` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`SpellFamilyName` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`SpellFamilyFlags1` INT UNSIGNED NOT NULL DEFAULT 0,
+	`SpellFamilyFlags2` INT UNSIGNED NOT NULL DEFAULT 0,
+	`SpellFamilyFlags3` INT UNSIGNED NOT NULL DEFAULT 0,
+	`MaxAffectedTargets` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`DmgClass` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`PreventionType` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`DmgMultiplier1` FLOAT NOT NULL DEFAULT 0,
+	`DmgMultiplier2` FLOAT NOT NULL DEFAULT 0,
+	`DmgMultiplier3` FLOAT NOT NULL DEFAULT 0,
+	`AreaGroupId` INT NOT NULL DEFAULT 0,
+	`SchoolMask` INT UNSIGNED NOT NULL DEFAULT 0,
+	`Comment` TEXT NOT NULL,
+	PRIMARY KEY (`id`)
+)ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Custom spell.dbc entries';
+
+INSERT INTO `spell_dbc` (`Id`, `DurationIndex`, `Effect1`, `EffectImplicitTargetA1`, `EffectApplyAuraName1`, `Comment`) VALUES (62388, 21, 6, 1, 4, 'Demonic Circle: Teleport(48020) - casterAuraSpell');
diff --git a/sql/world.sql b/sql/world.sql
index e4ee3ea2b3a..1e9831d856c 100644
--- a/sql/world.sql
+++ b/sql/world.sql
@@ -2741,6 +2741,109 @@ CREATE TABLE `spell_bonus_data` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 --
+-- Table structure for table `spell_dbc`
+--
+DROP TABLE IF EXISTS `spell_dbc`;
+CREATE TABLE `spell_dbc` (
+	`Id` INT UNSIGNED NOT NULL,
+	`Dispel` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`Mechanic` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`Attributes` INT UNSIGNED NOT NULL DEFAULT 0,
+	`AttributesEx` INT UNSIGNED NOT NULL DEFAULT 0,
+	`AttributesEx2` INT UNSIGNED NOT NULL DEFAULT 0,
+	`AttributesEx3` INT UNSIGNED NOT NULL DEFAULT 0,
+	`AttributesEx4` INT UNSIGNED NOT NULL DEFAULT 0,
+	`AttributesEx5` INT UNSIGNED NOT NULL DEFAULT 0,
+	`Targets` INT UNSIGNED NOT NULL DEFAULT 0,
+	`CastingTimeIndex` TINYINT UNSIGNED NOT NULL DEFAULT 1,
+	`AuraInterruptFlags` INT UNSIGNED NOT NULL DEFAULT 0,
+	`ProcFlags` INT UNSIGNED NOT NULL DEFAULT 0,
+	`ProcChance` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`ProcCharges` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`MaxLevel` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`BaseLevel` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`SpellLevel` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`DurationIndex` SMALLINT UNSIGNED NOT NULL DEFAULT 0,
+	`RangeIndex` TINYINT UNSIGNED NOT NULL DEFAULT 1,
+	`StackAmount` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`EquippedItemClass` INT NOT NULL DEFAULT -1,
+	`EquippedItemSubClassMask` INT NOT NULL DEFAULT 0 DEFAULT 0,
+	`EquippedItemInventoryTypeMask` INT NOT NULL DEFAULT 0 DEFAULT 0,
+	`Effect1` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`Effect2` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`Effect3` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectDieSides1` INT NOT NULL DEFAULT 0,
+	`EffectDieSides2` INT NOT NULL DEFAULT 0,
+	`EffectDieSides3` INT NOT NULL DEFAULT 0,
+	`EffectBaseDice1` INT NOT NULL DEFAULT 0,
+	`EffectBaseDice2` INT NOT NULL DEFAULT 0,
+	`EffectBaseDice3` INT NOT NULL DEFAULT 0,
+	`EffectDicePerLevel1` FLOAT NOT NULL DEFAULT 0,
+	`EffectDicePerLevel2` FLOAT NOT NULL DEFAULT 0,
+	`EffectDicePerLevel3` FLOAT NOT NULL DEFAULT 0,
+	`EffectRealPointsPerLevel1` FLOAT NOT NULL DEFAULT 0,
+	`EffectRealPointsPerLevel2` FLOAT NOT NULL DEFAULT 0,
+	`EffectRealPointsPerLevel3` FLOAT NOT NULL DEFAULT 0,
+	`EffectBasePoints1` INT NOT NULL DEFAULT 0,
+	`EffectBasePoints2` INT NOT NULL DEFAULT 0,
+	`EffectBasePoints3` INT NOT NULL DEFAULT 0,
+	`EffectMechanic1` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectMechanic2` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectMechanic3` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectImplicitTargetA1` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectImplicitTargetA2` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectImplicitTargetA3` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectImplicitTargetB1` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectImplicitTargetB2` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectImplicitTargetB3` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectRadiusIndex1` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectRadiusIndex2` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectRadiusIndex3` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectApplyAuraName1` SMALLINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectApplyAuraName2` SMALLINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectApplyAuraName3` SMALLINT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectAmplitude1` INT NOT NULL DEFAULT 0,
+	`EffectAmplitude2` INT NOT NULL DEFAULT 0,
+	`EffectAmplitude3` INT NOT NULL DEFAULT 0,
+	`EffectMultipleValue1` FLOAT NOT NULL DEFAULT 0,
+	`EffectMultipleValue2` FLOAT NOT NULL DEFAULT 0,
+	`EffectMultipleValue3` FLOAT NOT NULL DEFAULT 0,
+	`EffectMiscValue1` INT NOT NULL DEFAULT 0,
+	`EffectMiscValue2` INT NOT NULL DEFAULT 0,
+	`EffectMiscValue3` INT NOT NULL DEFAULT 0,
+	`EffectMiscValueB1` INT NOT NULL DEFAULT 0,
+	`EffectMiscValueB2` INT NOT NULL DEFAULT 0,
+	`EffectMiscValueB3` INT NOT NULL DEFAULT 0,
+	`EffectTriggerSpell1` INT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectTriggerSpell2` INT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectTriggerSpell3` INT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectSpellClassMaskA1` INT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectSpellClassMaskA2` INT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectSpellClassMaskA3` INT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectSpellClassMaskB1` INT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectSpellClassMaskB2` INT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectSpellClassMaskB3` INT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectSpellClassMaskC1` INT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectSpellClassMaskC2` INT UNSIGNED NOT NULL DEFAULT 0,
+	`EffectSpellClassMaskC3` INT UNSIGNED NOT NULL DEFAULT 0,
+	`MaxTargetLevel` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`SpellFamilyName` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`SpellFamilyFlags1` INT UNSIGNED NOT NULL DEFAULT 0,
+	`SpellFamilyFlags2` INT UNSIGNED NOT NULL DEFAULT 0,
+	`SpellFamilyFlags3` INT UNSIGNED NOT NULL DEFAULT 0,
+	`MaxAffectedTargets` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`DmgClass` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`PreventionType` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	`DmgMultiplier1` FLOAT NOT NULL DEFAULT 0,
+	`DmgMultiplier2` FLOAT NOT NULL DEFAULT 0,
+	`DmgMultiplier3` FLOAT NOT NULL DEFAULT 0,
+	`AreaGroupId` INT NOT NULL DEFAULT 0,
+	`SchoolMask` INT UNSIGNED NOT NULL DEFAULT 0,
+	`Comment` TEXT NOT NULL,
+	PRIMARY KEY (`id`)
+)ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Custom spell.dbc entries';
+
+--
 -- Table structure for table `spell_disabled`
 --