From 3753d989b75f2f3cd64090bf4e4d2941a0bfa6cb Mon Sep 17 00:00:00 2001 From: Sloth Date: Mon, 17 Jun 2013 20:28:36 +0000 Subject: [PATCH] - Removed some unnecessary Replicate stuff. --- src/main/java/forge/Card.java | 36 -------------- .../forge/card/cardfactory/CardFactory.java | 4 -- .../card/cardfactory/CardFactoryUtil.java | 11 ----- .../forge/card/spellability/SpellAbility.java | 47 ------------------- .../forge/card/trigger/WrappedAbility.java | 10 ---- src/main/java/forge/game/zone/MagicStack.java | 18 +++---- 6 files changed, 9 insertions(+), 117 deletions(-) diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index 0bd2bf9ffc1..d4de213a4dc 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -195,8 +195,6 @@ public class Card extends GameEntity implements Comparable { private int xManaCostPaid = 0; - private int replicateMagnitude = 0; - private int sunburstValue = 0; private byte colorsPaid = 0; @@ -4072,40 +4070,6 @@ public class Card extends GameEntity implements Comparable { return hasK1 == costsPaid.contains(OptionalCost.Kicker2) ? (hasK1 ? 2 : 0) : 1; } - /** - *

- * addReplicateMagnitude. - *

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

- * Setter for the field replicateMagnitude. - *

- * - * @param n - * a int. - */ - public final void resetReplicateMagnitude() { - this.replicateMagnitude = 0; - } - - /** - *

- * Getter for the field replicateMagnitude. - *

- * - * @return a int. - */ - public final int getReplicateMagnitude() { - return this.replicateMagnitude; - } // for cards like Giant Growth, etc. /** diff --git a/src/main/java/forge/card/cardfactory/CardFactory.java b/src/main/java/forge/card/cardfactory/CardFactory.java index a5a02e29861..79f52c4a658 100644 --- a/src/main/java/forge/card/cardfactory/CardFactory.java +++ b/src/main/java/forge/card/cardfactory/CardFactory.java @@ -207,10 +207,6 @@ public class CardFactory { for (OptionalCost cost : original.getOptionalCostsPaid()) { c.addOptionalCostPaid(cost); } - c.addReplicateMagnitude(original.getReplicateMagnitude()); - if (sa.isReplicate()) { - copySA.setIsReplicate(true); - } } controller.getController().playSpellAbilityForFree(copySA); diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java index 6a88b1771d8..e4127313db1 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java @@ -2226,17 +2226,6 @@ public class CardFactoryUtil { sa.setMultiKickerManaCost(new ManaCost(new ManaCostParser(k[1]))); } } - - if (hasKeyword(card, "Replicate") != -1) { - final int n = hasKeyword(card, "Replicate"); - final String parse = card.getKeyword().get(n).toString(); - final String[] k = parse.split("cate "); - - final SpellAbility sa = card.getFirstSpellAbility(); - sa.setIsReplicate(true); - sa.setReplicateManaCost(new ManaCost(new ManaCostParser(k[1]))); - - } if(hasKeyword(card, "Fuse") != -1) { card.getState(CardCharacteristicName.Original).getSpellAbility().add(AbilityFactory.buildFusedAbility(card)); diff --git a/src/main/java/forge/card/spellability/SpellAbility.java b/src/main/java/forge/card/spellability/SpellAbility.java index b739dbbdc5d..702268195b2 100644 --- a/src/main/java/forge/card/spellability/SpellAbility.java +++ b/src/main/java/forge/card/spellability/SpellAbility.java @@ -54,7 +54,6 @@ public abstract class SpellAbility implements ISpellAbility { private String description = ""; private String stackDescription = ""; private ManaCost multiKickerManaCost = null; - private ManaCost replicateManaCost = null; private Player activatingPlayer = null; private boolean temporary; // that is given by some static ability @@ -74,7 +73,6 @@ public abstract class SpellAbility implements ISpellAbility { private boolean temporarilySuppressed = false; private boolean flashBackAbility = false; - private boolean replicate = false; private boolean cycling = false; private boolean delve = false; private boolean offering = false; @@ -236,28 +234,6 @@ public abstract class SpellAbility implements ISpellAbility { this.multiKickerManaCost = cost; } - /** - *

- * Getter for the field replicateManaCost. - *

- * - * @return a {@link java.lang.String} object. - */ - public ManaCost getReplicateManaCost() { - return this.replicateManaCost; - } - - /** - *

- * Setter for the field replicateManaCost. - *

- * - * @param spellManaCost - * a {@link java.lang.String} object. - */ - public final void setReplicateManaCost(final ManaCost spellManaCost) { - this.replicateManaCost = spellManaCost; - } /** *

@@ -308,29 +284,6 @@ public abstract class SpellAbility implements ISpellAbility { return this.multiKickerManaCost != null && !this.isAnnouncing("Multikicker"); } - /** - *

- * setIsReplicate. - *

- * - * @param b - * a boolean. - */ - public final void setIsReplicate(final boolean b) { - this.replicate = b; - } - - /** - *

- * isReplicate. - *

- * - * @return a boolean. - */ - public boolean isReplicate() { - return this.replicate; - } - /** *

* setIsMorphUp. diff --git a/src/main/java/forge/card/trigger/WrappedAbility.java b/src/main/java/forge/card/trigger/WrappedAbility.java index 59124523914..f8884cfbdb3 100644 --- a/src/main/java/forge/card/trigger/WrappedAbility.java +++ b/src/main/java/forge/card/trigger/WrappedAbility.java @@ -162,11 +162,6 @@ public class WrappedAbility extends Ability implements ISpellAbility { return sa.getMultiKickerManaCost(); } - @Override - public ManaCost getReplicateManaCost() { - return sa.getReplicateManaCost(); - } - @Override public SpellAbilityRestriction getRestrictions() { return sa.getRestrictions(); @@ -242,11 +237,6 @@ public class WrappedAbility extends Ability implements ISpellAbility { return sa.isMultiKicker(); } - @Override - public boolean isReplicate() { - return sa.isReplicate(); - } - @Override public boolean isSpell() { return sa.isSpell(); diff --git a/src/main/java/forge/game/zone/MagicStack.java b/src/main/java/forge/game/zone/MagicStack.java index 0ac7b3cfd07..fffe3d07262 100644 --- a/src/main/java/forge/game/zone/MagicStack.java +++ b/src/main/java/forge/game/zone/MagicStack.java @@ -338,27 +338,27 @@ public class MagicStack /* extends MyObservable */ implements Iterable