added 2 SOM - Kuldotha Phoenix + Molten Psyche

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

@@ -0,0 +1,76 @@
+/*
+ *  Copyright 2011 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.scarsofmirrodin;
+
+import java.util.UUID;
+import mage.Constants.CardType;
+import mage.Constants.Rarity;
+import mage.Constants.Zone;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.MetalcraftCost;
+import mage.abilities.costs.common.OnlyDuringUpkeepCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.abilities.keyword.HasteAbility;
+import mage.cards.CardImpl;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class KuldothaPhoenix extends CardImpl<KuldothaPhoenix> {
+
+	public KuldothaPhoenix(UUID ownerId) {
+		super(ownerId, 95, "Kuldotha Phoenix", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{R}{R}{R}");
+		this.expansionSetCode = "SOM";
+		this.subtype.add("Phoenix");
+		this.color.setRed(true);
+		this.power = new MageInt(4);
+		this.toughness = new MageInt(4);
+
+		this.addAbility(FlyingAbility.getInstance());
+		this.addAbility(HasteAbility.getInstance());
+		Ability ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(true), new ManaCostsImpl("{4}"));
+		ability.addCost(new MetalcraftCost());
+		ability.addCost(new OnlyDuringUpkeepCost());
+		this.addAbility(ability);
+	}
+
+	public KuldothaPhoenix(final KuldothaPhoenix card) {
+		super(card);
+	}
+
+	@Override
+	public KuldothaPhoenix copy() {
+		return new KuldothaPhoenix(this);
+	}
+
+}

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

@@ -0,0 +1,150 @@
+/*
+ *  Copyright 2011 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.scarsofmirrodin;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import mage.Constants.CardType;
+import mage.Constants.Outcome;
+import mage.Constants.Rarity;
+import mage.abilities.Ability;
+import mage.abilities.condition.common.Metalcraft;
+import mage.abilities.effects.OneShotEffect;
+import mage.cards.CardImpl;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.players.Player;
+import mage.watchers.WatcherImpl;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class MoltenPsyche extends CardImpl<MoltenPsyche> {
+
+	public MoltenPsyche(UUID ownerId) {
+		super(ownerId, 98, "Molten Psyche", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{R}{R}");
+		this.expansionSetCode = "SOM";
+		this.color.setRed(true);
+		this.getSpellAbility().addEffect(new MoltenPsycheEffect());
+		this.watchers.add(new MoltenPsycheWatcher(ownerId));
+	}
+
+	public MoltenPsyche(final MoltenPsyche card) {
+		super(card);
+	}
+
+	@Override
+	public MoltenPsyche copy() {
+		return new MoltenPsyche(this);
+	}
+
+}
+
+class MoltenPsycheEffect extends OneShotEffect<MoltenPsycheEffect> {
+
+	public MoltenPsycheEffect() {
+		super(Outcome.Neutral);
+		staticText = "Each player shuffles the cards from his or her hand into his or her library, then draws that many cards.\\n" + 
+				"Metalcraft — If you control three or more artifacts, {this} deals damage to each opponent equal to the number of cards that player has drawn this turn.";
+	}
+
+	public MoltenPsycheEffect(final MoltenPsycheEffect effect) {
+		super(effect);
+	}
+	
+	@Override
+	public boolean apply(Game game, Ability source) {
+		Player sourcePlayer = game.getPlayer(source.getControllerId());
+		for (UUID playerId: sourcePlayer.getInRange()) {
+			Player player = game.getPlayer(playerId);
+			if (player != null) {
+				int count = player.getHand().size();
+				player.getLibrary().addAll(player.getHand().getCards(game), game);
+				player.getLibrary().shuffle();
+				player.getHand().clear();
+				player.drawCards(count, game);
+				if (Metalcraft.getInstance().apply(game, source) && !playerId.equals(source.getControllerId())) {
+					MoltenPsycheWatcher watcher = (MoltenPsycheWatcher) game.getState().getWatchers().get(source.getControllerId(), "CardsDrawnMoltenPsyche");
+					player.damage(watcher.getDraws(playerId), source.getId(), game, false, true);
+				}
+			}
+		}
+		return true;
+	}
+
+	@Override
+	public MoltenPsycheEffect copy() {
+		return new MoltenPsycheEffect(this);
+	}
+
+}
+
+class MoltenPsycheWatcher extends WatcherImpl<MoltenPsycheWatcher> {
+
+	private Map<UUID, Integer> draws = new HashMap<UUID, Integer>();
+	
+	public MoltenPsycheWatcher(UUID controllerId) {
+        super("CardsDrawnMoltenPsyche", controllerId);
+	}
+	
+	public MoltenPsycheWatcher(final MoltenPsycheWatcher watcher) {
+		super(watcher);
+	}
+	
+	@Override
+	public void watch(GameEvent event, Game game) {
+        if (event.getType() == GameEvent.EventType.DREW_CARD) {
+			int count = 1;
+			if (draws.containsKey(event.getPlayerId())) {
+				count += draws.get(event.getPlayerId());
+			}
+			draws.put(event.getPlayerId(), count);
+		}
+	}
+
+    @Override
+    public void reset() {
+        super.reset();
+        draws.clear();
+    }
+
+	public int getDraws(UUID playerId) {
+		if (draws.containsKey(playerId)) {
+			return draws.get(playerId);
+		}
+		return 0;
+	}
+	
+	@Override
+	public MoltenPsycheWatcher copy() {
+		return new MoltenPsycheWatcher(this);
+	}
+	
+}

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

@@ -0,0 +1,67 @@
+/*
+ *  Copyright 2011 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.abilities.costs.common;
+
+import java.util.UUID;
+import mage.Constants.PhaseStep;
+import mage.abilities.costs.CostImpl;
+import mage.game.Game;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class OnlyDuringUpkeepCost extends CostImpl<OnlyDuringUpkeepCost> {
+
+	public OnlyDuringUpkeepCost() {
+		text = "Activate this ability only during your upkeep";
+	}
+	
+	public OnlyDuringUpkeepCost(final OnlyDuringUpkeepCost cost) {
+		super(cost);
+	}
+	
+	@Override
+	public OnlyDuringUpkeepCost copy() {
+		return new OnlyDuringUpkeepCost(this);
+	}
+
+	@Override
+	public boolean canPay(UUID sourceId, UUID controllerId, Game game) {
+		if (game.getActivePlayerId().equals(controllerId) && game.getStep().getType() == PhaseStep.UPKEEP)
+			return true;
+		return false;
+	}
+
+	@Override
+	public boolean pay(Game game, UUID sourceId, UUID controllerId, boolean noMana) {
+		this.paid = true;
+		return paid;
+	}
+	
+}