From f16bd0bd0b6982d9ba8ac4a60aa1727bd473ce1f Mon Sep 17 00:00:00 2001 From: BursegSardaukar <> Date: Sat, 12 Sep 2015 22:10:10 -0400 Subject: [PATCH 1/8] Added Goblin Wizard implementation --- .../sets/mastersedition/GoblinWizard.java | 52 ++++++++ .../src/mage/sets/thedark/GoblinWizard.java | 118 ++++++++++++++++++ 2 files changed, 170 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/mastersedition/GoblinWizard.java create mode 100644 Mage.Sets/src/mage/sets/thedark/GoblinWizard.java diff --git a/Mage.Sets/src/mage/sets/mastersedition/GoblinWizard.java b/Mage.Sets/src/mage/sets/mastersedition/GoblinWizard.java new file mode 100644 index 00000000000..b56451f6117 --- /dev/null +++ b/Mage.Sets/src/mage/sets/mastersedition/GoblinWizard.java @@ -0,0 +1,52 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.mastersedition; + +import java.util.UUID; + +/** + * + * @author LevelX2 + */ +public class GoblinWizard extends mage.sets.thedark.GoblinWizard { + + public GoblinWizard(UUID ownerId) { + super(ownerId); + this.cardNumber = 97; + this.expansionSetCode = "MED"; + } + + public GoblinWizard(final GoblinWizard card) { + super(card); + } + + @Override + public GoblinWizard copy() { + return new GoblinWizard(this); + } +} diff --git a/Mage.Sets/src/mage/sets/thedark/GoblinWizard.java b/Mage.Sets/src/mage/sets/thedark/GoblinWizard.java new file mode 100644 index 00000000000..a7021b8de76 --- /dev/null +++ b/Mage.Sets/src/mage/sets/thedark/GoblinWizard.java @@ -0,0 +1,118 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.thedark; + +import java.util.UUID; +import mage.MageInt; +import mage.ObjectColor; +import mage.abilities.Ability; +import mage.abilities.common.DealsDamageToAPlayerTriggeredAbility; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.effects.common.PutPermanentOnBattlefieldEffect; +import mage.abilities.keyword.ProtectionAbility; +import mage.cards.Card; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.counters.CounterType; +import mage.filter.Filter; +import mage.filter.FilterCard; +import mage.filter.FilterPermanent; +import mage.filter.common.FilterBySubtypeCard; +import mage.filter.common.FilterCreatureCard; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.common.FilterPermanentCard; +import mage.filter.predicate.Predicates; +import mage.filter.predicate.mageobject.ColorPredicate; +import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.filter.predicate.mageobject.SubtypePredicate; +import mage.game.Game; +import mage.game.permanent.Permanent; +import mage.players.Player; +import mage.target.Target; +import mage.target.TargetPermanent; +import mage.target.common.TargetCardInHand; +import mage.target.common.TargetCreaturePermanent; + +/** + * + * @author BursegSardaukar + */ +public class GoblinWizard extends CardImpl { + + private static final FilterPermanentCard filter = new FilterPermanentCard("a Goblin permanent card"); + private static final FilterCard protectionFilter = new FilterCard("white"); + private static final FilterPermanent goblinCard = new FilterPermanent("a Goblin permanent card"); + + static { + filter.add(new SubtypePredicate("Goblin")); + goblinCard.add(new SubtypePredicate("Goblin")); + protectionFilter.add(new ColorPredicate(ObjectColor.WHITE)); + } + + public GoblinWizard(UUID ownerId) { + //Can't find the card ID....? + super(ownerId, 9001, "Goblin Wizard", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{R}{R}"); + this.expansionSetCode = "DRK"; + this.rarity = Rarity.RARE; + + this.subtype.add("Goblin"); + this.subtype.add("Wizard"); + + this.power = new MageInt(1); + this.toughness = new MageInt(1); + + // {tap}: You may put a Goblin permanent card from your hand onto the battlefield. + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + new PutPermanentOnBattlefieldEffect(filter), + new TapSourceCost())); + + // {R}: Target Goblin gains protection from white until end of turn. + Ability ability = new mage.abilities.common.SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new ProtectionAbility(protectionFilter), Duration.EndOfTurn), new ManaCostsImpl("{R}")); + Target target = new TargetPermanent(goblinCard); + ability.addTarget(target); + this.addAbility(ability); + + } + + public GoblinWizard(final GoblinWizard card) { + super(card); + } + + @Override + public GoblinWizard copy() { + return new GoblinWizard(this); + } +} \ No newline at end of file From 0189d6436127f6054fe91d7b093b27f0b36eb2be Mon Sep 17 00:00:00 2001 From: BursegSardaukar <> Date: Sun, 13 Sep 2015 02:09:05 -0400 Subject: [PATCH 2/8] Cleaned up unneeded imports for Goblin Wizard. Added Magewright's Stone. Modified AbilityPredicate to allow for Magewright's stone to search specifically for creatures containing {T} in their mana cost. --- .../sets/dissension/MagewrightsStone.java | 75 +++++++++++++++++++ .../src/mage/sets/thedark/GoblinWizard.java | 16 ---- .../mageobject/AbilityPredicate.java | 17 ++++- 3 files changed, 91 insertions(+), 17 deletions(-) create mode 100644 Mage.Sets/src/mage/sets/dissension/MagewrightsStone.java diff --git a/Mage.Sets/src/mage/sets/dissension/MagewrightsStone.java b/Mage.Sets/src/mage/sets/dissension/MagewrightsStone.java new file mode 100644 index 00000000000..345fd9b3df1 --- /dev/null +++ b/Mage.Sets/src/mage/sets/dissension/MagewrightsStone.java @@ -0,0 +1,75 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.dissension; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.common.UntapTargetEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.AbilityPredicate; +import mage.target.common.TargetCreaturePermanent; + +/** + * + * @author BursegSardaukar + */ +public class MagewrightsStone extends CardImpl { + + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature that has an ability with {T} in its cost"); + + static { + filter.add(new AbilityPredicate(SimpleActivatedAbility.class)); + } + + public MagewrightsStone(UUID ownerId) { + super(ownerId, 162, "Magewright's Stone", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); + this.expansionSetCode = "DIS"; + + // {1}, {tap}: Untap target creature that has an activated ability with {T} in its cost. + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl("{1}")); + ability.addCost(new TapSourceCost()); + ability.addTarget(new TargetCreaturePermanent(filter)); + this.addAbility(ability); + } + + public MagewrightsStone(final MagewrightsStone card) { + super(card); + } + + @Override + public MagewrightsStone copy() { + return new MagewrightsStone(this); + } +} diff --git a/Mage.Sets/src/mage/sets/thedark/GoblinWizard.java b/Mage.Sets/src/mage/sets/thedark/GoblinWizard.java index a7021b8de76..b4084bdf712 100644 --- a/Mage.Sets/src/mage/sets/thedark/GoblinWizard.java +++ b/Mage.Sets/src/mage/sets/thedark/GoblinWizard.java @@ -31,40 +31,24 @@ import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; -import mage.abilities.common.DealsDamageToAPlayerTriggeredAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.effects.common.PutPermanentOnBattlefieldEffect; import mage.abilities.keyword.ProtectionAbility; -import mage.cards.Card; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Duration; -import mage.constants.Outcome; import mage.constants.Rarity; import mage.constants.Zone; -import mage.counters.CounterType; -import mage.filter.Filter; import mage.filter.FilterCard; import mage.filter.FilterPermanent; -import mage.filter.common.FilterBySubtypeCard; -import mage.filter.common.FilterCreatureCard; -import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.game.Game; -import mage.game.permanent.Permanent; -import mage.players.Player; import mage.target.Target; import mage.target.TargetPermanent; -import mage.target.common.TargetCardInHand; -import mage.target.common.TargetCreaturePermanent; /** * diff --git a/Mage/src/mage/filter/predicate/mageobject/AbilityPredicate.java b/Mage/src/mage/filter/predicate/mageobject/AbilityPredicate.java index 42489015ab4..5d029b5027f 100644 --- a/Mage/src/mage/filter/predicate/mageobject/AbilityPredicate.java +++ b/Mage/src/mage/filter/predicate/mageobject/AbilityPredicate.java @@ -30,6 +30,10 @@ package mage.filter.predicate.mageobject; import mage.MageObject; import mage.abilities.Abilities; import mage.abilities.Ability; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.Cost; +import mage.abilities.costs.common.DiscardCardCost; +import mage.abilities.costs.common.TapSourceCost; import mage.cards.Card; import mage.filter.predicate.Predicate; import mage.game.Game; @@ -57,7 +61,18 @@ public class AbilityPredicate implements Predicate { for (Ability ability : abilities) { if (abilityClass.equals(ability.getClass())) { - return true; + //Burseg Hack: Magewright's Stone [DIS] specifically looks for activated ability containing {T} + //As of 9/13/2015, no other AbilityPredicate is filtering for SimpleActivatedAbility + if (abilityClass.equals(SimpleActivatedAbility.class) && ability.getCosts().size() > 0){ + for (Cost cost : ability.getCosts()) { + if (cost instanceof TapSourceCost) { + return true; + } + } + return false; + } else { + return true; + } } } return false; From 96afd0d18c6835be3e3cb097d8936171a5fecd18 Mon Sep 17 00:00:00 2001 From: BursegSardaukar <> Date: Sun, 13 Sep 2015 02:26:17 -0400 Subject: [PATCH 3/8] Cleaned up unneeded imports for Goblin Wizard. Added Magewright's Stone. Modified AbilityPredicate to allow for Magewright's stone to search specifically for creatures containing {T} in their mana cost. --- Mage.Sets/src/mage/sets/thedark/GoblinWizard.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/sets/thedark/GoblinWizard.java b/Mage.Sets/src/mage/sets/thedark/GoblinWizard.java index b4084bdf712..4cdf3a6dd54 100644 --- a/Mage.Sets/src/mage/sets/thedark/GoblinWizard.java +++ b/Mage.Sets/src/mage/sets/thedark/GoblinWizard.java @@ -68,7 +68,7 @@ public class GoblinWizard extends CardImpl { public GoblinWizard(UUID ownerId) { //Can't find the card ID....? - super(ownerId, 9001, "Goblin Wizard", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{R}{R}"); + super(ownerId, 66, "Goblin Wizard", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{R}{R}"); this.expansionSetCode = "DRK"; this.rarity = Rarity.RARE; From b0b6d6b63cf9b7bbd6ff38959aaf8153290e99ce Mon Sep 17 00:00:00 2001 From: BursegSardaukar <> Date: Sun, 13 Sep 2015 20:06:40 -0400 Subject: [PATCH 4/8] Changed the reference to SimpleActivatedAbility to search instead for an instance of ActivatedAbilityImpl --- .../filter/predicate/mageobject/AbilityPredicate.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Mage/src/mage/filter/predicate/mageobject/AbilityPredicate.java b/Mage/src/mage/filter/predicate/mageobject/AbilityPredicate.java index 5d029b5027f..0835c04b638 100644 --- a/Mage/src/mage/filter/predicate/mageobject/AbilityPredicate.java +++ b/Mage/src/mage/filter/predicate/mageobject/AbilityPredicate.java @@ -30,9 +30,8 @@ package mage.filter.predicate.mageobject; import mage.MageObject; import mage.abilities.Abilities; import mage.abilities.Ability; -import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.Cost; -import mage.abilities.costs.common.DiscardCardCost; import mage.abilities.costs.common.TapSourceCost; import mage.cards.Card; import mage.filter.predicate.Predicate; @@ -62,8 +61,9 @@ public class AbilityPredicate implements Predicate { for (Ability ability : abilities) { if (abilityClass.equals(ability.getClass())) { //Burseg Hack: Magewright's Stone [DIS] specifically looks for activated ability containing {T} - //As of 9/13/2015, no other AbilityPredicate is filtering for SimpleActivatedAbility - if (abilityClass.equals(SimpleActivatedAbility.class) && ability.getCosts().size() > 0){ + //As of 9/13/2015, no other AbilityPredicate is filtering for ActivatedAbilityImpl + //if (abilityClass.equals(SimpleActivatedAbility.class) && ability.getCosts().size() > 0){ + if((ability instanceof ActivatedAbilityImpl) && ability.getCosts().size() > 0){ for (Cost cost : ability.getCosts()) { if (cost instanceof TapSourceCost) { return true; From a7912bcdcab28d12682c92f4222b0c8dee06bd67 Mon Sep 17 00:00:00 2001 From: BursegSardaukar <> Date: Sun, 13 Sep 2015 21:03:33 -0400 Subject: [PATCH 5/8] Added "Last-Ditch Effort" --- .../sets/urzaslegacy/LastDitchEffort.java | 128 ++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/urzaslegacy/LastDitchEffort.java diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/LastDitchEffort.java b/Mage.Sets/src/mage/sets/urzaslegacy/LastDitchEffort.java new file mode 100644 index 00000000000..7a881513807 --- /dev/null +++ b/Mage.Sets/src/mage/sets/urzaslegacy/LastDitchEffort.java @@ -0,0 +1,128 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.urzaslegacy; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.Mode; +import mage.abilities.costs.VariableCost; +import mage.abilities.costs.common.PayVariableLifeCost; +import mage.abilities.effects.OneShotEffect; +import mage.abilities.keyword.EntwineAbility; +import mage.cards.Card; +import mage.cards.CardImpl; +import mage.cards.Cards; +import mage.cards.CardsImpl; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.filter.FilterCard; +import mage.filter.common.FilterControlledCreaturePermanent; +import mage.game.Game; +import mage.game.permanent.Permanent; +import mage.players.Player; +import mage.target.Target; +import mage.target.TargetCard; +import mage.target.common.TargetControlledCreaturePermanent; +import mage.target.common.TargetCreatureOrPlayer; + +/** + * + * @author emerald000 + */ +public class LastDitchEffort extends CardImpl { + + public LastDitchEffort(UUID ownerId) { + super(ownerId, 83, "Last-Ditch Effort", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{R}"); + this.expansionSetCode = "ULG"; + + // Sacrifice any number of creatures. Last-Ditch Effort deals that much damage to target creature or player. + this.getSpellAbility().addEffect(new LastDitchEffortEffect()); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(1)); + } + + public LastDitchEffort(final LastDitchEffort card) { + super(card); + } + + @Override + public LastDitchEffort copy() { + return new LastDitchEffort(this); + } +} + +class LastDitchEffortEffect extends OneShotEffect { + + LastDitchEffortEffect() { + super(Outcome.Damage); + this.staticText = "Sacrifice any number of creatures. Last-Ditch Effort deals that much damage to target creature or player."; + } + + LastDitchEffortEffect(final LastDitchEffortEffect effect) { + super(effect); + } + + @Override + public LastDitchEffortEffect copy() { + return new LastDitchEffortEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Player player = game.getPlayer(source.getControllerId()); + if (player != null) { + Target target = new TargetControlledCreaturePermanent(0, Integer.MAX_VALUE, new FilterControlledCreaturePermanent(), true); + player.chooseTarget(Outcome.Sacrifice, target, source, game); + int numSacrificed = 0; + for (UUID permanentId : target.getTargets()) { + Permanent permanent = game.getPermanent(permanentId); + if (permanent != null) { + if (permanent.sacrifice(source.getSourceId(), game)) { + numSacrificed++; + } + } + } + if (numSacrificed > 0) { + int damage = numSacrificed; + UUID uuid = this.getTargetPointer().getFirst(game, source); + Permanent permanent = game.getPermanent(uuid); + Player opponent = game.getPlayer(uuid); + if (permanent != null) { + permanent.damage(damage, source.getSourceId(), game, false, true); + } + if (opponent != null) { + opponent.damage(damage, source.getSourceId(), game, false, true); + } + return true; + } + return true; + } + return false; + } +} \ No newline at end of file From 23bf65201b7728082d9a36e9acc24e880c3d1818 Mon Sep 17 00:00:00 2001 From: BursegSardaukar <> Date: Sun, 13 Sep 2015 21:05:58 -0400 Subject: [PATCH 6/8] Added "Last-Ditch Effort" --- .../src/mage/sets/urzaslegacy/LastDitchEffort.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/LastDitchEffort.java b/Mage.Sets/src/mage/sets/urzaslegacy/LastDitchEffort.java index 7a881513807..413c2f6dd4e 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/LastDitchEffort.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/LastDitchEffort.java @@ -29,26 +29,16 @@ package mage.sets.urzaslegacy; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.Mode; -import mage.abilities.costs.VariableCost; -import mage.abilities.costs.common.PayVariableLifeCost; import mage.abilities.effects.OneShotEffect; -import mage.abilities.keyword.EntwineAbility; -import mage.cards.Card; import mage.cards.CardImpl; -import mage.cards.Cards; -import mage.cards.CardsImpl; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Rarity; -import mage.constants.Zone; -import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.Target; -import mage.target.TargetCard; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreatureOrPlayer; From ac0795c7bf441d53f198811dc9e0d86f3656b7cb Mon Sep 17 00:00:00 2001 From: tmannion Date: Sun, 13 Sep 2015 21:10:43 -0400 Subject: [PATCH 7/8] Corrected authorship. --- Mage.Sets/src/mage/sets/mastersedition/GoblinWizard.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/LastDitchEffort.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Mage.Sets/src/mage/sets/mastersedition/GoblinWizard.java b/Mage.Sets/src/mage/sets/mastersedition/GoblinWizard.java index b56451f6117..47465f6d88b 100644 --- a/Mage.Sets/src/mage/sets/mastersedition/GoblinWizard.java +++ b/Mage.Sets/src/mage/sets/mastersedition/GoblinWizard.java @@ -31,7 +31,7 @@ import java.util.UUID; /** * - * @author LevelX2 + * @author BursegSardaukar */ public class GoblinWizard extends mage.sets.thedark.GoblinWizard { diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/LastDitchEffort.java b/Mage.Sets/src/mage/sets/urzaslegacy/LastDitchEffort.java index 413c2f6dd4e..c35e356b0c3 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/LastDitchEffort.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/LastDitchEffort.java @@ -44,7 +44,7 @@ import mage.target.common.TargetCreatureOrPlayer; /** * - * @author emerald000 + * @author BursegSardaukar */ public class LastDitchEffort extends CardImpl { From 94fcb96e4da2698df202195c602826d3a4e927ac Mon Sep 17 00:00:00 2001 From: BursegSardaukar <> Date: Mon, 14 Sep 2015 15:43:06 -0400 Subject: [PATCH 8/8] Moved the tap-symbol searching effect into from within Ability Predicate into MagewrightStone itself, since it is a single-use predicate. Goblin Wizard's set number has been corrected. References to "goblin permanent" have been shortened to "Goblin" within the Goblin Wizard's tooltip text. --- .../sets/dissension/MagewrightsStone.java | 47 ++++++++++++++++++- .../src/mage/sets/thedark/GoblinWizard.java | 9 ++-- .../mageobject/AbilityPredicate.java | 17 +------ 3 files changed, 50 insertions(+), 23 deletions(-) diff --git a/Mage.Sets/src/mage/sets/dissension/MagewrightsStone.java b/Mage.Sets/src/mage/sets/dissension/MagewrightsStone.java index 345fd9b3df1..04be3109a54 100644 --- a/Mage.Sets/src/mage/sets/dissension/MagewrightsStone.java +++ b/Mage.Sets/src/mage/sets/dissension/MagewrightsStone.java @@ -28,17 +28,23 @@ package mage.sets.dissension; import java.util.UUID; +import mage.MageObject; +import mage.abilities.Abilities; import mage.abilities.Ability; +import mage.abilities.ActivatedAbilityImpl; import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.Cost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.UntapTargetEffect; +import mage.cards.Card; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.AbilityPredicate; +import mage.filter.predicate.Predicate; +import mage.game.Game; import mage.target.common.TargetCreaturePermanent; /** @@ -50,7 +56,7 @@ public class MagewrightsStone extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature that has an ability with {T} in its cost"); static { - filter.add(new AbilityPredicate(SimpleActivatedAbility.class)); + filter.add(new HasAbilityWithTapSymbolPredicate()); } public MagewrightsStone(UUID ownerId) { @@ -73,3 +79,40 @@ public class MagewrightsStone extends CardImpl { return new MagewrightsStone(this); } } + +/** + * + * @author North + */ +class HasAbilityWithTapSymbolPredicate implements Predicate { + + public HasAbilityWithTapSymbolPredicate() { + + } + + @Override + public boolean apply(MageObject input, Game game) { + Abilities abilities; + if (input instanceof Card){ + abilities = ((Card)input).getAbilities(game); + } else { + abilities = input.getAbilities(); + } + + for (Ability ability : abilities) { + if((ability instanceof ActivatedAbilityImpl) && ability.getCosts().size() > 0){ + for (Cost cost : ability.getCosts()) { + if (cost instanceof TapSourceCost) { + return true; + } + } + } + } + return false; + } + + @Override + public String toString() { + return "Ability contains {T} symbol."; + } +} diff --git a/Mage.Sets/src/mage/sets/thedark/GoblinWizard.java b/Mage.Sets/src/mage/sets/thedark/GoblinWizard.java index 4cdf3a6dd54..93478b33642 100644 --- a/Mage.Sets/src/mage/sets/thedark/GoblinWizard.java +++ b/Mage.Sets/src/mage/sets/thedark/GoblinWizard.java @@ -56,9 +56,9 @@ import mage.target.TargetPermanent; */ public class GoblinWizard extends CardImpl { - private static final FilterPermanentCard filter = new FilterPermanentCard("a Goblin permanent card"); + private static final FilterPermanentCard filter = new FilterPermanentCard("Goblin"); private static final FilterCard protectionFilter = new FilterCard("white"); - private static final FilterPermanent goblinCard = new FilterPermanent("a Goblin permanent card"); + private static final FilterPermanent goblinCard = new FilterPermanent("Goblin"); static { filter.add(new SubtypePredicate("Goblin")); @@ -67,8 +67,7 @@ public class GoblinWizard extends CardImpl { } public GoblinWizard(UUID ownerId) { - //Can't find the card ID....? - super(ownerId, 66, "Goblin Wizard", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{R}{R}"); + super(ownerId, 68, "Goblin Wizard", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{R}{R}"); this.expansionSetCode = "DRK"; this.rarity = Rarity.RARE; @@ -99,4 +98,4 @@ public class GoblinWizard extends CardImpl { public GoblinWizard copy() { return new GoblinWizard(this); } -} \ No newline at end of file +} diff --git a/Mage/src/mage/filter/predicate/mageobject/AbilityPredicate.java b/Mage/src/mage/filter/predicate/mageobject/AbilityPredicate.java index 0835c04b638..42489015ab4 100644 --- a/Mage/src/mage/filter/predicate/mageobject/AbilityPredicate.java +++ b/Mage/src/mage/filter/predicate/mageobject/AbilityPredicate.java @@ -30,9 +30,6 @@ package mage.filter.predicate.mageobject; import mage.MageObject; import mage.abilities.Abilities; import mage.abilities.Ability; -import mage.abilities.ActivatedAbilityImpl; -import mage.abilities.costs.Cost; -import mage.abilities.costs.common.TapSourceCost; import mage.cards.Card; import mage.filter.predicate.Predicate; import mage.game.Game; @@ -60,19 +57,7 @@ public class AbilityPredicate implements Predicate { for (Ability ability : abilities) { if (abilityClass.equals(ability.getClass())) { - //Burseg Hack: Magewright's Stone [DIS] specifically looks for activated ability containing {T} - //As of 9/13/2015, no other AbilityPredicate is filtering for ActivatedAbilityImpl - //if (abilityClass.equals(SimpleActivatedAbility.class) && ability.getCosts().size() > 0){ - if((ability instanceof ActivatedAbilityImpl) && ability.getCosts().size() > 0){ - for (Cost cost : ability.getCosts()) { - if (cost instanceof TapSourceCost) { - return true; - } - } - return false; - } else { - return true; - } + return true; } } return false;