diff --git a/src/engine/wpakpowers/Behaviour.java b/src/engine/wpakpowers/Behaviour.java index e27d8ee0..3789ab32 100644 --- a/src/engine/wpakpowers/Behaviour.java +++ b/src/engine/wpakpowers/Behaviour.java @@ -38,17 +38,18 @@ public class Behaviour { public static Object Standard(AbstractCharacter caster, AbstractWorldObject target, Power power, ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) { boolean useAdditiveCurve = true; - float curveValue = modifierEntry.compoundCurveType.getValue(); + float modifierCurveValue = modifierEntry.compoundCurveType.getValue(); float modValue = 0.0f; - if (curveValue > 0 && curveValue < .1 && + if (modifierCurveValue > 0 && modifierCurveValue < .1 && modifierEntry.min != 0 && modifierEntry.max != 0) useAdditiveCurve = false; if (useAdditiveCurve) - modValue = this.percentMod + (curveValue * rank); + modValue = powerAction.curve.getValue() + (modifierCurveValue * rank); else - modValue = this.percentMod * (1 + (curveValue * rank)); + modValue = powerAction.curve.getValue() * (1 + (modifierCurveValue * rank)); + modValue = modValue * 0.01f; return modValue;