more work at Kicker - now we shall use special KickerManaCost for it

This commit is contained in:
Loki 2011-09-15 23:01:57 +03:00
parent 0491c34005
commit 8dfd3bfc9d
6 changed files with 43 additions and 27 deletions

View file

@ -40,6 +40,7 @@ import mage.abilities.costs.AlternativeCost;
import mage.abilities.costs.Cost;
import mage.abilities.costs.Costs;
import mage.abilities.costs.CostsImpl;
import mage.abilities.costs.mana.KickerManaCost;
import mage.abilities.costs.mana.ManaCost;
import mage.abilities.costs.mana.ManaCosts;
import mage.abilities.costs.mana.ManaCostsImpl;
@ -56,8 +57,6 @@ import mage.target.Targets;
import org.apache.log4j.Logger;
import javax.management.openmbean.ArrayType;
/**
*
* @author BetaSteward_at_googlemail.com

View file

@ -1,11 +1,9 @@
package mage.abilities.condition.common;
import mage.Constants;
import mage.abilities.Ability;
import mage.abilities.condition.Condition;
import mage.abilities.costs.mana.ManaCost;
import mage.abilities.costs.mana.KickerManaCost;
import mage.cards.Card;
import mage.filter.FilterPermanent;
import mage.game.Game;
/**
@ -28,8 +26,8 @@ public class KickedCondition implements Condition {
boolean kicked = false;
if (p != null) {
for (Object cost : p.getSpellAbility().getOptionalCosts()) {
if (cost instanceof ManaCost) {
if (((ManaCost) cost).isPaid()) {
if (cost instanceof KickerManaCost) {
if (((KickerManaCost) cost).isPaid()) {
kicked = true;
}
}

View file

@ -0,0 +1,32 @@
package mage.abilities.costs.mana;
import mage.abilities.Ability;
import mage.abilities.costs.Cost;
import mage.abilities.costs.CostImpl;
import mage.game.Game;
import java.util.UUID;
/**
* This cost must be used only as optional mana cost in cards with Kicker
* @author Loki
*/
public class KickerManaCost extends ManaCostsImpl {
public KickerManaCost(String manaString) {
super(manaString);
}
public KickerManaCost(final KickerManaCost cost) {
super(cost);
}
@Override
public KickerManaCost copy() {
return new KickerManaCost(this);
}
@Override
public String getText() {
return "Kicker - " + super.getText();
}
}

View file

@ -39,6 +39,7 @@ import mage.abilities.Abilities;
import mage.abilities.Ability;
import mage.abilities.SpellAbility;
import mage.abilities.costs.Cost;
import mage.abilities.costs.mana.KickerManaCost;
import mage.abilities.costs.mana.ManaCost;
import mage.abilities.costs.mana.ManaCosts;
import mage.abilities.effects.Effect;