From d96993576aea7add7f11d5498ed088e05834af8e Mon Sep 17 00:00:00 2001 From: MagicBot Date: Tue, 25 Feb 2025 14:44:51 -0500 Subject: [PATCH] Update to helper method --- src/engine/wpakpowers/WpakPowerManager.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/engine/wpakpowers/WpakPowerManager.java b/src/engine/wpakpowers/WpakPowerManager.java index 0b442806..66264fcc 100644 --- a/src/engine/wpakpowers/WpakPowerManager.java +++ b/src/engine/wpakpowers/WpakPowerManager.java @@ -35,7 +35,6 @@ import engine.wpak.data.Effect; import engine.wpak.data.*; import org.pmw.tinylog.Logger; -import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; @@ -420,15 +419,13 @@ public class WpakPowerManager { public static float getModifiedValue(ModifierEntry modifierEntry, int rank) { - mbEnums.ModificationType modificationType = mbEnums.ModificationType.ADD; + mbEnums.ModificationType modificationType; // Only a subset of these ModTypes used for percents // are multiplicative. Everything else is additive. - if (EnumSet.of(mbEnums.ModType.Health, mbEnums.ModType.Mana, - mbEnums.ModType.Stamina).contains(modifierEntry.type)) - if (modifierEntry.percentage == 0) - modificationType = mbEnums.ModificationType.MULTIPLY; + modificationType = modifierEntry.compoundCurveType.name().contains("SIVL") ? + mbEnums.ModificationType.MULTIPLY : mbEnums.ModificationType.ADD; return modifierEntry.percentage != 0f ? calculatePercentageValue(modifierEntry, rank, modificationType)