diff --git a/src/engine/wpakpowers/WpakPowerManager.java b/src/engine/wpakpowers/WpakPowerManager.java index e2c56d6d..0b442806 100644 --- a/src/engine/wpakpowers/WpakPowerManager.java +++ b/src/engine/wpakpowers/WpakPowerManager.java @@ -431,18 +431,18 @@ public class WpakPowerManager { modificationType = mbEnums.ModificationType.MULTIPLY; return modifierEntry.percentage != 0f - ? calculatePercentageBasedValue(modifierEntry, rank, modificationType) - : calculateBaseValue(modifierEntry, rank, modificationType); + ? calculatePercentageValue(modifierEntry, rank, modificationType) + : calculateFlatValue(modifierEntry, rank, modificationType); } - private static float calculatePercentageBasedValue(ModifierEntry modifierEntry, int rank, mbEnums.ModificationType modificationType) { + private static float calculatePercentageValue(ModifierEntry modifierEntry, int rank, mbEnums.ModificationType modificationType) { float scaledValue = modificationType.equals(mbEnums.ModificationType.ADD) ? modifierEntry.percentage + (modifierEntry.compoundCurveType.getValue() * rank) : modifierEntry.percentage * (1 + (modifierEntry.compoundCurveType.getValue() * rank)); return scaledValue * 0.01f; } - private static float calculateBaseValue(ModifierEntry modifierEntry, int rank, mbEnums.ModificationType modificationType) { + private static float calculateFlatValue(ModifierEntry modifierEntry, int rank, mbEnums.ModificationType modificationType) { return modificationType.equals(mbEnums.ModificationType.ADD) ? modifierEntry.min + (modifierEntry.compoundCurveType.getValue() * rank) : modifierEntry.min * (1 + (modifierEntry.compoundCurveType.getValue() * rank));