diff options
| author | tobmaps <spambot42@yandex.ru> | 2011-06-18 01:34:17 +0700 |
|---|---|---|
| committer | tobmaps <spambot42@yandex.ru> | 2011-06-18 01:34:17 +0700 |
| commit | 3a8702b8a4cb440454f812dfc4fcb67204cac8d6 (patch) | |
| tree | 459996eb592951f0e5d714ef0cf2db6c8ff409c0 | |
| parent | 73c84f5fcfc3900e757d3dcde75df4965bbd3c51 (diff) | |
Core/Spells: Fix Victory Rush
Closes #2020
| -rw-r--r-- | sql/base/world_database.sql | 3 | ||||
| -rw-r--r-- | sql/updates/world/2011_06_17_07_world_spell_proc_event.sql | 3 | ||||
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 6 | ||||
| -rwxr-xr-x | src/server/game/Spells/SpellEffects.cpp | 3 |
4 files changed, 11 insertions, 4 deletions
diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql index 6ae3cf22d62..94d2a7f1ed2 100644 --- a/sql/base/world_database.sql +++ b/sql/base/world_database.sql @@ -18710,11 +18710,12 @@ INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFam ( 31836, 0x00, 10, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Light's Grace (Rank 3) ( 31871, 0x00, 10, 0x00000010, 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0, 0, 0), -- Divine Purpose (Rank 1) ( 31872, 0x00, 10, 0x00000010, 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0, 0, 0), -- Divine Purpose (Rank 2) -( 53530, 1, 10, 0x00000000, 0x00000000, 0x0004, 0x0400, 0x0001, 0, 100, 0), -- Divine Guardian +( 53530, 0x01, 10, 0x00000000, 0x00000000, 0x00000004, 0x00000400, 0x00000001, 0, 100, 0), -- Divine Guardian ( 31876, 0x00, 10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0), -- Judgements of the Wise (Rank 1) ( 31877, 0x00, 10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0), -- Judgements of the Wise (Rank 2) ( 31878, 0x00, 10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0, 0, 0), -- Judgements of the Wise (Rank 3) ( 31904, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000040, 0, 0, 0), -- Holy Shield +( 32216, 0x00, 4, 0x00000000, 0x00000100, 0x00000000, 0x00000010, 0x00000000, 0, 0, 0), -- Victorious ( 32385, 0x00, 5, 0x00000001, 0x00040000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Shadow Embrace (Rank 1) ( 32387, 0x00, 5, 0x00000001, 0x00040000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Shadow Embrace (Rank 2) ( 32392, 0x00, 5, 0x00000001, 0x00040000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Shadow Embrace (Rank 3) diff --git a/sql/updates/world/2011_06_17_07_world_spell_proc_event.sql b/sql/updates/world/2011_06_17_07_world_spell_proc_event.sql new file mode 100644 index 00000000000..8a9f45c30a7 --- /dev/null +++ b/sql/updates/world/2011_06_17_07_world_spell_proc_event.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_proc_event` WHERE `entry` = 32216; +INSERT INTO `spell_proc_event` VALUES +(32216,0,4,0,0x100,0,0x10,0,0,0,0); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 800a71d1df1..68026515ef7 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -5853,6 +5853,12 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger triggered_spell_id = 26654; break; } + // Victorious + case 32216: + { + RemoveAura(dummySpell->Id); + return false; + } // Improved Spell Reflection case 59088: case 59089: diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 9627b5c4f83..0fa30486ba4 100755 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -469,10 +469,7 @@ void Spell::SpellDamageSchoolDmg(SpellEffIndex effIndex) damage += int32(m_caster->ApplyEffectModifiers(m_spellInfo, effIndex, float(m_caster->GetShieldBlockValue()))); // Victory Rush else if (m_spellInfo->SpellFamilyFlags[1] & 0x100) - { ApplyPctF(damage, m_caster->GetTotalAttackPowerValue(BASE_ATTACK)); - m_caster->ModifyAuraState(AURA_STATE_WARRIOR_VICTORY_RUSH, false); - } // Shockwave else if (m_spellInfo->Id == 46968) { |