diff --git a/src/engine/mbEnums.java b/src/engine/mbEnums.java index 0e391e11..e405ae7e 100644 --- a/src/engine/mbEnums.java +++ b/src/engine/mbEnums.java @@ -2222,8 +2222,8 @@ public class mbEnums { SIVL0243(0.243f, ADD), SIVL0360(0.360f, ADD); - private final float value; - private final ModificationType type; + public final float value; + public final ModificationType type; CompoundCurveType(float value, ModificationType type) { diff --git a/src/engine/wpakpowers/WpakPowerManager.java b/src/engine/wpakpowers/WpakPowerManager.java index 18d6d158..cb1442c3 100644 --- a/src/engine/wpakpowers/WpakPowerManager.java +++ b/src/engine/wpakpowers/WpakPowerManager.java @@ -436,12 +436,12 @@ public class WpakPowerManager { // These all have "SIVL" in the curve name suggesting // interpolation between min max. Not something currently done. - outData.first = modifierEntry.compoundCurveType.name().contains("SIVL") ? + outData.first = modifierEntry.compoundCurveType.type.equals(mbEnums.ModificationType.MULTIPLY) ? modifierEntry.min * (1 + (modifierEntry.compoundCurveType.getValue() * rank)) : modifierEntry.min + (modifierEntry.compoundCurveType.getValue() * rank); if (modifierEntry.max != 0) - outData.second = modifierEntry.compoundCurveType.name().contains("SIVL") ? + outData.second = modifierEntry.compoundCurveType.type.equals(mbEnums.ModificationType.MULTIPLY) ? modifierEntry.max * (1 + (modifierEntry.compoundCurveType.getValue() * rank)) : modifierEntry.max + (modifierEntry.compoundCurveType.getValue() * rank); return outData;