*Update procflags for Imp.Shadowform.
*Use item speed value instead of attack speed value for enchant PPM - by MaS0n. *Correctly apply cooldown to Improved leader of the pack mana regen. *Do not refresh duration when stack from aura is dropped - by Apoc --HG-- branch : trunk
This commit is contained in:
+1
-4
@@ -7243,10 +7243,7 @@ void Player::CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32
|
||||
float chance = pEnchant->amount[s] != 0 ? float(pEnchant->amount[s]) : GetWeaponProcChance();
|
||||
|
||||
if (entry && entry->PPMChance)
|
||||
{
|
||||
uint32 WeaponSpeed = GetAttackTime(attType);
|
||||
chance = GetPPMProcChance(WeaponSpeed, entry->PPMChance, spellInfo);
|
||||
}
|
||||
chance = GetPPMProcChance(proto->Delay, entry->PPMChance, spellInfo);
|
||||
else if (entry && entry->customChance)
|
||||
chance = entry->customChance;
|
||||
|
||||
|
||||
@@ -1388,6 +1388,7 @@ void Aura::_RemoveAura()
|
||||
|
||||
void Aura::SetStackAmount(uint8 stackAmount, bool applied)
|
||||
{
|
||||
bool refresh = stackAmount >= m_stackAmount;
|
||||
if (stackAmount != m_stackAmount)
|
||||
{
|
||||
m_stackAmount = stackAmount;
|
||||
@@ -1399,7 +1400,11 @@ void Aura::SetStackAmount(uint8 stackAmount, bool applied)
|
||||
}
|
||||
}
|
||||
}
|
||||
RefreshAura();
|
||||
|
||||
if (refresh)
|
||||
RefreshAura();
|
||||
else
|
||||
SendAuraUpdate();
|
||||
}
|
||||
|
||||
bool Aura::modStackAmount(int32 num)
|
||||
|
||||
+6
-4
@@ -5843,10 +5843,13 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
|
||||
basepoints0 = triggerAmount * GetMaxHealth() / 100;
|
||||
target = this;
|
||||
triggered_spell_id = 34299;
|
||||
if (triggeredByAura->GetCaster() != this)
|
||||
if (triggeredByAura->GetCasterGUID() != GetGUID())
|
||||
break;
|
||||
int32 basepoints1 = triggerAmount * 2;
|
||||
CastCustomSpell(this,60889,&basepoints1,0,0,true,0,triggeredByAura);
|
||||
// Improved Leader of the Pack
|
||||
// Check cooldown of heal spell cooldown
|
||||
if (GetTypeId()==TYPEID_PLAYER && !((Player *)this)->HasSpellCooldown(34299))
|
||||
CastCustomSpell(this,60889,&basepoints1,0,0,true,0,triggeredByAura);
|
||||
break;
|
||||
}
|
||||
// Healing Touch (Dreamwalker Raiment set)
|
||||
@@ -10451,8 +10454,7 @@ float Unit::GetPPMProcChance(uint32 WeaponSpeed, float PPM, const SpellEntry * s
|
||||
if(Player* modOwner = GetSpellModOwner())
|
||||
modOwner->ApplySpellMod(spellProto->Id,SPELLMOD_PROC_PER_MINUTE,PPM);
|
||||
|
||||
uint32 result = uint32((WeaponSpeed * PPM) / 600.0f); // result is chance in percents (probability = Speed_in_sec * (PPM / 60))
|
||||
return result;
|
||||
return uint32((WeaponSpeed * PPM) / 600.0f); // result is chance in percents (probability = Speed_in_sec * (PPM / 60))
|
||||
}
|
||||
|
||||
void Unit::Mount(uint32 mount)
|
||||
|
||||
Reference in New Issue
Block a user