From af05bc6ce3bcc203f508e5fc95722298730d6c33 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 25 Apr 2013 17:29:32 +0200 Subject: [PATCH 1/2] Used existing framework effect for Mayel the Anima. --- .../sets/shardsofalara/MayaelTheAnima.java | 81 +++---------------- 1 file changed, 9 insertions(+), 72 deletions(-) diff --git a/Mage.Sets/src/mage/sets/shardsofalara/MayaelTheAnima.java b/Mage.Sets/src/mage/sets/shardsofalara/MayaelTheAnima.java index 8c95ceb0a6..41fdd6c5de 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/MayaelTheAnima.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/MayaelTheAnima.java @@ -38,6 +38,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; @@ -45,6 +46,7 @@ import mage.cards.CardsImpl; import mage.filter.Filter.ComparisonType; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; +import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.PowerPredicate; import mage.game.Game; import mage.players.Player; @@ -56,6 +58,12 @@ import mage.target.TargetCard; */ public class MayaelTheAnima extends CardImpl { + private static final FilterCreatureCard filter = new FilterCreatureCard("a creature card with power 5 or greater to put onto the battlefield"); + static { + filter.add(new CardTypePredicate(CardType.CREATURE)); + filter.add(new PowerPredicate(ComparisonType.GreaterThan, 4)); + } + public MayaelTheAnima(UUID ownerId) { super(ownerId, 179, "Mayael the Anima", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{R}{G}{W}"); this.expansionSetCode = "ALA"; @@ -73,7 +81,7 @@ public class MayaelTheAnima extends CardImpl { // You may put a creature card with power 5 or greater from among them onto the battlefield. // Put the rest on the bottom of your library in any order. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new MayaelTheAnimaEffect(), + new LookLibraryAndPickControllerEffect(5,1, filter,false), new ManaCostsImpl("{3}{R}{G}{W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); @@ -88,74 +96,3 @@ public class MayaelTheAnima extends CardImpl { return new MayaelTheAnima(this); } } - -class MayaelTheAnimaEffect extends OneShotEffect { - - public MayaelTheAnimaEffect() { - super(Outcome.PutCreatureInPlay); - this.staticText = "Look at the top five cards of your library. You may put a creature card with power 5 or greater from among them onto the battlefield. Put the rest on the bottom of your library in any order"; - } - - public MayaelTheAnimaEffect(final MayaelTheAnimaEffect effect) { - super(effect); - } - - @Override - public MayaelTheAnimaEffect copy() { - return new MayaelTheAnimaEffect(this); - } - - @Override - public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(source.getControllerId()); - if (player == null) { - return false; - } - FilterCreatureCard filterCreatureCard = new FilterCreatureCard("creature card with power 5 or greater to put onto the battlefield"); - filterCreatureCard.add(new PowerPredicate(ComparisonType.GreaterThan, 4)); - - Cards cards = new CardsImpl(Zone.PICK); - boolean creatureCardFound = false; - int count = Math.min(player.getLibrary().size(), 5); - 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); - if (filterCreatureCard.match(card, game)) { - creatureCardFound = true; - } - } - } - player.lookAtCards("Mayael the Anima", cards, game); - - if (creatureCardFound && player.chooseUse(Outcome.DrawCard, "Do you wish to put a creature card with power 5 or greater from among them onto the battlefield?", game)) { - TargetCard target = new TargetCard(Zone.PICK, filterCreatureCard); - if (player.choose(this.outcome, cards, target, game)) { - Card card = cards.get(target.getFirstTarget(), game); - if (card != null) { - cards.remove(card); - card.putOntoBattlefield(game, Zone.PICK, source.getId(), player.getId()); - } - } - } - - TargetCard target = new TargetCard(Zone.PICK, new FilterCard("card to put on the bottom of your library")); - target.setRequired(true); - while (cards.size() > 1) { - player.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, false); - } - target.clearChosen(); - } - if (cards.size() == 1) { - Card card = cards.get(cards.iterator().next(), game); - card.moveToZone(Zone.LIBRARY, source.getId(), game, false); - } - - return true; - } -} From 4733d9ad13fb6ac7b526077d396841bd4b73c08e Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 25 Apr 2013 17:29:55 +0200 Subject: [PATCH 2/2] [DGM] Blast of Genius, Blaze Commando --- .../mage/sets/dragonsmaze/BlastOfGenius.java | 119 +++++++++++++++ .../mage/sets/dragonsmaze/BlazeCommando.java | 141 ++++++++++++++++++ 2 files changed, 260 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/dragonsmaze/BlastOfGenius.java create mode 100644 Mage.Sets/src/mage/sets/dragonsmaze/BlazeCommando.java diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BlastOfGenius.java b/Mage.Sets/src/mage/sets/dragonsmaze/BlastOfGenius.java new file mode 100644 index 0000000000..778f3fb720 --- /dev/null +++ b/Mage.Sets/src/mage/sets/dragonsmaze/BlastOfGenius.java @@ -0,0 +1,119 @@ +/* + * 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.dragonsmaze; + +import java.util.UUID; +import mage.Constants.CardType; +import mage.Constants.Outcome; +import mage.Constants.Rarity; +import mage.abilities.Ability; +import mage.abilities.effects.OneShotEffect; +import mage.cards.Card; +import mage.cards.CardImpl; +import mage.game.Game; +import mage.game.permanent.Permanent; +import mage.players.Player; +import mage.target.common.TargetCreatureOrPlayer; +import mage.target.common.TargetDiscard; + +/** + * + * @author LevelX2 + */ + + +public class BlastOfGenius extends CardImpl { + + public BlastOfGenius(UUID ownerId) { + super(ownerId, 55, "Blast of Genius", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{U}{R}"); + this.expansionSetCode = "DGM"; + + this.color.setBlue(true); + this.color.setRed(true); + + // Choose target creature or player. Draw three cards and discard a card. Blast of Genius deals damage equal to the converted mana cost of the discard card to that creature or player. + this.getSpellAbility().addEffect(new BlastOfGeniusEffect()); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + } + + public BlastOfGenius(final BlastOfGenius card) { + super(card); + } + + @Override + public BlastOfGenius copy() { + return new BlastOfGenius(this); + } + +} + +class BlastOfGeniusEffect extends OneShotEffect { + + public BlastOfGeniusEffect() { + super(Outcome.Benefit); + this.staticText = "Choose target creature or player. Draw three cards and discard a card. Blast of Genius deals damage equal to the converted mana cost of the discard card to that creature or player"; + } + + public BlastOfGeniusEffect(final BlastOfGeniusEffect effect) { + super(effect); + } + + @Override + public BlastOfGeniusEffect copy() { + return new BlastOfGeniusEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Player player = game.getPlayer(source.getControllerId()); + if (player != null) { + player.drawCards(3, game); + TargetDiscard target = new TargetDiscard(player.getId()); + if (target.canChoose(source.getSourceId(), player.getId(), game)) { + player.choose(Outcome.Discard, target, source.getSourceId(), game); + Card card = player.getHand().get(target.getFirstTarget(), game); + if (card != null) { + player.discard(card, source, game); + int damage = card.getManaCost().convertedManaCost(); + Permanent creature = game.getPermanent(this.getTargetPointer().getFirst(game, source)); + if (creature != null) { + creature.damage(damage, source.getSourceId(), game, true, false); + return true; + } + Player targetPlayer = game.getPlayer(this.getTargetPointer().getFirst(game, source)); + if (targetPlayer != null) { + targetPlayer.damage(damage, source.getSourceId(), game, false, true); + return true; + } + } + } + } + return false; + } +} diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BlazeCommando.java b/Mage.Sets/src/mage/sets/dragonsmaze/BlazeCommando.java new file mode 100644 index 0000000000..f2742f66f4 --- /dev/null +++ b/Mage.Sets/src/mage/sets/dragonsmaze/BlazeCommando.java @@ -0,0 +1,141 @@ +/* + * 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.dragonsmaze; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; +import mage.Constants; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.Constants.Zone; +import mage.MageInt; +import mage.MageObject; +import mage.abilities.TriggeredAbilityImpl; +import mage.abilities.effects.common.CreateTokenEffect; +import mage.abilities.keyword.HasteAbility; +import mage.cards.CardImpl; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.game.events.GameEvent.EventType; +import mage.game.permanent.token.MerfolkToken; +import mage.game.permanent.token.Token; +import mage.game.stack.StackObject; + +/** + * + * @author LevelX2 + */ + + +public class BlazeCommando extends CardImpl { + + public BlazeCommando (UUID ownerId) { + super(ownerId, 56, "Blaze Commando", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{R}{W}"); + this.expansionSetCode = "DGM"; + this.subtype.add("Minotaur"); + this.subtype.add("Soldier"); + this.color.setRed(true); + this.color.setWhite(true); + this.power = new MageInt(5); + this.toughness = new MageInt(3); + + // Whenever an instant or sorcery spell you control deals damage, put two 1/1 red and white Soldier creature tokens with haste onto the battlefield. + this.addAbility(new BlazeCommandoTriggeredAbility()); + + } + + public BlazeCommando (final BlazeCommando card) { + super(card); + } + + @Override + public BlazeCommando copy() { + return new BlazeCommando(this); + } + +} +class BlazeCommandoTriggeredAbility extends TriggeredAbilityImpl { + + private List handledStackObjects = new ArrayList(); + + public BlazeCommandoTriggeredAbility() { + super(Zone.BATTLEFIELD, new CreateTokenEffect(new BlazeCommandoSoldierToken(), 2), false); + } + + public BlazeCommandoTriggeredAbility(final BlazeCommandoTriggeredAbility ability) { + super(ability); + } + + @Override + public BlazeCommandoTriggeredAbility copy() { + return new BlazeCommandoTriggeredAbility(this); + } + + @Override + public void reset(Game game) { + handledStackObjects.clear(); + } + + @Override + public boolean checkTrigger(GameEvent event, Game game) { + if (event.getType() == EventType.DAMAGED_CREATURE || event.getType() == EventType.DAMAGED_PLANESWALKER || event.getType() == EventType.DAMAGED_PLAYER) { + StackObject stackObject = game.getStack().getStackObject(event.getSourceId()); + if (stackObject != null && stackObject.getControllerId().equals(getControllerId())) { + MageObject object = game.getObject(stackObject.getSourceId()); + if (object.getCardType().contains(CardType.INSTANT) || object.getCardType().contains(CardType.SORCERY)) { + if (!handledStackObjects.contains(stackObject.getId())) { + handledStackObjects.add(stackObject.getId()); + return true; + } + } + } + } + return false; + } + + @Override + public String getRule() { + return new StringBuilder("Whenever an instant or sorcery spell you control deals damage, ").append(super.getRule()).toString(); + } +} + +class BlazeCommandoSoldierToken extends Token { + + public BlazeCommandoSoldierToken() { + super("Soldier", "1/1 red and white Soldier creature tokens with haste"); + cardType.add(Constants.CardType.CREATURE); + color.setRed(true); + color.setWhite(true); + subtype.add("Soldier"); + power = new MageInt(1); + toughness = new MageInt(1); + this.addAbility(HasteAbility.getInstance()); + } +} \ No newline at end of file