Merge

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<JaceMemoryAdept> {
+
+	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);
+	}
+}
+
+

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<VisionsOfBeyond> {
+
+    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<VisionsOfBeyondEffect> {
+
+	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);
+	}
+}

Mage/src/mage/abilities/common/EntersBattlefieldAbility.java

@@ -39,6 +39,10 @@ import mage.abilities.effects.EntersBattlefieldEffect;
  */
 public class EntersBattlefieldAbility extends StaticAbility<EntersBattlefieldAbility> {
 
+	public EntersBattlefieldAbility(Effect effect) {
+		super(Zone.BATTLEFIELD, new EntersBattlefieldEffect(effect, ""));
+	}
+
 	public EntersBattlefieldAbility(Effect effect, String rule) {
 		super(Zone.BATTLEFIELD, new EntersBattlefieldEffect(effect, rule));
 	}

Mage/src/mage/abilities/costs/common/RemoveCountersSourceCost.java

@@ -47,13 +47,15 @@ public class RemoveCountersSourceCost extends CostImpl<RemoveCountersSourceCost>
 	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) {

Mage/src/mage/abilities/effects/common/DrawCardControllerEffect.java

@@ -37,7 +37,6 @@ import mage.game.Game;
 import mage.players.Player;
 
 /**
- *
  * @author BetaSteward_at_googlemail.com
  */
 public class DrawCardControllerEffect extends OneShotEffect<DrawCardControllerEffect> {
@@ -76,9 +75,9 @@ public class DrawCardControllerEffect extends OneShotEffect<DrawCardControllerEf
 
 	private void setText() {
 		StringBuilder sb = new StringBuilder();
-        sb.append("draw ").append(amount).append(" card");
+		boolean oneCard = amount instanceof StaticValue && amount.calculate(null, null) == 1;
-        if (amount instanceof StaticValue && amount.calculate(null, null) == 1) {
+		sb.append("draw ").append(oneCard ? "a" : amount).append(" card");
-        } else {
+		if (!oneCard) {
 			sb.append("s");
 		}
 		String message = amount.getMessage();