From 4afcd3be6df0c75eb7740c8597670935ff270000 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 22 Jul 2015 13:31:57 +0200 Subject: [PATCH 1/4] ChampionAbility - If subtypes parameter is set to null, Champion ability works with all creatures. --- .../abilities/keyword/ChampionAbility.java | 45 ++++++++++++------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/Mage/src/mage/abilities/keyword/ChampionAbility.java b/Mage/src/mage/abilities/keyword/ChampionAbility.java index b020ee4694..02e7151602 100644 --- a/Mage/src/mage/abilities/keyword/ChampionAbility.java +++ b/Mage/src/mage/abilities/keyword/ChampionAbility.java @@ -68,42 +68,53 @@ import mage.util.CardUtil; * the former as the direct result of a champion ability. # * */ - public class ChampionAbility extends StaticAbility { protected String[] subtypes; protected String objectDescription; - public ChampionAbility(Card card, String subtype) { this(card, new String[]{subtype}); } - + + /** + * Champion one or more creature types or if the subtype array is empty + * champion every creature. + * + * @param card + * @param subtypes subtypes to champion with, if empty all creatures can be + * used + */ public ChampionAbility(Card card, String[] subtypes) { super(Zone.BATTLEFIELD, null); this.subtypes = subtypes; - StringBuilder sb = new StringBuilder("another "); ArrayList> subtypesPredicates = new ArrayList<>(); - int i = 0; - for (String subtype : this.subtypes) { - subtypesPredicates.add(new SubtypePredicate(subtype)); - if (i == 0) { - sb.append(subtype); - } else { - sb.append(" or ").append(subtype); + if (subtypes != null) { + int i = 0; + for (String subtype : this.subtypes) { + subtypesPredicates.add(new SubtypePredicate(subtype)); + if (i == 0) { + sb.append(subtype); + } else { + sb.append(" or ").append(subtype); + } + i++; } - i++; + } else { + sb.append("creature"); } this.objectDescription = sb.toString(); FilterControlledPermanent filter = new FilterControlledPermanent(objectDescription); - filter.add(Predicates.or(subtypesPredicates)); + if (subtypes != null) { + filter.add(Predicates.or(subtypesPredicates)); + } filter.add(new AnotherPredicate()); // When this permanent enters the battlefield, sacrifice it unless you exile another [object] you control. Ability ability1 = new EntersBattlefieldTriggeredAbility( - new SacrificeSourceUnlessPaysEffect(new ChampionExileCost(filter, new StringBuilder(card.getName()).append(" championed permanents").toString())),false); + new SacrificeSourceUnlessPaysEffect(new ChampionExileCost(filter, new StringBuilder(card.getName()).append(" championed permanents").toString())), false); ability1.setRuleVisible(false); addSubAbility(ability1); @@ -139,7 +150,7 @@ class ChampionExileCost extends CostImpl { private String exileZone = null; public ChampionExileCost(FilterControlledPermanent filter, String exileZone) { - this.addTarget(new TargetControlledPermanent(1,1,filter, true)); + this.addTarget(new TargetControlledPermanent(1, 1, filter, true)); this.text = "exile " + filter.getMessage() + " you control"; this.exileZone = exileZone; } @@ -152,11 +163,11 @@ class ChampionExileCost extends CostImpl { @Override public boolean pay(Ability ability, Game game, UUID sourceId, UUID controllerId, boolean noMana) { Player controller = game.getPlayer(controllerId); - MageObject sourceObject = ability.getSourceObject(game); + MageObject sourceObject = ability.getSourceObject(game); if (controller != null && sourceObject != null) { if (targets.choose(Outcome.Exile, controllerId, sourceId, game)) { UUID exileId = CardUtil.getExileZoneId(game, ability.getSourceId(), ability.getSourceObjectZoneChangeCounter()); - for (UUID targetId: targets.get(0).getTargets()) { + for (UUID targetId : targets.get(0).getTargets()) { Permanent permanent = game.getPermanent(targetId); if (permanent == null) { return false; From a6bb51decaa31cd451ac0a02287ab114d2d74b26 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 22 Jul 2015 13:53:09 +0200 Subject: [PATCH 2/4] Added Jolrael, Empress of Beasts. --- .../sets/prophecy/JolraelEmpressOfBeasts.java | 122 ++++++++++++++++++ .../timeshifted/JolraelEmpressOfBeasts.java | 54 ++++++++ 2 files changed, 176 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/prophecy/JolraelEmpressOfBeasts.java create mode 100644 Mage.Sets/src/mage/sets/timeshifted/JolraelEmpressOfBeasts.java diff --git a/Mage.Sets/src/mage/sets/prophecy/JolraelEmpressOfBeasts.java b/Mage.Sets/src/mage/sets/prophecy/JolraelEmpressOfBeasts.java new file mode 100644 index 0000000000..b0f0fe3aa8 --- /dev/null +++ b/Mage.Sets/src/mage/sets/prophecy/JolraelEmpressOfBeasts.java @@ -0,0 +1,122 @@ +/* + * 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.prophecy; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.common.DiscardTargetCost; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.common.continuous.BecomesCreatureAllEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.filter.FilterCard; +import mage.filter.FilterPermanent; +import mage.filter.predicate.other.PlayerIdPredicate; +import mage.game.Game; +import mage.game.permanent.token.Token; +import mage.players.Player; +import mage.target.common.TargetCardInHand; + +/** + * + * @author LevelX2 + */ +public class JolraelEmpressOfBeasts extends CardImpl { + + public JolraelEmpressOfBeasts(UUID ownerId) { + super(ownerId, 115, "Jolrael, Empress of Beasts", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); + this.expansionSetCode = "PCY"; + this.supertype.add("Legendary"); + this.subtype.add("Human"); + this.subtype.add("Spellshaper"); + this.power = new MageInt(3); + this.toughness = new MageInt(3); + + // {2}{G}, {tap}, Discard two cards: All lands target player controls become 3/3 creatures until end of turn. They're still lands. + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new JolraelEmpressOfBeastsEffect(), new ManaCostsImpl<>("{2}{G}")); + ability.addCost(new TapSourceCost()); + ability.addCost(new DiscardTargetCost(new TargetCardInHand(2, new FilterCard("two cards")))); + this.addAbility(ability); + } + + public JolraelEmpressOfBeasts(final JolraelEmpressOfBeasts card) { + super(card); + } + + @Override + public JolraelEmpressOfBeasts copy() { + return new JolraelEmpressOfBeasts(this); + } +} + +class JolraelEmpressOfBeastsEffect extends OneShotEffect { + + public JolraelEmpressOfBeastsEffect() { + super(Outcome.Benefit); + this.staticText = "All lands target player controls become 3/3 creatures until end of turn. They're still lands."; + } + + public JolraelEmpressOfBeastsEffect(final JolraelEmpressOfBeastsEffect effect) { + super(effect); + } + + @Override + public JolraelEmpressOfBeastsEffect copy() { + return new JolraelEmpressOfBeastsEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); + if (targetPlayer != null) { + FilterPermanent filter = new FilterPermanent(); + filter.add(new PlayerIdPredicate(targetPlayer.getId())); + game.addEffect(new BecomesCreatureAllEffect(new JolraelLandsToken(), "lands", filter, Duration.EndOfTurn), source); + return true; + } + return false; + } +} + +class JolraelLandsToken extends Token { + + public JolraelLandsToken() { + super("", "3/3 creature"); + cardType.add(CardType.CREATURE); + power = new MageInt(3); + toughness = new MageInt(3); + } +} diff --git a/Mage.Sets/src/mage/sets/timeshifted/JolraelEmpressOfBeasts.java b/Mage.Sets/src/mage/sets/timeshifted/JolraelEmpressOfBeasts.java new file mode 100644 index 0000000000..7df8b37299 --- /dev/null +++ b/Mage.Sets/src/mage/sets/timeshifted/JolraelEmpressOfBeasts.java @@ -0,0 +1,54 @@ +/* + * 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.timeshifted; + +import java.util.UUID; +import mage.constants.Rarity; + +/** + * + * @author LevelX2 + */ +public class JolraelEmpressOfBeasts extends mage.sets.prophecy.JolraelEmpressOfBeasts { + + public JolraelEmpressOfBeasts(UUID ownerId) { + super(ownerId); + this.cardNumber = 81; + this.expansionSetCode = "TSB"; + this.rarity = Rarity.SPECIAL; + } + + public JolraelEmpressOfBeasts(final JolraelEmpressOfBeasts card) { + super(card); + } + + @Override + public JolraelEmpressOfBeasts copy() { + return new JolraelEmpressOfBeasts(this); + } +} From 8fd006caa5a74aaf61ade1f3be88e62277af913e Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 22 Jul 2015 13:57:18 +0200 Subject: [PATCH 3/4] Added Jolrael, Empress of Beasts (added target). --- Mage.Sets/src/mage/sets/prophecy/JolraelEmpressOfBeasts.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Mage.Sets/src/mage/sets/prophecy/JolraelEmpressOfBeasts.java b/Mage.Sets/src/mage/sets/prophecy/JolraelEmpressOfBeasts.java index b0f0fe3aa8..2bda3a4344 100644 --- a/Mage.Sets/src/mage/sets/prophecy/JolraelEmpressOfBeasts.java +++ b/Mage.Sets/src/mage/sets/prophecy/JolraelEmpressOfBeasts.java @@ -48,6 +48,7 @@ import mage.filter.predicate.other.PlayerIdPredicate; import mage.game.Game; import mage.game.permanent.token.Token; import mage.players.Player; +import mage.target.TargetPlayer; import mage.target.common.TargetCardInHand; /** @@ -69,6 +70,7 @@ public class JolraelEmpressOfBeasts extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new JolraelEmpressOfBeastsEffect(), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardTargetCost(new TargetCardInHand(2, new FilterCard("two cards")))); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } From 1e2c4a894a23102ec3e0fb33897e025e6093f2e6 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 22 Jul 2015 13:58:26 +0200 Subject: [PATCH 4/4] Added Jolrael, Empress of Beasts (added land filter). --- Mage.Sets/src/mage/sets/prophecy/JolraelEmpressOfBeasts.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/sets/prophecy/JolraelEmpressOfBeasts.java b/Mage.Sets/src/mage/sets/prophecy/JolraelEmpressOfBeasts.java index 2bda3a4344..b2c681bde0 100644 --- a/Mage.Sets/src/mage/sets/prophecy/JolraelEmpressOfBeasts.java +++ b/Mage.Sets/src/mage/sets/prophecy/JolraelEmpressOfBeasts.java @@ -44,6 +44,7 @@ import mage.constants.Rarity; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.FilterPermanent; +import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.other.PlayerIdPredicate; import mage.game.Game; import mage.game.permanent.token.Token; @@ -104,7 +105,7 @@ class JolraelEmpressOfBeastsEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (targetPlayer != null) { - FilterPermanent filter = new FilterPermanent(); + FilterPermanent filter = new FilterLandPermanent(); filter.add(new PlayerIdPredicate(targetPlayer.getId())); game.addEffect(new BecomesCreatureAllEffect(new JolraelLandsToken(), "lands", filter, Duration.EndOfTurn), source); return true;