mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[8213] Update code for talent 17962.

Browse source 
* Fixed place, basic dependent from 2 auras type at target and damage calculation.
* Avoid double apply spell bonus from original effect and talent self.

Signed-off-by: VladimirMangos <vladimir@getmangos.com>

This is first patch in series for resolve all problem suggested by different authors.

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
Ungaminga 2009-07-20 06:11:16 +04:00 • committed by VladimirMangos
parent b047a62259
commit eba34304ea
6 changed files with 29 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/mangos.sql
View file

@ -23,7 +23,7 @@ DROP TABLE IF EXISTS `db_version`;
CREATE TABLE `db_version` (
`version` varchar(120) default NULL,
`creature_ai_version` varchar(120) default NULL,
`required_8212_01_mangos_spell_proc_event` bit(1) default NULL
`required_8213_01_mangos_spell_bonus_data` bit(1) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
--
@ -17891,7 +17891,7 @@ INSERT INTO `spell_bonus_data` VALUES
('27243', '0.22', '0.25', '0', 'Warlock - Seed of Corruption'),
('30108', '0', '0.24', '0', 'Warlock - Unstable Affliction'),
('31117', '1.8', '0', '0', 'Warlock - Unstable Affliction Dispell'),
('17962', '0.4286', '0', '0', 'Warlock - Conflagrate'),
('17962', '0', '0', '0', 'Warlock - Conflagrate'),
('6789', '0.22', '0', '0', 'Warlock - Death Coil'),
('28176', '0', '0', '0', 'Warlock - Fel Armor'),
('48181', '0.4729', '0', '0', 'Warlock - Haunt'),

4
sql/updates/8213_01_mangos_spell_bonus_data.sql Normal file
View file

@ -0,0 +1,4 @@
ALTER TABLE db_version CHANGE COLUMN required_8212_01_mangos_spell_proc_event required_8213_01_mangos_spell_bonus_data bit;
DELETE FROM `spell_bonus_data` where entry='17962';
INSERT INTO `spell_bonus_data` (`entry`) VALUES ('17962');

2
sql/updates/Makefile.am
View file

@ -248,6 +248,7 @@ pkgdata_DATA = \
8191_01_mangos_spell_affect.sql \
8211_01_mangos_spell_proc_event.sql \
8212_01_mangos_spell_proc_event.sql \
8213_01_mangos_spell_bonus_data.sql \
README
## Additional files to include when running 'make dist'
@ -476,4 +477,5 @@ EXTRA_DIST = \
8191_01_mangos_spell_affect.sql \
8211_01_mangos_spell_proc_event.sql \
8212_01_mangos_spell_proc_event.sql \
8213_01_mangos_spell_bonus_data.sql \
README

16
src/game/Spell.cpp
View file

@ -2346,22 +2346,6 @@ void Spell::cast(bool skipCheck)
break;
}
// Conflagrate - consumes immolate
if ((m_spellInfo->TargetAuraState == AURA_STATE_IMMOLATE) && m_targets.getUnitTarget())
{
// for caster applied auras only
Unit::AuraList const &mPeriodic = m_targets.getUnitTarget()->GetAurasByType(SPELL_AURA_PERIODIC_DAMAGE);
for(Unit::AuraList::const_iterator i = mPeriodic.begin(); i != mPeriodic.end(); ++i)
{
if( (*i)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_WARLOCK && ((*i)->GetSpellProto()->SpellFamilyFlags & 4) &&
(*i)->GetCasterGUID()==m_caster->GetGUID() )
{
m_targets.getUnitTarget()->RemoveAura((*i)->GetId(), (*i)->GetEffIndex());
break;
}
}
}
// traded items have trade slot instead of guid in m_itemTargetGUID
// set to real guid to be sent later to the client
m_targets.updateTradeSlotItem();

20
src/game/SpellEffects.cpp
View file

@ -408,6 +408,26 @@ void Spell::EffectSchoolDMG(uint32 effect_idx)
if(unitTarget->HasAuraState(AURA_STATE_IMMOLATE))
damage += int32(damage*0.25f);
}
// Conflagrate - consumes immolate or Shadowflame
if (m_spellInfo->TargetAuraState == AURA_STATE_IMMOLATE)
{
// for caster applied auras only
Unit::AuraList const &mPeriodic = unitTarget->GetAurasByType(SPELL_AURA_PERIODIC_DAMAGE);
for(Unit::AuraList::const_iterator i = mPeriodic.begin(); i != mPeriodic.end(); ++i)
{
if ((*i)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_WARLOCK &&
(*i)->GetCasterGUID()==m_caster->GetGUID() &&
// Immolate
((*i)->GetSpellProto()->SpellFamilyFlags & 0x0000000000000004 ||
// Shadowflame
(*i)->GetSpellProto()->SpellFamilyFlags2 & 0x00000002))
{
int32 damagetick = m_caster->SpellDamageBonus(unitTarget, (*i)->GetSpellProto(), (*i)->GetModifier()->m_amount, DOT);
damage += damagetick * 4;
break;
}
}
}
break;
}
case SPELLFAMILY_PRIEST:

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "8212"
#define REVISION_NR "8213"
#endif // __REVISION_NR_H__