From e959ccb972d53e63e9942e84897a317ea91720f7 Mon Sep 17 00:00:00 2001 From: Max Lebedev Date: Fri, 16 Sep 2016 14:10:05 -0400 Subject: [PATCH 1/3] added Selvala --- .../SelvalaHeartOfTheWilds.java | 192 ++++++++++++++++++ 1 file changed, 192 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/conspiracytakethecrown/SelvalaHeartOfTheWilds.java diff --git a/Mage.Sets/src/mage/sets/conspiracytakethecrown/SelvalaHeartOfTheWilds.java b/Mage.Sets/src/mage/sets/conspiracytakethecrown/SelvalaHeartOfTheWilds.java new file mode 100644 index 00000000000..bea6473dc46 --- /dev/null +++ b/Mage.Sets/src/mage/sets/conspiracytakethecrown/SelvalaHeartOfTheWilds.java @@ -0,0 +1,192 @@ +/* + * 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.conspiracytakethecrown; + +import java.util.UUID; +import mage.MageInt; +import mage.Mana; +import mage.abilities.Ability; +import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.dynamicvalue.DynamicValue; +import mage.abilities.effects.Effect; +import mage.abilities.effects.OneShotEffect; +import mage.abilities.mana.DynamicManaAbility; +import mage.cards.CardImpl; +import mage.constants.*; +import mage.filter.FilterPermanent; +import mage.filter.common.FilterControlledCreaturePermanent; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.ObjectSourcePlayer; +import mage.filter.predicate.ObjectSourcePlayerPredicate; +import mage.filter.predicate.permanent.AnotherPredicate; +import mage.game.Game; +import mage.game.permanent.Permanent; +import mage.players.Player; +import mage.target.targetpointer.FixedTarget; + +/** + * + * @author maxlebedev + */ +public class SelvalaHeartOfTheWilds extends CardImpl { + + + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature"); + static { + filter.add(new AnotherPredicate()); + filter.add(new GreatestPowerPredicate()); + } + + public SelvalaHeartOfTheWilds(UUID ownerId) { + super(ownerId, 70, "Selvala, Heart of the Wilds", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{1}{G}{G}"); + this.expansionSetCode = "CN2"; + this.supertype.add("Legendary"); + this.subtype.add("Elf"); + this.subtype.add("Scout"); + this.power = new MageInt(2); + this.toughness = new MageInt(3); + + // Whenever another creature enters the battlefield, its controller may draw a card if its power is greater than each other creature's power. + this.addAbility(new SelvalaHeartOfTheWildsTriggeredAbility(new SelvalaHeartOfTheWildsEffect(), filter)); + + // {G}, {T}: Add X mana in any combination of colors to your mana pool, where X is the greatest power among creatures you control. + this.addAbility(new DynamicManaAbility(new Mana(0,0,0,0,0,0,1, 0), new GreatestPowerYouControlValue(), new TapSourceCost(), + "Add X mana in any combination of colors to your mana pool, where X is the number of creatures with defender you control.")); + } + + public SelvalaHeartOfTheWilds(final SelvalaHeartOfTheWilds card) { + super(card); + } + + @Override + public SelvalaHeartOfTheWilds copy() { + return new SelvalaHeartOfTheWilds(this); + } +} + + +class SelvalaHeartOfTheWildsTriggeredAbility extends EntersBattlefieldAllTriggeredAbility { + private static final String rule = "Whenever another creature enters the battlefield, its controller may draw a card if its power is greater than each other creature's power"; + public SelvalaHeartOfTheWildsTriggeredAbility(Effect effect, FilterPermanent filter) { + super(Zone.BATTLEFIELD, effect, filter, false, SetTargetPointer.PERMANENT, rule); + } + + public SelvalaHeartOfTheWildsTriggeredAbility(final SelvalaHeartOfTheWildsTriggeredAbility ability) { + super(ability); + } + @Override + public SelvalaHeartOfTheWildsTriggeredAbility copy() { + return new SelvalaHeartOfTheWildsTriggeredAbility(this); + } + +} + +class SelvalaHeartOfTheWildsEffect extends OneShotEffect { + + public SelvalaHeartOfTheWildsEffect() { + super(Outcome.Benefit); + this.staticText = "that creature's controller may draw a card"; + } + + public SelvalaHeartOfTheWildsEffect(final SelvalaHeartOfTheWildsEffect effect) { + super(effect); + } + + @Override + public SelvalaHeartOfTheWildsEffect copy() { + return new SelvalaHeartOfTheWildsEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); + if(permanent == null){ + permanent = (Permanent)game.getLastKnownInformation(targetPointer.getFirst(game, source), Zone.BATTLEFIELD); + } + if (permanent != null) { + Player cardowner = game.getPlayer(permanent.getControllerId()); + if(cardowner.chooseUse(Outcome.DrawCard, "Would you like to draw a card?", source, game)){ + cardowner.drawCards(1, game); + } + } + return true; + } +} + + +class GreatestPowerPredicate implements ObjectSourcePlayerPredicate> { + + @Override + public boolean apply(ObjectSourcePlayer input, Game game) { + int pow = input.getObject().getPower().getValue(); + + for (UUID id :game.getPlayerList()){ + Player player = game.getPlayer(id); + if (player != null) { + for (Permanent p : game.getBattlefield().getActivePermanents(new FilterControlledCreaturePermanent(), id, game)) { + if(p.getPower().getValue() >= pow && !p.equals(input.getObject())){ + return false; //we found something with equal/more power + } + } + } + } + return true; + } + @Override + public String toString() { + return "Greatest Power"; + } +} + +class GreatestPowerYouControlValue implements DynamicValue { + + @Override + public int calculate(Game game, Ability sourceAbility, Effect effect) { + Player player = game.getPlayer(sourceAbility.getControllerId()); + int amount = 0; + if (player != null) { + for (Permanent p : game.getBattlefield().getActivePermanents(new FilterControlledCreaturePermanent(), sourceAbility.getControllerId(), game)) { + if (p.getPower().getValue() > amount) { + amount = p.getPower().getValue(); + } + } + } + return amount; + } + + @Override + public DynamicValue copy() { + return new GreatestPowerYouControlValue(); + } + + @Override + public String getMessage() { + return "Add X mana in any combination of colors to your mana pool, where X is the number of creatures with defender you control."; + } +} From d44d0c0378185a74009887fa04d5cd4ab169c181 Mon Sep 17 00:00:00 2001 From: Max Lebedev Date: Fri, 16 Sep 2016 14:22:58 -0400 Subject: [PATCH 2/3] fixed a bug with Cabal Therapy where it would 'look at' rather than 'reveal' a hand --- Mage.Sets/src/mage/sets/judgment/CabalTherapy.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Mage.Sets/src/mage/sets/judgment/CabalTherapy.java b/Mage.Sets/src/mage/sets/judgment/CabalTherapy.java index 53508b3973e..76efe39d0ce 100644 --- a/Mage.Sets/src/mage/sets/judgment/CabalTherapy.java +++ b/Mage.Sets/src/mage/sets/judgment/CabalTherapy.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.NameACardEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.Card; import mage.cards.CardImpl; +import mage.cards.Cards; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Rarity; @@ -81,7 +82,7 @@ class CabalTherapyEffect extends OneShotEffect { public CabalTherapyEffect() { super(Outcome.Discard); - staticText = "Name a nonland card. Search target player's hand for all cards with that name and discard them"; + staticText = "Name a nonland card. Target player reveals his or her hand and discards all cards with that name"; } public CabalTherapyEffect(final CabalTherapyEffect effect) { @@ -95,12 +96,14 @@ class CabalTherapyEffect extends OneShotEffect { MageObject sourceObject = game.getObject(source.getSourceId()); if (targetPlayer != null && controller != null && sourceObject != null) { String cardName = (String) game.getState().getValue(source.getSourceId().toString() + NameACardEffect.INFO_KEY); - for (Card card : targetPlayer.getHand().getCards(game)) { + Cards hand = targetPlayer.getHand(); + + for (Card card : hand.getCards(game)) { if (card.getName().equals(cardName)) { targetPlayer.discard(card, source, game); } } - controller.lookAtCards(sourceObject.getName() + " Hand", targetPlayer.getHand(), game); + targetPlayer.revealCards("Cabal Therapy", hand, game); } return true; } From e6566e1e8093e844ca270c62d7956c00563756fe Mon Sep 17 00:00:00 2001 From: Max Lebedev Date: Fri, 16 Sep 2016 14:36:25 -0400 Subject: [PATCH 3/3] removed unnecessary SelvalaHeartOfTheWildsTriggeredAbility --- .../SelvalaHeartOfTheWilds.java | 22 ++++--------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/Mage.Sets/src/mage/sets/conspiracytakethecrown/SelvalaHeartOfTheWilds.java b/Mage.Sets/src/mage/sets/conspiracytakethecrown/SelvalaHeartOfTheWilds.java index bea6473dc46..d092cf4b3e7 100644 --- a/Mage.Sets/src/mage/sets/conspiracytakethecrown/SelvalaHeartOfTheWilds.java +++ b/Mage.Sets/src/mage/sets/conspiracytakethecrown/SelvalaHeartOfTheWilds.java @@ -63,6 +63,8 @@ public class SelvalaHeartOfTheWilds extends CardImpl { filter.add(new GreatestPowerPredicate()); } + private static final String rule = "Whenever another creature enters the battlefield, its controller may draw a card if its power is greater than each other creature's power"; + public SelvalaHeartOfTheWilds(UUID ownerId) { super(ownerId, 70, "Selvala, Heart of the Wilds", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{1}{G}{G}"); this.expansionSetCode = "CN2"; @@ -73,7 +75,8 @@ public class SelvalaHeartOfTheWilds extends CardImpl { this.toughness = new MageInt(3); // Whenever another creature enters the battlefield, its controller may draw a card if its power is greater than each other creature's power. - this.addAbility(new SelvalaHeartOfTheWildsTriggeredAbility(new SelvalaHeartOfTheWildsEffect(), filter)); + + this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new SelvalaHeartOfTheWildsEffect(), filter, false, SetTargetPointer.PERMANENT, rule)); // {G}, {T}: Add X mana in any combination of colors to your mana pool, where X is the greatest power among creatures you control. this.addAbility(new DynamicManaAbility(new Mana(0,0,0,0,0,0,1, 0), new GreatestPowerYouControlValue(), new TapSourceCost(), @@ -90,23 +93,6 @@ public class SelvalaHeartOfTheWilds extends CardImpl { } } - -class SelvalaHeartOfTheWildsTriggeredAbility extends EntersBattlefieldAllTriggeredAbility { - private static final String rule = "Whenever another creature enters the battlefield, its controller may draw a card if its power is greater than each other creature's power"; - public SelvalaHeartOfTheWildsTriggeredAbility(Effect effect, FilterPermanent filter) { - super(Zone.BATTLEFIELD, effect, filter, false, SetTargetPointer.PERMANENT, rule); - } - - public SelvalaHeartOfTheWildsTriggeredAbility(final SelvalaHeartOfTheWildsTriggeredAbility ability) { - super(ability); - } - @Override - public SelvalaHeartOfTheWildsTriggeredAbility copy() { - return new SelvalaHeartOfTheWildsTriggeredAbility(this); - } - -} - class SelvalaHeartOfTheWildsEffect extends OneShotEffect { public SelvalaHeartOfTheWildsEffect() {