Merge remote-tracking branch 'upstream/master' into CMH-GuiltyConscienceAndBackfire

Mage/src/main/java/mage/abilities/costs/WrapperCost.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2017 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;
+
+import java.io.Serializable;
+
+/**
+ * Some Cost act like wrappers hiding real costs inside
+ *
+ * @author noxx
+ */
+public interface WrapperCost extends Serializable {
+
+    Cost getOriginalCost();
+
+}

Mage/src/main/java/mage/abilities/costs/common/CyclingCost.java

@@ -0,0 +1,119 @@
+/*
+ *  Copyright 2017 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 mage.abilities.Ability;
+import mage.abilities.costs.Cost;
+import mage.abilities.costs.WrapperCost;
+import mage.game.Game;
+import mage.game.events.CostEvent;
+import mage.game.events.GameEvent;
+import mage.target.Targets;
+
+import java.util.UUID;
+
+/**
+ * Cycling Cost to interact with cards like 'New Perspectives'
+ */
+public class CyclingCost implements Cost, WrapperCost {
+
+    protected Cost cost;
+
+    public CyclingCost(Cost cost) {
+        this.cost = cost;
+    }
+
+    public CyclingCost(final CyclingCost cost) {
+        this.cost = cost.cost.copy();
+    }
+
+    @Override
+    public boolean pay(Ability ability, Game game, UUID sourceId, UUID controllerId, boolean noMana) {
+        return pay(ability, game, sourceId, controllerId, noMana, cost);
+    }
+
+    @Override
+    public boolean canPay(Ability ability, UUID sourceId, UUID controllerId, Game game) {
+        CostEvent costEvent = new CostEvent(GameEvent.EventType.CAN_PAY_CYCLE_COST, sourceId, sourceId, controllerId, cost);
+        game.replaceEvent(costEvent);
+        return cost.canPay(ability, sourceId, controllerId, game) || costEvent.getCost().canPay(ability, sourceId, controllerId, game);
+    }
+
+    @Override
+    public boolean pay(Ability ability, Game game, UUID sourceId, UUID controllerId, boolean noMana, Cost costToPay) {
+        CostEvent costEvent = new CostEvent(GameEvent.EventType.PAY_CYCLE_COST, sourceId, sourceId, controllerId, cost);
+        game.replaceEvent(costEvent);
+        cost = costEvent.getCost();
+        return cost.pay(ability, game, sourceId, controllerId, noMana, cost);
+    }
+
+    @Override
+    public String getText() {
+        return cost.getText();
+    }
+
+    @Override
+    public void setText(String text) {
+        cost.setText(text);
+    }
+
+    @Override
+    public Targets getTargets() {
+        return cost.getTargets();
+    }
+
+    @Override
+    public boolean isPaid() {
+        return cost.isPaid();
+    }
+
+    @Override
+    public void clearPaid() {
+        cost.clearPaid();
+    }
+
+    @Override
+    public void setPaid() {
+        cost.setPaid();
+    }
+
+    @Override
+    public UUID getId() {
+        return cost.getId();
+    }
+
+    @Override
+    public Cost copy() {
+        return new CyclingCost(this);
+    }
+
+    @Override
+    public Cost getOriginalCost() {
+        return this.cost;
+    }
+}

Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesBlackZombieAdditionEffect.java

@@ -58,7 +58,10 @@ public class BecomesBlackZombieAdditionEffect extends ContinuousEffectImpl {
 
     @Override
     public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
-        Permanent creature = game.getPermanent(targetPointer.getFirst(game, source));
+        Permanent creature = game.getPermanent(source.getTargets().getFirstTarget());
+        if (creature == null) {
+            creature = game.getPermanentEntering(source.getTargets().getFirstTarget());
+        }
         if (creature != null) {
             switch (layer) {
                 case TypeChangingEffects_4:

Mage/src/main/java/mage/abilities/keyword/CyclingAbility.java

@@ -31,6 +31,7 @@ import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.ActivatedAbilityImpl;
 import mage.abilities.costs.Cost;
+import mage.abilities.costs.common.CyclingCost;
 import mage.abilities.costs.common.DiscardSourceCost;
 import mage.abilities.costs.mana.ManaCost;
 import mage.abilities.effects.common.DrawCardSourceControllerEffect;
@@ -90,77 +91,3 @@ public class CyclingAbility extends ActivatedAbilityImpl {
     }
 
 }
-
-class CyclingCost implements Cost {
-
-    protected Cost cost;
-
-    public CyclingCost(Cost cost) {
-        this.cost = cost;
-    }
-
-    public CyclingCost(final CyclingCost cost) {
-        this.cost = cost.cost.copy();
-    }
-
-    @Override
-    public boolean pay(Ability ability, Game game, UUID sourceId, UUID controllerId, boolean noMana) {
-        return pay(ability, game, sourceId, controllerId, noMana, cost);
-    }
-
-    @Override
-    public boolean canPay(Ability ability, UUID sourceId, UUID controllerId, Game game) {
-        CostEvent costEvent = new CostEvent(GameEvent.EventType.CAN_PAY_CYCLE_COST, sourceId, sourceId, controllerId, cost);
-        game.replaceEvent(costEvent);
-        return cost.canPay(ability, sourceId, controllerId, game) || costEvent.getCost().canPay(ability, sourceId, controllerId, game);
-    }
-
-    @Override
-    public boolean pay(Ability ability, Game game, UUID sourceId, UUID controllerId, boolean noMana, Cost costToPay) {
-        CostEvent costEvent = new CostEvent(GameEvent.EventType.PAY_CYCLE_COST, sourceId, sourceId, controllerId, cost);
-        game.replaceEvent(costEvent);
-        cost = costEvent.getCost();
-        return cost.pay(ability, game, sourceId, controllerId, noMana, cost);
-    }
-
-    @Override
-    public String getText() {
-        return cost.getText();
-    }
-
-    @Override
-    public void setText(String text) {
-        cost.setText(text);
-    }
-
-    @Override
-    public Targets getTargets() {
-        return cost.getTargets();
-    }
-
-    @Override
-    public boolean isPaid() {
-        return cost.isPaid();
-    }
-
-    @Override
-    public void clearPaid() {
-        cost.clearPaid();
-    }
-
-    @Override
-    public void setPaid() {
-        cost.setPaid();
-    }
-
-    @Override
-    public UUID getId() {
-        return cost.getId();
-    }
-
-    @Override
-    public Cost copy() {
-        return new CyclingCost(this);
-    }
-
-}

Mage/src/main/java/mage/filter/FilterCard.java

@@ -28,14 +28,11 @@
 package mage.filter;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
-
 import mage.cards.Card;
-import mage.cards.SplitCard;
 import mage.filter.predicate.ObjectPlayer;
 import mage.filter.predicate.ObjectPlayerPredicate;
 import mage.filter.predicate.ObjectSourcePlayer;
@@ -78,12 +75,7 @@ public class FilterCard extends FilterObject<Card> {
         if (card == null) {
             return false;
         }
-        if (card.isSplitCard()) {
-            return super.match(((SplitCard) card).getLeftHalfCard(), game)
-                    || super.match(((SplitCard) card).getRightHalfCard(), game);
-        } else {
-            return super.match(card, game);
-        }
+        return super.match(card, game);
     }
 
     public boolean match(Card card, UUID playerId, Game game) {

Mage/src/main/java/mage/util/CardUtil.java

@@ -27,6 +27,10 @@
  */
 package mage.util;
 
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
 import mage.MageObject;
 import mage.Mana;
 import mage.ObjectColor;
@@ -36,7 +40,6 @@ import mage.abilities.SpellAbility;
 import mage.abilities.costs.VariableCost;
 import mage.abilities.costs.mana.*;
 import mage.cards.Card;
-import mage.cards.SplitCard;
 import mage.filter.FilterMana;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
@@ -44,11 +47,6 @@ import mage.game.permanent.token.Token;
 import mage.game.stack.Spell;
 import mage.util.functions.CopyTokenFunction;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
-
 /**
  * @author nantuko
  */
@@ -540,13 +538,7 @@ public final class CardUtil {
             cmcObject.add(object.getConvertedManaCost());
         } else if (object instanceof Card) {
             Card card = (Card) object;
-            if (card instanceof SplitCard) {
-                SplitCard splitCard = (SplitCard) card;
-                cmcObject.add(splitCard.getLeftHalfCard().getConvertedManaCost());
-                cmcObject.add(splitCard.getRightHalfCard().getConvertedManaCost());
-            } else {
-                cmcObject.add(card.getConvertedManaCost());
-            }
+            cmcObject.add(card.getConvertedManaCost());
         }
         return cmcObject;
     }