Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 08:28:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spell: Hymn of Hope fix.

Browse Source 
*fixed mess with temporary increase max/current power (percent).
*thx Shocker for advice
This commit is contained in:
Chaplain
2011-09-26 20:12:25 +03:00
parent 210a770958
commit 5bbd8dcf33
2 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/server/game/Spells/Auras/SpellAuraEffects.cpp
View File

@@ -742,11 +742,6 @@ int32 AuraEffect::CalculateAmount(Unit* caster)
if (GetId() == 55233)
amount = GetBase()->GetUnitOwner()->CountPctFromMaxHealth(amount);
break;
case SPELL_AURA_MOD_INCREASE_ENERGY:
// Hymn of Hope
if (GetId() == 64904)
ApplyPctU(amount, GetBase()->GetUnitOwner()->GetMaxPower(GetBase()->GetUnitOwner()->getPowerType()));
break;
case SPELL_AURA_MOD_INCREASE_SPEED:
// Dash - do not set speed if not in cat form
if (GetSpellInfo()->SpellFamilyName == SPELLFAMILY_DRUID && GetSpellInfo()->SpellFamilyFlags[2] & 0x00000008)
@@ -3989,19 +3984,6 @@ void AuraEffect::HandleAuraModIncreaseEnergy(AuraApplication const* aurApp, uint
UnitMods unitMod = UnitMods(UNIT_MOD_POWER_START + powerType);
// Special case with temporary increase max/current power (percent)
if (GetId() == 64904) // Hymn of Hope
{
if (mode & AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK)
{
int32 change = target->GetPower(powerType) + (apply ? GetAmount() : -GetAmount());
if (change < 0)
change = 0;
target->SetPower(powerType, change);
}
}
// generic flat case
target->HandleStatModifier(unitMod, TOTAL_VALUE, float(GetAmount()), apply);
}

3
src/server/game/Spells/SpellMgr.cpp
View File

@@ -3087,6 +3087,9 @@ void SpellMgr::LoadDbcDataCorrections()
// with this spell atrribute aura can be stacked several times
spellInfo->Attributes &= ~SPELL_ATTR0_NOT_SHAPESHIFT;
break;
case 64904: //Hymn of Hope
spellInfo->EffectApplyAuraName[EFFECT_1] = SPELL_AURA_MOD_INCREASE_ENERGY_PERCENT;
break;
case 30421: // Nether Portal - Perseverence
spellInfo->EffectBasePoints[2] += 30000;
break;