diff options
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 22 | ||||
| -rwxr-xr-x | src/server/game/Entities/Player/Player.h | 1 |
2 files changed, 1 insertions, 22 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 1fc9aaf7322..23af34ddeee 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -2699,7 +2699,7 @@ void Player::RegenerateHealth() // normal regen case (maybe partly in combat case) else if (!isInCombat() || HasAuraType(SPELL_AURA_MOD_REGEN_DURING_COMBAT)) { - addvalue = OCTRegenHPPerSpirit() * HealthIncreaseRate; + addvalue = HealthIncreaseRate; if (!isInCombat()) { AuraEffectList const& mModHealthRegenPct = GetAuraEffectsByType(SPELL_AURA_MOD_HEALTH_REGEN_PERCENT); @@ -5864,26 +5864,6 @@ float Player::GetExpertiseDodgeOrParryReduction(WeaponAttackType attType) const return 0.0f; } -float Player::OCTRegenHPPerSpirit() -{ - /* - uint8 level = getLevel(); - uint32 pclass = getClass(); - - if (level > GT_MAX_LEVEL) - level = GT_MAX_LEVEL; - */ - - // Formula from PaperDollFrame script - float spirit = GetStat(STAT_SPIRIT); - float baseSpirit = spirit; - if (baseSpirit > 50) - baseSpirit = 50; - float moreSpirit = spirit - baseSpirit; - float regen = baseSpirit + moreSpirit; - return regen; -} - float Player::OCTRegenMPPerSpirit() { uint8 level = getLevel(); diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index b0e2a008f3f..a57c1fe908c 100755 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1955,7 +1955,6 @@ class Player : public Unit, public GridObject<Player> float GetMeleeCritFromAgility(); void GetDodgeFromAgility(float &diminishing, float &nondiminishing); float GetSpellCritFromIntellect(); - float OCTRegenHPPerSpirit(); float OCTRegenMPPerSpirit(); float GetRatingMultiplier(CombatRating cr) const; float GetRatingBonusValue(CombatRating cr) const; |