aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sql/updates/4066_world_spell_proc_event.sql9
-rw-r--r--sql/world_spell_full.sql9
-rw-r--r--src/game/SharedDefines.h2
-rw-r--r--src/game/SpellAuras.cpp4
-rw-r--r--src/game/SpellEffects.cpp6
-rw-r--r--src/game/Unit.cpp6
6 files changed, 31 insertions, 5 deletions
diff --git a/sql/updates/4066_world_spell_proc_event.sql b/sql/updates/4066_world_spell_proc_event.sql
new file mode 100644
index 00000000000..08adad1a28e
--- /dev/null
+++ b/sql/updates/4066_world_spell_proc_event.sql
@@ -0,0 +1,9 @@
+DELETE FROM `spell_proc_event` WHERE `entry` IN (64976,64343, 63158, 63156, 51698, 51700, 51701);
+INSERT INTO `spell_proc_event` VALUES
+( 51698, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 1), -- Honor Among Thieves (Rank 1)
+( 51700, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 1), -- Honor Among Thieves (Rank 2)
+( 51701, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 1), -- Honor Among Thieves (Rank 3)
+( 64976, 0x00, 4, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Juggernaut
+( 64343, 0x00, 3, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Impact
+( 63158, 0x00, 5, 0x00000001, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Decimation
+( 63156, 0x00, 5, 0x00000001, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0); -- Decimation
diff --git a/sql/world_spell_full.sql b/sql/world_spell_full.sql
index c39370ec588..e0483161553 100644
--- a/sql/world_spell_full.sql
+++ b/sql/world_spell_full.sql
@@ -1231,9 +1231,6 @@ INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `Spell
( 51667, 0x00, 8, 0x00020000, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Cut to the Chase (Rank 3)
( 51668, 0x00, 8, 0x00020000, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Cut to the Chase (Rank 4)
( 51669, 0x00, 8, 0x00020000, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Cut to the Chase (Rank 5)
-( 51698, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 1), -- Honor Among Thieves
-( 51700, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 1), -- Honor Among Thieves
-( 51701, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 1), -- Honor Among Thieves
( 51672, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0, 0, 1), -- Unfair Advantage (Rank 1)
( 51674, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0, 0, 1), -- Unfair Advantage (Rank 2)
( 51679, 0x00, 8, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Throwing Specialization (Rank 2)
@@ -1449,7 +1446,11 @@ INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `Spell
( 61848, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0, 0, 0), -- Aspect of the Dragonhawk
( 62147, 0x00, 15, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Icy Touch Defense Increase
( 62459, 0x00, 15, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Chains of Ice Frost Rune Refresh (Rank 3)
-( 63108, 0x00, 5, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0); -- Siphon Life
+( 63108, 0x00, 5, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Siphon Life
+( 63158, 0x00, 5, 0x00000001, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Decimation
+( 63156, 0x00, 5, 0x00000001, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Decimation
+( 64343, 0x00, 3, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Impact
+( 64976, 0x00, 4, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0); -- Juggernaut
-- --------
-- ENCHANT PROC
diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h
index cebd9c07e5d..639bc5f5e81 100644
--- a/src/game/SharedDefines.h
+++ b/src/game/SharedDefines.h
@@ -911,7 +911,7 @@ enum AuraState
AURA_STATE_SWIFTMEND = 15, // T |
AURA_STATE_DEADLY_POISON = 16, // T |
AURA_STATE_ENRAGE = 17, // C |
- //AURA_STATE_UNKNOWN18 = 18, // C t|
+ AURA_STATE_BLEEDING = 18, // T|
//AURA_STATE_UNKNOWN19 = 19, // | not used
//AURA_STATE_UNKNOWN20 = 20, // c | only (45317 Suicide)
//AURA_STATE_UNKNOWN21 = 21, // | not used
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index a88ff097673..027a648cd80 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -1129,6 +1129,10 @@ void Aura::_AddAura()
if(m_spellProto->Dispel == DISPEL_ENRAGE)
SetAuraState(AURA_STATE_ENRAGE);
+ // Bleeding aura state
+ if (GetAllSpellMechanicMask(m_spellProto) & 1<<MECHANIC_BLEED)
+ SetAuraState(AURA_STATE_BLEEDING);
+
if(GetSpellSchoolMask(m_spellProto) & SPELL_SCHOOL_MASK_FROST)
{
for (uint8 i = 0;i<MAX_SPELL_EFFECTS;++i)
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index e19dae8601f..674fe0e2ba6 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -1549,6 +1549,12 @@ void Spell::EffectDummy(uint32 i)
}
break;
case SPELLFAMILY_ROGUE:
+ // Hunger for Blood
+ if (m_spellInfo->SpellFamilyFlags[1] & 0x1000000)
+ {
+ m_caster->CastSpell(m_caster, 63848, true);
+ break;
+ }
switch(m_spellInfo->Id )
{
case 5938: // Shiv
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 75ee0e3784d..4c93c6652eb 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -7687,6 +7687,12 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
return false;
break;
}
+ // Decimation
+ case 63156:
+ case 63158:
+ // Can proc only if target has hp below 35%
+ if(!pVictim->HasAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, procSpell, this))
+ return false;
}
// Custom basepoints/target for exist spell