From c2b9657a59e2bc4b1a5e7d439467da47b2bc7e7f Mon Sep 17 00:00:00 2001 From: mnapoleon Date: Mon, 9 Mar 2015 08:49:12 -0400 Subject: [PATCH 1/3] Implemented Mirrodin:Tel-Jilad Archers, Mirroden:Tel-Jilad Chosen and Darksteel:Tel-Jilad Outrider --- .../mage/sets/darksteel/TelJiladOutrider.java | 64 ++++++++++++++++++ .../mage/sets/mirrodin/TelJiladArchers.java | 67 +++++++++++++++++++ .../mage/sets/mirrodin/TelJiladChosen.java | 64 ++++++++++++++++++ 3 files changed, 195 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/darksteel/TelJiladOutrider.java create mode 100644 Mage.Sets/src/mage/sets/mirrodin/TelJiladArchers.java create mode 100644 Mage.Sets/src/mage/sets/mirrodin/TelJiladChosen.java diff --git a/Mage.Sets/src/mage/sets/darksteel/TelJiladOutrider.java b/Mage.Sets/src/mage/sets/darksteel/TelJiladOutrider.java new file mode 100644 index 0000000000..03a363e872 --- /dev/null +++ b/Mage.Sets/src/mage/sets/darksteel/TelJiladOutrider.java @@ -0,0 +1,64 @@ +/* + * 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.darksteel; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.keyword.ProtectionAbility; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.filter.common.FilterArtifactCard; + +/** + * + * @author michael.napoleon@gmail.com + */ +public class TelJiladOutrider extends CardImpl { + + public TelJiladOutrider(UUID ownerId) { + super(ownerId, 87, "Tel-Jilad Outrider", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}"); + this.expansionSetCode = "DST"; + this.subtype.add("Elf"); + this.subtype.add("Warrior"); + this.power = new MageInt(3); + this.toughness = new MageInt(1); + + // Protection from artifacts + this.addAbility(new ProtectionAbility(new FilterArtifactCard("artifacts"))); + } + + public TelJiladOutrider(final TelJiladOutrider card) { + super(card); + } + + @Override + public TelJiladOutrider copy() { + return new TelJiladOutrider(this); + } +} diff --git a/Mage.Sets/src/mage/sets/mirrodin/TelJiladArchers.java b/Mage.Sets/src/mage/sets/mirrodin/TelJiladArchers.java new file mode 100644 index 0000000000..0aa6211b08 --- /dev/null +++ b/Mage.Sets/src/mage/sets/mirrodin/TelJiladArchers.java @@ -0,0 +1,67 @@ +/* + * 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.mirrodin; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.keyword.ProtectionAbility; +import mage.abilities.keyword.ReachAbility; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.filter.common.FilterArtifactCard; + +/** + * + * @author michael.napoleon@gmail.com + */ +public class TelJiladArchers extends CardImpl { + + public TelJiladArchers(UUID ownerId) { + super(ownerId, 131, "Tel-Jilad Archers", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{G}"); + this.expansionSetCode = "MRD"; + this.subtype.add("Elf"); + this.subtype.add("Archer"); + this.power = new MageInt(2); + this.toughness = new MageInt(4); + + // Protection from artifacts; reach + this.addAbility(new ProtectionAbility(new FilterArtifactCard("artifacts"))); + this.addAbility(ReachAbility.getInstance()); + + } + + public TelJiladArchers(final TelJiladArchers card) { + super(card); + } + + @Override + public TelJiladArchers copy() { + return new TelJiladArchers(this); + } +} diff --git a/Mage.Sets/src/mage/sets/mirrodin/TelJiladChosen.java b/Mage.Sets/src/mage/sets/mirrodin/TelJiladChosen.java new file mode 100644 index 0000000000..b6f56f03ca --- /dev/null +++ b/Mage.Sets/src/mage/sets/mirrodin/TelJiladChosen.java @@ -0,0 +1,64 @@ +/* + * 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.mirrodin; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.keyword.ProtectionAbility; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.filter.common.FilterArtifactCard; + +/** + * + * @author michael.napoleon@gmail.com + */ +public class TelJiladChosen extends CardImpl { + + public TelJiladChosen(UUID ownerId) { + super(ownerId, 132, "Tel-Jilad Chosen", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{G}"); + this.expansionSetCode = "MRD"; + this.subtype.add("Elf"); + this.subtype.add("Warrior"); + this.power = new MageInt(2); + this.toughness = new MageInt(1); + + // Protection from artifacts + this.addAbility(new ProtectionAbility(new FilterArtifactCard("artifacts"))); + } + + public TelJiladChosen(final TelJiladChosen card) { + super(card); + } + + @Override + public TelJiladChosen copy() { + return new TelJiladChosen(this); + } +} From e5a951929dc7f4a17b769f0dc46dd3928479e0d7 Mon Sep 17 00:00:00 2001 From: mnapoleon Date: Mon, 9 Mar 2015 10:07:49 -0400 Subject: [PATCH 2/3] Implemented Mirrodin:Dreams Grip --- .../src/mage/sets/mirrodin/DreamsGrip.java | 80 +++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/mirrodin/DreamsGrip.java diff --git a/Mage.Sets/src/mage/sets/mirrodin/DreamsGrip.java b/Mage.Sets/src/mage/sets/mirrodin/DreamsGrip.java new file mode 100644 index 0000000000..7d9ad9c981 --- /dev/null +++ b/Mage.Sets/src/mage/sets/mirrodin/DreamsGrip.java @@ -0,0 +1,80 @@ +/* + * 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.mirrodin; + +import java.util.UUID; +import mage.abilities.Mode; +import mage.abilities.effects.Effect; +import mage.abilities.effects.common.TapTargetEffect; +import mage.abilities.effects.common.UntapTargetEffect; +import mage.abilities.keyword.EntwineAbility; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.filter.predicate.permanent.TappedPredicate; +import mage.target.TargetPermanent; + +/** + * + * @author michael.napoleon@gmail.com + */ +public class DreamsGrip extends CardImpl { + + public DreamsGrip(UUID ownerId) { + super(ownerId, 34, "Dream's Grip", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); + this.expansionSetCode = "MRD"; + + // Choose one - + this.getSpellAbility().getModes().setMinModes(1); + this.getSpellAbility().getModes().setMaxModes(1); + //Tap target permanent; + TargetPermanent target1 = new TargetPermanent(); + Effect tapEffect = new TapTargetEffect(); + this.getSpellAbility().addTarget(target1); + this.getSpellAbility().addEffect(tapEffect); + //or untap target permanent. + Mode mode = new Mode(); + TargetPermanent target2 = new TargetPermanent(); + mode.getTargets().add(target2); + Effect untapEffect = new UntapTargetEffect(); + mode.getEffects().add(untapEffect); + this.getSpellAbility().addMode(mode); + + // Entwine {1} + this.addAbility(new EntwineAbility("{1}")); + } + + public DreamsGrip(final DreamsGrip card) { + super(card); + } + + @Override + public DreamsGrip copy() { + return new DreamsGrip(this); + } +} From eeb204afdb2031eb32793fe6202c243b7e8fed96 Mon Sep 17 00:00:00 2001 From: Michael Napoleon Date: Mon, 9 Mar 2015 22:02:14 -0400 Subject: [PATCH 3/3] Added more clear text tap/uptap selections Made the selection more clear when selecting to tap and selection to untap when entwine is used. --- Mage.Sets/src/mage/sets/mirrodin/DreamsGrip.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Mage.Sets/src/mage/sets/mirrodin/DreamsGrip.java b/Mage.Sets/src/mage/sets/mirrodin/DreamsGrip.java index 7d9ad9c981..1f539e867e 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/DreamsGrip.java +++ b/Mage.Sets/src/mage/sets/mirrodin/DreamsGrip.java @@ -36,6 +36,7 @@ import mage.abilities.keyword.EntwineAbility; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; +import mage.filter.FilterPermanent; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPermanent; @@ -53,13 +54,13 @@ public class DreamsGrip extends CardImpl { this.getSpellAbility().getModes().setMinModes(1); this.getSpellAbility().getModes().setMaxModes(1); //Tap target permanent; - TargetPermanent target1 = new TargetPermanent(); + TargetPermanent target1 = new TargetPermanent(new FilterPermanent("Permanent to tap")); Effect tapEffect = new TapTargetEffect(); this.getSpellAbility().addTarget(target1); this.getSpellAbility().addEffect(tapEffect); //or untap target permanent. Mode mode = new Mode(); - TargetPermanent target2 = new TargetPermanent(); + TargetPermanent target2 = new TargetPermanent(new FilterPermanent("Permanent to untap")); mode.getTargets().add(target2); Effect untapEffect = new UntapTargetEffect(); mode.getEffects().add(untapEffect);