From 86089f0fb9136fb37fabf8f47d783bf0405461eb Mon Sep 17 00:00:00 2001 From: magenoxx Date: Wed, 18 Jul 2012 20:52:57 +0400 Subject: [PATCH] Removed duplicate class for cost. Refactored 1 card. --- .../mage/sets/lorwyn/HoofprintsOfTheStag.java | 4 +-- .../costs/common/OnlyDuringYourTurnCost.java | 4 +-- .../abilities/costs/common/YourTurnCost.java | 35 ------------------- 3 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 Mage/src/mage/abilities/costs/common/YourTurnCost.java diff --git a/Mage.Sets/src/mage/sets/lorwyn/HoofprintsOfTheStag.java b/Mage.Sets/src/mage/sets/lorwyn/HoofprintsOfTheStag.java index f335ad98f3c..56d70d8c6d2 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/HoofprintsOfTheStag.java +++ b/Mage.Sets/src/mage/sets/lorwyn/HoofprintsOfTheStag.java @@ -34,8 +34,8 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DrawCardTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.common.OnlyDuringYourTurnCost; import mage.abilities.costs.common.RemoveCountersSourceCost; -import mage.abilities.costs.common.YourTurnCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -61,7 +61,7 @@ public class HoofprintsOfTheStag extends CardImpl { this.addAbility(new DrawCardTriggeredAbility(new AddCountersSourceEffect(CounterType.HOOFPRINT.createInstance(1)), true)); Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new WhiteElementalToken(), 1), new ManaCostsImpl("{2}{W}")); ability.addCost(new RemoveCountersSourceCost(CounterType.HOOFPRINT.createInstance(4))); - ability.addCost(new YourTurnCost()); + ability.addCost(new OnlyDuringYourTurnCost()); this.addAbility(ability); } diff --git a/Mage/src/mage/abilities/costs/common/OnlyDuringYourTurnCost.java b/Mage/src/mage/abilities/costs/common/OnlyDuringYourTurnCost.java index 93ef0b71de3..bcef6edfbaf 100644 --- a/Mage/src/mage/abilities/costs/common/OnlyDuringYourTurnCost.java +++ b/Mage/src/mage/abilities/costs/common/OnlyDuringYourTurnCost.java @@ -54,9 +54,7 @@ public class OnlyDuringYourTurnCost extends CostImpl { @Override public boolean canPay(UUID sourceId, UUID controllerId, Game game) { - if (game.getActivePlayerId().equals(controllerId)) - return true; - return false; + return game.getActivePlayerId().equals(controllerId); } @Override diff --git a/Mage/src/mage/abilities/costs/common/YourTurnCost.java b/Mage/src/mage/abilities/costs/common/YourTurnCost.java deleted file mode 100644 index b638131d4c8..00000000000 --- a/Mage/src/mage/abilities/costs/common/YourTurnCost.java +++ /dev/null @@ -1,35 +0,0 @@ -package mage.abilities.costs.common; - -import mage.abilities.Ability; -import mage.abilities.costs.CostImpl; -import mage.game.Game; - -import java.util.UUID; - -/** - * "Activate this ability only during your turn" cost - **/ -public class YourTurnCost extends CostImpl { - public YourTurnCost() { - this.text = "Activate this ability only during your turn"; - } - - public YourTurnCost(final YourTurnCost cost) { - super(cost); - } - - @Override - public boolean canPay(UUID sourceId, UUID controllerId, Game game) { - return game.getActivePlayerId().equals(controllerId); - } - - @Override - public boolean pay(Ability ability, Game game, UUID sourceId, UUID controllerId, boolean noMana) { - return true; - } - - @Override - public YourTurnCost copy() { - return new YourTurnCost(this); - } -}