mirror of
https://github.com/mangosfour/server.git
synced 2025-12-14 16:37:01 +00:00
[11530] Fixes for talent 47201 and ranks
* Update triggering source spells. * In code overwrite wrong family mask data for spell mod. If more cases will be maybe will better restore spell_affect table. Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
parent
7c86d3f477
commit
d02bee5127
5 changed files with 19 additions and 5 deletions
|
|
@ -24,7 +24,7 @@ CREATE TABLE `db_version` (
|
||||||
`version` varchar(120) default NULL,
|
`version` varchar(120) default NULL,
|
||||||
`creature_ai_version` varchar(120) default NULL,
|
`creature_ai_version` varchar(120) default NULL,
|
||||||
`cache_id` int(10) default '0',
|
`cache_id` int(10) default '0',
|
||||||
`required_11529_01_mangos_command` bit(1) default NULL
|
`required_11530_01_mangos_spell_proc_event` bit(1) default NULL
|
||||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
|
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
|
||||||
|
|
||||||
--
|
--
|
||||||
|
|
@ -17357,7 +17357,7 @@ INSERT INTO `spell_proc_event` VALUES
|
||||||
(46916, 0x00, 4, 0x00000000, 0x00000000, 0x00000000, 0x00000400, 0x00000400, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0),
|
(46916, 0x00, 4, 0x00000000, 0x00000000, 0x00000000, 0x00000400, 0x00000400, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0),
|
||||||
(46951, 0x00, 4, 0x00000400, 0x00000400, 0x00000400, 0x00000040, 0x00000040, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0),
|
(46951, 0x00, 4, 0x00000400, 0x00000400, 0x00000400, 0x00000040, 0x00000040, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0),
|
||||||
(47195, 0x00, 5, 0x00000002, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 30),
|
(47195, 0x00, 5, 0x00000002, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 30),
|
||||||
(47201, 0x00, 5, 0x00000008, 0x00000008, 0x00000008, 0x00040000, 0x00040000, 0x00040000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0.000000, 0.000000, 0),
|
(47201, 0x00, 5, 0x00004009, 0x00004009, 0x00004009, 0x00040000, 0x00040000, 0x00040000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0.000000, 0.000000, 0),
|
||||||
(47245, 0x20, 5, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0),
|
(47245, 0x20, 5, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0),
|
||||||
(47258, 0x00, 5, 0x00000000, 0x00000000, 0x00000000, 0x00800000, 0x00800000, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0.000000, 0.000000, 0),
|
(47258, 0x00, 5, 0x00000000, 0x00000000, 0x00000000, 0x00800000, 0x00800000, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0.000000, 0.000000, 0),
|
||||||
(47263, 0x20, 5, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 20),
|
(47263, 0x20, 5, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 20),
|
||||||
|
|
|
||||||
5
sql/updates/11530_01_mangos_spell_proc_event.sql
Normal file
5
sql/updates/11530_01_mangos_spell_proc_event.sql
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
ALTER TABLE db_version CHANGE COLUMN required_11529_01_mangos_command required_11530_01_mangos_spell_proc_event bit;
|
||||||
|
|
||||||
|
DELETE FROM `spell_proc_event` WHERE entry = 47201;
|
||||||
|
INSERT INTO `spell_proc_event` VALUE
|
||||||
|
(47201, 0x00, 5, 0x00004009, 0x00004009, 0x00004009, 0x00040000, 0x00040000, 0x00040000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0.000000, 0.000000, 0);
|
||||||
|
|
@ -1010,8 +1010,10 @@ void Aura::HandleAddModifier(bool apply, bool Real)
|
||||||
|
|
||||||
if (apply)
|
if (apply)
|
||||||
{
|
{
|
||||||
|
SpellEntry const* spellProto = GetSpellProto();
|
||||||
|
|
||||||
// Add custom charges for some mod aura
|
// Add custom charges for some mod aura
|
||||||
switch (GetSpellProto()->Id)
|
switch (spellProto->Id)
|
||||||
{
|
{
|
||||||
case 17941: // Shadow Trance
|
case 17941: // Shadow Trance
|
||||||
case 22008: // Netherwind Focus
|
case 22008: // Netherwind Focus
|
||||||
|
|
@ -1036,6 +1038,13 @@ void Aura::HandleAddModifier(bool apply, bool Real)
|
||||||
// prevent expire spell mods with (charges > 0 && m_stackAmount > 1)
|
// prevent expire spell mods with (charges > 0 && m_stackAmount > 1)
|
||||||
// all this spell expected expire not at use but at spell proc event check
|
// all this spell expected expire not at use but at spell proc event check
|
||||||
GetSpellProto()->StackAmount > 1 ? 0 : GetHolder()->GetAuraCharges());
|
GetSpellProto()->StackAmount > 1 ? 0 : GetHolder()->GetAuraCharges());
|
||||||
|
|
||||||
|
// Everlasting Affliction, overwrite wrong data, if will need more better restore support of spell_affect table
|
||||||
|
if (spellProto->SpellFamilyName == SPELLFAMILY_WARLOCK && spellProto->SpellIconID == 3169)
|
||||||
|
{
|
||||||
|
m_spellmod->mask = UI64LIT(0x0000010000000002); // Corruption and Unstable Affliction
|
||||||
|
m_spellmod->mask2 = 0x00000000;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
((Player*)GetTarget())->AddSpellMod(m_spellmod, apply);
|
((Player*)GetTarget())->AddSpellMod(m_spellmod, apply);
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "11529"
|
#define REVISION_NR "11530"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
#ifndef __REVISION_SQL_H__
|
#ifndef __REVISION_SQL_H__
|
||||||
#define __REVISION_SQL_H__
|
#define __REVISION_SQL_H__
|
||||||
#define REVISION_DB_CHARACTERS "required_11436_01_characters_character_queststatus"
|
#define REVISION_DB_CHARACTERS "required_11436_01_characters_character_queststatus"
|
||||||
#define REVISION_DB_MANGOS "required_11529_01_mangos_command"
|
#define REVISION_DB_MANGOS "required_11530_01_mangos_spell_proc_event"
|
||||||
#define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version"
|
#define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version"
|
||||||
#endif // __REVISION_SQL_H__
|
#endif // __REVISION_SQL_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue