From 94afb7f40f5ed6b1e96d90c902084c3a53f23f53 Mon Sep 17 00:00:00 2001 From: MagicBot Date: Sat, 1 Mar 2025 17:13:58 -0500 Subject: [PATCH] Ternary restored --- src/engine/wpakpowers/WpakPowerManager.java | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/engine/wpakpowers/WpakPowerManager.java b/src/engine/wpakpowers/WpakPowerManager.java index 8058a837..ecebf0dd 100644 --- a/src/engine/wpakpowers/WpakPowerManager.java +++ b/src/engine/wpakpowers/WpakPowerManager.java @@ -435,19 +435,15 @@ public class WpakPowerManager { // These all have "SIVL" in the curve name suggesting // interpolation between min max. Not something currently done. - if (modifierEntry.compoundCurveType.type.equals(mbEnums.ModificationType.MULTIPLY)) { - outData.first = modifierEntry.min * (1 + (modifierEntry.compoundCurveType.value * rank)); - } else { - outData.first = modifierEntry.min + (modifierEntry.compoundCurveType.value * rank); - } + outData.first = modifierEntry.compoundCurveType.type.equals(mbEnums.ModificationType.MULTIPLY) ? + modifierEntry.min * (1 + (modifierEntry.compoundCurveType.value * rank)) : + modifierEntry.min + (modifierEntry.compoundCurveType.value * rank); + + if (modifierEntry.max != 0) + outData.second = modifierEntry.compoundCurveType.type.equals(mbEnums.ModificationType.MULTIPLY) ? + modifierEntry.max * (1 + (modifierEntry.compoundCurveType.value * rank)) : + modifierEntry.max + (modifierEntry.compoundCurveType.value * rank); - if (modifierEntry.max != 0) { - if (modifierEntry.compoundCurveType.type.equals(mbEnums.ModificationType.MULTIPLY)) { - outData.second = modifierEntry.max * (1 + (modifierEntry.compoundCurveType.value * rank)); - } else { - outData.second = modifierEntry.max + (modifierEntry.compoundCurveType.value * rank); - } - } return outData; }