From 02625442b1159a4069db4cb9392b35ed9b914c07 Mon Sep 17 00:00:00 2001 From: Alexsandro Date: Sun, 8 Jan 2017 11:11:31 -0200 Subject: [PATCH 01/10] Add Muraganda Petroglyphs --- .../mage/cards/m/MuragandaPetroglyphs.java | 69 +++++++++++++++++++ Mage.Sets/src/mage/sets/FutureSight.java | 1 + .../main/java/mage/cards/ExpansionSet.java | 2 +- .../mageobject/NoAbilityPredicate.java | 36 ++++++++++ 4 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 Mage.Sets/src/mage/cards/m/MuragandaPetroglyphs.java create mode 100644 Mage/src/main/java/mage/filter/predicate/mageobject/NoAbilityPredicate.java diff --git a/Mage.Sets/src/mage/cards/m/MuragandaPetroglyphs.java b/Mage.Sets/src/mage/cards/m/MuragandaPetroglyphs.java new file mode 100644 index 0000000000..d7731449c2 --- /dev/null +++ b/Mage.Sets/src/mage/cards/m/MuragandaPetroglyphs.java @@ -0,0 +1,69 @@ +/* + * 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.abilities.common.SimpleStaticAbility; +import mage.abilities.effects.common.continuous.BoostAllEffect; +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.mageobject.NoAbilityPredicate; + +/** + * + * @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); + } +} \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/FutureSight.java b/Mage.Sets/src/mage/sets/FutureSight.java index fc74fe637e..6a06a53d50 100644 --- a/Mage.Sets/src/mage/sets/FutureSight.java +++ b/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)); diff --git a/Mage/src/main/java/mage/cards/ExpansionSet.java b/Mage/src/main/java/mage/cards/ExpansionSet.java index 24e3d35dc2..99fe4aa8a3 100644 --- a/Mage/src/main/java/mage/cards/ExpansionSet.java +++ b/Mage/src/main/java/mage/cards/ExpansionSet.java @@ -46,7 +46,7 @@ import mage.util.RandomUtil; */ public abstract class ExpansionSet implements Serializable { - public class SetCardInfo implements Serializable { + public static class SetCardInfo implements Serializable { private final String name; private final String cardNumber; diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/NoAbilityPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/NoAbilityPredicate.java new file mode 100644 index 0000000000..52ab89f35c --- /dev/null +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/NoAbilityPredicate.java @@ -0,0 +1,36 @@ +package mage.filter.predicate.mageobject; + +import mage.MageObject; +import mage.abilities.Abilities; +import mage.abilities.Ability; +import mage.abilities.SpellAbility; +import mage.cards.Card; +import mage.filter.predicate.Predicate; +import mage.game.Game; + +/** + * Created by Alexsandro. + */ +public class NoAbilityPredicate implements Predicate { + @Override + public boolean apply(MageObject input, Game game) { + Abilities abilities; + if (input instanceof Card){ + abilities = ((Card)input).getAbilities(game); + } else { + abilities = input.getAbilities(); + } + + for (Ability a : abilities){ + if (a.getClass() != SpellAbility.class){ + return false; + } + } + return true; + } + + @Override + public String toString() { + return "with no abilities"; + } +} \ No newline at end of file From 3033dfecc4c5669c364827f91bd2030947ef5c21 Mon Sep 17 00:00:00 2001 From: Alexsandro Date: Sun, 8 Jan 2017 15:18:02 -0200 Subject: [PATCH 02/10] Add tests based on gatherer --- .../single/fut/MuragandaPetroglyphsTest.java | 185 ++++++++++++++++++ .../mageobject/NoAbilityPredicate.java | 18 +- 2 files changed, 201 insertions(+), 2 deletions(-) create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/single/fut/MuragandaPetroglyphsTest.java diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/fut/MuragandaPetroglyphsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/fut/MuragandaPetroglyphsTest.java new file mode 100644 index 0000000000..f7ef102d66 --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/fut/MuragandaPetroglyphsTest.java @@ -0,0 +1,185 @@ +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. + */ +// TODO See how to set the cipher ability in tests +// 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"); +// +// +// } +} diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/NoAbilityPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/NoAbilityPredicate.java index 52ab89f35c..ad20b77f47 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/NoAbilityPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/NoAbilityPredicate.java @@ -4,6 +4,7 @@ import mage.MageObject; import mage.abilities.Abilities; import mage.abilities.Ability; import mage.abilities.SpellAbility; +import mage.abilities.keyword.MorphAbility; import mage.cards.Card; import mage.filter.predicate.Predicate; import mage.game.Game; @@ -12,17 +13,30 @@ import mage.game.Game; * Created by Alexsandro. */ public class NoAbilityPredicate implements Predicate { + @Override public boolean apply(MageObject input, Game game) { + boolean isFaceDown = false; Abilities 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() != input.getId()) { + return false; + } + } + return true; + } + + for (Ability ability : abilities){ + if (ability.getClass() != SpellAbility.class){ - for (Ability a : abilities){ - if (a.getClass() != SpellAbility.class){ return false; } } From 47b96e5411a039533cd13f6a27635d9bbfa401ed Mon Sep 17 00:00:00 2001 From: Alexsandro Date: Tue, 10 Jan 2017 11:17:09 -0200 Subject: [PATCH 03/10] Remove static placed by IDE --- Mage/src/main/java/mage/cards/ExpansionSet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage/src/main/java/mage/cards/ExpansionSet.java b/Mage/src/main/java/mage/cards/ExpansionSet.java index 99fe4aa8a3..24e3d35dc2 100644 --- a/Mage/src/main/java/mage/cards/ExpansionSet.java +++ b/Mage/src/main/java/mage/cards/ExpansionSet.java @@ -46,7 +46,7 @@ import mage.util.RandomUtil; */ public abstract class ExpansionSet implements Serializable { - public static class SetCardInfo implements Serializable { + public class SetCardInfo implements Serializable { private final String name; private final String cardNumber; From 92cfe2403e61e5167eb4169be5a64ef4304ace1e Mon Sep 17 00:00:00 2001 From: Alexsandro Date: Tue, 10 Jan 2017 11:40:04 -0200 Subject: [PATCH 04/10] Create cipher test for Muraganda Petroglyphs --- .../single/fut/MuragandaPetroglyphsTest.java | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/fut/MuragandaPetroglyphsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/fut/MuragandaPetroglyphsTest.java index f7ef102d66..c8263589cb 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/fut/MuragandaPetroglyphsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/fut/MuragandaPetroglyphsTest.java @@ -171,15 +171,19 @@ public class MuragandaPetroglyphsTest extends CardTestPlayerBase { /** * Cipher grants an ability to creatures, meaning the affected creatures would no longer get the +2/+2 bonus. */ -// TODO See how to set the cipher ability in tests -// 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"); -// -// -// } + @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); + } } From 0a0878aba6edf4ebbb8c7d7ed9dd2e93d6a2b92f Mon Sep 17 00:00:00 2001 From: Alexsandro Date: Tue, 10 Jan 2017 12:37:15 -0200 Subject: [PATCH 05/10] Create Hivestone card --- Mage.Sets/src/mage/cards/h/Hivestone.java | 71 +++++++++++++++++++++++ Mage.Sets/src/mage/sets/TimeSpiral.java | 1 + 2 files changed, 72 insertions(+) create mode 100644 Mage.Sets/src/mage/cards/h/Hivestone.java diff --git a/Mage.Sets/src/mage/cards/h/Hivestone.java b/Mage.Sets/src/mage/cards/h/Hivestone.java new file mode 100644 index 0000000000..da2f346c15 --- /dev/null +++ b/Mage.Sets/src/mage/cards/h/Hivestone.java @@ -0,0 +1,71 @@ +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 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 = "All permanents are artifacts in addition to their other types"; + } + + @Override + public boolean apply(Game game, Ability source) { + List permanents = game.getBattlefield().getActivePermanents(filter, source.getControllerId(), game); + for (Permanent perm : permanents) { + List cardSubType = perm.getSubtype(game); + if (!cardSubType.contains("Sliver")) { + 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); + } +} diff --git a/Mage.Sets/src/mage/sets/TimeSpiral.java b/Mage.Sets/src/mage/sets/TimeSpiral.java index b3c01a8ad8..f943f5cb34 100644 --- a/Mage.Sets/src/mage/sets/TimeSpiral.java +++ b/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)); From 81954b92ea3ea0ac2df014cfe6fc5a3989026813 Mon Sep 17 00:00:00 2001 From: Alexsandro Date: Tue, 10 Jan 2017 12:47:50 -0200 Subject: [PATCH 06/10] Change card text --- Mage.Sets/src/mage/cards/h/Hivestone.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Mage.Sets/src/mage/cards/h/Hivestone.java b/Mage.Sets/src/mage/cards/h/Hivestone.java index da2f346c15..badf162e41 100644 --- a/Mage.Sets/src/mage/cards/h/Hivestone.java +++ b/Mage.Sets/src/mage/cards/h/Hivestone.java @@ -43,9 +43,8 @@ class CreaturesAreSliversEffect extends ContinuousEffectImpl { public CreaturesAreSliversEffect() { - super(Duration.WhileOnBattlefield, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Neutral); - staticText = "All permanents are artifacts in addition to their other types"; + staticText = "Creatures you control are Slivers in addition to their other creature types."; } @Override From 4bf2137e9d1b754ad22cd72e1e08c53df4b9b59e Mon Sep 17 00:00:00 2001 From: Alexsandro Date: Tue, 10 Jan 2017 12:56:39 -0200 Subject: [PATCH 07/10] Add hivestone test structure --- .../test/cards/single/tsp/HivestoneTest.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/single/tsp/HivestoneTest.java diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/tsp/HivestoneTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/tsp/HivestoneTest.java new file mode 100644 index 0000000000..94db7d00ad --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/tsp/HivestoneTest.java @@ -0,0 +1,31 @@ +package org.mage.test.cards.single.tsp; + +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() { + // Coloca criatura qualquer em campo, uma no player A e outra no player B, checa se + // receberam o subtipo + } + + /** + * 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() { + // com o root sliver e a hivestone em campo, tenta counterar uma carta que não é sliver vinda + // da mão (tem que funcionar, ja que a carta não é sliver na stack) + } +} From 1d91e04ac12d32c6b86f2e3a95d0d5c2882c332f Mon Sep 17 00:00:00 2001 From: Alexsandro Date: Wed, 11 Jan 2017 14:08:34 -0200 Subject: [PATCH 08/10] Add Hivestone tests --- Mage.Sets/src/mage/cards/h/Hivestone.java | 4 +- .../test/cards/single/tsp/HivestoneTest.java | 41 ++++++++++++++++--- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/Mage.Sets/src/mage/cards/h/Hivestone.java b/Mage.Sets/src/mage/cards/h/Hivestone.java index badf162e41..a159823ef5 100644 --- a/Mage.Sets/src/mage/cards/h/Hivestone.java +++ b/Mage.Sets/src/mage/cards/h/Hivestone.java @@ -10,6 +10,7 @@ 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; @@ -49,10 +50,11 @@ class CreaturesAreSliversEffect extends ContinuousEffectImpl { @Override public boolean apply(Game game, Ability source) { + Player player = game.getPlayer(source.getControllerId()); List permanents = game.getBattlefield().getActivePermanents(filter, source.getControllerId(), game); for (Permanent perm : permanents) { List cardSubType = perm.getSubtype(game); - if (!cardSubType.contains("Sliver")) { + if (!cardSubType.contains("Sliver") && perm.getOwnerId() == player.getId()) { cardSubType.add("Sliver"); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/tsp/HivestoneTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/tsp/HivestoneTest.java index 94db7d00ad..945e184811 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/tsp/HivestoneTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/tsp/HivestoneTest.java @@ -1,13 +1,14 @@ 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 { /** @@ -15,8 +16,21 @@ public class HivestoneTest extends CardTestPlayerBase { */ @Test public void abilityCheckTest() { - // Coloca criatura qualquer em campo, uma no player A e outra no player B, checa se - // receberam o subtipo + 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); + + } /** @@ -25,7 +39,22 @@ public class HivestoneTest extends CardTestPlayerBase { */ @Test public void rootSliverTest() { - // com o root sliver e a hivestone em campo, tenta counterar uma carta que não é sliver vinda - // da mão (tem que funcionar, ja que a carta não é sliver na stack) + 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); } } From 03576ce11a50d9a5fca47a9151611e9242d4a618 Mon Sep 17 00:00:00 2001 From: Alexsandro Date: Thu, 12 Jan 2017 09:40:55 -0200 Subject: [PATCH 09/10] Change operators for .equals() --- Mage.Sets/src/mage/cards/h/Hivestone.java | 2 +- .../mage/filter/predicate/mageobject/NoAbilityPredicate.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Mage.Sets/src/mage/cards/h/Hivestone.java b/Mage.Sets/src/mage/cards/h/Hivestone.java index a159823ef5..1738625eaf 100644 --- a/Mage.Sets/src/mage/cards/h/Hivestone.java +++ b/Mage.Sets/src/mage/cards/h/Hivestone.java @@ -54,7 +54,7 @@ class CreaturesAreSliversEffect extends ContinuousEffectImpl { List permanents = game.getBattlefield().getActivePermanents(filter, source.getControllerId(), game); for (Permanent perm : permanents) { List cardSubType = perm.getSubtype(game); - if (!cardSubType.contains("Sliver") && perm.getOwnerId() == player.getId()) { + if (!cardSubType.contains("Sliver") && perm.getOwnerId().equals(player.getId())) { cardSubType.add("Sliver"); } } diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/NoAbilityPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/NoAbilityPredicate.java index ad20b77f47..83e285132b 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/NoAbilityPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/NoAbilityPredicate.java @@ -27,7 +27,7 @@ public class NoAbilityPredicate implements Predicate { } if (isFaceDown) { for (Ability ability : abilities){ - if(ability.getSourceId() != input.getId()) { + if(!ability.getSourceId().equals(input.getId())) { return false; } } From f5ddd77e5b6cbe6f35499bb4616957a85043a48a Mon Sep 17 00:00:00 2001 From: Alexsandro Date: Thu, 12 Jan 2017 09:45:35 -0200 Subject: [PATCH 10/10] Move NoAbilityPredicate to MuragandaPetroglyphs file --- .../mage/cards/m/MuragandaPetroglyphs.java | 45 ++++++++++++++++- .../mageobject/NoAbilityPredicate.java | 50 ------------------- 2 files changed, 44 insertions(+), 51 deletions(-) delete mode 100644 Mage/src/main/java/mage/filter/predicate/mageobject/NoAbilityPredicate.java diff --git a/Mage.Sets/src/mage/cards/m/MuragandaPetroglyphs.java b/Mage.Sets/src/mage/cards/m/MuragandaPetroglyphs.java index d7731449c2..ae27cf86d9 100644 --- a/Mage.Sets/src/mage/cards/m/MuragandaPetroglyphs.java +++ b/Mage.Sets/src/mage/cards/m/MuragandaPetroglyphs.java @@ -29,15 +29,21 @@ 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.mageobject.NoAbilityPredicate; +import mage.filter.predicate.Predicate; +import mage.game.Game; /** * @@ -66,4 +72,41 @@ public class MuragandaPetroglyphs extends CardImpl { public MuragandaPetroglyphs copy() { return new MuragandaPetroglyphs(this); } +} + +class NoAbilityPredicate implements Predicate { + + @Override + public boolean apply(MageObject input, Game game) { + boolean isFaceDown = false; + Abilities 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"; + } } \ No newline at end of file diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/NoAbilityPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/NoAbilityPredicate.java deleted file mode 100644 index 83e285132b..0000000000 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/NoAbilityPredicate.java +++ /dev/null @@ -1,50 +0,0 @@ -package mage.filter.predicate.mageobject; - -import mage.MageObject; -import mage.abilities.Abilities; -import mage.abilities.Ability; -import mage.abilities.SpellAbility; -import mage.abilities.keyword.MorphAbility; -import mage.cards.Card; -import mage.filter.predicate.Predicate; -import mage.game.Game; - -/** - * Created by Alexsandro. - */ -public class NoAbilityPredicate implements Predicate { - - @Override - public boolean apply(MageObject input, Game game) { - boolean isFaceDown = false; - Abilities 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"; - } -} \ No newline at end of file