|
|
@ -35,7 +35,6 @@ import engine.wpak.data.Effect; |
|
|
|
import engine.wpak.data.*; |
|
|
|
import engine.wpak.data.*; |
|
|
|
import org.pmw.tinylog.Logger; |
|
|
|
import org.pmw.tinylog.Logger; |
|
|
|
|
|
|
|
|
|
|
|
import java.util.EnumSet; |
|
|
|
|
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.HashSet; |
|
|
|
import java.util.HashSet; |
|
|
|
|
|
|
|
|
|
|
@ -420,15 +419,13 @@ public class WpakPowerManager { |
|
|
|
|
|
|
|
|
|
|
|
public static float getModifiedValue(ModifierEntry modifierEntry, int rank) { |
|
|
|
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
|
|
|
|
// Only a subset of these ModTypes used for percents
|
|
|
|
// are multiplicative. Everything else is additive.
|
|
|
|
// are multiplicative. Everything else is additive.
|
|
|
|
|
|
|
|
|
|
|
|
if (EnumSet.of(mbEnums.ModType.Health, mbEnums.ModType.Mana, |
|
|
|
modificationType = modifierEntry.compoundCurveType.name().contains("SIVL") ? |
|
|
|
mbEnums.ModType.Stamina).contains(modifierEntry.type)) |
|
|
|
mbEnums.ModificationType.MULTIPLY : mbEnums.ModificationType.ADD; |
|
|
|
if (modifierEntry.percentage == 0) |
|
|
|
|
|
|
|
modificationType = mbEnums.ModificationType.MULTIPLY; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return modifierEntry.percentage != 0f |
|
|
|
return modifierEntry.percentage != 0f |
|
|
|
? calculatePercentageValue(modifierEntry, rank, modificationType) |
|
|
|
? calculatePercentageValue(modifierEntry, rank, modificationType) |
|
|
|