From 6f6cf6e3bba728f3c80bd4b2fb0fa2544e742ccc Mon Sep 17 00:00:00 2001 From: Andy Fries Date: Mon, 27 Oct 2014 22:46:25 -0700 Subject: [PATCH 1/3] Added Belbe's Portal --- .../src/mage/sets/nemesis/BelbesPortal.java | 166 ++++++++++++++++++ 1 file changed, 166 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/nemesis/BelbesPortal.java diff --git a/Mage.Sets/src/mage/sets/nemesis/BelbesPortal.java b/Mage.Sets/src/mage/sets/nemesis/BelbesPortal.java new file mode 100644 index 0000000000..799b288236 --- /dev/null +++ b/Mage.Sets/src/mage/sets/nemesis/BelbesPortal.java @@ -0,0 +1,166 @@ +/* + * 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.nemesis; + +import java.util.UUID; + +import mage.abilities.Ability; +import mage.abilities.common.AsEntersBattlefieldAbility; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.ContinuousEffectImpl; +import mage.abilities.effects.Effect; +import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.common.PutCreatureOnBattlefieldEffect; +import mage.cards.Card; +import mage.cards.CardImpl; +import mage.cards.repository.CardRepository; +import mage.choices.Choice; +import mage.choices.ChoiceImpl; +import mage.constants.*; +import mage.filter.common.FilterCreatureCard; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.SubtypePredicate; +import mage.game.Game; +import mage.game.permanent.Permanent; +import mage.players.Player; +import mage.target.common.TargetCardInHand; + +/** + * + * @author andyfries + */ +public class BelbesPortal extends CardImpl { + + public BelbesPortal(UUID ownerId) { + super(ownerId, 127, "Belbe's Portal", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{5}"); + this.expansionSetCode = "NMS"; + + // As Belbe's Portal enters the battlefield, choose a creature type. + this.addAbility(new AsEntersBattlefieldAbility(new BelbesPortalEnterBattlefieldEffect())); + // {3}, {tap}: You may put a creature card of the chosen type from your hand onto the battlefield. + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + new BelbesPortalPutCreatureOnBattlefieldEffect(), + new ManaCostsImpl("{3}")); + ability.addCost(new TapSourceCost()); + this.addAbility(ability); + } + + public BelbesPortal(final BelbesPortal card) { + super(card); + } + + @Override + public BelbesPortal copy() { + return new BelbesPortal(this); + } +} + +class BelbesPortalEnterBattlefieldEffect extends OneShotEffect { + + BelbesPortalEnterBattlefieldEffect() { + super(Outcome.PutCreatureInPlay); + staticText = "choose a creature type"; + } + + BelbesPortalEnterBattlefieldEffect(final BelbesPortalEnterBattlefieldEffect effect) { + super(effect); + } + + @Override + public BelbesPortalEnterBattlefieldEffect copy() { + return new BelbesPortalEnterBattlefieldEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Player player = game.getPlayer(source.getControllerId()); + Permanent permanent = game.getPermanent(source.getSourceId()); + if (player != null && permanent != null) { + Choice typeChoice = new ChoiceImpl(true); + typeChoice.setMessage("Choose a creature type:"); + typeChoice.setChoices(CardRepository.instance.getCreatureTypes()); + while (!player.choose(Outcome.PutCreatureInPlay, typeChoice, game)) { + if (!player.isInGame()) { + return false; + } + } + game.informPlayers(permanent.getName() + ": " + player.getName() + " has chosen " + typeChoice.getChoice()); + game.getState().setValue(permanent.getId() + "_type", typeChoice.getChoice()); + permanent.addInfo("chosen type", "Chosen type: " + typeChoice.getChoice() + ""); + } + return false; + } +} + +class BelbesPortalPutCreatureOnBattlefieldEffect extends OneShotEffect { + BelbesPortalPutCreatureOnBattlefieldEffect() { + super(Outcome.PutCreatureInPlay); + staticText = "You may put a creature card of the chosen type from your hand onto the battlefield"; + } + + BelbesPortalPutCreatureOnBattlefieldEffect(final BelbesPortalPutCreatureOnBattlefieldEffect effect) { + super(effect); + } + + @Override + public BelbesPortalPutCreatureOnBattlefieldEffect copy() { + return new BelbesPortalPutCreatureOnBattlefieldEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Permanent permanent = game.getPermanent(source.getSourceId()); + if (permanent != null) { + String subtype = (String) game.getState().getValue(permanent.getId() + "_type"); + if (subtype != null) { + Player player = game.getPlayer(source.getControllerId()); + String choiceText = "Put a " + subtype.toLowerCase() + " creature card from your hand onto the battlefield?"; + + if (player == null || !player.chooseUse(Outcome.PutCreatureInPlay, choiceText, game)) { + return false; + } + FilterCreatureCard creatureTypeFilter = new FilterCreatureCard(); + creatureTypeFilter.add(new SubtypePredicate(subtype)); + + TargetCardInHand target = new TargetCardInHand(creatureTypeFilter); + if (player.choose(Outcome.PutCreatureInPlay, target, source.getSourceId(), game)) { + Card card = game.getCard(target.getFirstTarget()); + if (card != null) { + player.putOntoBattlefieldWithInfo(card, game, Zone.HAND, source.getSourceId()); + return true; + } + } else { + return false; + } + } + } + return true; + } +} \ No newline at end of file From 4c9ca8a11b94b1b547223bd8e5d0c24de7903107 Mon Sep 17 00:00:00 2001 From: Andy Fries Date: Tue, 28 Oct 2014 08:59:11 -0700 Subject: [PATCH 2/3] implemented recommended changes --- .../src/mage/sets/nemesis/BelbesPortal.java | 67 +++++-------------- 1 file changed, 15 insertions(+), 52 deletions(-) diff --git a/Mage.Sets/src/mage/sets/nemesis/BelbesPortal.java b/Mage.Sets/src/mage/sets/nemesis/BelbesPortal.java index 799b288236..c596012adb 100644 --- a/Mage.Sets/src/mage/sets/nemesis/BelbesPortal.java +++ b/Mage.Sets/src/mage/sets/nemesis/BelbesPortal.java @@ -37,6 +37,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.common.ChooseCreatureTypeEffect; import mage.abilities.effects.common.PutCreatureOnBattlefieldEffect; import mage.cards.Card; import mage.cards.CardImpl; @@ -63,7 +64,7 @@ public class BelbesPortal extends CardImpl { this.expansionSetCode = "NMS"; // As Belbe's Portal enters the battlefield, choose a creature type. - this.addAbility(new AsEntersBattlefieldAbility(new BelbesPortalEnterBattlefieldEffect())); + this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.PutCreatureInPlay))); // {3}, {tap}: You may put a creature card of the chosen type from your hand onto the battlefield. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BelbesPortalPutCreatureOnBattlefieldEffect(), @@ -82,43 +83,6 @@ public class BelbesPortal extends CardImpl { } } -class BelbesPortalEnterBattlefieldEffect extends OneShotEffect { - - BelbesPortalEnterBattlefieldEffect() { - super(Outcome.PutCreatureInPlay); - staticText = "choose a creature type"; - } - - BelbesPortalEnterBattlefieldEffect(final BelbesPortalEnterBattlefieldEffect effect) { - super(effect); - } - - @Override - public BelbesPortalEnterBattlefieldEffect copy() { - return new BelbesPortalEnterBattlefieldEffect(this); - } - - @Override - public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(source.getControllerId()); - Permanent permanent = game.getPermanent(source.getSourceId()); - if (player != null && permanent != null) { - Choice typeChoice = new ChoiceImpl(true); - typeChoice.setMessage("Choose a creature type:"); - typeChoice.setChoices(CardRepository.instance.getCreatureTypes()); - while (!player.choose(Outcome.PutCreatureInPlay, typeChoice, game)) { - if (!player.isInGame()) { - return false; - } - } - game.informPlayers(permanent.getName() + ": " + player.getName() + " has chosen " + typeChoice.getChoice()); - game.getState().setValue(permanent.getId() + "_type", typeChoice.getChoice()); - permanent.addInfo("chosen type", "Chosen type: " + typeChoice.getChoice() + ""); - } - return false; - } -} - class BelbesPortalPutCreatureOnBattlefieldEffect extends OneShotEffect { BelbesPortalPutCreatureOnBattlefieldEffect() { super(Outcome.PutCreatureInPlay); @@ -143,24 +107,23 @@ class BelbesPortalPutCreatureOnBattlefieldEffect extends OneShotEffect { Player player = game.getPlayer(source.getControllerId()); String choiceText = "Put a " + subtype.toLowerCase() + " creature card from your hand onto the battlefield?"; - if (player == null || !player.chooseUse(Outcome.PutCreatureInPlay, choiceText, game)) { - return false; - } - FilterCreatureCard creatureTypeFilter = new FilterCreatureCard(); - creatureTypeFilter.add(new SubtypePredicate(subtype)); + if (player != null) { + if (player.chooseUse(Outcome.PutCreatureInPlay, choiceText, game)) { + FilterCreatureCard creatureTypeFilter = new FilterCreatureCard(); + creatureTypeFilter.add(new SubtypePredicate(subtype)); - TargetCardInHand target = new TargetCardInHand(creatureTypeFilter); - if (player.choose(Outcome.PutCreatureInPlay, target, source.getSourceId(), game)) { - Card card = game.getCard(target.getFirstTarget()); - if (card != null) { - player.putOntoBattlefieldWithInfo(card, game, Zone.HAND, source.getSourceId()); - return true; + TargetCardInHand target = new TargetCardInHand(creatureTypeFilter); + if (player.choose(Outcome.PutCreatureInPlay, target, source.getSourceId(), game)) { + Card card = game.getCard(target.getFirstTarget()); + if (card != null) { + player.putOntoBattlefieldWithInfo(card, game, Zone.HAND, source.getSourceId()); + } + } } - } else { - return false; + return true; } } } - return true; + return false; } } \ No newline at end of file From cbb709cd6ded2f050abce8b0bc16130a6bbd61d7 Mon Sep 17 00:00:00 2001 From: emerald000 Date: Wed, 29 Oct 2014 16:52:54 -0400 Subject: [PATCH 3/3] Fixed Lord of Extinction. --- Mage.Sets/src/mage/sets/alarareborn/LordOfExtinction.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Mage.Sets/src/mage/sets/alarareborn/LordOfExtinction.java b/Mage.Sets/src/mage/sets/alarareborn/LordOfExtinction.java index 122db23f49..06c2d6834f 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/LordOfExtinction.java +++ b/Mage.Sets/src/mage/sets/alarareborn/LordOfExtinction.java @@ -27,6 +27,7 @@ */ package mage.sets.alarareborn; +import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -41,8 +42,6 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; -import java.util.UUID; - /** * * @author jeffwadsworth @@ -60,7 +59,7 @@ public class LordOfExtinction extends CardImpl { this.toughness = new MageInt(0); // Lord of Extinction's power and toughness are each equal to the number of cards in all graveyards. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetPowerToughnessSourceEffect(new LordOfExtinctionDynamicCount(), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new LordOfExtinctionDynamicCount(), Duration.WhileOnBattlefield))); } public LordOfExtinction(final LordOfExtinction card) {