[M12,M10] Djinn of Wishes. Fixes.

Mage.Sets/src/mage/sets/magic2010/DjinnOfWishes.java

@@ -0,0 +1,161 @@
+/*
+ *  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.magic2010;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+
+import mage.Constants;
+import mage.Constants.CardType;
+import mage.Constants.Rarity;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldAbility;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.RemoveCountersSourceCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.counter.AddCountersSourceEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.Card;
+import mage.cards.CardImpl;
+import mage.cards.Cards;
+import mage.cards.CardsImpl;
+import mage.choices.Choice;
+import mage.choices.ChoiceImpl;
+import mage.counters.CounterType;
+import mage.filter.FilterPermanent;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+import org.w3c.dom.css.Counter;
+
+/**
+ *
+ * @author nantuko
+ */
+public class DjinnOfWishes extends CardImpl<DjinnOfWishes> {
+
+	private static final String ruleText = "Djinn of Wishes enters the battlefield with three wish counters on it";
+
+    public DjinnOfWishes(UUID ownerId) {
+        super(ownerId, 50, "Djinn of Wishes", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{U}{U}");
+        this.expansionSetCode = "M10";
+        this.subtype.add("Djinn");
+
+        this.color.setBlue(true);
+        this.power = new MageInt(4);
+        this.toughness = new MageInt(4);
+
+        this.addAbility(FlyingAbility.getInstance());
+        // Djinn of Wishes enters the battlefield with three wish counters on it.
+		this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.WISH.createInstance(3)), ruleText));
+
+        // {2}{U}{U}, Remove a wish counter from Djinn of Wishes: Reveal the top card of your library. You may play that card without paying its mana cost. If you don't, exile it.
+		Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DjinnOfWishesEffect1(), new ManaCostsImpl("{2}{U}{U}"));
+		ability.addCost(new RemoveCountersSourceCost(CounterType.WISH.createInstance()));
+		this.addAbility(ability);
+    }
+
+    public DjinnOfWishes(final DjinnOfWishes card) {
+        super(card);
+    }
+
+    @Override
+    public DjinnOfWishes copy() {
+        return new DjinnOfWishes(this);
+    }
+}
+
+class DjinnOfWishesEffect1 extends OneShotEffect<DjinnOfWishesEffect1> {
+
+	private static FilterPermanent filter = new FilterCreaturePermanent();
+
+	public DjinnOfWishesEffect1() {
+		super(Constants.Outcome.PlayForFree);
+		staticText = "Reveal the top card of your library. You may play that card without paying its mana cost. If you don't, exile it";
+	}
+
+	public DjinnOfWishesEffect1(final DjinnOfWishesEffect1 effect) {
+		super(effect);
+	}
+
+	@Override
+	public boolean apply(Game game, Ability source) {
+		Player player = game.getPlayer(source.getControllerId());
+		if (player != null && player.getLibrary().size() > 0) {
+			Card card = player.getLibrary().getFromTop(game);
+			Cards cards = new CardsImpl();
+			cards.add(card);
+			player.revealCards("Djinn Of Wishes", cards, game);
+
+			Choice abilityChoice = new ChoiceImpl();
+			abilityChoice.setMessage("Play " + card.getName() + " without paying its mana cost?");
+			Set<String> abilities = new HashSet<String>();
+			abilities.add("Yes");
+			abilities.add("No");
+			abilityChoice.setChoices(abilities);
+
+			player.choose(Constants.Outcome.PlayForFree, abilityChoice, game);
+
+			System.out.println(abilityChoice);
+			System.out.println(abilityChoice.getChoice());
+
+			player.getLibrary().removeFromTop(game);
+
+			boolean used = false;
+			if (abilityChoice.getChoice() != null && abilityChoice.getChoice().equals("Yes")) {
+				if (card.getCardType().contains(CardType.LAND)) {
+					// If the revealed card is a land, you can play it only if it's your turn and you haven't yet played a land this turn.
+					if (game.getActivePlayerId().equals(player.getId()) && player.getLandsPlayed() < player.getLandsPerTurn()) {
+						used = true;
+						player.playLand(card, game);
+					}
+				} else {
+					used = true;
+					player.cast(card.getSpellAbility(), game, true);
+				}
+			}
+
+			if (!used) {
+				card.moveToZone(Constants.Zone.EXILED, source.getSourceId(), game, false);
+			}
+
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public DjinnOfWishesEffect1 copy() {
+		return new DjinnOfWishesEffect1(this);
+	}
+
+}

Mage.Sets/src/mage/sets/magic2012/DjinnOfWishes.java

@@ -0,0 +1,52 @@
+/*
+ *  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;
+
+/**
+ *
+ * @author nantuko
+ */
+public class DjinnOfWishes extends mage.sets.magic2010.DjinnOfWishes {
+
+    public DjinnOfWishes(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 51;
+        this.expansionSetCode = "M12";
+    }
+
+    public DjinnOfWishes(final DjinnOfWishes card) {
+        super(card);
+    }
+
+    @Override
+    public DjinnOfWishes copy() {
+        return new DjinnOfWishes(this);
+    }
+}

Mage.Sets/src/mage/sets/scarsofmirrodin/HandOfThePraetors.java

@@ -71,7 +71,7 @@ public class HandOfThePraetors extends CardImpl<HandOfThePraetors> {
 
         this.addAbility(InfectAbility.getInstance());
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true)));
-        SpellCastTriggeredAbility ability = new SpellCastTriggeredAbility(new AddPoisonCounterTargetEffect(1), filterSpell, true);
+        SpellCastTriggeredAbility ability = new SpellCastTriggeredAbility(new AddPoisonCounterTargetEffect(1), filterSpell, false);
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
     }

Mage.Sets/src/mage/sets/scarsofmirrodin/RustTick.java

@@ -189,7 +189,7 @@ class RustTickSelfRestrictionEffect extends RestrictionEffect<RustTickSelfRestri
 		Player playerControls = game.getPlayer(permanent.getControllerId());
 		playerControls.choose(Constants.Outcome.Neutral, abilityChoice, game);
 
-		return abilityChoice.getChoice().equals("Yes");
+		return abilityChoice.getChoice() != null && abilityChoice.getChoice().equals("Yes");
 	}
 
 	@Override

Mage/src/mage/Constants.java

@@ -313,6 +313,7 @@ public final class Constants {
 		DrawCard(true),
 		Discard(false),
 		Sacrifice(false),
+		PlayForFree(true),
 		ReturnToHand(false),
 		Exile(false),
 		Protect(true),

Mage/src/mage/counters/CounterType.java

@@ -51,7 +51,8 @@ public enum CounterType {
     EON(new EonCounter().name),
 	AWAKENING(new AwakeningCounter().name),
     DEVOTION(new DevotionCounter().name),
-    DIVINE(new DivineCounter().name);
+    DIVINE(new DivineCounter().name),
+	WISH(new WishCounter().name);
 
     private String name;
 
@@ -117,6 +118,8 @@ public enum CounterType {
 				return new DevotionCounter(amount);
             case DIVINE:
                 return new DivineCounter(amount);
+			case WISH:
+				return new WishCounter(amount);
         }
         return null;
     }

Mage/src/mage/counters/common/WishCounter.java

@@ -0,0 +1,21 @@
+package mage.counters.common;
+
+import mage.counters.Counter;
+
+/**
+ * Wish counter.
+ *
+ * @author nantuko
+ */
+public class WishCounter extends Counter<WishCounter> {
+
+    public WishCounter() {
+        super("Wish");
+        this.count = 1;
+    }
+
+    public WishCounter(int amount) {
+        super("Wish");
+        this.count = amount;
+    }
+}