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

[11040] Fixed spell bonuses apply to healing from 58757

Browse source 
Thanks Lynx3d for help in patch writing.
This commit is contained in:
VladimirMangos 2011-01-18 21:46:17 +03:00
parent f2e78cdded
commit bf04f46011
7 changed files with 45 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
sql/mangos.sql
View file

@ -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_11036_01_mangos_spell_threat` bit(1) default NULL
`required_11040_02_mangos_spell_bonus_data` bit(1) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
--
@ -14536,7 +14536,7 @@ INSERT INTO `spell_bonus_data` VALUES
(8026, 0.1, 0, 0, 0, 'Shaman - Flametongue Weapon Proc'),
(8056, 0.3858, 0, 0, 0, 'Shaman - Frost Shock'),
(8034, 0.1, 0, 0, 0, 'Shaman - Frostbrand Attack Rank 1'),
(52042, 0.045, 0, 0, 0, 'Shaman - Healing Stream Totem Triggered Heal'),
(5672, 0.08272,0, 0, 0, 'Shaman - Healing Stream Totem Aura'),
(331, 1.6106, 0, 0, 0, 'Shaman - Healing Wave'),
(403, 0.7143, 0, 0, 0, 'Shaman - Lightning Bolt'),
(26364, 0.33, 0, 0, 0, 'Shaman - Lightning Shield Proc'),
@ -14636,6 +14636,16 @@ INSERT INTO spell_chain VALUES
(58797,25501,8034,7,0),
(58798,58797,8034,8,0),
(58799,58798,8034,9,0),
/* Healing Stream Totem Aura */
(5672,0,5672,1,0),
(6371,5672,5672,2,0),
(6372,6371,5672,3,0),
(10460,6372,5672,4,0),
(10461,10460,5672,5,0),
(25566,10461,5672,6,0),
(58763,25566,5672,7,0),
(58764,58763,5672,8,0),
(58765,58764,5672,9,0),
/* Instant Poison */
(8680,0,8680,1,0),
(8685,8680,8680,2,0),

15
sql/updates/11040_01_mangos_spell_chain.sql Normal file
View file

@ -0,0 +1,15 @@
ALTER TABLE db_version CHANGE COLUMN required_11036_01_mangos_spell_threat required_11040_01_mangos_spell_chain bit;
DELETE FROM `spell_chain` WHERE `first_spell` IN (5672);
INSERT INTO `spell_chain` VALUES
/* Healing Stream Totem Aura */
(5672,0,5672,1,0),
(6371,5672,5672,2,0),
(6372,6371,5672,3,0),
(10460,6372,5672,4,0),
(10461,10460,5672,5,0),
(25566,10461,5672,6,0),
(58763,25566,5672,7,0),
(58764,58763,5672,8,0),
(58765,58764,5672,9,0);

5
sql/updates/11040_02_mangos_spell_bonus_data.sql Normal file
View file

@ -0,0 +1,5 @@
ALTER TABLE db_version CHANGE COLUMN required_11040_01_mangos_spell_chain required_11040_02_mangos_spell_bonus_data bit;
DELETE FROM spell_bonus_data WHERE entry IN (52042, 5672);
INSERT INTO spell_bonus_data VALUES
(5672, 0.08272, 0, 0, 0, 'Shaman - Healing Stream Totem Aura');

4
sql/updates/Makefile.am
View file

@ -155,6 +155,8 @@ pkgdata_DATA = \
11018_01_mangos_command.sql \
11023_01_mangos_spell_threat.sql \
11036_01_mangos_spell_threat.sql \
11040_01_mangos_spell_chain.sql \
11040_02_mangos_spell_bonus_data.sql \
README
## Additional files to include when running 'make dist'
@ -290,4 +292,6 @@ EXTRA_DIST = \
11018_01_mangos_command.sql \
11023_01_mangos_spell_threat.sql \
11036_01_mangos_spell_threat.sql \
11040_01_mangos_spell_chain.sql \
11040_02_mangos_spell_bonus_data.sql \
README

7
src/game/SpellEffects.cpp
View file

@ -2581,6 +2581,13 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
{
if (Unit *owner = m_caster->GetOwner())
{
// spell have SPELL_DAMAGE_CLASS_NONE and not get bonuses from owner, use main spell for bonuses
if (m_triggeredBySpellInfo)
{
damage = int32(owner->SpellHealingBonusDone(unitTarget, m_triggeredBySpellInfo, damage, HEAL));
damage = int32(unitTarget->SpellHealingBonusTaken(owner, m_triggeredBySpellInfo, damage, HEAL));
}
// Restorative Totems
Unit::AuraList const& mDummyAuras = owner->GetAurasByType(SPELL_AURA_DUMMY);
for(Unit::AuraList::const_iterator i = mDummyAuras.begin(); i != mDummyAuras.end(); ++i)

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "11039"
#define REVISION_NR "11040"
#endif // __REVISION_NR_H__

2
src/shared/revision_sql.h
View file

@ -1,6 +1,6 @@
#ifndef __REVISION_SQL_H__
#define __REVISION_SQL_H__
#define REVISION_DB_CHARACTERS "required_10973_01_characters_game_event_status"
#define REVISION_DB_MANGOS "required_11036_01_mangos_spell_threat"
#define REVISION_DB_MANGOS "required_11040_02_mangos_spell_bonus_data"
#define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version"
#endif // __REVISION_SQL_H__