From 7446cc7a1baf2e894aeedb3e884a7bc02a25986b Mon Sep 17 00:00:00 2001 From: melvin Date: Fri, 1 Jul 2011 11:31:14 +0800 Subject: [PATCH] added getId --- .../choice/MagicBuilderPayManaCostResult.java | 27 +++++-------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/src/magic/model/choice/MagicBuilderPayManaCostResult.java b/src/magic/model/choice/MagicBuilderPayManaCostResult.java index d59d4e4e27..a99ec615e7 100644 --- a/src/magic/model/choice/MagicBuilderPayManaCostResult.java +++ b/src/magic/model/choice/MagicBuilderPayManaCostResult.java @@ -21,15 +21,12 @@ public class MagicBuilderPayManaCostResult implements private int hashCode; public MagicBuilderPayManaCostResult(final List sourceActivations) { - count=0; x=0; amountLeft=new short[MagicManaType.NR_OF_TYPES]; for (final MagicSourceManaActivation activation : sourceActivations) { - if (activation.available) { for (int index=0;index sourceActivations,final MagicBuilderManaCost cost) { - x=cost.getX(count); results=new MagicSourceManaActivationResult[count]; int index=0; for (final MagicSourceManaActivation activation : sourceActivations) { - if (!activation.available) { results[index++]=activation.getResult(); } @@ -78,36 +69,29 @@ public class MagicBuilderPayManaCostResult implements } public int getWeight() { - return weight; } @Override public int getX() { - return x; } @Override public int getConverted() { - return count; } public void doAction(final MagicGame game,final MagicPlayer player) { - for (final MagicSourceManaActivationResult result : results) { - result.doActivation(game); } } public String getText() { - final StringBuilder builder=new StringBuilder(); builder.append(count); for (final int amount : amountLeft) { - builder.append('-').append(amount); } builder.append('-').append(weight); @@ -121,13 +105,11 @@ public class MagicBuilderPayManaCostResult implements @Override public int hashCode() { - return hashCode; } @Override public boolean equals(final Object obj) { - if (this==obj) { return true; } @@ -140,9 +122,7 @@ public class MagicBuilderPayManaCostResult implements @Override public int compareTo(final MagicBuilderPayManaCostResult result) { - for (int index=0;index