diff --git a/sql/mangos.sql b/sql/mangos.sql index e9a09e918..2cf9fe1a1 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -1425,7 +1425,7 @@ CREATE TABLE `db_version` ( `version` varchar(120) DEFAULT NULL, `creature_ai_version` varchar(120) DEFAULT NULL, `cache_id` int(10) DEFAULT '0', - `required_c12564_01_mangos_spell_template` bit(1) default NULL + `required_c12594_01_mangos_spell_template` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; /*!40101 SET character_set_client = @saved_cs_client */; @@ -1435,7 +1435,7 @@ CREATE TABLE `db_version` ( LOCK TABLES `db_version` WRITE; /*!40000 ALTER TABLE `db_version` DISABLE KEYS */; -INSERT INTO `db_version` (`version`, `creature_ai_version`, `cache_id`, `required_c12564_01_mangos_spell_template`) VALUES +INSERT INTO `db_version` (`version`, `creature_ai_version`, `cache_id`, `required_c12594_01_mangos_spell_template`) VALUES ('Mangos default database.','Creature EventAI not provided.',0,NULL); /*!40000 ALTER TABLE `db_version` ENABLE KEYS */; UNLOCK TABLES; @@ -21354,17 +21354,21 @@ UNLOCK TABLES; DROP TABLE IF EXISTS `spell_template`; CREATE TABLE `spell_template` ( - `id` int(11) unsigned NOT NULL default '0', - `proc_flags` int(11) unsigned NOT NULL default '0', - `proc_chance` int(11) unsigned NOT NULL default '0', - `duration_index` int(11) unsigned NOT NULL default '0', - `effect0` int(11) unsigned NOT NULL default '0', - `effect0_implicit_target_a` int(11) unsigned NOT NULL default '0', - `effect0_radius_idx` int(11) unsigned NOT NULL default '0', - `effect0_apply_aura_name` int(11) unsigned NOT NULL default '0', - `effect0_misc_value` int(11) unsigned NOT NULL default '0', - `effect0_misc_value_b` int(11) unsigned NOT NULL default '0', - `effect0_trigger_spell` int(11) unsigned NOT NULL default '0', + `id` int(11) unsigned NOT NULL DEFAULT '0', + `attr` int(11) unsigned NOT NULL DEFAULT '0', + `attr_ex` int(11) unsigned NOT NULL DEFAULT '0', + `attr_ex2` int(11) unsigned NOT NULL DEFAULT '0', + `proc_flags` int(11) unsigned NOT NULL DEFAULT '0', + `proc_chance` int(11) unsigned NOT NULL DEFAULT '0', + `duration_index` int(11) unsigned NOT NULL DEFAULT '0', + `effect0` int(11) unsigned NOT NULL DEFAULT '0', + `effect0_implicit_target_a` int(11) unsigned NOT NULL DEFAULT '0', + `effect0_implicit_target_b` int(11) unsigned NOT NULL DEFAULT '0', + `effect0_radius_idx` int(11) unsigned NOT NULL DEFAULT '0', + `effect0_apply_aura_name` int(11) unsigned NOT NULL DEFAULT '0', + `effect0_misc_value` int(11) unsigned NOT NULL DEFAULT '0', + `effect0_misc_value_b` int(11) unsigned NOT NULL DEFAULT '0', + `effect0_trigger_spell` int(11) unsigned NOT NULL DEFAULT '0', `comments` varchar(255) NOT NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='MaNGOS server side spells'; @@ -21375,31 +21379,40 @@ CREATE TABLE `spell_template` ( LOCK TABLES `spell_template` WRITE; /*!40000 ALTER TABLE `spell_template` DISABLE KEYS */; INSERT INTO `spell_template` VALUES --- id proc_flags chnce dur ef0 tarA0 rad aur misc miscB, trigger -(21387, 0x00000028, 15, 21, 6, 1, 0, 42, 0, 0, 21388, 'Melt-Weapon trigger aura related used by Ragnaros'), -(23363, 0x00000000, 101, 21, 76, 18, 0, 0, 179804, 0, 0, 'Summon Drakonid Corpse Trigger'), -(25192, 0x00000000, 101, 21, 76, 18, 0, 0, 180619, 0, 0, 'Summon Ossirian Crystal'), -(26133, 0x00000000, 101, 21, 76, 18, 0, 0, 180795, 0, 0, 'Summon Sandworm Base'), -(34810, 0x00000000, 101, 21, 28, 42, 8, 0, 20083, 64, 0, 'Summon Summoned Bloodwarder Mender behind of the caster'), -(34817, 0x00000000, 101, 21, 28, 44, 8, 0, 20078, 64, 0, 'Summon Summoned Bloodwarder Reservist right of the caster'), -(34818, 0x00000000, 101, 21, 28, 43, 8, 0, 20078, 64, 0, 'Summon Summoned Bloodwarder Reservist left of the caster'), -(34819, 0x00000000, 101, 21, 28, 41, 8, 0, 20078, 64, 0, 'Summon Summoned Bloodwarder Reservist front of the caster'), -(35153, 0x00000000, 101, 21, 28, 42, 8, 0, 20405, 64, 0, 'Summon Nether Charge behind of the caster'), -(35904, 0x00000000, 101, 21, 28, 44, 8, 0, 20405, 64, 0, 'Summon Nether Charge right of the caster'), -(35905, 0x00000000, 101, 21, 28, 43, 8, 0, 20405, 64, 0, 'Summon Nether Charge left of the caster'), -(35906, 0x00000000, 101, 21, 28, 41, 8, 0, 20405, 64, 0, 'Summon Nether Charge front of the caster'), -(37264, 0x00000000, 101, 21, 28, 18, 7, 0, 21729, 64, 0, 'Power Converters: Summon Electromental (from cata)'), -(37278, 0x00000000, 101, 21, 28, 18, 1, 0, 21737, 64, 0, 'Power Converters: Summon Mini-Electromental (from cata)'), -(37365, 0x00000000, 101, 21, 28, 18, 1, 0, 21757, 64, 0, 'Power Converters: Summon Big Flavor Electromental (from cata)'), -(44920, 0x00000000, 101, 21, 6, 1, 0, 56, 24941, 0, 0, 'Model - Shattered Sun Marksman - BE Male Tier 4'), -(44924, 0x00000000, 101, 21, 6, 1, 0, 56, 24945, 0, 0, 'Model - Shattered Sun Marksman - BE Female Tier 4'), -(44928, 0x00000000, 101, 21, 6, 1, 0, 56, 24949, 0, 0, 'Model - Shattered Sun Marksman - Draenei Male Tier 4'), -(44932, 0x00000000, 101, 21, 6, 1, 0, 56, 24953, 0, 0, 'Model - Shattered Sun Marksman - Draenei Female Tier 4'), -(45158, 0x00000000, 101, 21, 6, 1, 0, 56, 25119, 0, 0, 'Model - Shattered Sun Warrior - BE Female Tier 4'), -(45162, 0x00000000, 101, 21, 6, 1, 0, 56, 25123, 0, 0, 'Model - Shattered Sun Warrior - BE Male Tier 4'), -(45166, 0x00000000, 101, 21, 6, 1, 0, 56, 25127, 0, 0, 'Model - Shattered Sun Warrior - Draenei Female Tier 4'), -(45170, 0x00000000, 101, 21, 6, 1, 0, 56, 25131, 0, 0, 'Model - Shattered Sun Warrior - Draenei Male Tier 4'), -(62388, 0x00000000, 101, 21, 6, 1, 0, 4, 0, 0, 0, 'Aura required for Demonic Circle 48020'); +-- id attr attr_ex attr_ex2 proc_flags chnce dur ef0 tarA0 tarB0 rad aur misc miscB, trigger +(21387, 0x00000140, 0x10000000, 0x00000000, 0x00000028, 15, 21, 6, 1, 0, 0, 42, 0, 0, 21388, 'Melt-Weapon trigger aura related used by Ragnaros'), +(23363, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 101, 21, 76, 18, 0, 0, 0, 179804, 0, 0, 'Summon Drakonid Corpse Trigger'), +(25192, 0x00000100, 0x00000000, 0x00000004, 0x00000000, 101, 21, 76, 18, 0, 0, 0, 180619, 0, 0, 'Summon Ossirian Crystal'), +(26133, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 101, 21, 76, 18, 0, 0, 0, 180795, 0, 0, 'Summon Sandworm Base'), +(34810, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101, 21, 28, 42, 0, 8, 0, 20083, 64, 0, 'Summon Summoned Bloodwarder Mender behind of the caster'), +(34817, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101, 21, 28, 44, 0, 8, 0, 20078, 64, 0, 'Summon Summoned Bloodwarder Reservist right of the caster'), +(34818, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101, 21, 28, 43, 0, 8, 0, 20078, 64, 0, 'Summon Summoned Bloodwarder Reservist left of the caster'), +(34819, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101, 21, 28, 41, 0, 8, 0, 20078, 64, 0, 'Summon Summoned Bloodwarder Reservist front of the caster'), +(35153, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101, 21, 28, 42, 0, 8, 0, 20405, 64, 0, 'Summon Nether Charge behind of the caster'), +(35904, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101, 21, 28, 44, 0, 8, 0, 20405, 64, 0, 'Summon Nether Charge right of the caster'), +(35905, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101, 21, 28, 43, 0, 8, 0, 20405, 64, 0, 'Summon Nether Charge left of the caster'), +(35906, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101, 21, 28, 41, 0, 8, 0, 20405, 64, 0, 'Summon Nether Charge front of the caster'), +(37264, 0x00000180, 0x00000000, 0x00000004, 0x00000000, 101, 21, 28, 18, 0, 7, 0, 21729, 64, 0, 'Power Converters: Summon Electromental (from cata)'), +(37278, 0x00000180, 0x00000000, 0x00000004, 0x00000000, 101, 21, 28, 18, 0, 1, 0, 21737, 64, 0, 'Power Converters: Summon Mini-Electromental (from cata)'), +(37365, 0x00000180, 0x00000000, 0x00000004, 0x00000000, 101, 21, 28, 18, 0, 1, 0, 21757, 64, 0, 'Power Converters: Summon Big Flavor Electromental (from cata)'), +(44920, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101, 21, 6, 1, 0, 0, 56, 24941, 0, 0, 'Model - Shattered Sun Marksman - BE Male Tier 4'), +(44924, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101, 21, 6, 1, 0, 0, 56, 24945, 0, 0, 'Model - Shattered Sun Marksman - BE Female Tier 4'), +(44928, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101, 21, 6, 1, 0, 0, 56, 24949, 0, 0, 'Model - Shattered Sun Marksman - Draenei Male Tier 4'), +(44932, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101, 21, 6, 1, 0, 0, 56, 24953, 0, 0, 'Model - Shattered Sun Marksman - Draenei Female Tier 4'), +(45158, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101, 21, 6, 1, 0, 0, 56, 25119, 0, 0, 'Model - Shattered Sun Warrior - BE Female Tier 4'), +(45162, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101, 21, 6, 1, 0, 0, 56, 25123, 0, 0, 'Model - Shattered Sun Warrior - BE Male Tier 4'), +(45166, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101, 21, 6, 1, 0, 0, 56, 25127, 0, 0, 'Model - Shattered Sun Warrior - Draenei Female Tier 4'), +(45170, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101, 21, 6, 1, 0, 0, 56, 25131, 0, 0, 'Model - Shattered Sun Warrior - Draenei Male Tier 4'), +(58630, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101, 37, 6, 22, 7, 28, 4, 0, 0, 0, 'Achievement check - Mal\'Ganis'), +(59046, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101, 37, 6, 22, 7, 28, 4, 0, 0, 0, 'Achievement check - Tribunal of Ages'), +(59450, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101, 37, 6, 22, 7, 28, 4, 0, 0, 0, 'Achievement check - The Four Horsemen'), +(62388, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 101, 21, 6, 1, 0, 0, 4, 0, 0, 0, 'Aura required for Demonic Circle 48020'), +(64899, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101, 37, 6, 22, 7, 28, 4, 0, 0, 0, 'Achievement check - Hodir'), +(64985, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101, 37, 6, 22, 7, 28, 4, 0, 0, 0, 'Achievement check - Thorim'), +(65074, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101, 37, 6, 22, 7, 28, 4, 0, 0, 0, 'Achievement check - Freya'), +(65195, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101, 37, 6, 22, 7, 28, 4, 0, 0, 0, 'Achievement check - Assembly of Iron'), +(68184, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101, 37, 6, 22, 7, 28, 4, 0, 0, 0, 'Achievement check - Faction Champions'), +(72845, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101, 37, 6, 22, 7, 28, 4, 0, 0, 0, 'Achievement check - Pit of Saron - Don\'t Look Up'); /*!40000 ALTER TABLE `spell_template` ENABLE KEYS */; UNLOCK TABLES; diff --git a/sql/updates/c12594_01_mangos_spell_template.sql b/sql/updates/c12594_01_mangos_spell_template.sql new file mode 100644 index 000000000..869704ba5 --- /dev/null +++ b/sql/updates/c12594_01_mangos_spell_template.sql @@ -0,0 +1,25 @@ +ALTER TABLE db_version CHANGE COLUMN required_c12564_01_mangos_spell_template required_c12594_01_mangos_spell_template bit; + +ALTER TABLE spell_template ADD COLUMN attr int(11) unsigned NOT NULL DEFAULT '0' AFTER id; +ALTER TABLE spell_template ADD COLUMN attr_ex int(11) unsigned NOT NULL DEFAULT '0' AFTER attr; +ALTER TABLE spell_template ADD COLUMN attr_ex2 int(11) unsigned NOT NULL DEFAULT '0' AFTER attr_ex; +ALTER TABLE spell_template ADD COLUMN effect0_implicit_target_b int(11) unsigned NOT NULL DEFAULT '0' AFTER effect0_implicit_target_a; + +DELETE FROM spell_template WHERE id IN (21387, 23363, 25192, 26133, 37264, 37278, 37365, 58630, 59046, 59450, 64899, 64985, 65074, 65195, 68184, 72845); +INSERT INTO spell_template VALUES +(21387, 0x00000140, 0x10000000, 0x00000000, 0x00000028, 15, 21, 6, 1, 0, 0, 42, 0, 0, 21388, 'Melt-Weapon trigger aura related used by Ragnaros'), +(23363, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 101, 21, 76, 18, 0, 0, 0, 179804, 0, 0, 'Summon Drakonid Corpse Trigger'), +(25192, 0x00000100, 0x00000000, 0x00000004, 0x00000000, 101, 21, 76, 18, 0, 0, 0, 180619, 0, 0, 'Summon Ossirian Crystal'), +(26133, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 101, 21, 76, 18, 0, 0, 0, 180795, 0, 0, 'Summon Sandworm Base'), +(37264, 0x00000180, 0x00000000, 0x00000004, 0x00000000, 101, 21, 28, 18, 0, 7, 0, 21729, 64, 0, 'Power Converters: Summon Electromental (from cata)'), +(37278, 0x00000180, 0x00000000, 0x00000004, 0x00000000, 101, 21, 28, 18, 0, 1, 0, 21737, 64, 0, 'Power Converters: Summon Mini-Electromental (from cata)'), +(37365, 0x00000180, 0x00000000, 0x00000004, 0x00000000, 101, 21, 28, 18, 0, 1, 0, 21757, 64, 0, 'Power Converters: Summon Big Flavor Electromental (from cata)'), +(58630, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101, 37, 6, 22, 7, 28, 4, 0, 0, 0, 'Achievement check - Mal\'Ganis'), +(59046, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101, 37, 6, 22, 7, 28, 4, 0, 0, 0, 'Achievement check - Tribunal of Ages'), +(59450, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101, 37, 6, 22, 7, 28, 4, 0, 0, 0, 'Achievement check - The Four Horsemen'), +(64899, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101, 37, 6, 22, 7, 28, 4, 0, 0, 0, 'Achievement check - Hodir'), +(64985, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101, 37, 6, 22, 7, 28, 4, 0, 0, 0, 'Achievement check - Thorim'), +(65074, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101, 37, 6, 22, 7, 28, 4, 0, 0, 0, 'Achievement check - Freya'), +(65195, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101, 37, 6, 22, 7, 28, 4, 0, 0, 0, 'Achievement check - Assembly of Iron'), +(68184, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101, 37, 6, 22, 7, 28, 4, 0, 0, 0, 'Achievement check - Faction Champions'), +(72845, 0x00800180, 0x00000000, 0x00000005, 0x00000000, 101, 37, 6, 22, 7, 28, 4, 0, 0, 0, 'Achievement check - Pit of Saron - Don\'t Look Up'); diff --git a/src/game/SQLStorages.cpp b/src/game/SQLStorages.cpp index 8fe565501..8b973d9e6 100644 --- a/src/game/SQLStorages.cpp +++ b/src/game/SQLStorages.cpp @@ -18,8 +18,8 @@ #include "SQLStorages.h" -const char CreatureInfosrcfmt[] = "iiiiiiiiiisssiiiiiiiiiiifffiffiifiiiiiiiiiiffiiiiiiiiiiiiiiiiiiisiiffliiiiiiiliiiiiis"; -const char CreatureInfodstfmt[] = "iiiiiiiiiisssiiiiiiiiiiifffiffiifiiiiiiiiiiffiiiiiiiiiiiiiiiiiiisiiffliiiiiiiliiiiiii"; +const char CreatureInfosrcfmt[] = "iiiiiiiiiisssiiiiiiiiiiifffiffiifiiiiiiiiiiiffiiiiiiiiiiiiiiisiiffliiiiiiiliiiiiis"; +const char CreatureInfodstfmt[] = "iiiiiiiiiisssiiiiiiiiiiifffiffiifiiiiiiiiiiiffiiiiiiiiiiiiiiisiiffliiiiiiiliiiiiii"; const char CreatureDataAddonInfofmt[] = "iiibbiis"; const char CreatureModelfmt[] = "iffbii"; const char CreatureInfoAddonInfofmt[] = "iiibbiis"; @@ -27,8 +27,8 @@ const char GameObjectInfoAddonInfofmt[] = "iffff"; const char EquipmentInfofmt[] = "iiii"; const char GameObjectInfosrcfmt[] = "iiissssiifiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiis"; const char GameObjectInfodstfmt[] = "iiissssiifiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii"; -const char ItemPrototypesrcfmt[]= "iiiisiiiiffiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiifiiifiiiiiifiiiiiifiiiiiifiiiiiifiiiisiiiiiiiiiiiiiiiiiiiiiiiifiiisiifiiiii"; -const char ItemPrototypedstfmt[]= "iiiisiiiiffiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiifiiifiiiiiifiiiiiifiiiiiifiiiiiifiiiisiiiiiiiiiiiiiiiiiiiiiiiifiiiiiifiiiii"; +const char ItemPrototypesrcfmt[] = "iiiisiiiiffiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiifiiifiiiiiifiiiiiifiiiiiifiiiiiifiiiisiiiiiiiiiiiiiiiiiiiiiiiifiiisiifiiiii"; +const char ItemPrototypedstfmt[] = "iiiisiiiiffiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiifiiifiiiiiifiiiiiifiiiiiifiiiiiifiiiisiiiiiiiiiiiiiiiiiiiiiiiifiiiiiifiiiii"; const char PageTextfmt[] = "isi"; const char InstanceTemplatesrcfmt[] = "iiiis"; const char InstanceTemplatedstfmt[] = "iiiii"; @@ -36,20 +36,30 @@ const char WorldTemplatesrcfmt[] = "is"; const char WorldTemplatedstfmt[] = "ii"; const char ConditionsSrcFmt[] = "iiii"; const char ConditionsDstFmt[] = "iiii"; -const char SpellTemplatesrcfmt[] = "iiiiiiiiiiix"; +const char SpellTemplatesrcfmt[] = "iiiiiiiiiiiiiiix"; // 0 10 20 30 40 50 60 70 80 90 100 110 120 130 140 150 160 170 180 185 -const char SpellTemplatedstfmt[] = "ixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxiixxxxixxxxxxFxxxxxxxxxxxxxxxxxxxxxxixxxxxFFFxxxxxxixxxxxixxixxxxxFFFxxxxxxixxixxixxFFFxxxxxxxxxxxxxppppppppppppppppppppppppppppppppxxxxxxxxxxxFFFxxxxxx"; -// Id proc DurationIndex Effect0 tarA0 effectAura0 triggerSpell0 SpellName[16] Rank[16] +const char SpellTemplatedstfmt[] = "ixxxiiixxxxxxxxxxxxxxxxxxxxxxxxxiixxxxixxxxxxFxxxxxxxxxxxxxxxxxxxxxxixxxxxFFFxxxxxxixxixxixxixxxxxFFFxxxxxxixxixxixxFFFxxxxxxxxxxxxxppppppppppppppppppppppppppppppppxxxxxxxxxxxFFFxxxxxx"; +// Id attr proc DurationIndex Effect0 tarA0 effectAura0 triggerSpell0 SpellName[16] Rank[16] +const char VehicleAccessorySrcFmt[] = "iiix"; +const char VehicleAccessoryDstFmt[] = "iii"; +const char CreatureTemplateSpellsFmt[] = "iiiiiiiiiii"; +const char SpellScriptTargetFmt[] = "iiii"; + SQLStorage sCreatureStorage(CreatureInfosrcfmt, CreatureInfodstfmt, "entry", "creature_template"); SQLStorage sCreatureDataAddonStorage(CreatureDataAddonInfofmt, "guid", "creature_addon"); SQLStorage sCreatureModelStorage(CreatureModelfmt, "modelid", "creature_model_info"); SQLStorage sCreatureInfoAddonStorage(CreatureInfoAddonInfofmt, "entry", "creature_template_addon"); -SQLStorage sGameObjectDataAddonStorage(GameObjectInfoAddonInfofmt, "guid", "gameobject_addon"); SQLStorage sEquipmentStorage(EquipmentInfofmt, "entry", "creature_equip_template"); -SQLStorage sGOStorage(GameObjectInfosrcfmt, GameObjectInfodstfmt, "entry", "gameobject_template"); SQLStorage sItemStorage(ItemPrototypesrcfmt, ItemPrototypedstfmt, "entry", "item_template"); SQLStorage sPageTextStore(PageTextfmt, "entry", "page_text"); SQLStorage sInstanceTemplate(InstanceTemplatesrcfmt, InstanceTemplatedstfmt, "map", "instance_template"); SQLStorage sWorldTemplate(WorldTemplatesrcfmt, WorldTemplatedstfmt, "map", "world_template"); SQLStorage sConditionStorage(ConditionsSrcFmt, ConditionsDstFmt, "condition_entry", "conditions"); -SQLStorage sSpellTemplate(SpellTemplatesrcfmt, SpellTemplatedstfmt, "id", "spell_template"); + +SQLHashStorage sGameObjectDataAddonStorage(GameObjectInfoAddonInfofmt, "guid", "gameobject_addon"); +SQLHashStorage sGOStorage(GameObjectInfosrcfmt, GameObjectInfodstfmt, "entry", "gameobject_template"); +SQLHashStorage sSpellTemplate(SpellTemplatesrcfmt, SpellTemplatedstfmt, "id", "spell_template"); +SQLHashStorage sCreatureTemplateSpellsStorage(CreatureTemplateSpellsFmt, "entry", "creature_template_spells"); + +SQLMultiStorage sVehicleAccessoryStorage(VehicleAccessorySrcFmt, VehicleAccessoryDstFmt, "vehicle_entry", "vehicle_accessory"); +SQLMultiStorage sSpellScriptTargetStorage(SpellScriptTargetFmt, "entry", "spell_script_target"); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 5ed8f2b83..278771745 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "12591" + #define REVISION_NR "12592" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index 8e6399ac5..35b095816 100644 --- a/src/shared/revision_sql.h +++ b/src/shared/revision_sql.h @@ -1,6 +1,6 @@ #ifndef __REVISION_SQL_H__ #define __REVISION_SQL_H__ #define REVISION_DB_CHARACTERS "required_12447_02_characters_calendar_invites" - #define REVISION_DB_MANGOS "required_c12564_01_mangos_spell_template" + #define REVISION_DB_MANGOS "required_c12594_01_mangos_spell_template" #define REVISION_DB_REALMD "required_c12484_02_realmd_account_access" #endif // __REVISION_SQL_H__