diff --git a/conf/individualProgression.conf.dist b/conf/individualProgression.conf.dist index 5c7685e..f44c5ef 100644 --- a/conf/individualProgression.conf.dist +++ b/conf/individualProgression.conf.dist @@ -53,9 +53,9 @@ IndividualProgression.VanillaHealingAdjustment = 0.5 # Applied linearly per level between levels 11 and 60 # Set to 1 (100% of regular health) to disable # -# Default: 0.5 - 50% of regular health +# Default: 0.75 - 75% of regular health # -IndividualProgression.VanillaHealthAdjustment = 0.5 +IndividualProgression.VanillaHealthAdjustment = 0.75 # # # IndividualProgression.TBCPowerAdjustment @@ -85,9 +85,9 @@ IndividualProgression.TBCHealingAdjustment = 0.5 # Unlike Vanilla adjustment, a flat value is always used # Set to 1 (100% of regular health) to disable # -# Default: 0.6 - 60% of regular health +# Default: 0.8 - 80% of regular health # -IndividualProgression.TBCHealthAdjustment = 0.6 +IndividualProgression.TBCHealthAdjustment = 0.8 # # IndividualProgression.QuestXPFix # Description: Quest XP for Vanilla and TBC quests was boosted as a catchup mechanism in patches 2.3.0 and 3.0.2 diff --git a/src/IndividualProgression.cpp b/src/IndividualProgression.cpp index 76567f9..afbf4dd 100644 --- a/src/IndividualProgression.cpp +++ b/src/IndividualProgression.cpp @@ -357,13 +357,15 @@ public: { return; } - // Player is still in Vanilla content - give Vanilla damage adjustment + // Player is still in Vanilla content - give Vanilla health adjustment if (!hasPassedProgression(player, PROGRESSION_NAXX40)) { - float computedAdjustment = player->getLevel() > 10 ? 1 - ((player->getLevel() - 10) / 50) * (1 - vanillaHealthAdjustment) : 1; + float adjustmentAmount = 1.0 - vanillaHealthAdjustment; + float applyPercent = ((player->getLevel() - 10.0) / 50.0); + float computedAdjustment = player->getLevel() > 10 ? 1.0 - applyPercent * adjustmentAmount : 1.0; value *= computedAdjustment; } - // Player is in TBC content - give TBC damage adjustment + // Player is in TBC content - give TBC health adjustment else if (!hasPassedProgression(player, PROGRESSION_TBC_TIER_5)) { value *= tbcHealthAdjustment;