diff --git a/sql/mangos.sql b/sql/mangos.sql index f2e6a5a5b..246b16e72 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_8777_02_mangos_gameobject` bit(1) default NULL + `required_8800_01_mangos_spell_elixir` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -17417,6 +17417,9 @@ INSERT INTO `spell_elixir` VALUES (60346,0x1), (60347,0x2), (62380,0x3), +(67016,0x3), +(67017,0x3), +(67018,0x3), (67019,0x3); diff --git a/sql/updates/8800_01_mangos_spell_elixir.sql b/sql/updates/8800_01_mangos_spell_elixir.sql new file mode 100644 index 000000000..3634c0b85 --- /dev/null +++ b/sql/updates/8800_01_mangos_spell_elixir.sql @@ -0,0 +1,9 @@ +ALTER TABLE db_version CHANGE COLUMN required_8777_02_mangos_gameobject required_8800_01_mangos_spell_elixir bit; + +DELETE FROM `spell_elixir` WHERE `entry` IN (67016,67017,67018); + +/* Flasks added in 3.2.x */ +INSERT INTO `spell_elixir` (`entry`, `mask`) VALUES +(67016,0x3), +(67017,0x3), +(67018,0x3); diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index cbb47eae8..6a6263391 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -153,6 +153,7 @@ pkgdata_DATA = \ 8775_03_mangos_gameobject.sql \ 8777_01_mangos_creature.sql \ 8777_02_mangos_gameobject.sql \ + 8800_01_mangos_spell_elixir.sql \ README ## Additional files to include when running 'make dist' @@ -286,4 +287,5 @@ EXTRA_DIST = \ 8775_03_mangos_gameobject.sql \ 8777_01_mangos_creature.sql \ 8777_02_mangos_gameobject.sql \ + 8800_01_mangos_spell_elixir.sql \ README diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 16170daa5..6dd37ae88 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -1321,6 +1321,22 @@ void Spell::EffectDummy(uint32 i) return; m_caster->CastSpell(unitTarget,60934,true,NULL); return; + case 67019: // Flask of the North + { + if (m_caster->GetTypeId() != TYPEID_PLAYER) + return; + + uint32 spell_id; + switch(urand(1, 3)) + { + case 1: spell_id = 67016; break; + case 2: spell_id = 67017; break; + default:spell_id = 67018; break; + } + + m_caster->CastSpell(m_caster, spell_id, true, NULL); + return; + } } break; } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 25d6d8913..beb04501a 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 "8799" + #define REVISION_NR "8800" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index f748d660a..004d772b9 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_8721_01_characters_guild" - #define REVISION_DB_MANGOS "required_8777_02_mangos_gameobject" + #define REVISION_DB_MANGOS "required_8800_01_mangos_spell_elixir" #define REVISION_DB_REALMD "required_8728_01_realmd_account" #endif // __REVISION_SQL_H__