* Turn proc flag on periodic heal spells back on.
* Fix Glyph of Rejuvenation. * Fix a typo in bladestorm handling. * Use Player's Crippling Poison for Deadly Brew instead of mob one to make it not stackable(dunno if it's correct) --HG-- branch : trunk
This commit is contained in:
@@ -0,0 +1,3 @@
|
|||||||
|
DELETE FROM `spell_proc_event` WHERE `entry` IN (54754);
|
||||||
|
INSERT INTO `spell_proc_event` VALUES
|
||||||
|
(54754, 0x00, 7, 0x00000010, 0x00000000, 0x00000000, 0x00000000, 0x0000000, 0.000000, 0.000000, 0);
|
||||||
@@ -4048,7 +4048,7 @@ void AuraEffect::HandleModStateImmunityMask(bool apply, bool Real)
|
|||||||
immunity_list.push_back(SPELL_AURA_MOD_DECREASE_SPEED);
|
immunity_list.push_back(SPELL_AURA_MOD_DECREASE_SPEED);
|
||||||
if (GetMiscValue() & (1<<0))
|
if (GetMiscValue() & (1<<0))
|
||||||
immunity_list.push_back(SPELL_AURA_MOD_ROOT);
|
immunity_list.push_back(SPELL_AURA_MOD_ROOT);
|
||||||
if (GetMiscValue() & (1<<3))
|
if (GetMiscValue() & (1<<2))
|
||||||
immunity_list.push_back(SPELL_AURA_MOD_CONFUSE);
|
immunity_list.push_back(SPELL_AURA_MOD_CONFUSE);
|
||||||
if (GetMiscValue() & (1<<9))
|
if (GetMiscValue() & (1<<9))
|
||||||
immunity_list.push_back(SPELL_AURA_MOD_FEAR);
|
immunity_list.push_back(SPELL_AURA_MOD_FEAR);
|
||||||
@@ -5920,10 +5920,10 @@ void AuraEffect::PeriodicTick()
|
|||||||
}
|
}
|
||||||
|
|
||||||
uint32 procAttacker = PROC_FLAG_ON_DO_PERIODIC;// | PROC_FLAG_SUCCESSFUL_HEAL;
|
uint32 procAttacker = PROC_FLAG_ON_DO_PERIODIC;// | PROC_FLAG_SUCCESSFUL_HEAL;
|
||||||
uint32 procVictim = 0;//ROC_FLAG_ON_TAKE_PERIODIC | PROC_FLAG_TAKEN_HEAL;
|
uint32 procVictim = PROC_FLAG_ON_TAKE_PERIODIC; //| PROC_FLAG_TAKEN_HEAL;
|
||||||
// ignore item heals
|
// ignore item heals
|
||||||
// if(procSpell && !haveCastItem)
|
if(procSpell && !haveCastItem)
|
||||||
// pCaster->ProcDamageAndSpell(target, procAttacker, procVictim, PROC_EX_NORMAL_HIT, pdamage, BASE_ATTACK, spellProto);
|
pCaster->ProcDamageAndSpell(target, procAttacker, procVictim, PROC_EX_NORMAL_HIT, pdamage, BASE_ATTACK, spellProto);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case SPELL_AURA_PERIODIC_MANA_LEECH:
|
case SPELL_AURA_PERIODIC_MANA_LEECH:
|
||||||
|
|||||||
+10
-1
@@ -5615,6 +5615,15 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
|
|||||||
triggered_spell_id = 28742;
|
triggered_spell_id = 28742;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
// Glyph of Rejuvenation
|
||||||
|
case 54754:
|
||||||
|
{
|
||||||
|
if (pVictim->GetHealth() >= triggerAmount * pVictim->GetMaxHealth()/100)
|
||||||
|
return false;
|
||||||
|
basepoints0 = int32(triggerAmount * damage / 100);
|
||||||
|
triggered_spell_id = 54755;
|
||||||
|
break;
|
||||||
|
}
|
||||||
// Healing Touch Refund (Idol of Longevity trinket)
|
// Healing Touch Refund (Idol of Longevity trinket)
|
||||||
case 28847:
|
case 28847:
|
||||||
{
|
{
|
||||||
@@ -5735,7 +5744,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
|
|||||||
// Deadly Brew
|
// Deadly Brew
|
||||||
else if( dummySpell->SpellIconID == 2963 )
|
else if( dummySpell->SpellIconID == 2963 )
|
||||||
{
|
{
|
||||||
triggered_spell_id = 25809;
|
triggered_spell_id = 3409;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
// Quick Recovery
|
// Quick Recovery
|
||||||
|
|||||||
Reference in New Issue
Block a user