diff --git a/sql/mangos.sql b/sql/mangos.sql index bee632063..0d673c9ec 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -24,7 +24,7 @@ CREATE TABLE `db_version` ( `version` varchar(120) default NULL, `creature_ai_version` varchar(120) default NULL, `cache_id` int(10) default '0', - `required_12112_14_mangos_command` bit(1) default NULL + `required_12120_01_mangos_spell_template` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -21430,6 +21430,7 @@ CREATE TABLE `spell_template` ( `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`) @@ -21441,20 +21442,20 @@ 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 trigger -(21387, 0x00000028, 15, 21, 6, 1, 0, 42, 0, 21388, 'Melt-Weapon trigger aura related used by Ragnaros'), -(23363, 0x00000000, 101, 21, 76, 18, 0, 0, 179804, 0, 'Summon Drakonid Corpse Trigger'), -(25192, 0x00000000, 101, 21, 76, 18, 0, 0, 180619, 0, 'Summon Ossirian Crystal'), -(26133, 0x00000000, 101, 21, 76, 18, 0, 0, 180795, 0, 'Summon Sandworm Base'), -(44920, 0x00000000, 101, 21, 6, 1, 0, 56, 24941, 0, 'Model - Shattered Sun Marksman - BE Male Tier 4'), -(44924, 0x00000000, 101, 21, 6, 1, 0, 56, 24945, 0, 'Model - Shattered Sun Marksman - BE Female Tier 4'), -(44928, 0x00000000, 101, 21, 6, 1, 0, 56, 24949, 0, 'Model - Shattered Sun Marksman - Draenei Male Tier 4'), -(44932, 0x00000000, 101, 21, 6, 1, 0, 56, 24953, 0, 'Model - Shattered Sun Marksman - Draenei Female Tier 4'), -(45158, 0x00000000, 101, 21, 6, 1, 0, 56, 25119, 0, 'Model - Shattered Sun Warrior - BE Female Tier 4'), -(45162, 0x00000000, 101, 21, 6, 1, 0, 56, 25123, 0, 'Model - Shattered Sun Warrior - BE Male Tier 4'), -(45166, 0x00000000, 101, 21, 6, 1, 0, 56, 25127, 0, 'Model - Shattered Sun Warrior - Draenei Female Tier 4'), -(45170, 0x00000000, 101, 21, 6, 1, 0, 56, 25131, 0, 'Model - Shattered Sun Warrior - Draenei Male Tier 4'), -(62388, 0x00000000, 101, 21, 6, 1, 0, 4, 0, 0, 'Aura required for Demonic Circle 48020'); +-- 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'), +(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'); /*!40000 ALTER TABLE `spell_template` ENABLE KEYS */; UNLOCK TABLES; diff --git a/sql/updates/12120_01_mangos_spell_template.sql b/sql/updates/12120_01_mangos_spell_template.sql new file mode 100644 index 000000000..0e6d34247 --- /dev/null +++ b/sql/updates/12120_01_mangos_spell_template.sql @@ -0,0 +1,3 @@ +ALTER TABLE db_version CHANGE COLUMN required_12112_14_mangos_command required_12120_01_mangos_spell_template bit; + +ALTER TABLE spell_template ADD COLUMN effect0_misc_value_b int(11) unsigned NOT NULL DEFAULT '0' AFTER effect0_misc_value; diff --git a/src/game/SQLStorages.cpp b/src/game/SQLStorages.cpp index e441e7e6d..f6c09de1d 100644 --- a/src/game/SQLStorages.cpp +++ b/src/game/SQLStorages.cpp @@ -36,10 +36,10 @@ const char WorldTemplatesrcfmt[] = "is"; const char WorldTemplatedstfmt[] = "ii"; const char ConditionsSrcFmt[] = "iiii"; const char ConditionsDstFmt[] = "iiii"; -const char SpellTemplatesrcfmt[] = "iiiiiiiiiix"; -// 0 10 20 30 40 50 60 70 80 90 100 110 120 130 140 150 160 170 180 185 -const char SpellTemplatedstfmt[]="ixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxiixxxxixxxxxxFxxxxxxxxxxxxxxxxxxxxxxixxxxxFFFxxxxxxixxxxxixxixxxxxFFFxxxxxxixxxxxixxFFFxxxxxxxxxxxxxppppppppppppppppppppppppppppppppxxxxxxxxxxxFFFxxxxxx"; -// Id proc DurationIndex +const char SpellTemplatesrcfmt[] = "iiiiiiiiiiix"; +// 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] SQLStorage sCreatureStorage(CreatureInfosrcfmt, CreatureInfodstfmt, "entry", "creature_template"); SQLStorage sCreatureDataAddonStorage(CreatureDataAddonInfofmt, "guid", "creature_addon"); SQLStorage sCreatureModelStorage(CreatureModelfmt, "modelid", "creature_model_info"); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 00e62461f..e316429cc 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 "12119" + #define REVISION_NR "12120" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index d67ee836c..d660f46a4 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_12112_02_characters_character" - #define REVISION_DB_MANGOS "required_12112_14_mangos_command" + #define REVISION_DB_MANGOS "required_12120_01_mangos_spell_template" #define REVISION_DB_REALMD "required_12112_01_realmd_account_access" #endif // __REVISION_SQL_H__