Merge origin/master

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

@@ -0,0 +1,110 @@
+/*
+ *  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.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.OneShotEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.counters.Counter;
+import mage.filter.FilterPermanent;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.target.Target;
+import mage.target.TargetPermanent;
+
+/**
+ *
+ * @author spjspj
+ */
+public class DeepglowSkate extends CardImpl {
+
+    public DeepglowSkate(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{U}");
+
+        this.subtype.add("Fish");
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(3);
+
+        // When Deepglow Skate enters the battlefield, double the number of each kind of counter on any number of target permanents.
+        Ability ability = new EntersBattlefieldTriggeredAbility(new DeepglowSkateEffect(), true);
+        ability.addTarget(new TargetPermanent(0, Integer.MAX_VALUE, new FilterPermanent(), false));
+        this.addAbility(ability);
+    }
+
+    public DeepglowSkate(final DeepglowSkate card) {
+        super(card);
+    }
+
+    @Override
+    public DeepglowSkate copy() {
+        return new DeepglowSkate(this);
+    }
+}
+
+class DeepglowSkateEffect extends OneShotEffect {
+
+    public DeepglowSkateEffect() {
+        super(Outcome.Benefit);
+        this.staticText = "{this} double the number of each kind of counter on any number of target permanents";
+    }
+
+    public DeepglowSkateEffect(final DeepglowSkateEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public DeepglowSkateEffect copy() {
+        return new DeepglowSkateEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        boolean didOne = false;
+
+        for (Target target : source.getTargets()) {
+            for (UUID targetID : target.getTargets()) {
+                Permanent permanent = game.getPermanent(targetID);
+                if (permanent != null) {
+                    for (Counter counter : permanent.getCounters(game).values()) {
+                        Counter newCounter = new Counter(counter.getName(), counter.getCount());
+                        permanent.addCounters(newCounter, game);
+                        didOne = true;
+                    }
+                }
+            }
+        }
+        return didOne;
+    }
+
+}

Mage.Sets/src/mage/cards/l/LambholtButcher.java

@@ -55,6 +55,7 @@ public class LambholtButcher extends CardImpl {
 
         // this card is the second face of double-faced card
         this.nightCard = true;
+        this.transformable = true;
 
         // At the beginning of each upkeep, if a player cast two or more spells last turn, transform Lambholt Butcher.
         TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), TargetController.ANY, false);

Mage.Sets/src/mage/cards/s/SirensCall.java

@@ -133,6 +133,11 @@ class SirensCallDestroyEffect extends OneShotEffect {
         Player player = game.getPlayer(game.getActivePlayerId());
         if (player != null) {
             for (Permanent permanent : game.getBattlefield().getAllActivePermanents(player.getId())) {
+                                
+                   // Non Creature Cards are safe.
+                if(!permanent.getCardType().contains(CardType.CREATURE))
+                    continue;  
+                
                 // Walls are safe.
                 if (permanent.getSubtype(game).contains("Wall")) {
                     continue;

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

@@ -70,7 +70,6 @@ public class Commander2016 extends ExpansionSet {
         cards.add(new SetCardInfo("Blind Obedience", 59, Rarity.RARE, mage.cards.b.BlindObedience.class));
         cards.add(new SetCardInfo("Blood Tyrant", 183, Rarity.RARE, mage.cards.b.BloodTyrant.class));
         cards.add(new SetCardInfo("Bloodbraid Elf", 184, Rarity.UNCOMMON, mage.cards.b.BloodbraidElf.class));
-	cards.add(new SetCardInfo("Boompile", 52, Rarity.RARE, mage.cards.b.Boompile.class));
         cards.add(new SetCardInfo("Boros Charm", 185, Rarity.UNCOMMON, mage.cards.b.BorosCharm.class));
         cards.add(new SetCardInfo("Brave the Sands", 60, Rarity.UNCOMMON, mage.cards.b.BraveTheSands.class));
         cards.add(new SetCardInfo("Breath of Fury", 121, Rarity.RARE, mage.cards.b.BreathOfFury.class));
@@ -102,6 +101,7 @@ public class Commander2016 extends ExpansionSet {
         cards.add(new SetCardInfo("Darkwater Catacombs", 289, Rarity.RARE, mage.cards.d.DarkwaterCatacombs.class));
         cards.add(new SetCardInfo("Dauntless Escort", 192, Rarity.RARE, mage.cards.d.DauntlessEscort.class));
         cards.add(new SetCardInfo("Decimate", 193, Rarity.RARE, mage.cards.d.Decimate.class));
+        cards.add(new SetCardInfo("Deepglow Skate", 7, Rarity.RARE, mage.cards.d.DeepglowSkate.class));
         cards.add(new SetCardInfo("Den Protector", 147, Rarity.RARE, mage.cards.d.DenProtector.class));
         cards.add(new SetCardInfo("Devastation Tide", 87, Rarity.RARE, mage.cards.d.DevastationTide.class));
         cards.add(new SetCardInfo("Disdainful Stroke", 88, Rarity.COMMON, mage.cards.d.DisdainfulStroke.class));