Merge pull request #4293 from Zzooouhh/master

Implemented Corrosion and Desolation

Mage.Sets/src/mage/cards/c/Corrosion.java

@@ -0,0 +1,145 @@
+/*
+ *  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.cards.c;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
+import mage.abilities.common.LeavesBattlefieldTriggeredAbility;
+import mage.abilities.costs.mana.GenericManaCost;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.keyword.CumulativeUpkeepAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.TargetController;
+import mage.counters.CounterType;
+import mage.filter.common.FilterArtifactPermanent;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+import mage.target.common.TargetOpponent;
+
+/**
+ *
+ * @author L_J
+ */
+public class Corrosion extends CardImpl {
+
+    public Corrosion(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{B}{R}");
+
+        // Cumulative upkeep-Pay {1}.
+        this.addAbility(new CumulativeUpkeepAbility(new GenericManaCost(1)));
+
+        // At the beginning of your upkeep, put a rust counter on each artifact target opponent controls. Then destroy each artifact with converted mana cost less than or equal to the number of rust counters on it. Artifacts destroyed this way can't be regenerated.
+        Ability ability = new BeginningOfUpkeepTriggeredAbility(new CorrosionUpkeepEffect(), TargetController.YOU, false);
+        ability.addTarget(new TargetOpponent());
+        this.addAbility(ability);
+        
+        // When Corrosion leaves the battlefield, remove all rust counters from all permanents.
+        this.addAbility(new LeavesBattlefieldTriggeredAbility(new CorrosionRemoveCountersEffect(), false)); 
+    }
+
+    public Corrosion(final Corrosion card) {
+        super(card);
+    }
+
+    @Override
+    public Corrosion copy() {
+        return new Corrosion(this);
+    }
+}
+
+class CorrosionUpkeepEffect extends OneShotEffect {
+    
+    private static final FilterArtifactPermanent filter = new FilterArtifactPermanent();
+    
+    CorrosionUpkeepEffect() {
+        super(Outcome.DestroyPermanent);
+        this.staticText = "put a rust counter on each artifact target opponent controls. Then destroy each artifact with converted mana cost less than or equal to the number of rust counters on it. Artifacts destroyed this way can't be regenerated";
+    }
+    
+    CorrosionUpkeepEffect(final CorrosionUpkeepEffect effect) {
+        super(effect);
+    }
+    
+    @Override
+    public CorrosionUpkeepEffect copy() {
+        return new CorrosionUpkeepEffect(this);
+    }
+    
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player player = game.getPlayer(source.getControllerId());
+        Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(source.getSourceId());
+        if (player != null && sourcePermanent != null) {
+            Player targetPlayer = game.getPlayer(source.getFirstTarget());
+            // put a rust counter on each artifact target opponent controls
+            if (targetPlayer != null) {
+                for (Permanent permanent : game.getBattlefield().getAllActivePermanents(filter, targetPlayer.getId(), game)) {
+                    permanent.addCounters(CounterType.RUST.createInstance(), source, game);
+                }
+            }
+            // destroy each artifact with converted mana cost less than or equal to the number of rust counters on it
+            for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) {
+                if (permanent.getConvertedManaCost() <= permanent.getCounters(game).getCount(CounterType.RUST)) {
+                    permanent.destroy(source.getSourceId(), game, true);
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+}
+
+class CorrosionRemoveCountersEffect extends OneShotEffect {
+
+    public CorrosionRemoveCountersEffect() {
+        super(Outcome.Neutral);
+        staticText = "remove all rust counters from all permanents";
+    }
+
+    public CorrosionRemoveCountersEffect(final CorrosionRemoveCountersEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public CorrosionRemoveCountersEffect copy() {
+        return new CorrosionRemoveCountersEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        for (Permanent permanent : game.getBattlefield().getAllActivePermanents()) {
+            permanent.removeCounters(CounterType.RUST.createInstance(permanent.getCounters(game).getCount(CounterType.RUST)), game);
+        }
+        return true;
+    }
+}

Mage.Sets/src/mage/cards/d/Desolation.java

@@ -0,0 +1,173 @@
+/*
+ *  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.cards.d;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.common.BeginningOfEndStepTriggeredAbility;
+import mage.abilities.effects.OneShotEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.constants.Outcome;
+import mage.constants.TargetController;
+import mage.constants.WatcherScope;
+import mage.filter.FilterPermanent;
+import mage.filter.common.FilterControlledPermanent;
+import mage.filter.predicate.mageobject.CardTypePredicate;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.filter.predicate.permanent.ControllerIdPredicate;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+import mage.target.common.TargetControlledPermanent;
+import mage.watchers.Watcher;
+
+/**
+ *
+ * @author L_J
+ */
+public class Desolation extends CardImpl {
+
+    public Desolation(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}{B}");
+
+        // At the beginning of each end step, each player who tapped a land for mana this turn sacrifices a land. Desolation deals 2 damage to each player who sacrificed a Plains this way.
+        BeginningOfEndStepTriggeredAbility ability = new BeginningOfEndStepTriggeredAbility(new DesolationEffect(), TargetController.ANY, false);
+        this.addAbility(ability, new DesolationWatcher());
+    }
+
+    public Desolation(final Desolation card) {
+        super(card);
+    }
+
+    @Override
+    public Desolation copy() {
+        return new Desolation(this);
+    }
+}
+
+class DesolationEffect extends OneShotEffect {
+
+    private static final FilterPermanent filterPlains = new FilterPermanent();
+
+    static {
+        filterPlains.add(new SubtypePredicate(SubType.PLAINS));
+    }
+
+    public DesolationEffect() {
+        super(Outcome.Damage);
+        this.staticText = "each player who tapped a land for mana this turn sacrifices a land. Desolation deals 2 damage to each player who sacrificed a Plains this way";
+    }
+
+    public DesolationEffect(DesolationEffect copy) {
+        super(copy);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        DesolationWatcher watcher = (DesolationWatcher) game.getState().getWatchers().get(DesolationWatcher.class.getSimpleName());
+        if (watcher != null) {
+            for (UUID playerId : watcher.getPlayersTappedForMana()) {
+                Player player = game.getPlayer(playerId);
+                if (player != null) {
+                    FilterControlledPermanent filter = new FilterControlledPermanent("land");
+                    filter.add(new CardTypePredicate(CardType.LAND));
+                    filter.add(new ControllerIdPredicate(playerId));
+                    TargetControlledPermanent target = new TargetControlledPermanent(1, 1, filter, true);
+                    if (target.canChoose(player.getId(), game)) {
+                        player.choose(Outcome.Sacrifice, target, source.getSourceId(), game);
+                        Permanent permanent = game.getPermanent(target.getFirstTarget());
+                        if (permanent != null) {
+                            permanent.sacrifice(source.getSourceId(), game);
+                            if (filterPlains.match(permanent, game)) {
+                                player.damage(2, source.getSourceId(), game, false, true);
+                            }
+                        }
+                    }
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public DesolationEffect copy() {
+        return new DesolationEffect(this);
+    }
+}
+
+class DesolationWatcher extends Watcher {
+
+    private final Set<UUID> tappedForManaThisTurnPlayers = new HashSet<>();
+
+    public DesolationWatcher() {
+        super(DesolationWatcher.class.getSimpleName(), WatcherScope.GAME);
+    }
+
+    public DesolationWatcher(final DesolationWatcher watcher) {
+        super(watcher);
+        this.tappedForManaThisTurnPlayers.addAll(watcher.tappedForManaThisTurnPlayers);
+    }
+
+    @Override
+    public void watch(GameEvent event, Game game) {
+        if (event.getType() == GameEvent.EventType.UNTAP_STEP_PRE) {
+            reset();
+        }
+        if (event.getType() == GameEvent.EventType.TAPPED_FOR_MANA) {
+            UUID playerId = event.getPlayerId();
+            if (playerId != null) {
+                tappedForManaThisTurnPlayers.add(playerId);
+            }
+        }
+    }
+
+    public Set<UUID> getPlayersTappedForMana() {
+        if (tappedForManaThisTurnPlayers != null) {
+            return tappedForManaThisTurnPlayers;
+        }
+        return new HashSet<>();
+    }
+
+    @Override
+    public void reset() {
+        super.reset();
+        tappedForManaThisTurnPlayers.clear();
+    }
+
+    @Override
+    public DesolationWatcher copy() {
+        return new DesolationWatcher(this);
+    }
+}

Mage.Sets/src/mage/sets/Visions.java

@@ -69,12 +69,14 @@ public class Visions extends ExpansionSet {
         cards.add(new SetCardInfo("Cloud Elemental", 29, Rarity.COMMON, mage.cards.c.CloudElemental.class));
         cards.add(new SetCardInfo("Coercion", 4, Rarity.COMMON, mage.cards.c.Coercion.class));
         cards.add(new SetCardInfo("Coral Atoll", 160, Rarity.UNCOMMON, mage.cards.c.CoralAtoll.class));
+        cards.add(new SetCardInfo("Corrosion", 128, Rarity.RARE, mage.cards.c.Corrosion.class));
         cards.add(new SetCardInfo("Creeping Mold", 53, Rarity.UNCOMMON, mage.cards.c.CreepingMold.class));
         cards.add(new SetCardInfo("Crypt Rats", 5, Rarity.COMMON, mage.cards.c.CryptRats.class));
         cards.add(new SetCardInfo("Daraja Griffin", 102, Rarity.UNCOMMON, mage.cards.d.DarajaGriffin.class));
         cards.add(new SetCardInfo("Dark Privilege", 6, Rarity.COMMON, mage.cards.d.DarkPrivilege.class));
         cards.add(new SetCardInfo("Death Watch", 7, Rarity.COMMON, mage.cards.d.DeathWatch.class));
         cards.add(new SetCardInfo("Desertion", 30, Rarity.RARE, mage.cards.d.Desertion.class));
+        cards.add(new SetCardInfo("Desolation", 8, Rarity.UNCOMMON, mage.cards.d.Desolation.class));
         cards.add(new SetCardInfo("Diamond Kaleidoscope", 143, Rarity.RARE, mage.cards.d.DiamondKaleidoscope.class));
         cards.add(new SetCardInfo("Dormant Volcano", 161, Rarity.UNCOMMON, mage.cards.d.DormantVolcano.class));
         cards.add(new SetCardInfo("Dragon Mask", 144, Rarity.UNCOMMON, mage.cards.d.DragonMask.class));

Mage/src/main/java/mage/counters/CounterType.java

@@ -109,6 +109,7 @@ public enum CounterType {
     PRESSURE("pressure"),
     PREY("prey"),
     REPAIR("repair"),
+    RUST("rust"),
     QUEST("quest"),
     SCREAM("scream"),
     SHELL("shell"),