Core/Spells: Chill of the Grave will now grant Runic Power in all cases and will now again grant Runic Power for each target hit by Howling Blast

This commit is contained in:
Ovahlord committed 2019-08-30 13:09:08 +02:00
1 parent 5fd124c279
commit c3518933ba
3 files changed
+5 -54

No files matched your search

+4 -10
View File
@@ -4999,9 +4999,7 @@ void Spell::TakeRunePower(bool didHit)
player->ClearLastUsedRuneMask();
int32 runeCost[NUM_RUNE_TYPES]; // blood, frost, unholy, death
int32 runicPowerGain = runeCostData->runePowerGain * sWorld->getRate(RATE_POWER_RUNICPOWER_INCOME);
// Apply rune cost modifiers
for (uint32 i = 0; i < RUNE_DEATH; ++i)
{
runeCost[i] = runeCostData->RuneCost[i];
@@ -5055,7 +5053,7 @@ void Spell::TakeRunePower(bool didHit)
// you can gain some runic power when use runes
if (didHit)
{
if (runicPowerGain)
if (int32 rp = int32(runeCostData->runePowerGain * sWorld->getRate(RATE_POWER_RUNICPOWER_INCOME)))
{
Unit::AuraEffectList const& bonusPct = m_caster->GetAuraEffectsByType(SPELL_AURA_MOD_RUNE_REGEN_SPEED);
for (auto i = bonusPct.begin(); i != bonusPct.end(); ++i)
@@ -5065,18 +5063,14 @@ void Spell::TakeRunePower(bool didHit)
{
// Apply bonus when in Unholy or Blood Presence
if (player->HasAura(48265) || player->HasAura(48263))
AddPct(runicPowerGain, (*i)->GetAmount());
AddPct(rp, (*i)->GetAmount());
continue;
}
else
AddPct(runicPowerGain, (*i)->GetAmount());
AddPct(rp, (*i)->GetAmount());
}
// Apply runic power gain modifiers
if (Player* modOwner = m_caster->GetSpellModOwner())
modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_COST, runicPowerGain, const_cast<Spell*>(this));
player->ModifyPower(POWER_RUNIC_POWER, std::max(0, runicPowerGain));
player->ModifyPower(POWER_RUNIC_POWER, rp);
}
}
}