Rework of helper method

This commit is contained in:
2025-02-24 14:26:43 -05:00
parent d58ba67cc2
commit a40025bca1
3 changed files with 26 additions and 10 deletions
+18 -7
View File
@@ -418,19 +418,30 @@ public class WpakPowerManager {
return false;
}
public static float applyCurveToValue(mbEnums.CompoundCurveType curve, float value, int rank) {
public static float getModifiedValue(ModifierEntry modifierEntry, int rank) {
float scaledValue;
mbEnums.ModificationType modificationType = mbEnums.ModificationType.ADD;
// Method scales by either integer or float values driven by the curve type
if (EnumSet.of(mbEnums.CompoundCurveType.DefaultFlat, mbEnums.CompoundCurveType.DefaultSlope,
mbEnums.CompoundCurveType.DefaultSlopeDown).contains(curve))
scaledValue = value + (curve.getValue() * rank);
else
scaledValue = value * (1 + (curve.getValue() * rank));
if (EnumSet.of(mbEnums.ModType.Health, mbEnums.ModType.Mana,
mbEnums.ModType.Stamina).contains(modifierEntry.type))
if (modifierEntry.percentage == 0)
modificationType = mbEnums.ModificationType.MULTIPLY;
scaledValue = scaledValue * 0.01f;
if (modifierEntry.percentage != 0f) { //Stat Percent Modifiers
if (modificationType.equals(mbEnums.ModificationType.ADD))
scaledValue = modifierEntry.percentage + (modifierEntry.compoundCurveType.getValue() * rank);
else
scaledValue = modifierEntry.percentage * (1 + (modifierEntry.compoundCurveType.getValue() * rank));
scaledValue = scaledValue * 0.01f;
} else { //Stat Modifiers
if (modificationType.equals(mbEnums.ModificationType.ADD))
scaledValue = modifierEntry.min + (modifierEntry.compoundCurveType.getValue() * rank);
else
scaledValue = modifierEntry.min * (1 + (modifierEntry.compoundCurveType.getValue() * rank));
}
return scaledValue;
}