From 3961f64c7c74b78bbfaa8ee08a1608d0e7a1cfe0 Mon Sep 17 00:00:00 2001 From: magenoxx Date: Tue, 9 Aug 2011 09:28:06 +0400 Subject: [PATCH 1/3] Fixes in texts. --- .../common/EntersBattlefieldAbility.java | 4 +++ .../common/RemoveCountersSourceCost.java | 6 +++-- .../common/DrawCardControllerEffect.java | 27 +++++++++---------- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/Mage/src/mage/abilities/common/EntersBattlefieldAbility.java b/Mage/src/mage/abilities/common/EntersBattlefieldAbility.java index 79436c685a1..ea1becb40d8 100644 --- a/Mage/src/mage/abilities/common/EntersBattlefieldAbility.java +++ b/Mage/src/mage/abilities/common/EntersBattlefieldAbility.java @@ -39,6 +39,10 @@ import mage.abilities.effects.EntersBattlefieldEffect; */ public class EntersBattlefieldAbility extends StaticAbility { + public EntersBattlefieldAbility(Effect effect) { + super(Zone.BATTLEFIELD, new EntersBattlefieldEffect(effect, "")); + } + public EntersBattlefieldAbility(Effect effect, String rule) { super(Zone.BATTLEFIELD, new EntersBattlefieldEffect(effect, rule)); } diff --git a/Mage/src/mage/abilities/costs/common/RemoveCountersSourceCost.java b/Mage/src/mage/abilities/costs/common/RemoveCountersSourceCost.java index 1c8ef227dd5..396466b31a4 100644 --- a/Mage/src/mage/abilities/costs/common/RemoveCountersSourceCost.java +++ b/Mage/src/mage/abilities/costs/common/RemoveCountersSourceCost.java @@ -47,13 +47,15 @@ public class RemoveCountersSourceCost extends CostImpl public RemoveCountersSourceCost(String name, int amount) { this.amount = amount; this.name = name; - this.text = "Remove " + amount + " " + name + " counters from {this}"; + this.text = "Remove " + (amount == 1 ? "a" : amount) + " " + name + " counter" + + (amount != 1 ? "s" : "") + " from {this}"; } public RemoveCountersSourceCost(Counter counter) { this.amount = counter.getCount(); this.name = counter.getName(); - this.text = "Remove " + amount + " " + name + " counters from {this}"; + this.text = "Remove " + (amount == 1 ? "a" : amount) + " " + name + " counter" + + (amount != 1 ? "s" : "") + "from {this}"; } public RemoveCountersSourceCost(RemoveCountersSourceCost cost) { diff --git a/Mage/src/mage/abilities/effects/common/DrawCardControllerEffect.java b/Mage/src/mage/abilities/effects/common/DrawCardControllerEffect.java index b6e95a63b30..e0d5312b368 100644 --- a/Mage/src/mage/abilities/effects/common/DrawCardControllerEffect.java +++ b/Mage/src/mage/abilities/effects/common/DrawCardControllerEffect.java @@ -37,16 +37,15 @@ import mage.game.Game; import mage.players.Player; /** - * * @author BetaSteward_at_googlemail.com */ public class DrawCardControllerEffect extends OneShotEffect { protected DynamicValue amount; - public DrawCardControllerEffect(int amount) { - this(new StaticValue(amount)); - } + public DrawCardControllerEffect(int amount) { + this(new StaticValue(amount)); + } public DrawCardControllerEffect(DynamicValue amount) { super(Outcome.DrawCard); @@ -76,16 +75,16 @@ public class DrawCardControllerEffect extends OneShotEffect 0) { - sb.append(" for each "); - } - sb.append(message); + boolean oneCard = amount instanceof StaticValue && amount.calculate(null, null) == 1; + sb.append("draw ").append(oneCard ? "a" : amount).append(" card"); + if (!oneCard) { + sb.append("s"); + } + String message = amount.getMessage(); + if (message.length() > 0) { + sb.append(" for each "); + } + sb.append(message); staticText = sb.toString(); } From 8f0dae7c465255f218e872bccf16174d066db7c5 Mon Sep 17 00:00:00 2001 From: magenoxx Date: Tue, 9 Aug 2011 09:28:23 +0400 Subject: [PATCH 2/3] [M12] Jace, Memory Adept --- .../mage/sets/magic2012/JaceMemoryAdept.java | 125 ++++++++++++++++++ 1 file changed, 125 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/magic2012/JaceMemoryAdept.java diff --git a/Mage.Sets/src/mage/sets/magic2012/JaceMemoryAdept.java b/Mage.Sets/src/mage/sets/magic2012/JaceMemoryAdept.java new file mode 100644 index 00000000000..95601f807ba --- /dev/null +++ b/Mage.Sets/src/mage/sets/magic2012/JaceMemoryAdept.java @@ -0,0 +1,125 @@ +/* + * 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.magic2012; + +import java.util.UUID; + +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.abilities.Ability; +import mage.abilities.LoyaltyAbility; +import mage.abilities.Mode; +import mage.abilities.common.EntersBattlefieldAbility; +import mage.abilities.effects.Effect; +import mage.abilities.effects.Effects; +import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardTargetEffect; +import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; +import mage.abilities.effects.common.counter.AddCountersSourceEffect; +import mage.cards.CardImpl; +import mage.counters.CounterType; +import mage.game.Game; +import mage.players.Player; +import mage.target.Target; +import mage.target.TargetPlayer; + +/** + * @author nantuko + */ +public class JaceMemoryAdept extends CardImpl { + + public JaceMemoryAdept(UUID ownerId) { + super(ownerId, 58, "Jace, Memory Adept", Rarity.MYTHIC, new CardType[]{}, "{3}{U}{U}"); + this.expansionSetCode = "M12"; + this.supertype.add("Planeswalker"); + this.supertype.add("Jace"); + + this.color.setBlue(true); + + this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(4)))); + + // +1: Draw a card. Target player puts the top card of his or her library into his or her graveyard. + LoyaltyAbility ability1 = new LoyaltyAbility(new DrawCardControllerEffect(1), 1); + ability1.addEffect(new PutLibraryIntoGraveTargetEffect(1)); + ability1.addTarget(new TargetPlayer()); + this.addAbility(ability1); + + // 0: Target player puts the top ten cards of his or her library into his or her graveyard. + LoyaltyAbility ability2 = new LoyaltyAbility(new PutLibraryIntoGraveTargetEffect(10), 0); + ability2.addTarget(new TargetPlayer()); + this.addAbility(ability2); + + // -7: Any number of target players each draw twenty cards. + LoyaltyAbility ability3 = new LoyaltyAbility(new JaceMemoryAdeptEffect(20), -7); + ability3.addTarget(new TargetPlayer(0)); //any number + this.addAbility(ability3); + } + + public JaceMemoryAdept(final JaceMemoryAdept card) { + super(card); + } + + @Override + public JaceMemoryAdept copy() { + return new JaceMemoryAdept(this); + } +} + +class JaceMemoryAdeptEffect extends DrawCardTargetEffect { + + public JaceMemoryAdeptEffect(int amount) { + super(amount); + staticText = "Any number of target players each draw twenty cards"; + } + + public JaceMemoryAdeptEffect(final DrawCardTargetEffect effect) { + super(effect); + } + + @Override + public boolean apply(Game game, Ability source) { + for (UUID target : targetPointer.getTargets(source)) { + Player player = game.getPlayer(target); + if (player != null) { + player.drawCards(amount.calculate(game, source), game); + } + } + return true; + } + + @Override + public String getText(Mode mode) { + return staticText; + } + + public JaceMemoryAdeptEffect copy() { + return new JaceMemoryAdeptEffect(this); + } +} + + From 9b75c27dc4fab4867f97053901b194a0fa787059 Mon Sep 17 00:00:00 2001 From: magenoxx Date: Tue, 9 Aug 2011 09:37:22 +0400 Subject: [PATCH 3/3] [M12] Visions of Beyond --- .../mage/sets/magic2012/VisionsOfBeyond.java | 100 ++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/magic2012/VisionsOfBeyond.java diff --git a/Mage.Sets/src/mage/sets/magic2012/VisionsOfBeyond.java b/Mage.Sets/src/mage/sets/magic2012/VisionsOfBeyond.java new file mode 100644 index 00000000000..1d08ecfb606 --- /dev/null +++ b/Mage.Sets/src/mage/sets/magic2012/VisionsOfBeyond.java @@ -0,0 +1,100 @@ +/* + * 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.magic2012; + +import java.util.UUID; + +import mage.Constants; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.abilities.Ability; +import mage.abilities.effects.Effect; +import mage.abilities.effects.OneShotEffect; +import mage.cards.CardImpl; +import mage.game.Game; +import mage.players.Player; + +/** + * + * @author nantuko + */ +public class VisionsOfBeyond extends CardImpl { + + public VisionsOfBeyond(UUID ownerId) { + super(ownerId, 80, "Visions of Beyond", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{U}"); + this.expansionSetCode = "M12"; + + this.color.setBlue(true); + + // Draw a card. If a graveyard has twenty or more cards in it, draw three cards instead. + this.getSpellAbility().addEffect(new VisionsOfBeyondEffect()); + } + + public VisionsOfBeyond(final VisionsOfBeyond card) { + super(card); + } + + @Override + public VisionsOfBeyond copy() { + return new VisionsOfBeyond(this); + } +} + +class VisionsOfBeyondEffect extends OneShotEffect { + + public VisionsOfBeyondEffect() { + super(Constants.Outcome.DrawCard); + staticText = "Draw a card. If a graveyard has twenty or more cards in it, draw three cards instead"; + } + + public VisionsOfBeyondEffect(VisionsOfBeyondEffect effect) { + super(effect); + } + + @Override + public boolean apply(Game game, Ability source) { + Player sourcePlayer = game.getPlayer(source.getControllerId()); + int count = 1; + for (UUID playerId: sourcePlayer.getInRange()) { + Player player = game.getPlayer(playerId); + if (player != null) { + if (player.getGraveyard().size() >= 20) { + count = 3; + break; + } + } + } + sourcePlayer.drawCards(count, game); + return true; + } + + @Override + public VisionsOfBeyondEffect copy() { + return new VisionsOfBeyondEffect(this); + } +}