Merge pull request #2774 from Alexsandr0x/master

Add 2 cards

Mage.Sets/src/mage/cards/h/Hivestone.java

@@ -0,0 +1,72 @@
+package mage.cards.h;
+
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.ContinuousEffectImpl;
+import mage.cards.Card;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.*;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * Created by Alexsandr0x.
+ */
+public class Hivestone extends CardImpl {
+
+    public Hivestone(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}");
+
+        // Creatures you control are Slivers in addition to their other creature types.
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CreaturesAreSliversEffect()));
+    }
+
+    public Hivestone(final Hivestone card) {
+        super(card);
+    }
+
+    @Override
+    public Card copy() {
+        return new Hivestone(this);
+    }
+
+}
+
+class CreaturesAreSliversEffect extends ContinuousEffectImpl {
+
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
+
+
+    public CreaturesAreSliversEffect() {
+        super(Duration.WhileOnBattlefield, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Neutral);
+        staticText = "Creatures you control are Slivers in addition to their other creature types.";
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player player = game.getPlayer(source.getControllerId());
+        List<Permanent> permanents = game.getBattlefield().getActivePermanents(filter, source.getControllerId(), game);
+        for (Permanent perm : permanents) {
+            List<String> cardSubType = perm.getSubtype(game);
+            if (!cardSubType.contains("Sliver") && perm.getOwnerId().equals(player.getId())) {
+                cardSubType.add("Sliver");
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public mage.cards.h.CreaturesAreSliversEffect copy() {
+        return new mage.cards.h.CreaturesAreSliversEffect(this);
+    }
+
+    private CreaturesAreSliversEffect(mage.cards.h.CreaturesAreSliversEffect effect) {
+        super(effect);
+    }
+}

Mage.Sets/src/mage/cards/m/MuragandaPetroglyphs.java

@@ -0,0 +1,112 @@
+/*
+ *  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.m;
+
+import java.util.UUID;
+
+import mage.MageObject;
+import mage.abilities.Abilities;
+import mage.abilities.Ability;
+import mage.abilities.SpellAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.common.continuous.BoostAllEffect;
+import mage.cards.Card;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Zone;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.Predicate;
+import mage.game.Game;
+
+/**
+ *
+ * @author anonymous
+ */
+public class MuragandaPetroglyphs extends CardImpl {
+
+    private static final FilterCreaturePermanent filterNoAbilities = new FilterCreaturePermanent(
+            "Creatures with no ability");
+
+    public MuragandaPetroglyphs(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT},"{3}{G}");
+        this.expansionSetCode = "FUT";
+
+        filterNoAbilities.add(new NoAbilityPredicate());
+        // Creatures with no abilities get +2/+2.
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(
+                2, 2, Duration.WhileOnBattlefield, filterNoAbilities, false)));
+    }
+
+    public MuragandaPetroglyphs(final MuragandaPetroglyphs card) {
+        super(card);
+    }
+
+    @Override
+    public MuragandaPetroglyphs copy() {
+        return new MuragandaPetroglyphs(this);
+    }
+}
+
+class NoAbilityPredicate implements Predicate<MageObject> {
+
+    @Override
+    public boolean apply(MageObject input, Game game) {
+        boolean isFaceDown = false;
+        Abilities<Ability> abilities;
+        if (input instanceof Card){
+            abilities = ((Card)input).getAbilities(game);
+
+            isFaceDown = ((Card)input).isFaceDown(game);
+        } else {
+            abilities = input.getAbilities();
+        }
+        if (isFaceDown) {
+            for (Ability ability : abilities){
+                if(!ability.getSourceId().equals(input.getId())) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        for (Ability ability : abilities){
+            if (ability.getClass() != SpellAbility.class){
+
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "with no abilities";
+    }
+}

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

@@ -146,6 +146,7 @@ public class FutureSight extends ExpansionSet {
         cards.add(new SetCardInfo("Minions' Murmurs", 71, Rarity.UNCOMMON, mage.cards.m.MinionsMurmurs.class));
         cards.add(new SetCardInfo("Mistmeadow Skulk", 27, Rarity.UNCOMMON, mage.cards.m.MistmeadowSkulk.class));
         cards.add(new SetCardInfo("Molten Disaster", 102, Rarity.RARE, mage.cards.m.MoltenDisaster.class));
+        cards.add(new SetCardInfo("Muraganda Petroglyphs", 146, Rarity.RARE, mage.cards.m.MuragandaPetroglyphs.class));
         cards.add(new SetCardInfo("Mystic Speculation", 41, Rarity.UNCOMMON, mage.cards.m.MysticSpeculation.class));
         cards.add(new SetCardInfo("Nacatl War-Pride", 147, Rarity.UNCOMMON, mage.cards.n.NacatlWarPride.class));
         cards.add(new SetCardInfo("Narcomoeba", 54, Rarity.UNCOMMON, mage.cards.n.Narcomoeba.class));

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

@@ -130,6 +130,7 @@ public class TimeSpiral extends ExpansionSet {
         cards.add(new SetCardInfo("Haunting Hymn", 112, Rarity.UNCOMMON, mage.cards.h.HauntingHymn.class));
         cards.add(new SetCardInfo("Havenwood Wurm", 199, Rarity.COMMON, mage.cards.h.HavenwoodWurm.class));
         cards.add(new SetCardInfo("Herd Gnarr", 200, Rarity.COMMON, mage.cards.h.HerdGnarr.class));
+        cards.add(new SetCardInfo("Hivestone", 256, Rarity.RARE, mage.cards.h.Hivestone.class));
         cards.add(new SetCardInfo("Hypergenesis", 201, Rarity.RARE, mage.cards.h.Hypergenesis.class));
         cards.add(new SetCardInfo("Ib Halfheart, Goblin Tactician", 163, Rarity.RARE, mage.cards.i.IbHalfheartGoblinTactician.class));
         cards.add(new SetCardInfo("Icatian Crier", 23, Rarity.COMMON, mage.cards.i.IcatianCrier.class));

Mage.Tests/src/test/java/org/mage/test/cards/single/fut/MuragandaPetroglyphsTest.java

@@ -0,0 +1,189 @@
+package org.mage.test.cards.single.fut;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import mage.filter.Filter;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ * This test is based on rulings of the card Muraganda Petroglyphs in magic Gatherer site
+ * (http://gatherer.wizards.com/Pages/Card/Details.aspx?multiverseid=145110), accessed in
+ * 08/01/2017.
+ *
+ * @author alexsandro.
+ */
+public class MuragandaPetroglyphsTest extends CardTestPlayerBase {
+
+
+    /**
+     * Muraganda Petroglyphs gives a bonus only to creatures that have no rules text at all.
+     * This includes true vanilla creatures (such as Grizzly Bears), face-down creatures,
+     * many tokens, and creatures that have lost their abilities (due to Ovinize, for example).
+     * Any ability of any kind, whether or not the ability functions in the on the battlefield zone,
+     * including things like “Cycling 2” means the creature doesn’t get the bonus.
+     */
+    @Test
+    public void trueVanillaCardsTest() {
+        addCard(Zone.BATTLEFIELD, playerA, "Grizzly Bears", 1);
+        addCard(Zone.BATTLEFIELD, playerB, "Grizzly Bears", 1);
+
+        addCard(Zone.BATTLEFIELD, playerA, "Muraganda Petroglyphs", 1);
+
+        setStopAt(1, PhaseStep.PRECOMBAT_MAIN);
+        execute();
+
+        assertPowerToughness(playerA, "Grizzly Bears", 4, 4, Filter.ComparisonScope.Any);
+        assertPowerToughness(playerB, "Grizzly Bears", 4, 4, Filter.ComparisonScope.Any);
+
+    }
+
+    @Test
+    public void faceDownCreaturesTest() {
+        addCard(Zone.HAND, playerA, "Pine Walker");
+        addCard(Zone.BATTLEFIELD, playerA, "Forest", 3);
+        addCard(Zone.BATTLEFIELD, playerA, "Muraganda Petroglyphs", 1);
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Pine Walker");
+        setChoice(playerA, "Yes"); // cast it face down as 2/2 creature
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertPermanentCount(playerA, "", 1);
+        assertPowerToughness(playerA, "", 4, 4);
+    }
+
+    @Test
+    public void faceDownGainedAbilityTest() {
+        addCard(Zone.HAND, playerA, "Pine Walker");
+        addCard(Zone.BATTLEFIELD, playerA, "Forest", 5);
+        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Mass Hysteria"); // All creatures have haste.
+
+        addCard(Zone.BATTLEFIELD, playerA, "Muraganda Petroglyphs", 1);
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Pine Walker");
+        setChoice(playerA, "Yes"); // cast it face down as 2/2 creature
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertPermanentCount(playerA, "", 1);
+        assertPowerToughness(playerA, "", 2, 2);
+    }
+
+    @Test
+    public void tokenTest() {
+        addCard(Zone.BATTLEFIELD, playerA, "Plains", 2);
+        addCard(Zone.BATTLEFIELD, playerA, "Muraganda Petroglyphs", 1);
+        // Put two 1/1 white Soldier creature tokens onto the battlefield.
+        addCard(Zone.HAND, playerA, "Raise the Alarm"); //  Instant {1}{W}
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Raise the Alarm");
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertPowerToughness(playerA, "Soldier", 3, 3);
+    }
+
+    @Test
+    public void loseAbilitiesTest() {
+        addCard(Zone.BATTLEFIELD, playerA, "Island", 2);
+        addCard(Zone.BATTLEFIELD, playerB, "Goblin Guide", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Muraganda Petroglyphs", 1);
+
+        addCard(Zone.HAND, playerA, "Ovinize");
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Ovinize", "Goblin Guide");
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertPowerToughness(playerB, "Goblin Guide", 2, 3);
+    }
+
+    @Test
+    public void CyclingAbilityTest() {
+        addCard(Zone.BATTLEFIELD, playerA, "Hundroog", 1); // Cycling {3}, 4/7
+        addCard(Zone.BATTLEFIELD, playerA, "Muraganda Petroglyphs", 1);
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertPowerToughness(playerA, "Hundroog", 4, 7);
+    }
+
+    /**
+     * Animated basic lands have mana abilities, so they won’t get the bonus.
+     */
+
+    @Test
+    public void animateBasicLandTest() {
+        addCard(Zone.BATTLEFIELD, playerA, "Forest", 5);
+        addCard(Zone.BATTLEFIELD, playerA, "Muraganda Petroglyphs", 1);
+        addCard(Zone.HAND, playerA, "Vastwood Zendikon");
+
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Vastwood Zendikon", "Forest");
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertPowerToughness(playerA, "Forest", 6, 4);
+
+    }
+
+    /**
+     * Some Auras and Equipment grant abilities to creatures, meaning the affected creature would no longer
+     * get the +2/+2 bonus. For example, Flight grants flying to the enchanted creature. Other Auras and Equipment
+     * do not, meaning the affected creature would continue to get the +2/+2 bonus. For example, Dehydration states
+     * something now true about the enchanted creature, but doesn’t give it any abilities. Auras and Equipment that
+     * grant abilities will use the words “gains” or “has,” and they’ll list a keyword ability or an ability in
+     * quotation marks.
+     */
+    @Test
+    public void grantAbilitiesTest() {
+        addCard(Zone.BATTLEFIELD, playerA, "Forest", 5);
+        addCard(Zone.BATTLEFIELD, playerA, "Island", 5);
+        addCard(Zone.BATTLEFIELD, playerA, "Muraganda Petroglyphs", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Grizzly Bears", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Runeclaw Bear", 1);
+        // Enchanted creature gets +2/+0 and has trample.
+        addCard(Zone.HAND, playerA, "Rancor");
+        // Enchanted creature doesn't untap during itscontroller's untap step.
+        addCard(Zone.HAND, playerA, "Dehydration");
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA,"Rancor", "Grizzly Bears");
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Dehydration", "Runeclaw Bear");
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertPowerToughness(playerA, "Grizzly Bears", 4, 2);
+
+        assertPowerToughness(playerA, "Runeclaw Bear", 4, 4);
+
+    }
+
+    /**
+     * Cipher grants an ability to creatures, meaning the affected creatures would no longer get the +2/+2 bonus.
+     */
+    @Test
+    public void cipherTest() {
+        addCard(Zone.BATTLEFIELD, playerA, "Swamp", 6);
+        addCard(Zone.BATTLEFIELD, playerA, "Muraganda Petroglyphs", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Grizzly Bears", 1);
+
+        addCard(Zone.HAND, playerA, "Shadow Slice"); // {4}{B}
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Shadow Slice");
+        setChoice(playerA, "Grizzly Bears");
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertPowerToughness(playerA, "Grizzly Bears", 2, 2);
+    }
+}

Mage.Tests/src/test/java/org/mage/test/cards/single/tsp/HivestoneTest.java

@@ -0,0 +1,60 @@
+package org.mage.test.cards.single.tsp;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import mage.filter.Filter;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ * Created by Alexsandr0x.
+ */
+public class HivestoneTest extends CardTestPlayerBase {
+
+    /**
+     * If a creature is already a Sliver, Hivestone has no effect on it.
+     */
+    @Test
+    public void abilityCheckTest() {
+        addCard(Zone.BATTLEFIELD, playerA, "Grizzly Bears", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Hivestone", 1);
+
+        addCard(Zone.BATTLEFIELD, playerA, "Muscle Sliver", 1);
+
+        addCard(Zone.BATTLEFIELD, playerB, "Runeclaw Bear", 1);
+
+        setStopAt(1, PhaseStep.PRECOMBAT_MAIN);
+        execute();
+
+        assertPowerToughness(playerA, "Grizzly Bears", 3, 3, Filter.ComparisonScope.Any);
+
+        assertPowerToughness(playerB, "Runeclaw Bear", 2, 2, Filter.ComparisonScope.Any);
+
+
+    }
+
+    /**
+     * Turns only your creatures on the battlefield, not in other zones, into Slivers. It won’t allow you to have
+     * Root Sliver on the battlefield and make your Grizzly Bears uncounterable, for example.
+     */
+    @Test
+    public void rootSliverTest() {
+        addCard(Zone.HAND, playerA, "Grizzly Bears", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Hivestone", 1);
+        // Root Sliver can't be countered. Sliver spells can't be countered by spells or abilities.
+        addCard(Zone.BATTLEFIELD, playerA, "Root Sliver", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Forest", 2);
+
+
+        addCard(Zone.BATTLEFIELD, playerB, "Island", 2);
+        addCard(Zone.HAND, playerB, "Counterspell");
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Grizzly Bears");
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Counterspell", "Grizzly Bears", "Grizzly Bears");
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertGraveyardCount(playerA, 1);
+    }
+}