From 9f1a00651d0c3232e515753635f9cfd4bbf8d643 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Thu, 6 Jun 2013 08:52:10 +0000 Subject: [PATCH] convert 3 costs from string to costs, extra clean up in Player class --- src/main/java/forge/Card.java | 25 +++--- .../card/cardfactory/CardFactoryUtil.java | 6 +- src/main/java/forge/game/GameAction.java | 2 +- src/main/java/forge/game/phase/Upkeep.java | 5 +- src/main/java/forge/game/player/Player.java | 81 +------------------ .../java/forge/gui/framework/SLayoutIO.java | 1 - 6 files changed, 18 insertions(+), 102 deletions(-) diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index 412f291cb04..be0e06dab4f 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -199,9 +199,9 @@ public class Card extends GameEntity implements Comparable { private TreeMap tempControllers = new TreeMap(); private String text = ""; - private String echoCost = ""; - private String madnessCost = null; - private String miracleCost = null; + private Cost echoCost = null; + private Cost madnessCost = null; + private Cost miracleCost = null; private String chosenType = ""; private List chosenColor = new ArrayList(); private String namedCard = ""; @@ -1440,18 +1440,11 @@ public class Card extends GameEntity implements Comparable { * @param s * a {@link java.lang.String} object. */ - public final void setEchoCost(final String s) { + public final void setEchoCost(final Cost s) { this.echoCost = s; } - /** - *

- * Getter for the field echoCost. - *

- * - * @return a {@link java.lang.String} object. - */ - public final String getEchoCost() { + public final Cost getEchoCost() { return this.echoCost; } @@ -4679,7 +4672,7 @@ public class Card extends GameEntity implements Comparable { * * @return a {@link java.lang.String} object. */ - public final String getMadnessCost() { + public final Cost getMadnessCost() { return this.madnessCost; } @@ -4691,7 +4684,7 @@ public class Card extends GameEntity implements Comparable { * @param cost * a {@link java.lang.String} object. */ - public final void setMadnessCost(final String cost) { + public final void setMadnessCost(final Cost cost) { this.madnessCost = cost; } @@ -4702,7 +4695,7 @@ public class Card extends GameEntity implements Comparable { * * @return a {@link java.lang.String} object. */ - public final String getMiracleCost() { + public final Cost getMiracleCost() { return this.miracleCost; } @@ -4714,7 +4707,7 @@ public class Card extends GameEntity implements Comparable { * @param cost * a {@link java.lang.String} object. */ - public final void setMiracleCost(final String cost) { + public final void setMiracleCost(final Cost cost) { this.miracleCost = cost; } diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java index 4cda6d8ab19..a49c52e8406 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java @@ -2354,7 +2354,7 @@ public class CardFactoryUtil { final String[] k = card.getKeyword().get(echoPos).split(":"); final String manacost = k[1]; - card.setEchoCost(manacost); + card.setEchoCost(new Cost(manacost, false)); final Command intoPlay = new Command() { @@ -3149,7 +3149,7 @@ public class CardFactoryUtil { // card.removeIntrinsicKeyword(parse); final String[] k = parse.split(":"); - card.setMadnessCost(k[1]); + card.setMadnessCost(new Cost(k[1], false)); } } // madness @@ -3160,7 +3160,7 @@ public class CardFactoryUtil { // card.removeIntrinsicKeyword(parse); final String[] k = parse.split(":"); - card.setMiracleCost(k[1]); + card.setMiracleCost(new Cost(k[1], false)); } } // miracle diff --git a/src/main/java/forge/game/GameAction.java b/src/main/java/forge/game/GameAction.java index d17e8520228..8a4153a5ca6 100644 --- a/src/main/java/forge/game/GameAction.java +++ b/src/main/java/forge/game/GameAction.java @@ -757,7 +757,7 @@ public class GameAction { } final SpellAbility madness = card.getFirstSpellAbility().copy(); - madness.setPayCosts(new Cost(card.getMadnessCost(), false)); + madness.setPayCosts(card.getMadnessCost()); final StringBuilder sb = new StringBuilder(); sb.append(card.getName()).append(" - Cast via Madness"); diff --git a/src/main/java/forge/game/phase/Upkeep.java b/src/main/java/forge/game/phase/Upkeep.java index daaf9443d94..ffa37a5c570 100644 --- a/src/main/java/forge/game/phase/Upkeep.java +++ b/src/main/java/forge/game/phase/Upkeep.java @@ -165,8 +165,7 @@ public class Upkeep extends Phase { for (int i = 0; i < list.size(); i++) { final Card c = list.get(i); if (c.hasStartOfKeyword("(Echo unpaid)")) { - Cost cost = new Cost(c.getEchoCost(), true); - final Ability blankAbility = Upkeep.getBlankAbility(c, cost); + final Ability blankAbility = Upkeep.getBlankAbility(c, c.getEchoCost()); blankAbility.setActivatingPlayer(c.getController()); final StringBuilder sb = new StringBuilder(); @@ -175,7 +174,7 @@ public class Upkeep extends Phase { final Ability sacAbility = new Ability(c, ManaCost.ZERO) { @Override public void resolve() { - Cost cost = new Cost(c.getEchoCost().trim(), true); + Cost cost = c.getEchoCost(); boolean hasPaid = c.getController().getController().payManaOptional(c, cost, "Echo for " + c, ManaPaymentPurpose.Echo); if (!hasPaid) diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java index 34505d92d01..378c065547f 100644 --- a/src/main/java/forge/game/player/Player.java +++ b/src/main/java/forge/game/player/Player.java @@ -113,7 +113,7 @@ public class Player extends GameEntity implements Comparable { private ArrayList prowl = new ArrayList(); /** The max lands to play. */ - private int maxLandsToPlay = 1; + private final static int maxLandsToPlay = 1; /** The num lands played. */ private int numLandsPlayed = 0; @@ -1849,32 +1849,6 @@ public class Player extends GameEntity implements Comparable { // // properties about the player and his/her cards/game status // // // ///////////////////////////// - /** - *

- * hasPlaneswalker. - *

- * - * @return a boolean. - */ - public final boolean hasPlaneswalker() { - return null != this.getPlaneswalker(); - } - - /** - *

- * getPlaneswalker. - *

- * - * @return a {@link forge.Card} object. - */ - public final Card getPlaneswalker() { - final List c = CardLists.filter(this.getCardsIn(ZoneType.Battlefield), CardPredicates.Presets.PLANEWALKERS); - if ((null != c) && (c.size() > 0)) { - return c.get(0); - } else { - return null; - } - } /** *

@@ -1921,24 +1895,11 @@ public class Player extends GameEntity implements Comparable { * a {@link forge.Card} object. * @return a {@link forge.Card} object. */ - public final Card setLastDrawnCard(final Card c) { + private final Card setLastDrawnCard(final Card c) { this.lastDrawnCard = c; return this.lastDrawnCard; } - /** - *

- * resetLastDrawnCard. - *

- * - * @return a {@link forge.Card} object. - */ - public final Card resetLastDrawnCard() { - final Card old = this.lastDrawnCard; - this.lastDrawnCard = null; - return old; - } - /** *

* getTurn. @@ -2502,42 +2463,6 @@ public class Player extends GameEntity implements Comparable { this.unlimitedHandSize = unlimited; } - - /** - *

- * Getter for the field maxLandsToPlay. - *

- * - * @return a int. - */ - public final int getMaxLandsToPlay() { - return this.maxLandsToPlay; - } - - /** - *

- * Setter for the field maxLandsToPlay. - *

- * - * @param n - * a int. - */ - public final void setMaxLandsToPlay(final int n) { - this.maxLandsToPlay = n; - } - - /** - *

- * addMaxLandsToPlay. - *

- * - * @param n - * a int. - */ - public final void addMaxLandsToPlay(final int n) { - this.maxLandsToPlay += n; - } - /** *

* Getter for the field numLandsPlayed. @@ -3062,7 +2987,7 @@ public class Player extends GameEntity implements Comparable { } final SpellAbility playForMiracleCost = card.getFirstSpellAbility().copy(); - playForMiracleCost.setPayCosts(new Cost(card.getMiracleCost(), false)); + playForMiracleCost.setPayCosts(card.getMiracleCost()); playForMiracleCost.setStackDescription(card.getName() + " - Cast via Miracle"); // TODO Convert this to a Trigger diff --git a/src/main/java/forge/gui/framework/SLayoutIO.java b/src/main/java/forge/gui/framework/SLayoutIO.java index 73580619231..f3b478595de 100644 --- a/src/main/java/forge/gui/framework/SLayoutIO.java +++ b/src/main/java/forge/gui/framework/SLayoutIO.java @@ -12,7 +12,6 @@ import java.util.List; import java.util.Map.Entry; import java.util.concurrent.atomic.AtomicBoolean; -import javax.swing.SwingUtilities; import javax.swing.border.EmptyBorder; import javax.xml.stream.XMLEventFactory; import javax.xml.stream.XMLEventReader;