diff options
| -rw-r--r-- | src/game/Player.cpp | 2 | ||||
| -rw-r--r-- | src/game/SpellAuraDefines.h | 2 | ||||
| -rw-r--r-- | src/game/SpellAuras.cpp | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 9f9ab80318f..bb8be628c54 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -6298,6 +6298,8 @@ bool Player::RewardHonor(Unit *uVictim, uint32 groupsize, float honor, bool pvpt if(groupsize > 1) honor /= groupsize; + // apply honor multiplier from aura (not stacking-get highest) + honor *= (float(GetMaxPositiveAuraModifier(SPELL_AURA_MOD_HONOR_GAIN_PCT))+100.0f)/100.0f; honor *= (((float)urand(8,12))/10); // approx honor: 80% - 120% of real honor } diff --git a/src/game/SpellAuraDefines.h b/src/game/SpellAuraDefines.h index 0c370105a58..8d298e2baf6 100644 --- a/src/game/SpellAuraDefines.h +++ b/src/game/SpellAuraDefines.h @@ -325,7 +325,7 @@ enum AuraType SPELL_AURA_MOD_DISARM_RANGED = 278, SPELL_AURA_279 = 279, SPELL_AURA_MOD_TARGET_ARMOR_PCT = 280, - SPELL_AURA_MOD_HONOR_GAIN = 281, + SPELL_AURA_MOD_HONOR_GAIN_PCT = 281, SPELL_AURA_MOD_BASE_HEALTH_PCT = 282, SPELL_AURA_MOD_HEALING_RECEIVED = 283, // Possibly only for some spell family class spells TOTAL_AURAS = 284 diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 7112c1c97ff..48bb43e644d 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -335,7 +335,7 @@ pAuraHandler AuraHandler[TOTAL_AURAS]= &Aura::HandleNULL, //278 SPELL_AURA_MOD_DISARM_RANGED disarm ranged weapon &Aura::HandleNULL, //279 &Aura::HandleNULL, //280 SPELL_AURA_MOD_TARGET_ARMOR_PCT - &Aura::HandleNULL, //281 SPELL_AURA_MOD_HONOR_GAIN + &Aura::HandleNoImmediateEffect, //281 SPELL_AURA_MOD_HONOR_GAIN_PCT implemented in Player::RewardHonor &Aura::HandleAuraIncreaseBaseHealthPercent, //282 SPELL_AURA_INCREASE_BASE_HEALTH_PERCENT &Aura::HandleNoImmediateEffect //283 SPELL_AURA_MOD_HEALING_RECEIVED implemented in Unit::SpellHealingBonus }; |