From d3b5a5e0d49c45c78d5ad7ebac05a195f22eacbc Mon Sep 17 00:00:00 2001 From: KholdFuzion Date: Wed, 31 Jul 2013 03:00:53 -0500 Subject: [PATCH 1/6] Add Natural Selection --- .../sets/limitedalpha/NaturalSelection.java | 131 ++++++++++++++++++ .../sets/limitedbeta/NaturalSelection.java | 53 +++++++ .../unlimitededition/NaturalSelection.java | 53 +++++++ 3 files changed, 237 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/limitedalpha/NaturalSelection.java create mode 100644 Mage.Sets/src/mage/sets/limitedbeta/NaturalSelection.java create mode 100644 Mage.Sets/src/mage/sets/unlimitededition/NaturalSelection.java diff --git a/Mage.Sets/src/mage/sets/limitedalpha/NaturalSelection.java b/Mage.Sets/src/mage/sets/limitedalpha/NaturalSelection.java new file mode 100644 index 0000000000..d1e897ac82 --- /dev/null +++ b/Mage.Sets/src/mage/sets/limitedalpha/NaturalSelection.java @@ -0,0 +1,131 @@ +/* + * 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.limitedalpha; + +import java.util.UUID; + +import mage.abilities.Ability; +import mage.abilities.effects.OneShotEffect; +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.game.Game; +import mage.players.Player; +import mage.target.TargetCard; +import mage.target.TargetPlayer; + +/** + * + * @author KholdFuzion + + */ +public class NaturalSelection extends CardImpl { + + public NaturalSelection(UUID ownerId) { + super(ownerId, 121, "Natural Selection", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{G}"); + this.expansionSetCode = "LEA"; + + this.color.setGreen(true); + + // Look at the top three cards of target player's library, then put them back in any order. You may have that player shuffle his or her library. + this.getSpellAbility().addEffect(new NaturalSelectionEffect()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); + } + + public NaturalSelection(final NaturalSelection card) { + super(card); + } + + @Override + public NaturalSelection copy() { + return new NaturalSelection(this); + } +} + +class NaturalSelectionEffect extends OneShotEffect< NaturalSelectionEffect> { + + public NaturalSelectionEffect() { + super(Outcome.DrawCard); + this.staticText = "look at the top three cards of target player's library, then put them back in any order. You may have that player shuffle his or her library."; + } + + public NaturalSelectionEffect(final NaturalSelectionEffect effect) { + super(effect); + } + + @Override + public NaturalSelectionEffect copy() { + return new NaturalSelectionEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Player you = game.getPlayer(source.getControllerId()); + Player player = game.getPlayer(source.getFirstTarget()); + if (player == null || you == null) { + return false; + } + Cards cards = new CardsImpl(Zone.PICK); + int count = Math.min(player.getLibrary().size(), 3); + for (int i = 0; i < count; i++) { + Card card = player.getLibrary().removeFromTop(game); + if (card != null) { + cards.add(card); + game.setZone(card.getId(), Zone.PICK); + } + } + + you.lookAtCards("Natural Selection", cards, game); + + TargetCard target = new TargetCard(Zone.PICK, new FilterCard("card to put on the top of target player's library")); + target.setRequired(true); + while (cards.size() > 1) { + you.choose(Outcome.Neutral, cards, target, game); + Card card = cards.get(target.getFirstTarget(), game); + if (card != null) { + cards.remove(card); + card.moveToZone(Zone.LIBRARY, source.getId(), game, true); + } + target.clearChosen(); + } + if (cards.size() == 1) { + Card card = cards.get(cards.iterator().next(), game); + card.moveToZone(Zone.LIBRARY, source.getId(), game, true); + } + if (you.chooseUse(Outcome.Neutral, "You may have that player shuffle his or her library", game)){ + player.shuffleLibrary(game); + } + return true; + } +} \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/limitedbeta/NaturalSelection.java b/Mage.Sets/src/mage/sets/limitedbeta/NaturalSelection.java new file mode 100644 index 0000000000..f3eb7458fd --- /dev/null +++ b/Mage.Sets/src/mage/sets/limitedbeta/NaturalSelection.java @@ -0,0 +1,53 @@ +/* + * 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.limitedbeta; + +import java.util.UUID; + +/** + * + * @author KholdFuzion + + */ +public class NaturalSelection extends mage.sets.limitedalpha.NaturalSelection { + + public NaturalSelection(UUID ownerId) { + super(ownerId); + this.cardNumber = 121; + this.expansionSetCode = "LEB"; + } + + public NaturalSelection(final NaturalSelection card) { + super(card); + } + + @Override + public NaturalSelection copy() { + return new NaturalSelection(this); + } +} diff --git a/Mage.Sets/src/mage/sets/unlimitededition/NaturalSelection.java b/Mage.Sets/src/mage/sets/unlimitededition/NaturalSelection.java new file mode 100644 index 0000000000..6017d24714 --- /dev/null +++ b/Mage.Sets/src/mage/sets/unlimitededition/NaturalSelection.java @@ -0,0 +1,53 @@ +/* + * 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.unlimitededition; + +import java.util.UUID; + +/** + * + * @author KholdFuzion + + */ +public class NaturalSelection extends mage.sets.limitedalpha.NaturalSelection { + + public NaturalSelection(UUID ownerId) { + super(ownerId); + this.cardNumber = 121; + this.expansionSetCode = "2ED"; + } + + public NaturalSelection(final NaturalSelection card) { + super(card); + } + + @Override + public NaturalSelection copy() { + return new NaturalSelection(this); + } +} From c1cbb5f60d1be498ab8bac720c4f2d85f23fc373 Mon Sep 17 00:00:00 2001 From: KholdFuzion Date: Wed, 31 Jul 2013 03:02:59 -0500 Subject: [PATCH 2/6] Fix id of Natural Selection in mtg-cards-data and update CARD_DB_VERSION --- Mage/src/mage/cards/repository/CardRepository.java | 2 +- Utils/mtg-cards-data.txt | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Mage/src/mage/cards/repository/CardRepository.java b/Mage/src/mage/cards/repository/CardRepository.java index a86353f335..979a25c9cf 100644 --- a/Mage/src/mage/cards/repository/CardRepository.java +++ b/Mage/src/mage/cards/repository/CardRepository.java @@ -55,7 +55,7 @@ public enum CardRepository { private static final String JDBC_URL = "jdbc:sqlite:db/cards.db"; private static final String VERSION_ENTITY_NAME = "card"; - private static final long CARD_DB_VERSION = 12; + private static final long CARD_DB_VERSION = 13; private Random random = new Random(); private Dao cardDao; diff --git a/Utils/mtg-cards-data.txt b/Utils/mtg-cards-data.txt index 858b80819e..c27de1ae22 100644 --- a/Utils/mtg-cards-data.txt +++ b/Utils/mtg-cards-data.txt @@ -5819,6 +5819,7 @@ Homing Sliver|Future Sight|118|C|{2}{R}|Creature - Sliver|2|2|Each Sliver card i Shah of Naar Isle|Future Sight|119|R|{3}{R}|Creature - Efreet|6|6|Trample$Echo {0} (At the beginning of your upkeep, if this came under your control since the beginning of your last upkeep, sacrifice it unless you pay its echo cost.)$When Shah of Naar Isle's echo cost is paid, each opponent may draw up to three cards.| Magus of the Moat|Future Sight|12|R|{2}{W}{W}|Creature - Human Wizard|0|3|Creatures without flying can't attack.| + Skizzik Surger|Future Sight|120|U|{4}{R}{R}|Creature - Elemental|6|4|Haste$Echo-Sacrifice two lands. (At the beginning of your upkeep, if this came under your control since the beginning of your last upkeep, sacrifice it unless you pay its echo cost.)| Steamflogger Boss|Future Sight|121|R|{3}{R}|Creature - Goblin Rigger|3|3|Other Rigger creatures you control get +1/+0 and have haste.$If a Rigger you control would assemble a Contraption, it assembles two Contraptions instead.| Storm Entity|Future Sight|122|U|{1}{R}|Creature - Elemental|1|1|Haste$Storm Entity enters the battlefield with a +1/+1 counter on it for each other spell cast this turn.| @@ -8183,6 +8184,7 @@ Living Lands|Limited Edition Alpha|118|R|{3}{G}|Enchantment|||All Forests are 1/ Llanowar Elves|Limited Edition Alpha|119|C|{G}|Creature - Elf Druid|1|1|{tap}: Add {G} to your mana pool.| Demonic Hordes|Limited Edition Alpha|12|R|{3}{B}{B}{B}|Creature - Demon|5|5|{tap}: Destroy target land.$At the beginning of your upkeep, unless you pay {B}{B}{B}, tap Demonic Hordes and sacrifice a land of an opponent's choice.| Lure|Limited Edition Alpha|120|U|{1}{G}{G}|Enchantment - Aura|||Enchant creature$All creatures able to block enchanted creature do so.| +Natural Selection|Limited Edition Alpha|121|R|{G}|Instant|||Look at the top three cards of target player's library, then put them back in any order. You may have that player shuffle his or her library.| Regeneration|Limited Edition Alpha|122|C|{1}{G}|Enchantment - Aura|||Enchant creature (Target a creature as you cast this. This card enters the battlefield attached to that creature.)${G}: Regenerate enchanted creature. (The next time that creature would be destroyed this turn, it isn't. Instead tap it, remove all damage from it, and remove it from combat.)| Regrowth|Limited Edition Alpha|123|U|{1}{G}|Sorcery|||Return target card from your graveyard to your hand.| Scryb Sprites|Limited Edition Alpha|124|C|{G}|Creature - Faerie|1|1|Flying| @@ -8378,7 +8380,6 @@ Black Knight|Limited Edition Alpha|3|U|{B}{B}|Creature - Human Knight|2|2|First Plague Rats|Limited Edition Alpha|30|C|{2}{B}|Creature - Rat|*|*|Plague Rats's power and toughness are each equal to the number of creatures named Plague Rats on the battlefield.| Raise Dead|Limited Edition Alpha|31|C|{B}|Sorcery|||Return target creature card from your graveyard to your hand.| Royal Assassin|Limited Edition Alpha|32|R|{1}{B}{B}|Creature - Human Assassin|1|1|{tap}: Destroy target tapped creature.| -Natural Selection|Limited Edition Alpha|32|R|{G}|Instant|||Look at the top three cards of target player's library, then put them back in any order. You may have that player shuffle his or her library.| Sacrifice|Limited Edition Alpha|33|U|{B}|Instant|||As an additional cost to cast Sacrifice, sacrifice a creature.$Add to your mana pool an amount of {B} equal to the sacrificed creature's converted mana cost.| Scathe Zombies|Limited Edition Alpha|34|C|{2}{B}|Creature - Zombie|2|2|| Scavenging Ghoul|Limited Edition Alpha|35|U|{3}{B}|Creature - Zombie|2|2|At the beginning of each end step, put a corpse counter on Scavenging Ghoul for each creature that died this turn.$Remove a corpse counter from Scavenging Ghoul: Regenerate Scavenging Ghoul.| @@ -9605,6 +9606,7 @@ Goblin Grenade|Magic 2012|140|U|{R}|Sorcery|||As an additional cost to cast Gobl Goblin Piker|Magic 2012|141|C|{1}{R}|Creature - Goblin Warrior|2|1|| Goblin Tunneler|Magic 2012|142|C|{1}{R}|Creature - Goblin Rogue|1|1|{tap}: Target creature with power 2 or less is unblockable this turn.| Goblin War Paint|Magic 2012|143|C|{1}{R}|Enchantment - Aura|||Enchant creature$Enchanted creature gets +2/+2 and has haste. (It can attack and {tap} no matter when it came under its controller's control.)| + Gorehorn Minotaurs|Magic 2012|144|C|{2}{R}{R}|Creature - Minotaur Warrior|3|3|Bloodthirst 2 (If an opponent was dealt damage this turn, this creature enters the battlefield with two +1/+1 counters on it.)| Grim Lavamancer|Magic 2012|145|R|{R}|Creature - Human Wizard|1|1|{R}, {tap}, Exile two cards from your graveyard: Grim Lavamancer deals 2 damage to target creature or player.| Incinerate|Magic 2012|146|C|{1}{R}|Instant|||Incinerate deals 3 damage to target creature or player. A creature dealt damage this way can't be regenerated this turn.| @@ -13618,6 +13620,7 @@ Balshan Griffin|Odyssey|67|U|{3}{U}|Creature - Griffin|3|2|Flying${1}{U}, Discar Bamboozle|Odyssey|68|U|{2}{U}|Sorcery|||Target player reveals the top four cards of his or her library. You choose two of those cards and put them into his or her graveyard. Put the rest on top of his or her library in any order.| Battle of Wits|Odyssey|69|R|{3}{U}{U}|Enchantment|||At the beginning of your upkeep, if you have 200 or more cards in your library, you win the game.| Aven Cloudchaser|Odyssey|7|C|{3}{W}|Creature - Bird Soldier|2|2|Flying (This creature can't be blocked except by creatures with flying or reach.)$When Aven Cloudchaser enters the battlefield, destroy target enchantment.| + Careful Study|Odyssey|70|C|{U}|Sorcery|||Draw two cards, then discard two cards.| Cephalid Broker|Odyssey|71|U|{3}{U}|Creature - Cephalid|2|2|{tap}: Target player draws two cards, then discards two cards.| Cephalid Looter|Odyssey|72|C|{2}{U}|Creature - Cephalid Rogue|2|1|{tap}: Target player draws a card, then discards a card.| @@ -19904,6 +19907,7 @@ Living Lands|Unlimited Edition|118|R|{3}{G}|Enchantment|||All Forests are 1/1 cr Llanowar Elves|Unlimited Edition|119|C|{G}|Creature - Elf Druid|1|1|{tap}: Add {G} to your mana pool.| Demonic Hordes|Unlimited Edition|12|R|{3}{B}{B}{B}|Creature - Demon|5|5|{tap}: Destroy target land.$At the beginning of your upkeep, unless you pay {B}{B}{B}, tap Demonic Hordes and sacrifice a land of an opponent's choice.| Lure|Unlimited Edition|120|U|{1}{G}{G}|Enchantment - Aura|||Enchant creature$All creatures able to block enchanted creature do so.| +Natural Selection|Unlimited Edition|121|R|{G}|Instant|||Look at the top three cards of target player's library, then put them back in any order. You may have that player shuffle his or her library.| Regeneration|Unlimited Edition|122|C|{1}{G}|Enchantment - Aura|||Enchant creature (Target a creature as you cast this. This card enters the battlefield attached to that creature.)${G}: Regenerate enchanted creature. (The next time that creature would be destroyed this turn, it isn't. Instead tap it, remove all damage from it, and remove it from combat.)| Regrowth|Unlimited Edition|123|U|{1}{G}|Sorcery|||Return target card from your graveyard to your hand.| Scryb Sprites|Unlimited Edition|124|C|{G}|Creature - Faerie|1|1|Flying| @@ -20106,7 +20110,6 @@ Underground Sea|Unlimited Edition|301|R||Land - Island Swamp|||| Volcanic Island|Unlimited Edition|302|R||Land - Island Mountain|||| Raise Dead|Unlimited Edition|31|C|{B}|Sorcery|||Return target creature card from your graveyard to your hand.| Royal Assassin|Unlimited Edition|32|R|{1}{B}{B}|Creature - Human Assassin|1|1|{tap}: Destroy target tapped creature.| -Natural Selection|Unlimited Edition|32|R|{G}|Instant|||Look at the top three cards of target player's library, then put them back in any order. You may have that player shuffle his or her library.| Sacrifice|Unlimited Edition|33|U|{B}|Instant|||As an additional cost to cast Sacrifice, sacrifice a creature.$Add to your mana pool an amount of {B} equal to the sacrificed creature's converted mana cost.| Scathe Zombies|Unlimited Edition|34|C|{2}{B}|Creature - Zombie|2|2|| Scavenging Ghoul|Unlimited Edition|35|U|{3}{B}|Creature - Zombie|2|2|At the beginning of each end step, put a corpse counter on Scavenging Ghoul for each creature that died this turn.$Remove a corpse counter from Scavenging Ghoul: Regenerate Scavenging Ghoul.| From 08fc45bf23660acf653715fcc328eb99c90121a5 Mon Sep 17 00:00:00 2001 From: KholdFuzion Date: Wed, 31 Jul 2013 15:16:57 -0500 Subject: [PATCH 3/6] Add Smoke --- .../src/mage/sets/fifthedition/Smoke.java | 53 ++++++ .../src/mage/sets/fourthedition/Smoke.java | 53 ++++++ .../src/mage/sets/limitedalpha/Smoke.java | 160 ++++++++++++++++++ .../src/mage/sets/limitedbeta/Smoke.java | 53 ++++++ .../src/mage/sets/revisededition/Smoke.java | 53 ++++++ .../src/mage/sets/unlimitededition/Smoke.java | 53 ++++++ 6 files changed, 425 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/fifthedition/Smoke.java create mode 100644 Mage.Sets/src/mage/sets/fourthedition/Smoke.java create mode 100644 Mage.Sets/src/mage/sets/limitedalpha/Smoke.java create mode 100644 Mage.Sets/src/mage/sets/limitedbeta/Smoke.java create mode 100644 Mage.Sets/src/mage/sets/revisededition/Smoke.java create mode 100644 Mage.Sets/src/mage/sets/unlimitededition/Smoke.java diff --git a/Mage.Sets/src/mage/sets/fifthedition/Smoke.java b/Mage.Sets/src/mage/sets/fifthedition/Smoke.java new file mode 100644 index 0000000000..84d2d546f2 --- /dev/null +++ b/Mage.Sets/src/mage/sets/fifthedition/Smoke.java @@ -0,0 +1,53 @@ +/* + * 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.fifthedition; + +import java.util.UUID; + +/** + * + * @author KholdFuzion + + */ +public class Smoke extends mage.sets.limitedalpha.Smoke { + + public Smoke(UUID ownerId) { + super(ownerId); + this.cardNumber = 64; + this.expansionSetCode = "5ED"; + } + + public Smoke(final Smoke card) { + super(card); + } + + @Override + public Smoke copy() { + return new Smoke(this); + } +} diff --git a/Mage.Sets/src/mage/sets/fourthedition/Smoke.java b/Mage.Sets/src/mage/sets/fourthedition/Smoke.java new file mode 100644 index 0000000000..45336b3d4e --- /dev/null +++ b/Mage.Sets/src/mage/sets/fourthedition/Smoke.java @@ -0,0 +1,53 @@ +/* + * 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.fourthedition; + +import java.util.UUID; + +/** + * + * @author KholdFuzion + + */ +public class Smoke extends mage.sets.limitedalpha.Smoke { + + public Smoke(UUID ownerId) { + super(ownerId); + this.cardNumber = 240; + this.expansionSetCode = "4ED"; + } + + public Smoke(final Smoke card) { + super(card); + } + + @Override + public Smoke copy() { + return new Smoke(this); + } +} diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Smoke.java b/Mage.Sets/src/mage/sets/limitedalpha/Smoke.java new file mode 100644 index 0000000000..e8d86aa3f6 --- /dev/null +++ b/Mage.Sets/src/mage/sets/limitedalpha/Smoke.java @@ -0,0 +1,160 @@ +/* + * 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.limitedalpha; + +import java.util.List; +import java.util.UUID; + +import mage.abilities.Ability; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.effects.ReplacementEffectImpl; +import mage.cards.CardImpl; +import mage.constants.*; +import mage.filter.common.FilterControlledCreaturePermanent; +import mage.filter.predicate.permanent.TappedPredicate; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.game.permanent.Permanent; +import mage.players.Player; +import mage.target.Target; +import mage.target.common.TargetControlledCreaturePermanent; +import mage.watchers.WatcherImpl; + +/** + * + * @author KholdFuzion + + */ +public class Smoke extends CardImpl { + + public Smoke(UUID ownerId) { + super(ownerId, 176, "Smoke", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{R}{R}"); + this.expansionSetCode = "LEA"; + + this.color.setRed(true); + + // Players can't untap more than one creature during their untap steps. + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SmokeEffect())); + this.addWatcher(new SmokeWatcher()); + } + + public Smoke(final Smoke card) { + super(card); + } + + @Override + public Smoke copy() { + return new Smoke(this); + } +} + +class SmokeWatcher extends WatcherImpl { + + public SmokeWatcher() { + super("SmokeWatcher", WatcherScope.GAME); + } + + public SmokeWatcher(final SmokeWatcher watcher) { + super(watcher); + } + + @Override + public void watch(GameEvent event, Game game) { + if(event.getType() == GameEvent.EventType.UNTAP_STEP_PRE){ + game.getState().setValue("SmokeUntapCreature", null); + } + } + + @Override + public SmokeWatcher copy() { + return new SmokeWatcher(this); + } +} + +class SmokeEffect extends ReplacementEffectImpl { + + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creature to untap"); + static{ + filter.add(new TappedPredicate()); + } + public SmokeEffect() { + super(Duration.WhileOnBattlefield, Outcome.Detriment); + staticText = "Players can't untap more than one creature during their untap steps"; + } + + public SmokeEffect(final SmokeEffect effect) { + super(effect); + } + + @Override + public SmokeEffect copy() { + return new SmokeEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + return false; + } + + @Override + public boolean replaceEvent(GameEvent event, Ability source, Game game) { + if(game.getState().getValue("SmokeUntapCreature") == null){ + List permanents = game.getBattlefield().getActivePermanents(filter, event.getPlayerId(), game); + if(permanents.size() == 1){ + game.getState().setValue("SmokeUntapCreature", permanents.get(0).getId()); + } + else if(permanents.size() > 1){ + Player player = game.getPlayer(event.getPlayerId()); + Target target = new TargetControlledCreaturePermanent(1, 1, filter, true, true); + if(player != null && player.choose(Outcome.Untap, target, source.getId(), game)){ + //TODO : This effect is bugged with other "don't untap effect".Also affects Stoic Angel. + game.getState().setValue("SmokeUntapCreature", target.getFirstTarget()); + } + } + } + if(event.getTargetId().equals(game.getState().getValue("SmokeUntapCreature"))){ + return false; + } + else{ + return true; + } + } + + @Override + public boolean applies(GameEvent event, Ability source, Game game) { + if (game.getTurn().getStepType() == PhaseStep.UNTAP && event.getType() == GameEvent.EventType.UNTAP){ + Player player = game.getPlayer(event.getPlayerId()); + Permanent permanent = game.getPermanent(event.getTargetId()); + if(player != null && game.getActivePlayerId().equals(event.getPlayerId()) + && permanent != null && permanent.getCardType().contains(CardType.CREATURE)){ + return true; + } + } + return false; + } +} \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Smoke.java b/Mage.Sets/src/mage/sets/limitedbeta/Smoke.java new file mode 100644 index 0000000000..5f970c699a --- /dev/null +++ b/Mage.Sets/src/mage/sets/limitedbeta/Smoke.java @@ -0,0 +1,53 @@ +/* + * 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.limitedbeta; + +import java.util.UUID; + +/** + * + * @author KholdFuzion + + */ +public class Smoke extends mage.sets.limitedalpha.Smoke { + + public Smoke(UUID ownerId) { + super(ownerId); + this.cardNumber = 176; + this.expansionSetCode = "LEB"; + } + + public Smoke(final Smoke card) { + super(card); + } + + @Override + public Smoke copy() { + return new Smoke(this); + } +} diff --git a/Mage.Sets/src/mage/sets/revisededition/Smoke.java b/Mage.Sets/src/mage/sets/revisededition/Smoke.java new file mode 100644 index 0000000000..8e52cbc18a --- /dev/null +++ b/Mage.Sets/src/mage/sets/revisededition/Smoke.java @@ -0,0 +1,53 @@ +/* + * 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.revisededition; + +import java.util.UUID; + +/** + * + * @author KholdFuzion + + */ +public class Smoke extends mage.sets.limitedalpha.Smoke { + + public Smoke(UUID ownerId) { + super(ownerId); + this.cardNumber = 177; + this.expansionSetCode = "3ED"; + } + + public Smoke(final Smoke card) { + super(card); + } + + @Override + public Smoke copy() { + return new Smoke(this); + } +} diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Smoke.java b/Mage.Sets/src/mage/sets/unlimitededition/Smoke.java new file mode 100644 index 0000000000..688029363b --- /dev/null +++ b/Mage.Sets/src/mage/sets/unlimitededition/Smoke.java @@ -0,0 +1,53 @@ +/* + * 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.unlimitededition; + +import java.util.UUID; + +/** + * + * @author KholdFuzion + + */ +public class Smoke extends mage.sets.limitedalpha.Smoke { + + public Smoke(UUID ownerId) { + super(ownerId); + this.cardNumber = 176; + this.expansionSetCode = "2ED"; + } + + public Smoke(final Smoke card) { + super(card); + } + + @Override + public Smoke copy() { + return new Smoke(this); + } +} From 7c168bab58c9ef4f323561cab7233235f4d0a9f5 Mon Sep 17 00:00:00 2001 From: Jeff Date: Wed, 31 Jul 2013 17:59:02 -0500 Subject: [PATCH 4/6] - Added Brilliant Ultimatum. --- .../shardsofalara/BrilliantUltimatum.java | 186 ++++++++++++++++++ .../mage/target/common/TargetOpponent.java | 7 + 2 files changed, 193 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/shardsofalara/BrilliantUltimatum.java diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BrilliantUltimatum.java b/Mage.Sets/src/mage/sets/shardsofalara/BrilliantUltimatum.java new file mode 100644 index 0000000000..2dfe4cc6c2 --- /dev/null +++ b/Mage.Sets/src/mage/sets/shardsofalara/BrilliantUltimatum.java @@ -0,0 +1,186 @@ +/* + * 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.shardsofalara; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.effects.OneShotEffect; +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.game.Game; +import mage.players.Player; +import mage.target.TargetCard; +import mage.target.common.TargetOpponent; + +/** + * + * @author jeffwadsworth + */ +public class BrilliantUltimatum extends CardImpl { + + public BrilliantUltimatum(UUID ownerId) { + super(ownerId, 159, "Brilliant Ultimatum", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{B}{B}"); + this.expansionSetCode = "ALA"; + + this.color.setBlue(true); + this.color.setBlack(true); + this.color.setWhite(true); + + // Exile the top five cards of your library. An opponent separates those cards into two piles. You may play any number of cards from one of those piles without paying their mana costs. + this.getSpellAbility().addEffect(new BrilliantUltimatumEffect()); + this.getSpellAbility().addTarget(new TargetOpponent(true, true)); + + } + + public BrilliantUltimatum(final BrilliantUltimatum card) { + super(card); + } + + @Override + public BrilliantUltimatum copy() { + return new BrilliantUltimatum(this); + } +} + +class BrilliantUltimatumEffect extends OneShotEffect { + + public BrilliantUltimatumEffect() { + super(Outcome.PlayForFree); + this.staticText = "Exile the top five cards of your library. An opponent separates those cards into two piles. You may play any number of cards from one of those piles without paying their mana costs"; + } + + public BrilliantUltimatumEffect(final BrilliantUltimatumEffect effect) { + super(effect); + } + + @Override + public BrilliantUltimatumEffect copy() { + return new BrilliantUltimatumEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Player you = game.getPlayer(source.getControllerId()); + if (you == null) { + return false; + } + + Cards pile2 = new CardsImpl(); + int max = Math.min(you.getLibrary().size(), 5); + for (int i = 0; i < max; i++) { + Card card = you.getLibrary().removeFromTop(game); + if (card != null) { + card.moveToExile(source.getSourceId(), "Brilliant Ultimatum", source.getId(), game); + pile2.add(card); + } + } + + Player opponent = game.getPlayer(source.getFirstTarget()); + if (opponent != null) { + TargetCard target = new TargetCard(0, pile2.size(), Zone.EXILED, new FilterCard("cards to put in the first pile")); + Cards pile1 = new CardsImpl(); + List pileOne = new ArrayList(); + List pileTwo = new ArrayList(); + if (opponent.choose(Outcome.Neutral, pile2, target, game)) { + List targets = target.getTargets(); + for (UUID targetId : targets) { + Card card = pile2.get(targetId, game); + if (card != null) { + pile1.add(card); + pile2.remove(card); + } + } + } + for (UUID cardID : pile1) { + Card card = pile1.get(cardID, game); + pileOne.add(card); + } + for (UUID cardId : pile2) { + Card card = pile2.get(cardId, game); + pileTwo.add(card); + } + + you.revealCards("Pile 1 (Brilliant Ultimatum)", pile1, game); + you.revealCards("Pile 2 (Brilliant Ultimatum)", pile2, game); + + boolean choice = you.choosePile(Outcome.PlayForFree, "Which pile (play for free)?", pileOne, pileTwo, game); + if (choice) { + game.informPlayer(you, you.getName() + " chose Pile 1."); + while (!pileOne.isEmpty() && you.chooseUse(Outcome.PlayForFree, "Do you want to play a card from Pile 1?", game)) { + TargetCard targetExiledCard = new TargetCard(Zone.EXILED, new FilterCard()); + targetExiledCard.setRequired(true); + if (you.chooseTarget(Outcome.PlayForFree, pile1, targetExiledCard, source, game)) { + Card card = pile1.get(targetExiledCard.getFirstTarget(), game); + if (card != null) { + if (card.getCardType().contains(CardType.LAND)) { + you.playLand(card, game); + pileOne.remove(card); + pile1.remove(card); + } else { + you.cast(card.getSpellAbility(), game, true); + pileOne.remove(card); + pile1.remove(card); + } + } + } + } + } else { + game.informPlayer(you, you.getName() + " chose Pile 2."); + while (!pileTwo.isEmpty() && you.chooseUse(Outcome.PlayForFree, "Do you want to play a card from Pile 2?", game)) { + TargetCard targetExiledCard = new TargetCard(Zone.EXILED, new FilterCard()); + targetExiledCard.setRequired(true); + if (you.chooseTarget(Outcome.PlayForFree, pile2, targetExiledCard, source, game)) { + Card card = pile2.get(targetExiledCard.getFirstTarget(), game); + if (card != null) { + if (card.getCardType().contains(CardType.LAND)) { + you.playLand(card, game); + pileTwo.remove(card); + pile2.remove(card); + } else { + you.cast(card.getSpellAbility(), game, true); + pileTwo.remove(card); + pile2.remove(card); + } + } + } + } + } + return true; + } + return false; + } +} diff --git a/Mage/src/mage/target/common/TargetOpponent.java b/Mage/src/mage/target/common/TargetOpponent.java index afc5613189..b26afef59e 100644 --- a/Mage/src/mage/target/common/TargetOpponent.java +++ b/Mage/src/mage/target/common/TargetOpponent.java @@ -51,6 +51,13 @@ public class TargetOpponent extends TargetPlayer { this.filter.add(new PlayerPredicate(TargetController.OPPONENT)); setRequired(required); } + + public TargetOpponent(boolean required, boolean notTarget) { + super(1, 1, false, new FilterPlayer("opponent")); + this.filter.add(new PlayerPredicate(TargetController.OPPONENT)); + setRequired(required); + setNotTarget(notTarget); + } public TargetOpponent(final TargetOpponent target) { super(target); From 95f9cc19c0c684f8006b579ecd25a3c7247a70cf Mon Sep 17 00:00:00 2001 From: Jeff Date: Wed, 31 Jul 2013 22:34:32 -0500 Subject: [PATCH 5/6] - Fixed cost --- Mage.Sets/src/mage/sets/shardsofalara/BrilliantUltimatum.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BrilliantUltimatum.java b/Mage.Sets/src/mage/sets/shardsofalara/BrilliantUltimatum.java index 2dfe4cc6c2..b202d82b4d 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BrilliantUltimatum.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BrilliantUltimatum.java @@ -53,7 +53,7 @@ import mage.target.common.TargetOpponent; public class BrilliantUltimatum extends CardImpl { public BrilliantUltimatum(UUID ownerId) { - super(ownerId, 159, "Brilliant Ultimatum", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{B}{B}"); + super(ownerId, 159, "Brilliant Ultimatum", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{W}{W}{U}{U}{U}{B}{B}"); this.expansionSetCode = "ALA"; this.color.setBlue(true); From e1d6184a6a7c24557a4d0d71403e49a4f9f00b5f Mon Sep 17 00:00:00 2001 From: KholdFuzion Date: Thu, 1 Aug 2013 00:47:06 -0500 Subject: [PATCH 6/6] Add Regrowth and Wall of Water --- .../mage/sets/fourthedition/WallOfWater.java | 53 ++++++++++++++ .../src/mage/sets/limitedalpha/Regrowth.java | 64 +++++++++++++++++ .../mage/sets/limitedalpha/WallOfWater.java | 72 +++++++++++++++++++ .../src/mage/sets/limitedbeta/Regrowth.java | 53 ++++++++++++++ .../mage/sets/limitedbeta/WallOfWater.java | 53 ++++++++++++++ .../mage/sets/revisededition/Regrowth.java | 53 ++++++++++++++ .../mage/sets/revisededition/WallOfWater.java | 53 ++++++++++++++ .../mage/sets/unlimitededition/Regrowth.java | 53 ++++++++++++++ .../sets/unlimitededition/WallOfWater.java | 53 ++++++++++++++ 9 files changed, 507 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/fourthedition/WallOfWater.java create mode 100644 Mage.Sets/src/mage/sets/limitedalpha/Regrowth.java create mode 100644 Mage.Sets/src/mage/sets/limitedalpha/WallOfWater.java create mode 100644 Mage.Sets/src/mage/sets/limitedbeta/Regrowth.java create mode 100644 Mage.Sets/src/mage/sets/limitedbeta/WallOfWater.java create mode 100644 Mage.Sets/src/mage/sets/revisededition/Regrowth.java create mode 100644 Mage.Sets/src/mage/sets/revisededition/WallOfWater.java create mode 100644 Mage.Sets/src/mage/sets/unlimitededition/Regrowth.java create mode 100644 Mage.Sets/src/mage/sets/unlimitededition/WallOfWater.java diff --git a/Mage.Sets/src/mage/sets/fourthedition/WallOfWater.java b/Mage.Sets/src/mage/sets/fourthedition/WallOfWater.java new file mode 100644 index 0000000000..54fcb1976a --- /dev/null +++ b/Mage.Sets/src/mage/sets/fourthedition/WallOfWater.java @@ -0,0 +1,53 @@ +/* + * 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.fourthedition; + +import java.util.UUID; + +/** + * + * @author KholdFuzion + + */ +public class WallOfWater extends mage.sets.limitedalpha.WallOfWater { + + public WallOfWater(UUID ownerId) { + super(ownerId); + this.cardNumber = 114; + this.expansionSetCode = "4ED"; + } + + public WallOfWater(final WallOfWater card) { + super(card); + } + + @Override + public WallOfWater copy() { + return new WallOfWater(this); + } +} diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Regrowth.java b/Mage.Sets/src/mage/sets/limitedalpha/Regrowth.java new file mode 100644 index 0000000000..1050f8b08a --- /dev/null +++ b/Mage.Sets/src/mage/sets/limitedalpha/Regrowth.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.limitedalpha; + +import java.util.UUID; + +import mage.abilities.effects.common.ReturnToHandTargetEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.target.common.TargetCardInYourGraveyard; + +/** + * + * @author KholdFuzion + + */ +public class Regrowth extends CardImpl { + + public Regrowth(UUID ownerId) { + super(ownerId, 123, "Regrowth", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{G}"); + this.expansionSetCode = "LEA"; + + this.color.setGreen(true); + + // Return target card from your graveyard to your hand. + this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); + this.getSpellAbility().addTarget(new TargetCardInYourGraveyard()); + } + + public Regrowth(final Regrowth card) { + super(card); + } + + @Override + public Regrowth copy() { + return new Regrowth(this); + } +} diff --git a/Mage.Sets/src/mage/sets/limitedalpha/WallOfWater.java b/Mage.Sets/src/mage/sets/limitedalpha/WallOfWater.java new file mode 100644 index 0000000000..6cf65910b5 --- /dev/null +++ b/Mage.Sets/src/mage/sets/limitedalpha/WallOfWater.java @@ -0,0 +1,72 @@ +/* + * 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.limitedalpha; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.common.continious.BoostSourceEffect; +import mage.abilities.keyword.DefenderAbility; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; + +/** + * + * @author KholdFuzion + + */ +public class WallOfWater extends CardImpl { + + public WallOfWater(UUID ownerId) { + super(ownerId, 91, "Wall of Water", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}{U}"); + this.expansionSetCode = "LEA"; + this.subtype.add("Wall"); + + this.color.setBlue(true); + this.power = new MageInt(0); + this.toughness = new MageInt(5); + + // Defender + this.addAbility(DefenderAbility.getInstance()); + // {U}: Wall of Water gets +1/+0 until end of turn. + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{U}"))); + } + + public WallOfWater(final WallOfWater card) { + super(card); + } + + @Override + public WallOfWater copy() { + return new WallOfWater(this); + } +} diff --git a/Mage.Sets/src/mage/sets/limitedbeta/Regrowth.java b/Mage.Sets/src/mage/sets/limitedbeta/Regrowth.java new file mode 100644 index 0000000000..ce82cb08e1 --- /dev/null +++ b/Mage.Sets/src/mage/sets/limitedbeta/Regrowth.java @@ -0,0 +1,53 @@ +/* + * 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.limitedbeta; + +import java.util.UUID; + +/** + * + * @author KholdFuzion + + */ +public class Regrowth extends mage.sets.limitedalpha.Regrowth { + + public Regrowth(UUID ownerId) { + super(ownerId); + this.cardNumber = 123; + this.expansionSetCode = "LEB"; + } + + public Regrowth(final Regrowth card) { + super(card); + } + + @Override + public Regrowth copy() { + return new Regrowth(this); + } +} diff --git a/Mage.Sets/src/mage/sets/limitedbeta/WallOfWater.java b/Mage.Sets/src/mage/sets/limitedbeta/WallOfWater.java new file mode 100644 index 0000000000..0bfdb080b1 --- /dev/null +++ b/Mage.Sets/src/mage/sets/limitedbeta/WallOfWater.java @@ -0,0 +1,53 @@ +/* + * 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.limitedbeta; + +import java.util.UUID; + +/** + * + * @author KholdFuzion + + */ +public class WallOfWater extends mage.sets.limitedalpha.WallOfWater { + + public WallOfWater(UUID ownerId) { + super(ownerId); + this.cardNumber = 91; + this.expansionSetCode = "LEB"; + } + + public WallOfWater(final WallOfWater card) { + super(card); + } + + @Override + public WallOfWater copy() { + return new WallOfWater(this); + } +} diff --git a/Mage.Sets/src/mage/sets/revisededition/Regrowth.java b/Mage.Sets/src/mage/sets/revisededition/Regrowth.java new file mode 100644 index 0000000000..5d005de194 --- /dev/null +++ b/Mage.Sets/src/mage/sets/revisededition/Regrowth.java @@ -0,0 +1,53 @@ +/* + * 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.revisededition; + +import java.util.UUID; + +/** + * + * @author KholdFuzion + + */ +public class Regrowth extends mage.sets.limitedalpha.Regrowth { + + public Regrowth(UUID ownerId) { + super(ownerId); + this.cardNumber = 121; + this.expansionSetCode = "3ED"; + } + + public Regrowth(final Regrowth card) { + super(card); + } + + @Override + public Regrowth copy() { + return new Regrowth(this); + } +} diff --git a/Mage.Sets/src/mage/sets/revisededition/WallOfWater.java b/Mage.Sets/src/mage/sets/revisededition/WallOfWater.java new file mode 100644 index 0000000000..63517236c3 --- /dev/null +++ b/Mage.Sets/src/mage/sets/revisededition/WallOfWater.java @@ -0,0 +1,53 @@ +/* + * 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.revisededition; + +import java.util.UUID; + +/** + * + * @author KholdFuzion + + */ +public class WallOfWater extends mage.sets.limitedalpha.WallOfWater { + + public WallOfWater(UUID ownerId) { + super(ownerId); + this.cardNumber = 91; + this.expansionSetCode = "3ED"; + } + + public WallOfWater(final WallOfWater card) { + super(card); + } + + @Override + public WallOfWater copy() { + return new WallOfWater(this); + } +} diff --git a/Mage.Sets/src/mage/sets/unlimitededition/Regrowth.java b/Mage.Sets/src/mage/sets/unlimitededition/Regrowth.java new file mode 100644 index 0000000000..d470f7072d --- /dev/null +++ b/Mage.Sets/src/mage/sets/unlimitededition/Regrowth.java @@ -0,0 +1,53 @@ +/* + * 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.unlimitededition; + +import java.util.UUID; + +/** + * + * @author KholdFuzion + + */ +public class Regrowth extends mage.sets.limitedalpha.Regrowth { + + public Regrowth(UUID ownerId) { + super(ownerId); + this.cardNumber = 123; + this.expansionSetCode = "2ED"; + } + + public Regrowth(final Regrowth card) { + super(card); + } + + @Override + public Regrowth copy() { + return new Regrowth(this); + } +} diff --git a/Mage.Sets/src/mage/sets/unlimitededition/WallOfWater.java b/Mage.Sets/src/mage/sets/unlimitededition/WallOfWater.java new file mode 100644 index 0000000000..f78965d000 --- /dev/null +++ b/Mage.Sets/src/mage/sets/unlimitededition/WallOfWater.java @@ -0,0 +1,53 @@ +/* + * 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.unlimitededition; + +import java.util.UUID; + +/** + * + * @author KholdFuzion + + */ +public class WallOfWater extends mage.sets.limitedalpha.WallOfWater { + + public WallOfWater(UUID ownerId) { + super(ownerId); + this.cardNumber = 91; + this.expansionSetCode = "2ED"; + } + + public WallOfWater(final WallOfWater card) { + super(card); + } + + @Override + public WallOfWater copy() { + return new WallOfWater(this); + } +}