From 6039429127f2667053bf9a7ce33cff6f5da26a08 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 15 Dec 2012 18:42:25 +0100 Subject: [PATCH] Changed call of KickerAbility and replaced KickerAbility by new MultikickerAbility. --- .../src/mage/sets/apocalypse/Anavolver.java | 11 +++----- .../src/mage/sets/apocalypse/Cetavolver.java | 11 +++----- .../src/mage/sets/apocalypse/Degavolver.java | 11 +++----- .../mage/sets/apocalypse/DesolationAngel.java | 28 ++++++------------- .../sets/avacynrestored/CavernOfSouls.java | 4 +-- .../mage/sets/futuresight/KavuPrimarch.java | 3 +- .../mage/sets/invasion/UrborgSkeleton.java | 3 +- .../src/mage/sets/planeshift/OrimsChant.java | 3 +- .../src/mage/sets/worldwake/ApexHawks.java | 5 ++-- .../sets/worldwake/BloodhuskRitualist.java | 5 ++-- .../src/mage/sets/worldwake/CometStorm.java | 5 ++-- .../mage/sets/worldwake/DeathforgeShaman.java | 5 ++-- .../src/mage/sets/worldwake/EnclaveElite.java | 5 ++-- .../sets/worldwake/EverflowingChalice.java | 5 ++-- .../src/mage/sets/worldwake/GnarlidPack.java | 5 ++-- .../mage/sets/worldwake/JoragaWarcaller.java | 5 ++-- .../sets/worldwake/LightkeeperOfEmeria.java | 5 ++-- .../mage/sets/worldwake/MarshalsAnthem.java | 5 ++-- .../src/mage/sets/worldwake/QuagVampires.java | 5 ++-- .../mage/sets/worldwake/SkitterOfLizards.java | 5 ++-- .../sets/worldwake/StrengthOfTheTajuru.java | 6 ++-- .../src/mage/sets/worldwake/VoyagerDrake.java | 5 ++-- .../sets/worldwake/WolfbriarElemental.java | 5 ++-- .../src/mage/sets/zendikar/AetherFigment.java | 7 ++--- .../src/mage/sets/zendikar/BoldDefense.java | 3 +- .../mage/sets/zendikar/BurstLightning.java | 3 +- .../mage/sets/zendikar/ConquerorsPledge.java | 3 +- .../mage/sets/zendikar/ElementalAppeal.java | 3 +- .../sets/zendikar/GatekeeperOfMalakir.java | 3 +- .../src/mage/sets/zendikar/Gigantiform.java | 3 +- .../mage/sets/zendikar/GoblinBushwhacker.java | 3 +- .../mage/sets/zendikar/GoblinRuinblaster.java | 3 +- .../sets/zendikar/HeartstabberMosquito.java | 3 +- .../src/mage/sets/zendikar/IntoTheRoil.java | 3 +- .../src/mage/sets/zendikar/KorAeronaut.java | 3 +- .../mage/sets/zendikar/KorSanctifiers.java | 3 +- .../mage/sets/zendikar/MarshCasualties.java | 3 +- .../src/mage/sets/zendikar/MoldShambler.java | 3 +- .../mage/sets/zendikar/OranRiefRecluse.java | 3 +- .../mage/sets/zendikar/RiteOfReplication.java | 3 +- .../mage/sets/zendikar/SadisticSacrament.java | 3 +- .../src/mage/sets/zendikar/TempestOwl.java | 3 +- .../src/mage/sets/zendikar/TorchSlinger.java | 3 +- .../mage/sets/zendikar/UnstableFooting.java | 3 +- .../src/mage/sets/zendikar/VampiresBite.java | 3 +- .../mage/sets/zendikar/VinesOfVastwood.java | 4 +-- 46 files changed, 80 insertions(+), 144 deletions(-) diff --git a/Mage.Sets/src/mage/sets/apocalypse/Anavolver.java b/Mage.Sets/src/mage/sets/apocalypse/Anavolver.java index f619943220..1ce5cc0788 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/Anavolver.java +++ b/Mage.Sets/src/mage/sets/apocalypse/Anavolver.java @@ -38,7 +38,6 @@ import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.KickedCostCondition; import mage.abilities.costs.common.PayLifeCost; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.effects.EntersBattlefieldEffect; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; @@ -62,23 +61,21 @@ public class Anavolver extends CardImpl { this.toughness = new MageInt(3); // Kicker {1}{U} and/or {B} (You may pay an additional {1}{U} and/or {B} as you cast this spell.) - KickerManaCost kicker1 = new KickerManaCost("{1}{U}"); - KickerManaCost kicker2 = new KickerManaCost("{B}"); - KickerAbility kickerAbility = new KickerAbility(kicker1); - kickerAbility.addKickerManaCost(kicker2); + KickerAbility kickerAbility = new KickerAbility("{1}{U}"); + kickerAbility.addKickerCost("{B}"); this.addAbility(kickerAbility); // If Anavolver was kicked with its {1}{U} kicker, it enters the battlefield with two +1/+1 counters on it and with flying. EntersBattlefieldAbility ability1 = new EntersBattlefieldAbility( new AddCountersSourceEffect(CounterType.P1P1.createInstance(2),false), - new KickedCostCondition(kicker1), true, "If {this} was kicked with its {1}{U} kicker, it enters the battlefield with two +1/+1 counters on it and with flying.", + new KickedCostCondition("{1}{U}"), true, "If {this} was kicked with its {1}{U} kicker, it enters the battlefield with two +1/+1 counters on it and with flying.", "{this} enters the battlefield with two +1/+1 counters on it and with flying"); ((EntersBattlefieldEffect)ability1.getEffects().get(0)).addEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield)); this.addAbility(ability1); // If Anavolver was kicked with its {B} kicker, it enters the battlefield with a +1/+1 counter on it and with "Pay 3 life: Regenerate Anavolver." EntersBattlefieldAbility ability2 = new EntersBattlefieldAbility( - new AddCountersSourceEffect(CounterType.P1P1.createInstance(1),false), new KickedCostCondition(kicker2), true, + new AddCountersSourceEffect(CounterType.P1P1.createInstance(1),false), new KickedCostCondition("{B}"), true, "If {this} was kicked with its {B} kicker, it enters the battlefield with a +1/+1 counter on it and with \"Pay 3 life: Regenerate Anavolver.\"", "{this} enters the battlefield with a +1/+1 counter on it and with \"Pay 3 life: Regenerate Anavolver.\""); ((EntersBattlefieldEffect)ability2.getEffects().get(0)).addEffect(new GainAbilitySourceEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new PayLifeCost(3)), Duration.WhileOnBattlefield)); diff --git a/Mage.Sets/src/mage/sets/apocalypse/Cetavolver.java b/Mage.Sets/src/mage/sets/apocalypse/Cetavolver.java index 266673af6d..c44e667116 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/Cetavolver.java +++ b/Mage.Sets/src/mage/sets/apocalypse/Cetavolver.java @@ -34,7 +34,6 @@ import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.common.KickedCostCondition; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.effects.EntersBattlefieldEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -59,23 +58,21 @@ public class Cetavolver extends CardImpl { this.toughness = new MageInt(1); // Kicker {1}{R} and/or {G} (You may pay an additional {1}{R} and/or {G} as you cast this spell.) - KickerManaCost kicker1 = new KickerManaCost("{1}{R}"); - KickerManaCost kicker2 = new KickerManaCost("{G}"); - KickerAbility kickerAbility = new KickerAbility(kicker1); - kickerAbility.addKickerManaCost(kicker2); + KickerAbility kickerAbility = new KickerAbility("{1}{R}"); + kickerAbility.addKickerCost("{G}"); this.addAbility(kickerAbility); // If Cetavolver was kicked with its {1}{R} kicker, it enters the battlefield with two +1/+1 counters on it and with first strike. EntersBattlefieldAbility ability1 = new EntersBattlefieldAbility( new AddCountersSourceEffect(CounterType.P1P1.createInstance(2),false), - new KickedCostCondition(kicker1), true, "If Cetavolver was kicked with its {1}{R} kicker, it enters the battlefield with two +1/+1 counters on it and with first strike.", + new KickedCostCondition("{1}{R}"), true, "If Cetavolver was kicked with its {1}{R} kicker, it enters the battlefield with two +1/+1 counters on it and with first strike.", "{this} enters the battlefield with two +1/+1 counters on it and with first strike"); ((EntersBattlefieldEffect)ability1.getEffects().get(0)).addEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield)); this.addAbility(ability1); // If Cetavolver was kicked with its {G} kicker, it enters the battlefield with a +1/+1 counter on it and with trample. EntersBattlefieldAbility ability2 = new EntersBattlefieldAbility( - new AddCountersSourceEffect(CounterType.P1P1.createInstance(1),false), new KickedCostCondition(kicker2), true, + new AddCountersSourceEffect(CounterType.P1P1.createInstance(1),false), new KickedCostCondition("{G}"), true, "If Cetavolver was kicked with its {G} kicker, it enters the battlefield with a +1/+1 counter on it and with trample.", "{this} enters the battlefield with a +1/+1 counter on it and with trample"); ((EntersBattlefieldEffect)ability2.getEffects().get(0)).addEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield)); diff --git a/Mage.Sets/src/mage/sets/apocalypse/Degavolver.java b/Mage.Sets/src/mage/sets/apocalypse/Degavolver.java index 37411ca8c7..0616be0b44 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/Degavolver.java +++ b/Mage.Sets/src/mage/sets/apocalypse/Degavolver.java @@ -38,7 +38,6 @@ import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.KickedCostCondition; import mage.abilities.costs.common.PayLifeCost; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.effects.EntersBattlefieldEffect; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; @@ -63,23 +62,21 @@ public class Degavolver extends CardImpl { this.toughness = new MageInt(1); // Kicker {1}{B} and/or {R} (You may pay an additional {1}{B} and/or {R} as you cast this spell.) - KickerManaCost kicker1 = new KickerManaCost("{1}{B}"); - KickerManaCost kicker2 = new KickerManaCost("{R}"); - KickerAbility kickerAbility = new KickerAbility(kicker1); - kickerAbility.addKickerManaCost(kicker2); + KickerAbility kickerAbility = new KickerAbility("{1}{B}"); + kickerAbility.addKickerCost("{R}"); this.addAbility(kickerAbility); // If Degavolver was kicked with its {1}{B} kicker, it enters the battlefield with two +1/+1 counters on it and with "Pay 3 life: Regenerate Degavolver." EntersBattlefieldAbility ability1 = new EntersBattlefieldAbility( new AddCountersSourceEffect(CounterType.P1P1.createInstance(2),false), - new KickedCostCondition(kicker1), true, "If Degavolver was kicked with its {1}{B} kicker, it enters the battlefield with two +1/+1 counters on it and with \"Pay 3 life: Regenerate Degavolver.\"", + new KickedCostCondition("{1}{B}"), true, "If Degavolver was kicked with its {1}{B} kicker, it enters the battlefield with two +1/+1 counters on it and with \"Pay 3 life: Regenerate Degavolver.\"", "{this} enters the battlefield with two +1/+1 counters on it and with \"Pay 3 life: Regenerate Degavolver.\""); ((EntersBattlefieldEffect)ability1.getEffects().get(0)).addEffect(new GainAbilitySourceEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new PayLifeCost(3)), Constants.Duration.WhileOnBattlefield)); this.addAbility(ability1); // If Degavolver was kicked with its {R} kicker, it enters the battlefield with a +1/+1 counter on it and with first strike. EntersBattlefieldAbility ability2 = new EntersBattlefieldAbility( - new AddCountersSourceEffect(CounterType.P1P1.createInstance(1),false), new KickedCostCondition(kicker2), true, + new AddCountersSourceEffect(CounterType.P1P1.createInstance(1),false), new KickedCostCondition("{R}"), true, "If Degavolver was kicked with its {R} kicker, it enters the battlefield with a +1/+1 counter on it and with first strike.", "{this} enters the battlefield with a +1/+1 counter on it and with first strike"); ((EntersBattlefieldEffect)ability2.getEffects().get(0)).addEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield)); diff --git a/Mage.Sets/src/mage/sets/apocalypse/DesolationAngel.java b/Mage.Sets/src/mage/sets/apocalypse/DesolationAngel.java index 9bec37405a..4bf30ffce2 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/DesolationAngel.java +++ b/Mage.Sets/src/mage/sets/apocalypse/DesolationAngel.java @@ -35,12 +35,13 @@ import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.costs.mana.KickerManaCost; +import mage.abilities.condition.common.KickedCondition; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.KickerAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.filter.common.FilterLandPermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -58,7 +59,7 @@ public class DesolationAngel extends CardImpl { this.toughness = new MageInt(4); // Kicker (You may pay an additional as you cast this spell.) - this.addAbility(new KickerAbility(new KickerManaCost("{W}{W}"))); + this.addAbility(new KickerAbility("{W}{W}")); // Flying this.addAbility(FlyingAbility.getInstance()); @@ -90,26 +91,13 @@ class DesolationAngelEntersBattlefieldEffect extends OneShotEffect { game.debugMessage("player canceled choosing type. retrying."); } game.informPlayers(permanent.getName() + ": " + player.getName() + " has chosen " + typeChoice.getChoice()); - game.getState().setValue(permanent.getId() + "_type", typeChoice.getChoice()); - permanent.addInfo("chosen type", "Chosen type: " + typeChoice.getChoice() + ""); + game.getState().setValue(permanent.getId() + "_type", typeChoice.getChoice().toString()); + permanent.addInfo("chosen type", "Chosen type: " + typeChoice.getChoice().toString() + ""); } return false; } diff --git a/Mage.Sets/src/mage/sets/futuresight/KavuPrimarch.java b/Mage.Sets/src/mage/sets/futuresight/KavuPrimarch.java index 04a39b2ccd..c514d46726 100644 --- a/Mage.Sets/src/mage/sets/futuresight/KavuPrimarch.java +++ b/Mage.Sets/src/mage/sets/futuresight/KavuPrimarch.java @@ -33,7 +33,6 @@ import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.ConvokeAbility; import mage.abilities.keyword.KickerAbility; @@ -55,7 +54,7 @@ public class KavuPrimarch extends CardImpl { this.toughness = new MageInt(3); // Kicker {4} (You may pay an additional {4} as you cast this spell.) - this.addAbility(new KickerAbility(new KickerManaCost("{4}"))); + this.addAbility(new KickerAbility("{4}")); // Convoke (Each creature you tap while casting this spell reduces its cost by {1} or by one mana of that creature's color.) this.addAbility(new ConvokeAbility()); diff --git a/Mage.Sets/src/mage/sets/invasion/UrborgSkeleton.java b/Mage.Sets/src/mage/sets/invasion/UrborgSkeleton.java index d72a1d9659..89b6bab0c8 100644 --- a/Mage.Sets/src/mage/sets/invasion/UrborgSkeleton.java +++ b/Mage.Sets/src/mage/sets/invasion/UrborgSkeleton.java @@ -36,7 +36,6 @@ import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.RegenerateSourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -62,7 +61,7 @@ public class UrborgSkeleton extends CardImpl { this.toughness = new MageInt(1); // Kicker {3} (You may pay an additional {3} as you cast this spell.) - this.addAbility(new KickerAbility(new KickerManaCost("{3}"))); + this.addAbility(new KickerAbility("{3}")); // {B}: Regenerate Urborg Skeleton. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}"))); diff --git a/Mage.Sets/src/mage/sets/planeshift/OrimsChant.java b/Mage.Sets/src/mage/sets/planeshift/OrimsChant.java index 1146db9efe..bf69f6e2ac 100644 --- a/Mage.Sets/src/mage/sets/planeshift/OrimsChant.java +++ b/Mage.Sets/src/mage/sets/planeshift/OrimsChant.java @@ -34,7 +34,6 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.abilities.Ability; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.keyword.KickerAbility; import mage.cards.CardImpl; @@ -55,7 +54,7 @@ public class OrimsChant extends CardImpl { this.color.setWhite(true); // Kicker {W} (You may pay an additional {W} as you cast this spell.) - this.addAbility(new KickerAbility(new KickerManaCost("{W}"))); + this.addAbility(new KickerAbility("{W}")); // Target player can't cast spells this turn. this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/worldwake/ApexHawks.java b/Mage.Sets/src/mage/sets/worldwake/ApexHawks.java index 2235797cbb..d6e3a6f081 100644 --- a/Mage.Sets/src/mage/sets/worldwake/ApexHawks.java +++ b/Mage.Sets/src/mage/sets/worldwake/ApexHawks.java @@ -32,11 +32,10 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; -import mage.abilities.costs.mana.MultikickerManaCost; import mage.abilities.dynamicvalue.common.MultikickerCount; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.FlyingAbility; -import mage.abilities.keyword.KickerAbility; +import mage.abilities.keyword.MultikickerAbility; import mage.cards.CardImpl; import mage.counters.CounterType; @@ -56,7 +55,7 @@ public class ApexHawks extends CardImpl { this.toughness = new MageInt(2); // Multikicker (You may pay an additional {1}{W} any number of times as you cast this spell.) - this.addAbility(new KickerAbility(new MultikickerManaCost("{1}{W}"))); + this.addAbility(new MultikickerAbility("{1}{W}")); // Flying this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/worldwake/BloodhuskRitualist.java b/Mage.Sets/src/mage/sets/worldwake/BloodhuskRitualist.java index 61967575ef..1a1f169423 100644 --- a/Mage.Sets/src/mage/sets/worldwake/BloodhuskRitualist.java +++ b/Mage.Sets/src/mage/sets/worldwake/BloodhuskRitualist.java @@ -35,11 +35,10 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.MultikickerManaCost; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.dynamicvalue.common.MultikickerCount; import mage.abilities.effects.common.DiscardTargetEffect; -import mage.abilities.keyword.KickerAbility; +import mage.abilities.keyword.MultikickerAbility; import mage.cards.CardImpl; import mage.target.common.TargetOpponent; @@ -59,7 +58,7 @@ public class BloodhuskRitualist extends CardImpl { this.toughness = new MageInt(2); // Multikicker (You may pay an additional {B} any number of times as you cast this spell.) - this.addAbility(new KickerAbility(new MultikickerManaCost("{B}"))); + this.addAbility(new MultikickerAbility("{B}")); // When Bloodhusk Ritualist enters the battlefield, target opponent discards a card for each time it was kicked. Ability ability = new ConditionalTriggeredAbility( diff --git a/Mage.Sets/src/mage/sets/worldwake/CometStorm.java b/Mage.Sets/src/mage/sets/worldwake/CometStorm.java index eb06a2e470..982cd87ba2 100644 --- a/Mage.Sets/src/mage/sets/worldwake/CometStorm.java +++ b/Mage.Sets/src/mage/sets/worldwake/CometStorm.java @@ -33,10 +33,9 @@ import mage.Constants.Outcome; import mage.Constants.Rarity; import mage.abilities.Ability; import mage.abilities.SpellAbility; -import mage.abilities.costs.mana.MultikickerManaCost; import mage.abilities.dynamicvalue.common.MultikickerCount; import mage.abilities.effects.OneShotEffect; -import mage.abilities.keyword.KickerAbility; +import mage.abilities.keyword.MultikickerAbility; import mage.cards.CardImpl; import mage.game.Game; import mage.game.permanent.Permanent; @@ -56,7 +55,7 @@ public class CometStorm extends CardImpl { this.color.setRed(true); // Multikicker {1} - this.addAbility(new KickerAbility(new MultikickerManaCost("{1}"))); + this.addAbility(new MultikickerAbility("{1}")); // Choose target creature or player, then choose another target creature or player for each time Comet Storm was kicked. Comet Storm deals X damage to each of them. this.getSpellAbility().addEffect(new CometStormEffect()); diff --git a/Mage.Sets/src/mage/sets/worldwake/DeathforgeShaman.java b/Mage.Sets/src/mage/sets/worldwake/DeathforgeShaman.java index 51f0b23229..65dbc0b264 100644 --- a/Mage.Sets/src/mage/sets/worldwake/DeathforgeShaman.java +++ b/Mage.Sets/src/mage/sets/worldwake/DeathforgeShaman.java @@ -34,11 +34,10 @@ import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.costs.mana.MultikickerManaCost; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.MultikickerCount; import mage.abilities.effects.OneShotEffect; -import mage.abilities.keyword.KickerAbility; +import mage.abilities.keyword.MultikickerAbility; import mage.cards.CardImpl; import mage.game.Game; import mage.players.Player; @@ -61,7 +60,7 @@ public class DeathforgeShaman extends CardImpl { this.toughness = new MageInt(3); // Multikicker {R} - this.addAbility(new KickerAbility(new MultikickerManaCost("{R}"))); + this.addAbility(new MultikickerAbility("{R}")); // When Deathforge Shaman enters the battlefield, it deals damage to target player equal to twice the number of times it was kicked. Ability ability = new EntersBattlefieldTriggeredAbility(new DeathforgeShamanEffect()); diff --git a/Mage.Sets/src/mage/sets/worldwake/EnclaveElite.java b/Mage.Sets/src/mage/sets/worldwake/EnclaveElite.java index 722ec67a4a..0492d71cf7 100644 --- a/Mage.Sets/src/mage/sets/worldwake/EnclaveElite.java +++ b/Mage.Sets/src/mage/sets/worldwake/EnclaveElite.java @@ -32,11 +32,10 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; -import mage.abilities.costs.mana.MultikickerManaCost; import mage.abilities.dynamicvalue.common.MultikickerCount; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.IslandwalkAbility; -import mage.abilities.keyword.KickerAbility; +import mage.abilities.keyword.MultikickerAbility; import mage.cards.CardImpl; import mage.counters.CounterType; @@ -57,7 +56,7 @@ public class EnclaveElite extends CardImpl { this.toughness = new MageInt(2); // Multikicker (You may pay an additional any number of times as you cast this spell.) - this.addAbility(new KickerAbility(new MultikickerManaCost("{1}{U}"))); + this.addAbility(new MultikickerAbility("{1}{U}")); // Islandwalk this.addAbility(new IslandwalkAbility()); diff --git a/Mage.Sets/src/mage/sets/worldwake/EverflowingChalice.java b/Mage.Sets/src/mage/sets/worldwake/EverflowingChalice.java index 1806b2d051..40963b9bbf 100644 --- a/Mage.Sets/src/mage/sets/worldwake/EverflowingChalice.java +++ b/Mage.Sets/src/mage/sets/worldwake/EverflowingChalice.java @@ -33,11 +33,10 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.Mana; import mage.abilities.common.EntersBattlefieldAbility; -import mage.abilities.costs.mana.MultikickerManaCost; import mage.abilities.dynamicvalue.common.CountersCount; import mage.abilities.dynamicvalue.common.MultikickerCount; import mage.abilities.effects.common.counter.AddCountersSourceEffect; -import mage.abilities.keyword.KickerAbility; +import mage.abilities.keyword.MultikickerAbility; import mage.abilities.mana.DynamicManaAbility; import mage.cards.CardImpl; import mage.counters.CounterType; @@ -57,7 +56,7 @@ public class EverflowingChalice extends CardImpl { this.expansionSetCode = "WWK"; // Multikicker {2} (You may pay an additional {2} any number of times as you cast this spell.) - this.addAbility(new KickerAbility(new MultikickerManaCost("{2}"))); + this.addAbility(new MultikickerAbility("{2}")); // Everflowing Chalice enters the battlefield with a charge counter on it for each time it was kicked. this.addAbility(new EntersBattlefieldAbility( diff --git a/Mage.Sets/src/mage/sets/worldwake/GnarlidPack.java b/Mage.Sets/src/mage/sets/worldwake/GnarlidPack.java index d187334348..19fdbda6f0 100644 --- a/Mage.Sets/src/mage/sets/worldwake/GnarlidPack.java +++ b/Mage.Sets/src/mage/sets/worldwake/GnarlidPack.java @@ -32,10 +32,9 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; -import mage.abilities.costs.mana.MultikickerManaCost; import mage.abilities.dynamicvalue.common.MultikickerCount; import mage.abilities.effects.common.counter.AddCountersSourceEffect; -import mage.abilities.keyword.KickerAbility; +import mage.abilities.keyword.MultikickerAbility; import mage.cards.CardImpl; import mage.counters.CounterType; @@ -55,7 +54,7 @@ public class GnarlidPack extends CardImpl { this.toughness = new MageInt(2); // Multikicker (You may pay an additional any number of times as you cast this spell.) - this.addAbility(new KickerAbility(new MultikickerManaCost("{1}{G}"))); + this.addAbility(new MultikickerAbility("{1}{G}")); // Gnarlid Pack enters the battlefield with a +1/+1 counter on it for each time it was kicked. this.addAbility(new EntersBattlefieldAbility( diff --git a/Mage.Sets/src/mage/sets/worldwake/JoragaWarcaller.java b/Mage.Sets/src/mage/sets/worldwake/JoragaWarcaller.java index da2a556ac2..64a24835ef 100644 --- a/Mage.Sets/src/mage/sets/worldwake/JoragaWarcaller.java +++ b/Mage.Sets/src/mage/sets/worldwake/JoragaWarcaller.java @@ -35,12 +35,11 @@ import mage.Constants.TargetController; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.costs.mana.MultikickerManaCost; import mage.abilities.dynamicvalue.common.CountersCount; import mage.abilities.dynamicvalue.common.MultikickerCount; import mage.abilities.effects.common.continious.BoostAllEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; -import mage.abilities.keyword.KickerAbility; +import mage.abilities.keyword.MultikickerAbility; import mage.cards.CardImpl; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; @@ -75,7 +74,7 @@ public class JoragaWarcaller extends CardImpl { this.toughness = new MageInt(1); // Multikicker {1}{G} - this.addAbility(new KickerAbility(new MultikickerManaCost("{1}{G}"))); + this.addAbility(new MultikickerAbility("{1}{G}")); // Joraga Warcaller enters the battlefield with a +1/+1 counter on it for each time it was kicked. this.addAbility(new EntersBattlefieldAbility( diff --git a/Mage.Sets/src/mage/sets/worldwake/LightkeeperOfEmeria.java b/Mage.Sets/src/mage/sets/worldwake/LightkeeperOfEmeria.java index 3a2b3570e0..9e98b33493 100644 --- a/Mage.Sets/src/mage/sets/worldwake/LightkeeperOfEmeria.java +++ b/Mage.Sets/src/mage/sets/worldwake/LightkeeperOfEmeria.java @@ -32,11 +32,10 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.costs.mana.MultikickerManaCost; import mage.abilities.dynamicvalue.common.MultikickerCount; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.keyword.FlyingAbility; -import mage.abilities.keyword.KickerAbility; +import mage.abilities.keyword.MultikickerAbility; import mage.cards.CardImpl; /** @@ -55,7 +54,7 @@ public class LightkeeperOfEmeria extends CardImpl { this.toughness = new MageInt(4); // Multikicker (You may pay an additional {W} any number of times as you cast this spell.) - this.addAbility(new KickerAbility(new MultikickerManaCost("{W}"))); + this.addAbility(new MultikickerAbility("{W}")); // Flying this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/worldwake/MarshalsAnthem.java b/Mage.Sets/src/mage/sets/worldwake/MarshalsAnthem.java index b2b38a92af..38eadf1026 100644 --- a/Mage.Sets/src/mage/sets/worldwake/MarshalsAnthem.java +++ b/Mage.Sets/src/mage/sets/worldwake/MarshalsAnthem.java @@ -36,12 +36,11 @@ import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.MultikickerManaCost; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.dynamicvalue.common.MultikickerCount; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; import mage.abilities.effects.common.continious.BoostAllEffect; -import mage.abilities.keyword.KickerAbility; +import mage.abilities.keyword.MultikickerAbility; import mage.cards.CardImpl; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; @@ -72,7 +71,7 @@ public class MarshalsAnthem extends CardImpl { this.color.setWhite(true); // Multikicker {1}{W} - this.addAbility(new KickerAbility(new MultikickerManaCost("{1}{W}"))); + this.addAbility(new MultikickerAbility("{1}{W}")); // Creatures you control get +1/+1. this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Constants.Duration.WhileOnBattlefield, filter, false))); diff --git a/Mage.Sets/src/mage/sets/worldwake/QuagVampires.java b/Mage.Sets/src/mage/sets/worldwake/QuagVampires.java index e784bab41a..9e9ae17b38 100644 --- a/Mage.Sets/src/mage/sets/worldwake/QuagVampires.java +++ b/Mage.Sets/src/mage/sets/worldwake/QuagVampires.java @@ -32,10 +32,9 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; -import mage.abilities.costs.mana.MultikickerManaCost; import mage.abilities.dynamicvalue.common.MultikickerCount; import mage.abilities.effects.common.counter.AddCountersSourceEffect; -import mage.abilities.keyword.KickerAbility; +import mage.abilities.keyword.MultikickerAbility; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; import mage.counters.CounterType; @@ -57,7 +56,7 @@ public class QuagVampires extends CardImpl { this.toughness = new MageInt(1); // Multikicker (You may pay an additional {1}{B} any number of times as you cast this spell.) - this.addAbility(new KickerAbility(new MultikickerManaCost("{1}{B}"))); + this.addAbility(new MultikickerAbility("{1}{B}")); // Swampwalk this.addAbility(new SwampwalkAbility()); diff --git a/Mage.Sets/src/mage/sets/worldwake/SkitterOfLizards.java b/Mage.Sets/src/mage/sets/worldwake/SkitterOfLizards.java index d2c90d2a92..416227a553 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SkitterOfLizards.java +++ b/Mage.Sets/src/mage/sets/worldwake/SkitterOfLizards.java @@ -32,11 +32,10 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAbility; -import mage.abilities.costs.mana.MultikickerManaCost; import mage.abilities.dynamicvalue.common.MultikickerCount; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.HasteAbility; -import mage.abilities.keyword.KickerAbility; +import mage.abilities.keyword.MultikickerAbility; import mage.cards.CardImpl; import mage.counters.CounterType; @@ -56,7 +55,7 @@ public class SkitterOfLizards extends CardImpl { this.toughness = new MageInt(1); // Multikicker (You may pay an additional {1}{R} any number of times as you cast this spell.) - this.addAbility(new KickerAbility(new MultikickerManaCost("{1}{R}"))); + this.addAbility(new MultikickerAbility("{1}{R}")); // Haste this.addAbility(HasteAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/worldwake/StrengthOfTheTajuru.java b/Mage.Sets/src/mage/sets/worldwake/StrengthOfTheTajuru.java index 7e1b6930aa..15cf4e2231 100644 --- a/Mage.Sets/src/mage/sets/worldwake/StrengthOfTheTajuru.java +++ b/Mage.Sets/src/mage/sets/worldwake/StrengthOfTheTajuru.java @@ -33,11 +33,9 @@ import mage.Constants.Outcome; import mage.Constants.Rarity; import mage.abilities.Ability; import mage.abilities.SpellAbility; -import mage.abilities.costs.mana.MultikickerManaCost; import mage.abilities.dynamicvalue.common.MultikickerCount; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.counter.AddCountersTargetEffect; -import mage.abilities.keyword.KickerAbility; +import mage.abilities.keyword.MultikickerAbility; import mage.cards.CardImpl; import mage.counters.Counter; import mage.counters.CounterType; @@ -59,7 +57,7 @@ public class StrengthOfTheTajuru extends CardImpl { // Multikicker (You may pay an additional {1} any number of times as you cast this spell.) - this.addAbility(new KickerAbility(new MultikickerManaCost("{1}"))); + this.addAbility(new MultikickerAbility("{1}")); // Choose target creature, then choose another target creature for each time Strength of the Tajuru was kicked. Put X +1/+1 counters on each of them. this.getSpellAbility().addEffect(new StrengthOfTheTajuruAddCountersTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/worldwake/VoyagerDrake.java b/Mage.Sets/src/mage/sets/worldwake/VoyagerDrake.java index 5a77c8e077..0ecdee168a 100644 --- a/Mage.Sets/src/mage/sets/worldwake/VoyagerDrake.java +++ b/Mage.Sets/src/mage/sets/worldwake/VoyagerDrake.java @@ -35,12 +35,11 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.MultikickerManaCost; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.dynamicvalue.common.MultikickerCount; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; -import mage.abilities.keyword.KickerAbility; +import mage.abilities.keyword.MultikickerAbility; import mage.cards.CardImpl; import mage.game.Game; import mage.target.common.TargetCreaturePermanent; @@ -61,7 +60,7 @@ public class VoyagerDrake extends CardImpl { this.toughness = new MageInt(3); // Multikicker {U} - this.addAbility(new KickerAbility(new MultikickerManaCost("{U}"))); + this.addAbility(new MultikickerAbility("{U}")); // Flying this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/worldwake/WolfbriarElemental.java b/Mage.Sets/src/mage/sets/worldwake/WolfbriarElemental.java index 1027ab2ba6..45f19a28db 100644 --- a/Mage.Sets/src/mage/sets/worldwake/WolfbriarElemental.java +++ b/Mage.Sets/src/mage/sets/worldwake/WolfbriarElemental.java @@ -33,10 +33,9 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.costs.mana.MultikickerManaCost; import mage.abilities.dynamicvalue.common.MultikickerCount; import mage.abilities.effects.common.CreateTokenEffect; -import mage.abilities.keyword.KickerAbility; +import mage.abilities.keyword.MultikickerAbility; import mage.cards.CardImpl; import mage.game.permanent.token.WolfToken; @@ -55,7 +54,7 @@ public class WolfbriarElemental extends CardImpl { this.toughness = new MageInt(4); // Multikicker (You may pay an additional {G} any number of times as you cast this spell.) - this.addAbility(new KickerAbility(new MultikickerManaCost("{G}"))); + this.addAbility(new MultikickerAbility("{G}")); // When Wolfbriar Elemental enters the battlefield, put a 2/2 green Wolf creature token onto the battlefield for each time it was kicked. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new WolfToken(), new MultikickerCount()))); diff --git a/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java b/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java index 6741974836..d1c5ac597e 100644 --- a/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java +++ b/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java @@ -28,21 +28,20 @@ package mage.sets.zendikar; +import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; +import mage.abilities.keyword.KickerAbility; import mage.abilities.keyword.UnblockableAbility; import mage.cards.CardImpl; import mage.counters.CounterType; -import java.util.UUID; -import mage.abilities.keyword.KickerAbility; /** * @author nantuko, BetaSteward_at_googlemail.com @@ -63,7 +62,7 @@ public class AetherFigment extends CardImpl { this.addAbility(new UnblockableAbility()); // Kicker {3} - this.addAbility(new KickerAbility(new KickerManaCost("{3}"))); + this.addAbility(new KickerAbility("{3}")); // If AEther Figment was kicked, it enters the battlefield with two +1/+1 counters on it Ability ability = new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), KickedCondition.getInstance(), ""), staticText); diff --git a/Mage.Sets/src/mage/sets/zendikar/BoldDefense.java b/Mage.Sets/src/mage/sets/zendikar/BoldDefense.java index b7b160c30e..61f08bfb71 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BoldDefense.java +++ b/Mage.Sets/src/mage/sets/zendikar/BoldDefense.java @@ -33,7 +33,6 @@ import mage.Constants.Duration; import mage.Constants.Rarity; import mage.abilities.Ability; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.ContinuousEffect; @@ -58,7 +57,7 @@ public class BoldDefense extends CardImpl { this.expansionSetCode = "ZEN"; this.color.setWhite(true); - this.addAbility(new KickerAbility(new KickerManaCost("{3}{W}"))); + this.addAbility(new KickerAbility("{3}{W}")); DynamicValue dn = new BoldDefensePTCount(); this.getSpellAbility().addEffect(new BoostControlledEffect(dn, dn, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/zendikar/BurstLightning.java b/Mage.Sets/src/mage/sets/zendikar/BurstLightning.java index a12f7cca81..0d0134e8cf 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BurstLightning.java +++ b/Mage.Sets/src/mage/sets/zendikar/BurstLightning.java @@ -32,7 +32,6 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.KickerAbility; @@ -50,7 +49,7 @@ public class BurstLightning extends CardImpl { this.expansionSetCode = "ZEN"; this.color.setRed(true); - this.addAbility(new KickerAbility(new KickerManaCost("{4}"))); + this.addAbility(new KickerAbility("{4}")); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new DamageTargetEffect(4), diff --git a/Mage.Sets/src/mage/sets/zendikar/ConquerorsPledge.java b/Mage.Sets/src/mage/sets/zendikar/ConquerorsPledge.java index a93fb0c098..e5d519e6c1 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ConquerorsPledge.java +++ b/Mage.Sets/src/mage/sets/zendikar/ConquerorsPledge.java @@ -33,7 +33,6 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.KickerAbility; @@ -51,7 +50,7 @@ public class ConquerorsPledge extends CardImpl { this.expansionSetCode = "ZEN"; this.color.setWhite(true); - this.addAbility(new KickerAbility(new KickerManaCost("{6}"))); + this.addAbility(new KickerAbility("{6}")); this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new CreateTokenEffect(new KorSoldierToken(), 12), new CreateTokenEffect(new KorSoldierToken(), 6), KickedCondition.getInstance(), diff --git a/Mage.Sets/src/mage/sets/zendikar/ElementalAppeal.java b/Mage.Sets/src/mage/sets/zendikar/ElementalAppeal.java index 9ae53d0b8c..d59643028d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ElementalAppeal.java +++ b/Mage.Sets/src/mage/sets/zendikar/ElementalAppeal.java @@ -36,7 +36,6 @@ import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.delayed.AtEndOfTurnDelayedTriggeredAbility; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileTargetEffect; @@ -59,7 +58,7 @@ public class ElementalAppeal extends CardImpl { this.color.setRed(true); // Kicker {5} - this.addAbility(new KickerAbility(new KickerManaCost("{5}"))); + this.addAbility(new KickerAbility("{5}")); // Put a 7/1 red Elemental creature token with trample and haste onto the battlefield. Exile it at the beginning of the next end step. this.getSpellAbility().addEffect(new ElementalAppealEffect()); diff --git a/Mage.Sets/src/mage/sets/zendikar/GatekeeperOfMalakir.java b/Mage.Sets/src/mage/sets/zendikar/GatekeeperOfMalakir.java index 5f0ed1e3b9..633617671d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GatekeeperOfMalakir.java +++ b/Mage.Sets/src/mage/sets/zendikar/GatekeeperOfMalakir.java @@ -33,7 +33,6 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.SacrificeEffect; import mage.cards.CardImpl; @@ -67,7 +66,7 @@ public class GatekeeperOfMalakir extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new KickerAbility(new KickerManaCost("{B}"))); + this.addAbility(new KickerAbility("{B}")); EntersBattlefieldTriggeredAbility ability = diff --git a/Mage.Sets/src/mage/sets/zendikar/Gigantiform.java b/Mage.Sets/src/mage/sets/zendikar/Gigantiform.java index 8eb14e0f84..b6830921e6 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Gigantiform.java +++ b/Mage.Sets/src/mage/sets/zendikar/Gigantiform.java @@ -40,7 +40,6 @@ import mage.abilities.StaticAbility; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; @@ -74,7 +73,7 @@ public class Gigantiform extends CardImpl { this.color.setGreen(true); // Kicker {4} - this.addAbility(new KickerAbility(new KickerManaCost("{4}"))); + this.addAbility(new KickerAbility("{4}")); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/sets/zendikar/GoblinBushwhacker.java b/Mage.Sets/src/mage/sets/zendikar/GoblinBushwhacker.java index e7f3576405..edac1065ff 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GoblinBushwhacker.java +++ b/Mage.Sets/src/mage/sets/zendikar/GoblinBushwhacker.java @@ -34,7 +34,6 @@ import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.continious.BoostControlledEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; @@ -59,7 +58,7 @@ public class GoblinBushwhacker extends CardImpl { this.toughness = new MageInt(1); // Kicker {R} (You may pay an additional {R} as you cast this spell.) - this.addAbility(new KickerAbility(new KickerManaCost("{R}"))); + this.addAbility(new KickerAbility("{R}")); // When Goblin Bushwhacker enters the battlefield, if it was kicked, creatures you control get +1/+0 and gain haste until end of turn. diff --git a/Mage.Sets/src/mage/sets/zendikar/GoblinRuinblaster.java b/Mage.Sets/src/mage/sets/zendikar/GoblinRuinblaster.java index e8bbb19e28..e205073231 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GoblinRuinblaster.java +++ b/Mage.Sets/src/mage/sets/zendikar/GoblinRuinblaster.java @@ -34,7 +34,6 @@ import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.HasteAbility; @@ -58,7 +57,7 @@ public class GoblinRuinblaster extends CardImpl { this.toughness = new MageInt(1); // Kicker {R} (You may pay an additional {R} as you cast this spell.) - this.addAbility(new KickerAbility(new KickerManaCost("{R}"))); + this.addAbility(new KickerAbility("{R}")); // Haste diff --git a/Mage.Sets/src/mage/sets/zendikar/HeartstabberMosquito.java b/Mage.Sets/src/mage/sets/zendikar/HeartstabberMosquito.java index 57bdb76cee..e2812e1651 100644 --- a/Mage.Sets/src/mage/sets/zendikar/HeartstabberMosquito.java +++ b/Mage.Sets/src/mage/sets/zendikar/HeartstabberMosquito.java @@ -33,7 +33,6 @@ import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.FlyingAbility; @@ -57,7 +56,7 @@ public class HeartstabberMosquito extends CardImpl { this.toughness = new MageInt(2); // Kicker {2}{B} (You may pay an additional {2}{B} as you cast this spell.) - this.addAbility(new KickerAbility(new KickerManaCost("{2}{B}"))); + this.addAbility(new KickerAbility("{2}{B}")); // Flying diff --git a/Mage.Sets/src/mage/sets/zendikar/IntoTheRoil.java b/Mage.Sets/src/mage/sets/zendikar/IntoTheRoil.java index 1269aeec91..b3fbc8df94 100644 --- a/Mage.Sets/src/mage/sets/zendikar/IntoTheRoil.java +++ b/Mage.Sets/src/mage/sets/zendikar/IntoTheRoil.java @@ -32,7 +32,6 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; @@ -52,7 +51,7 @@ public class IntoTheRoil extends CardImpl { this.color.setBlue(true); // Kicker {1}{U} (You may pay an additional {1}{U} as you cast this spell.) - this.addAbility(new KickerAbility(new KickerManaCost("{1}{U}"))); + this.addAbility(new KickerAbility("{1}{U}")); // Return target nonland permanent to its owner's hand. If Into the Roil was kicked, draw a card. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/zendikar/KorAeronaut.java b/Mage.Sets/src/mage/sets/zendikar/KorAeronaut.java index 56c478e94c..e8078b69fd 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KorAeronaut.java +++ b/Mage.Sets/src/mage/sets/zendikar/KorAeronaut.java @@ -34,7 +34,6 @@ import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; @@ -58,7 +57,7 @@ public class KorAeronaut extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new KickerAbility(new KickerManaCost("{1}{W}"))); + this.addAbility(new KickerAbility("{1}{W}")); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/zendikar/KorSanctifiers.java b/Mage.Sets/src/mage/sets/zendikar/KorSanctifiers.java index de7b26ab69..eb2dc23ac4 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KorSanctifiers.java +++ b/Mage.Sets/src/mage/sets/zendikar/KorSanctifiers.java @@ -34,7 +34,6 @@ import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.KickerAbility; @@ -67,7 +66,7 @@ public class KorSanctifiers extends CardImpl { this.toughness = new MageInt(3); // Kicker {W} (You may pay an additional {W} as you cast this spell.) - this.addAbility(new KickerAbility(new KickerManaCost("{W}"))); + this.addAbility(new KickerAbility("{W}")); // When Kor Sanctifiers enters the battlefield, if it was kicked, destroy target artifact or enchantment. diff --git a/Mage.Sets/src/mage/sets/zendikar/MarshCasualties.java b/Mage.Sets/src/mage/sets/zendikar/MarshCasualties.java index bc76d78551..641c13efec 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MarshCasualties.java +++ b/Mage.Sets/src/mage/sets/zendikar/MarshCasualties.java @@ -30,7 +30,6 @@ package mage.sets.zendikar; import mage.Constants.*; import mage.abilities.Ability; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; @@ -58,7 +57,7 @@ public class MarshCasualties extends CardImpl { this.color.setBlack(true); // Kicker {3} - this.addAbility(new KickerAbility(new KickerManaCost("{3}"))); + this.addAbility(new KickerAbility("{3}")); // Creatures target player controls get -1/-1 until end of turn. If Marsh Casualties was kicked, those creatures get -2/-2 until end of turn instead. this.getSpellAbility().addEffect(new ConditionalContinousEffect( diff --git a/Mage.Sets/src/mage/sets/zendikar/MoldShambler.java b/Mage.Sets/src/mage/sets/zendikar/MoldShambler.java index 8a6ab2f5ae..1a1ad07feb 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MoldShambler.java +++ b/Mage.Sets/src/mage/sets/zendikar/MoldShambler.java @@ -33,7 +33,6 @@ import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.KickerAbility; @@ -66,7 +65,7 @@ public class MoldShambler extends CardImpl { this.toughness = new MageInt(3); // Kicker {1}{G} (You may pay an additional {1}{G} as you cast this spell.) - this.addAbility(new KickerAbility(new KickerManaCost("{1}{G}"))); + this.addAbility(new KickerAbility("{1}{G}")); // When Mold Shambler enters the battlefield, if it was kicked, destroy target noncreature permanent. EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false); diff --git a/Mage.Sets/src/mage/sets/zendikar/OranRiefRecluse.java b/Mage.Sets/src/mage/sets/zendikar/OranRiefRecluse.java index 39c17a0fab..e0c80f5f05 100644 --- a/Mage.Sets/src/mage/sets/zendikar/OranRiefRecluse.java +++ b/Mage.Sets/src/mage/sets/zendikar/OranRiefRecluse.java @@ -33,7 +33,6 @@ import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.FlyingAbility; @@ -66,7 +65,7 @@ public class OranRiefRecluse extends CardImpl { this.toughness = new MageInt(3); // Kicker {2}{G} (You may pay an additional {2}{G} as you cast this spell.) - this.addAbility(new KickerAbility(new KickerManaCost("{2}{G}"))); + this.addAbility(new KickerAbility("{2}{G}")); // Reach (This creature can block creatures with flying.) this.addAbility(ReachAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/zendikar/RiteOfReplication.java b/Mage.Sets/src/mage/sets/zendikar/RiteOfReplication.java index 173d3e3232..e60989e190 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RiteOfReplication.java +++ b/Mage.Sets/src/mage/sets/zendikar/RiteOfReplication.java @@ -33,7 +33,6 @@ import mage.Constants.Outcome; import mage.Constants.Rarity; import mage.abilities.Ability; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.KickerAbility; @@ -57,7 +56,7 @@ public class RiteOfReplication extends CardImpl { this.color.setBlue(true); // Kicker {5} - this.addAbility(new KickerAbility(new KickerManaCost("{5}"))); + this.addAbility(new KickerAbility("{5}")); // Put a token that's a copy of target creature onto the battlefield. If Rite of Replication was kicked, put five of those tokens onto the battlefield instead. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/zendikar/SadisticSacrament.java b/Mage.Sets/src/mage/sets/zendikar/SadisticSacrament.java index dbff367b4c..316bd5883a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SadisticSacrament.java +++ b/Mage.Sets/src/mage/sets/zendikar/SadisticSacrament.java @@ -34,7 +34,6 @@ import mage.Constants.Outcome; import mage.Constants.Rarity; import mage.abilities.Ability; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.KickerAbility; @@ -61,7 +60,7 @@ public class SadisticSacrament extends CardImpl { this.color.setBlack(true); // Kicker {7} - this.addAbility(new KickerAbility(new KickerManaCost("{7}"))); + this.addAbility(new KickerAbility("{7}")); // Search target player's library for up to three cards, exile them, then that player shuffles his or her library. // If Sadistic Sacrament was kicked, instead search that player's library for up to fifteen cards, exile them, then that player shuffles his or her library. diff --git a/Mage.Sets/src/mage/sets/zendikar/TempestOwl.java b/Mage.Sets/src/mage/sets/zendikar/TempestOwl.java index 5ef873ce95..02b5e66357 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TempestOwl.java +++ b/Mage.Sets/src/mage/sets/zendikar/TempestOwl.java @@ -33,7 +33,6 @@ import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.keyword.FlyingAbility; @@ -61,7 +60,7 @@ public class TempestOwl extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Kicker {4}{U} - this.addAbility(new KickerAbility(new KickerManaCost("{4}{U}"))); + this.addAbility(new KickerAbility("{4}{U}")); // When Tempest Owl enters the battlefield, if it was kicked, tap up to three target permanents. EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new TapTargetEffect(), false); diff --git a/Mage.Sets/src/mage/sets/zendikar/TorchSlinger.java b/Mage.Sets/src/mage/sets/zendikar/TorchSlinger.java index aa6c35ce9d..4c4c2e5d9b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TorchSlinger.java +++ b/Mage.Sets/src/mage/sets/zendikar/TorchSlinger.java @@ -33,7 +33,6 @@ import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.KickerAbility; @@ -57,7 +56,7 @@ public class TorchSlinger extends CardImpl { this.toughness = new MageInt(2); // Kicker {1}{R} (You may pay an additional {1}{R} as you cast this spell.) - this.addAbility(new KickerAbility(new KickerManaCost("{1}{R}"))); + this.addAbility(new KickerAbility("{1}{R}")); // When Torch Slinger enters the battlefield, if it was kicked, it deals 2 damage to target creature. diff --git a/Mage.Sets/src/mage/sets/zendikar/UnstableFooting.java b/Mage.Sets/src/mage/sets/zendikar/UnstableFooting.java index 708f5138f7..a8ddef3417 100644 --- a/Mage.Sets/src/mage/sets/zendikar/UnstableFooting.java +++ b/Mage.Sets/src/mage/sets/zendikar/UnstableFooting.java @@ -35,7 +35,6 @@ import mage.Constants.Rarity; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.DamageTargetEffect; @@ -58,7 +57,7 @@ public class UnstableFooting extends CardImpl { this.color.setRed(true); // Kicker {3}{R} (You may pay an additional {3}{R} as you cast this spell.) - this.addAbility(new KickerAbility(new KickerManaCost("{3}{R}"))); + this.addAbility(new KickerAbility("{3}{R}")); // Damage can't be prevented this turn. If Unstable Footing was kicked, it deals 5 damage to target player. this.getSpellAbility().addEffect(new UnstableFootingEffect()); diff --git a/Mage.Sets/src/mage/sets/zendikar/VampiresBite.java b/Mage.Sets/src/mage/sets/zendikar/VampiresBite.java index 3f9dc596e2..8c2fcd4af5 100644 --- a/Mage.Sets/src/mage/sets/zendikar/VampiresBite.java +++ b/Mage.Sets/src/mage/sets/zendikar/VampiresBite.java @@ -32,7 +32,6 @@ import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; @@ -55,7 +54,7 @@ public class VampiresBite extends CardImpl { this.color.setBlack(true); // Kicker {2}{B} (You may pay an additional {2}{B} as you cast this spell.) - this.addAbility(new KickerAbility(new KickerManaCost("{2}{B}"))); + this.addAbility(new KickerAbility("{2}{B}")); // Target creature gets +3/+0 until end of turn. If Vampire's Bite was kicked, that creature gains lifelink until end of turn. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/sets/zendikar/VinesOfVastwood.java b/Mage.Sets/src/mage/sets/zendikar/VinesOfVastwood.java index d77c4781a0..b1e002657e 100644 --- a/Mage.Sets/src/mage/sets/zendikar/VinesOfVastwood.java +++ b/Mage.Sets/src/mage/sets/zendikar/VinesOfVastwood.java @@ -29,12 +29,10 @@ package mage.sets.zendikar; import java.util.UUID; - import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; import mage.abilities.condition.common.KickedCondition; -import mage.abilities.costs.mana.KickerManaCost; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; @@ -56,7 +54,7 @@ public class VinesOfVastwood extends CardImpl { this.color.setGreen(true); // Kicker {G} (You may pay an additional {G} as you cast this spell.) - this.addAbility(new KickerAbility(new KickerManaCost("{G}"))); + this.addAbility(new KickerAbility("{G}")); // Target creature can't be the target of spells or abilities your opponents control this turn. TargetCreaturePermanent target = new TargetCreaturePermanent();