diff --git a/src/engine/util/Pair.java b/src/engine/util/Pair.java new file mode 100644 index 00000000..27beab77 --- /dev/null +++ b/src/engine/util/Pair.java @@ -0,0 +1,24 @@ +package engine.util; + +public class Pair { + private final A first; + private final B second; + + public Pair(A first, B second) { + this.first = first; + this.second = second; + } + + public A getFirst() { + return first; + } + + public B getSecond() { + return second; + } + + @Override + public String toString() { + return "Pair{" + "first=" + first + ", second=" + second + '}'; + } +} diff --git a/src/engine/wpakpowers/Behaviours.java b/src/engine/wpakpowers/Behaviours.java index df726f8e..1afa4a67 100644 --- a/src/engine/wpakpowers/Behaviours.java +++ b/src/engine/wpakpowers/Behaviours.java @@ -8,8 +8,10 @@ package engine.wpakpowers; +import com.mysql.cj.conf.ConnectionUrlParser; import engine.objects.AbstractCharacter; import engine.objects.AbstractWorldObject; +import engine.util.Pair; import engine.wpak.data.Effect; import engine.wpak.data.ModifierEntry; import engine.wpak.data.Power; @@ -58,8 +60,8 @@ public class Behaviours { public static Object FPSubTypeDmg(AbstractCharacter caster, AbstractWorldObject target, Power power, PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) { - System.out.println("Behavior method called"); - return null; + + return new Pair<>(modifierEntry.arg1,WpakPowerManager.applyCurveToModifier(powerAction, modifierEntry, rank)); } public static Object DD(AbstractCharacter caster, AbstractWorldObject target, Power power,