From f74d718d650a541d65ae4942ad7bf2dfb67a33db Mon Sep 17 00:00:00 2001 From: KAPATEJIb Date: Tue, 12 Jan 2010 05:53:29 +0300 Subject: [PATCH] [9153] Use in code heal amount calculation for 20165. Thanks to MrLama for small cleanups and patch updating. Signed-off-by: VladimirMangos --- sql/mangos.sql | 3 +-- sql/updates/9153_01_mangos_spell_bonus_data.sql | 3 +++ sql/updates/Makefile.am | 2 ++ src/game/SpellEffects.cpp | 10 +++++++++- src/shared/revision_nr.h | 2 +- src/shared/revision_sql.h | 2 +- 6 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 sql/updates/9153_01_mangos_spell_bonus_data.sql diff --git a/sql/mangos.sql b/sql/mangos.sql index 64f952b31..05f460628 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_9150_01_mangos_spell_bonus_data` bit(1) default NULL + `required_9153_01_mangos_spell_bonus_data` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -14135,7 +14135,6 @@ INSERT INTO `spell_bonus_data` VALUES (31804, 0, 0, 0, 'Paladin - Judgement of Vengeance'), (20424, 0, 0, 0, 'Paladin - Seal of Command Proc'), (53739, 0, 0.00156, 0.003, 'Paladin - Seal of Corruption (full stack proc)'), -(20167, 0.15, 0, 0.15, 'Paladin - Seal of Light Proc'), (25742, 0.07, 0, 0.039, 'Paladin - Seal of Righteousness Dummy Proc'), (42463, 0, 0.00156, 0.003, 'Paladin - Seal of Vengeance (full stack proc)'), (53600, 0, 0, 0, 'Paladin - Shield of Righteousness'), diff --git a/sql/updates/9153_01_mangos_spell_bonus_data.sql b/sql/updates/9153_01_mangos_spell_bonus_data.sql new file mode 100644 index 000000000..3b492b568 --- /dev/null +++ b/sql/updates/9153_01_mangos_spell_bonus_data.sql @@ -0,0 +1,3 @@ +ALTER TABLE db_version CHANGE COLUMN required_9150_01_mangos_spell_bonus_data required_9153_01_mangos_spell_bonus_data bit; + +DELETE FROM spell_bonus_data WHERE entry IN (20167); diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index ea2d46261..995a2ca2e 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -238,6 +238,7 @@ pkgdata_DATA = \ 9148_01_mangos_spell_bonus_data.sql \ 9149_01_mangos_spell_bonus_data.sql \ 9150_01_mangos_spell_bonus_data.sql \ + 9153_01_mangos_spell_bonus_data.sql \ README ## Additional files to include when running 'make dist' @@ -456,4 +457,5 @@ EXTRA_DIST = \ 9148_01_mangos_spell_bonus_data.sql \ 9149_01_mangos_spell_bonus_data.sql \ 9150_01_mangos_spell_bonus_data.sql \ + 9153_01_mangos_spell_bonus_data.sql \ README diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 36fbe55c2..0e437fd1a 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -2643,8 +2643,16 @@ void Spell::EffectHeal( uint32 /*i*/ ) int32 addhealth = damage; + // Seal of Light proc + if (m_spellInfo->Id == 20167) + { + float ap = caster->GetTotalAttackPowerValue(BASE_ATTACK); + int32 holy = caster->SpellBaseHealingBonus(GetSpellSchoolMask(m_spellInfo)) + + caster->SpellBaseHealingBonusForVictim(GetSpellSchoolMask(m_spellInfo), unitTarget); + addhealth += int32(ap * 0.15) + int32(holy * 15 / 100); + } // Vessel of the Naaru (Vial of the Sunwell trinket) - if (m_spellInfo->Id == 45064) + else if (m_spellInfo->Id == 45064) { // Amount of heal - depends from stacked Holy Energy int damageAmount = 0; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 9a5c83fe6..c8ca9da8d 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 "9152" + #define REVISION_NR "9153" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index b693456f4..607292c7b 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_9136_07_characters_characters" - #define REVISION_DB_MANGOS "required_9150_01_mangos_spell_bonus_data" + #define REVISION_DB_MANGOS "required_9153_01_mangos_spell_bonus_data" #define REVISION_DB_REALMD "required_9010_01_realmd_realmlist" #endif // __REVISION_SQL_H__ -- 2.11.4.GIT