Merge origin/master

Mage.Server/src/main/java/mage/server/User.java

@@ -403,7 +403,7 @@ public class User {
             if (userStats != null) {
                 this.userData.setHistory(userStatsToString(userStats.getProto()));
             } else {
-                this.userData.setHistory("<new player>");
+                this.userData.setHistory("Matches: 0");
             }
         }
     }

Mage.Sets/src/mage/sets/battleforzendikar/BrutalExpulsion.java

@@ -79,7 +79,7 @@ public class BrutalExpulsion extends CardImpl {
         effect.setText("If that permanent would be put into a graveyard this turn, exile it instead");
         mode.getEffects().add(effect);
         this.getSpellAbility().addMode(mode);
-        this.getSpellAbility().addWatcher(new DamagedByWatcher());
+        this.getSpellAbility().addWatcher(new DamagedByWatcher(true));
     }
 
     public BrutalExpulsion(final BrutalExpulsion card) {

Mage.Sets/src/mage/sets/battleforzendikar/SwarmSurge.java

@@ -47,10 +47,10 @@ import mage.filter.predicate.mageobject.ColorlessPredicate;
  */
 public class SwarmSurge extends CardImpl {
 
-    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Colorless creatures you control");
+    private static final FilterCreaturePermanent FILTER = new FilterCreaturePermanent("Colorless creatures you control");
 
     static {
-        filter.add(new ColorlessPredicate());
+        FILTER.add(new ColorlessPredicate());
     }
 
     public SwarmSurge(UUID ownerId) {
@@ -66,7 +66,7 @@ public class SwarmSurge extends CardImpl {
         this.getSpellAbility().addEffect(new BoostControlledEffect(2, 0, Duration.EndOfTurn));
 
         // Colorless creatures you control also gain first strike until end of turn.
-        Effect effect = new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn, filter);
+        Effect effect = new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn, FILTER);
         effect.setText("Colorless creatures you control also gain first strike until end of turn");
         this.getSpellAbility().addEffect(effect);
     }

Mage.Sets/src/mage/sets/iceage/ThunderWall.java

@@ -0,0 +1,74 @@
+/*
+ *  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.iceage;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.continuous.BoostSourceEffect;
+import mage.abilities.keyword.DefenderAbility;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+
+/**
+ *
+ * @author icetc
+ */
+public class ThunderWall extends CardImpl {
+
+    public ThunderWall(UUID ownerId) {
+        super(ownerId, 104, "Thunder Wall", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}{U}");
+        this.expansionSetCode = "ICE";
+        this.subtype.add("Wall");
+        this.power = new MageInt(0);
+        this.toughness = new MageInt(2);
+
+        // Defender
+        this.addAbility(DefenderAbility.getInstance());
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+
+        // {U}: Thunder Wall gets +1/+1 until end of turn.
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{U}")));
+    }
+
+    public ThunderWall(final ThunderWall card) {
+        super(card);
+    }
+
+    @Override
+    public ThunderWall copy() {
+        return new ThunderWall(this);
+    }
+}

Mage.Sets/src/mage/sets/masterseditionii/ThunderWall.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.masterseditionii;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author icetc
+ */
+public class ThunderWall extends mage.sets.iceage.ThunderWall {
+
+    public ThunderWall(UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 71;
+        this.expansionSetCode = "ME2";
+    }
+
+    public ThunderWall(final ThunderWall card) {
+        super(card);
+    }
+
+    @Override
+    public ThunderWall copy() {
+        return new ThunderWall(this);
+    }
+}

Mage.Tests/src/test/java/org/mage/test/cards/rules/CantCastTest.java

@@ -40,11 +40,11 @@ public class CantCastTest extends CardTestPlayerBase {
 
     /**
      * I control Void Winnower. But my opponent can cast Jayemdae Tome (that's
-     * converted mana cost is even) He can cast other even spell.
-     *
+     * converted mana cost is even) He can cast other even spell. Test casting
+     * cost 4
      */
     @Test
-    public void testVoidWinnower() {
+    public void testVoidWinnower1() {
         // Your opponent can't cast spells with even converted mana costs. (Zero is even.)
         // Your opponents can't block with creatures with even converted mana costs.
         addCard(Zone.BATTLEFIELD, playerB, "Void Winnower");
@@ -53,7 +53,7 @@ public class CantCastTest extends CardTestPlayerBase {
 
         addCard(Zone.HAND, playerA, "Jayemdae Tome", 1);
 
-        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Jayemdae Tome");
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Jayemdae Tome"); // {4}
 
         setStopAt(1, PhaseStep.BEGIN_COMBAT);
         execute();
@@ -64,6 +64,9 @@ public class CantCastTest extends CardTestPlayerBase {
 
     }
 
+    /**
+     * Test with X=3
+     */
     @Test
     public void testVoidWinnower2() {
         // Your opponent can't cast spells with even converted mana costs. (Zero is even.)
@@ -87,6 +90,9 @@ public class CantCastTest extends CardTestPlayerBase {
 
     }
 
+    /**
+     * Test with X=4
+     */
     @Test
     public void testVoidWinnower3() {
         // Your opponent can't cast spells with even converted mana costs. (Zero is even.)
@@ -136,4 +142,27 @@ public class CantCastTest extends CardTestPlayerBase {
         assertHandCount(playerA, "Pine Walker", 1);
 
     }
+
+    /**
+     * Test with casting cost = {0}
+     */
+    @Test
+    public void testVoidWinnowerZero() {
+        // Your opponent can't cast spells with even converted mana costs. (Zero is even.)
+        // Your opponents can't block with creatures with even converted mana costs.
+        addCard(Zone.BATTLEFIELD, playerB, "Void Winnower");
+
+        // Metalcraft - {T}: Add one mana of any color to your mana pool. Activate this ability only if you control three or more artifacts.
+        addCard(Zone.HAND, playerA, "Mox Opal", 1); // {0}
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Mox Opal");
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertHandCount(playerA, "Mox Opal", 1);
+
+        assertLife(playerB, 20);
+
+    }
 }

Mage.Tests/src/test/java/org/mage/test/cards/single/bfz/BrutalExpulsionTest.java

@@ -0,0 +1,76 @@
+/*
+ *  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 org.mage.test.cards.single.bfz;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author Quercitron
+ */
+public class BrutalExpulsionTest extends CardTestPlayerBase {
+
+    /**
+     * Brutal Expulsion targeting Gideon, Ally of Zendikar. Gideon has 3 loyalty. Brutal Expulsion resolves,
+     * leaves 1 loyalty. I attack Gideon for 1 with a Scion token, Gideon dies. Instead of going to graveyard,
+     * Expulsion sends Gideon to exile. However, in game Gideon went to graveyard.
+     */
+    @Test
+    public void testPlaneswalkerExile() {
+        // Choose one or both
+        // - Return target spell or creature to its owner's hand;
+        // or Brutal Expulsion deals 2 damage to target creature or planeswalker. If that permanent would be put into a graveyard this turn, exile it instead.
+        addCard(Zone.HAND, playerA, "Brutal Expulsion");
+        // Shock deals 2 damage to target creature or player.
+        addCard(Zone.HAND, playerA, "Shock");
+        addCard(Zone.BATTLEFIELD, playerA, "Island", 4);
+        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5);
+
+        // Planeswalker with 4 loyalty.
+        addCard(Zone.BATTLEFIELD, playerB, "Gideon, Ally of Zendikar");
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Brutal Expulsion", playerB);
+        setModeChoice(playerA, "2");
+        setModeChoice(playerA, null);
+        setChoice(playerA, "Yes");
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Shock", playerB);
+        setChoice(playerA, "Yes");
+
+        setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
+        execute();
+
+        assertPermanentCount(playerB, "Gideon, Ally of Zendikar", 0);
+        assertGraveyardCount(playerB, "Gideon, Ally of Zendikar", 0);
+        assertExileCount("Gideon, Ally of Zendikar", 1);
+    }
+
+}

Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java

@@ -521,6 +521,11 @@ public class TestPlayer implements Player {
     @Override
     public Mode chooseMode(Modes modes, Ability source, Game game) {
         if (!modesSet.isEmpty() && modes.getMaxModes() > modes.getSelectedModes().size()) {
+            // set mode to null to select less than maximum modes if multiple modes are allowed
+            if (modesSet.get(0) == null) {
+                modesSet.remove(0);
+                return null;
+            }
             int selectedMode = Integer.parseInt(modesSet.get(0));
             int i = 1;
             for (Mode mode : modes.getAvailableModes(source, game)) {

Mage/src/main/java/mage/watchers/common/DamagedByWatcher.java

@@ -45,15 +45,23 @@ import mage.watchers.Watcher;
  */
 public class DamagedByWatcher extends Watcher {
 
-    public Set<MageObjectReference> damagedCreatures = new HashSet<>();
+    public Set<MageObjectReference> damagedBySource = new HashSet<>();
+
+    private final boolean watchPlaneswalkers;
 
     public DamagedByWatcher() {
+        this(false);
+    }
+
+    public DamagedByWatcher(boolean watchPlaneswalkers) {
         super("DamagedByWatcher", WatcherScope.CARD);
+        this.watchPlaneswalkers = watchPlaneswalkers;
     }
 
     public DamagedByWatcher(final DamagedByWatcher watcher) {
         super(watcher);
-        this.damagedCreatures.addAll(watcher.damagedCreatures);
+        this.damagedBySource.addAll(watcher.damagedBySource);
+        this.watchPlaneswalkers = watcher.watchPlaneswalkers;
     }
 
     @Override
@@ -63,10 +71,12 @@ public class DamagedByWatcher extends Watcher {
 
     @Override
     public void watch(GameEvent event, Game game) {
-        if (event.getType() == EventType.DAMAGED_CREATURE && sourceId.equals(event.getSourceId())) {
+        boolean eventHasAppropriateType = (event.getType() == EventType.DAMAGED_CREATURE) ||
+                                          (watchPlaneswalkers && event.getType() == EventType.DAMAGED_PLANESWALKER);
+        if (eventHasAppropriateType && sourceId.equals(event.getSourceId())) {
             MageObjectReference mor = new MageObjectReference(event.getTargetId(), game);
-            if (!damagedCreatures.contains(mor)) {
-                damagedCreatures.add(mor);
+            if (!damagedBySource.contains(mor)) {
+                damagedBySource.add(mor);
             }
         }
     }
@@ -74,7 +84,7 @@ public class DamagedByWatcher extends Watcher {
     @Override
     public void reset() {
         super.reset();
-        damagedCreatures.clear();
+        damagedBySource.clear();
     }
 
     public boolean wasDamaged(UUID sourceId, Game game) {
@@ -86,6 +96,6 @@ public class DamagedByWatcher extends Watcher {
     }
 
     public boolean wasDamaged(Permanent permanent, Game game) {
-        return damagedCreatures.contains(new MageObjectReference(permanent, game));
+        return damagedBySource.contains(new MageObjectReference(permanent, game));
     }
 }