From 02625442b1159a4069db4cb9392b35ed9b914c07 Mon Sep 17 00:00:00 2001 From: Alexsandro Date: Sun, 8 Jan 2017 11:11:31 -0200 Subject: [PATCH 01/18] 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/18] 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/18] 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/18] 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/18] 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/18] 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/18] 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/18] 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/18] 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/18] 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 From 073100273ccb0688eddec608d9c3ff67e35e8f9e Mon Sep 17 00:00:00 2001 From: vereena42 Date: Sun, 15 Jan 2017 17:28:42 +0100 Subject: [PATCH 11/18] Adding PowerstoneMinefield card --- .../src/mage/cards/p/PowerstoneMinefield.java | 109 ++++++++++++++++++ Mage.Sets/src/mage/sets/Apocalypse.java | 1 + 2 files changed, 110 insertions(+) create mode 100644 Mage.Sets/src/mage/cards/p/PowerstoneMinefield.java diff --git a/Mage.Sets/src/mage/cards/p/PowerstoneMinefield.java b/Mage.Sets/src/mage/cards/p/PowerstoneMinefield.java new file mode 100644 index 0000000000..97dc6b032b --- /dev/null +++ b/Mage.Sets/src/mage/cards/p/PowerstoneMinefield.java @@ -0,0 +1,109 @@ +/* + * 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.p; + +import mage.abilities.TriggeredAbilityImpl; +import mage.abilities.effects.Effect; +import mage.abilities.effects.common.DamageTargetEffect; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; +import mage.filter.common.FilterCreaturePermanent; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.game.events.GameEvent.EventType; +import mage.game.permanent.Permanent; +import mage.target.targetpointer.FixedTarget; + +import java.util.UUID; + +/** + * + * @author vereena42 + */ +public class PowerstoneMinefield extends CardImpl { + + public PowerstoneMinefield(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}{W}"); + + + // Whenever a creature attacks or blocks, Powerstone Minefield deals 2 damage to it. + this.addAbility(new PowerstoneMinefieldTriggeredAbility()); + } + + public PowerstoneMinefield(final PowerstoneMinefield card) { + super(card); + } + + @Override + public PowerstoneMinefield copy() { + return new PowerstoneMinefield(this); + } +} + +class PowerstoneMinefieldTriggeredAbility extends TriggeredAbilityImpl { + + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); + + public PowerstoneMinefieldTriggeredAbility() { + super(Zone.BATTLEFIELD, new DamageTargetEffect(2), false); + } + + public PowerstoneMinefieldTriggeredAbility(PowerstoneMinefieldTriggeredAbility ability) { + super(ability); + } + + @Override + public boolean checkEventType(GameEvent event, Game game) { + return event.getType() == EventType.ATTACKER_DECLARED || event.getType() == EventType.BLOCKER_DECLARED; + } + + @Override + public boolean checkTrigger(GameEvent event, Game game) { + UUID sourceId = event.getSourceId(); + Permanent permanent = game.getPermanent(sourceId); + if (filter.match(permanent, getSourceId(), getControllerId(), game)) { + for (Effect effect : this.getEffects()) { + effect.setTargetPointer(new FixedTarget(sourceId)); + } + return true; + } + return false; + } + + @Override + public String getRule() { + return "Whenever a creature attacks or blocks, Powerstone Minefield deals 2 damage to it."; + } + + @Override + public PowerstoneMinefieldTriggeredAbility copy() { + return new PowerstoneMinefieldTriggeredAbility(this); + } +} diff --git a/Mage.Sets/src/mage/sets/Apocalypse.java b/Mage.Sets/src/mage/sets/Apocalypse.java index 8369a55174..2ce5226b2c 100644 --- a/Mage.Sets/src/mage/sets/Apocalypse.java +++ b/Mage.Sets/src/mage/sets/Apocalypse.java @@ -110,6 +110,7 @@ public class Apocalypse extends ExpansionSet { cards.add(new SetCardInfo("Phyrexian Gargantua", 48, Rarity.UNCOMMON, mage.cards.p.PhyrexianGargantua.class)); cards.add(new SetCardInfo("Phyrexian Rager", 49, Rarity.COMMON, mage.cards.p.PhyrexianRager.class)); cards.add(new SetCardInfo("Planar Despair", 50, Rarity.RARE, mage.cards.p.PlanarDespair.class)); + cards.add(new SetCardInfo("Powerstone Minefield", 115, Rarity.RARE, mage.cards.p.PowerstoneMinefield.class)); cards.add(new SetCardInfo("Prophetic Bolt", 116, Rarity.RARE, mage.cards.p.PropheticBolt.class)); cards.add(new SetCardInfo("Putrid Warrior", 117, Rarity.COMMON, mage.cards.p.PutridWarrior.class)); cards.add(new SetCardInfo("Quagmire Druid", 51, Rarity.COMMON, mage.cards.q.QuagmireDruid.class)); From 8969157ce88c2ee752201a902ab679bef59d2ca5 Mon Sep 17 00:00:00 2001 From: Galatolol Date: Sat, 21 Jan 2017 14:26:04 +0100 Subject: [PATCH 12/18] Added 5 cards --- .../src/mage/cards/b/BlanketOfNight.java | 70 ++++++++++++++++ Mage.Sets/src/mage/cards/g/GhostHounds.java | 79 +++++++++++++++++++ Mage.Sets/src/mage/cards/m/Morale.java | 62 +++++++++++++++ Mage.Sets/src/mage/cards/s/SpiritShackle.java | 76 ++++++++++++++++++ .../mage/cards/u/UrborgTombOfYawgmoth.java | 38 +-------- Mage.Sets/src/mage/cards/w/WallOfLava.java | 70 ++++++++++++++++ Mage.Sets/src/mage/sets/FourthEdition.java | 2 + Mage.Sets/src/mage/sets/Homelands.java | 1 + Mage.Sets/src/mage/sets/IceAge.java | 1 + Mage.Sets/src/mage/sets/Legends.java | 3 +- .../src/mage/sets/MastersEditionIII.java | 1 + Mage.Sets/src/mage/sets/TheDark.java | 5 +- Mage.Sets/src/mage/sets/Visions.java | 1 + .../continuous/AddCardSubtypeAllEffect.java | 75 ++++++++++++++++++ 14 files changed, 445 insertions(+), 39 deletions(-) create mode 100644 Mage.Sets/src/mage/cards/b/BlanketOfNight.java create mode 100644 Mage.Sets/src/mage/cards/g/GhostHounds.java create mode 100644 Mage.Sets/src/mage/cards/m/Morale.java create mode 100644 Mage.Sets/src/mage/cards/s/SpiritShackle.java create mode 100644 Mage.Sets/src/mage/cards/w/WallOfLava.java create mode 100644 Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAllEffect.java diff --git a/Mage.Sets/src/mage/cards/b/BlanketOfNight.java b/Mage.Sets/src/mage/cards/b/BlanketOfNight.java new file mode 100644 index 0000000000..5807f7a5a6 --- /dev/null +++ b/Mage.Sets/src/mage/cards/b/BlanketOfNight.java @@ -0,0 +1,70 @@ +/* + * 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.b; + +import java.util.UUID; + +import mage.abilities.Ability; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.effects.common.continuous.GainAbilityAllEffect; +import mage.abilities.mana.BlackManaAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.abilities.effects.common.continuous.AddCardSubtypeAllEffect; +import mage.constants.CardType; +import mage.constants.DependencyType; +import mage.constants.Duration; +import mage.constants.Zone; +import mage.filter.common.FilterLandPermanent; + +/** + * + * @author Galatolol + */ +public class BlanketOfNight extends CardImpl { + + public BlanketOfNight(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}{B}"); + + + // Each land is a Swamp in addition to its other land types. + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new BlackManaAbility(), Duration.WhileOnBattlefield, new FilterLandPermanent(), + "Each land is a Swamp in addition to its other land types")); + ability.addEffect(new AddCardSubtypeAllEffect(new FilterLandPermanent(), "Swamp", DependencyType.BecomeSwamp)); + this.addAbility(ability); + } + + public BlanketOfNight(final BlanketOfNight card) { + super(card); + } + + @Override + public BlanketOfNight copy() { + return new BlanketOfNight(this); + } +} diff --git a/Mage.Sets/src/mage/cards/g/GhostHounds.java b/Mage.Sets/src/mage/cards/g/GhostHounds.java new file mode 100644 index 0000000000..5dbef9e482 --- /dev/null +++ b/Mage.Sets/src/mage/cards/g/GhostHounds.java @@ -0,0 +1,79 @@ +/* + * 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.g; + +import java.util.UUID; +import mage.MageInt; +import mage.ObjectColor; +import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility; +import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; +import mage.abilities.keyword.FirstStrikeAbility; +import mage.abilities.keyword.VigilanceAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.ColorPredicate; + +/** + * + * @author Galatolol + */ +public class GhostHounds extends CardImpl { + + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("white creature"); + + static { + filter.add(new ColorPredicate(ObjectColor.WHITE)); + } + + public GhostHounds(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}"); + + this.subtype.add("Hound"); + this.subtype.add("Spirit"); + this.power = new MageInt(1); + this.toughness = new MageInt(1); + + // Vigilance + this.addAbility(VigilanceAbility.getInstance()); + + // Whenever Ghost Hounds blocks or becomes blocked by a white creature, Ghost Hounds gains first strike until end of turn. + this.addAbility(new BlocksOrBecomesBlockedTriggeredAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), filter, false)); + + } + + public GhostHounds(final GhostHounds card) { + super(card); + } + @Override + public GhostHounds copy() { + return new GhostHounds(this); + } +} diff --git a/Mage.Sets/src/mage/cards/m/Morale.java b/Mage.Sets/src/mage/cards/m/Morale.java new file mode 100644 index 0000000000..93b40bb0f2 --- /dev/null +++ b/Mage.Sets/src/mage/cards/m/Morale.java @@ -0,0 +1,62 @@ +/* + * 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.effects.common.continuous.BoostAllEffect; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.filter.common.FilterAttackingCreature; + +/** + * + * @author Galatolol + */ +public class Morale extends CardImpl { + + public Morale(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{W}{W}"); + + + // Attacking creatures get +1/+1 until end of turn. + this.getSpellAbility().addEffect(new BoostAllEffect(1, 1, Duration.EndOfTurn, new FilterAttackingCreature("Attacking creatures"), false)); + + } + + public Morale(final Morale card) { + super(card); + } + + @Override + public Morale copy() { + return new Morale(this); + } +} diff --git a/Mage.Sets/src/mage/cards/s/SpiritShackle.java b/Mage.Sets/src/mage/cards/s/SpiritShackle.java new file mode 100644 index 0000000000..d4c64a5697 --- /dev/null +++ b/Mage.Sets/src/mage/cards/s/SpiritShackle.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 mage.cards.s; + +import java.util.UUID; + +import mage.abilities.common.BecomesTappedAttachedTriggeredAbility; +import mage.abilities.effects.common.counter.AddCountersAttachedEffect; +import mage.counters.BoostCounter; +import mage.target.common.TargetCreaturePermanent; +import mage.abilities.Ability; +import mage.abilities.effects.common.AttachEffect; +import mage.constants.Outcome; +import mage.target.TargetPermanent; +import mage.abilities.keyword.EnchantAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; + +/** + * + * @author Galatolol + */ +public class SpiritShackle extends CardImpl { + + public SpiritShackle(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{B}{B}"); + + this.subtype.add("Aura"); + + // Enchant creature + TargetPermanent auraTarget = new TargetCreaturePermanent(); + this.getSpellAbility().addTarget(auraTarget); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); + Ability ability = new EnchantAbility(auraTarget.getTargetName()); + this.addAbility(ability); + + // Whenever enchanted creature becomes tapped, put a -0/-2 counter on it. + this.addAbility(new BecomesTappedAttachedTriggeredAbility(new AddCountersAttachedEffect(new BoostCounter(0, -2), "it"), "enchanted creature")); + + } + + public SpiritShackle(final SpiritShackle card) { + super(card); + } + + @Override + public SpiritShackle copy() { + return new SpiritShackle(this); + } +} diff --git a/Mage.Sets/src/mage/cards/u/UrborgTombOfYawgmoth.java b/Mage.Sets/src/mage/cards/u/UrborgTombOfYawgmoth.java index 4d3a9e5223..5c0818e58c 100644 --- a/Mage.Sets/src/mage/cards/u/UrborgTombOfYawgmoth.java +++ b/Mage.Sets/src/mage/cards/u/UrborgTombOfYawgmoth.java @@ -32,14 +32,12 @@ import java.util.UUID; import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.abilities.mana.BlackManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.filter.common.FilterLandPermanent; -import mage.game.Game; -import mage.game.permanent.Permanent; +import mage.abilities.effects.common.continuous.AddCardSubtypeAllEffect; /** * @@ -54,7 +52,7 @@ public class UrborgTombOfYawgmoth extends CardImpl { // Each land is a Swamp in addition to its other land types. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new BlackManaAbility(), Duration.WhileOnBattlefield, new FilterLandPermanent(), "Each land is a Swamp in addition to its other land types")); - ability.addEffect(new AddCardSubtypeAllEffect()); + ability.addEffect(new AddCardSubtypeAllEffect(new FilterLandPermanent(), "Swamp", DependencyType.BecomeSwamp)); this.addAbility(ability); } @@ -68,35 +66,3 @@ public class UrborgTombOfYawgmoth extends CardImpl { return new UrborgTombOfYawgmoth(this); } } - -class AddCardSubtypeAllEffect extends ContinuousEffectImpl { - - private static final FilterLandPermanent filter = new FilterLandPermanent(); - private static final String addedSubtype = "Swamp"; - - public AddCardSubtypeAllEffect() { - super(Duration.WhileOnBattlefield, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Benefit); - staticText = ""; - addDependencyType(DependencyType.BecomeSwamp); - } - - public AddCardSubtypeAllEffect(final AddCardSubtypeAllEffect effect) { - super(effect); - } - - @Override - public boolean apply(Game game, Ability source) { - for (Permanent perm : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { - if (perm != null && !perm.getSubtype(game).contains(addedSubtype)) { - perm.getSubtype(game).add(addedSubtype); - } - } - return true; - } - - @Override - public AddCardSubtypeAllEffect copy() { - return new AddCardSubtypeAllEffect(this); - } - -} diff --git a/Mage.Sets/src/mage/cards/w/WallOfLava.java b/Mage.Sets/src/mage/cards/w/WallOfLava.java new file mode 100644 index 0000000000..9c032f6f49 --- /dev/null +++ b/Mage.Sets/src/mage/cards/w/WallOfLava.java @@ -0,0 +1,70 @@ +/* + * 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.w; + +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.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; + +/** + * + * @author anonymous + */ +public class WallOfLava extends CardImpl { + + public WallOfLava(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}{R}"); + + this.subtype.add("Wall"); + this.power = new MageInt(1); + this.toughness = new MageInt(3); + + // Defender + this.addAbility(DefenderAbility.getInstance()); + + // {R}: Wall of Lava gets +1/+1 until end of turn. + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{R}"))); + } + + public WallOfLava(final WallOfLava card) { + super(card); + } + + @Override + public WallOfLava copy() { + return new WallOfLava(this); + } +} diff --git a/Mage.Sets/src/mage/sets/FourthEdition.java b/Mage.Sets/src/mage/sets/FourthEdition.java index 2e819a3c2a..6efaa0aa39 100644 --- a/Mage.Sets/src/mage/sets/FourthEdition.java +++ b/Mage.Sets/src/mage/sets/FourthEdition.java @@ -254,6 +254,7 @@ public class FourthEdition extends ExpansionSet { cards.add(new SetCardInfo("Mind Twist", 31, Rarity.RARE, mage.cards.m.MindTwist.class)); cards.add(new SetCardInfo("Mishra's Factory", 181, Rarity.UNCOMMON, mage.cards.m.MishrasFactory.class)); cards.add(new SetCardInfo("Mons's Goblin Raiders", 231, Rarity.COMMON, mage.cards.m.MonssGoblinRaiders.class)); + cards.add(new SetCardInfo("Morale", 288, Rarity.COMMON, mage.cards.m.Morale.class)); cards.add(new SetCardInfo("Mountain", 182, Rarity.LAND, mage.cards.basiclands.Mountain.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Mountain", 183, Rarity.LAND, mage.cards.basiclands.Mountain.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Mountain", 184, Rarity.LAND, mage.cards.basiclands.Mountain.class, new CardGraphicInfo(null, true))); @@ -325,6 +326,7 @@ public class FourthEdition extends ExpansionSet { cards.add(new SetCardInfo("Soul Net", 364, Rarity.UNCOMMON, mage.cards.s.SoulNet.class)); cards.add(new SetCardInfo("Spell Blast", 103, Rarity.COMMON, mage.cards.s.SpellBlast.class)); cards.add(new SetCardInfo("Spirit Link", 301, Rarity.UNCOMMON, mage.cards.s.SpiritLink.class)); + cards.add(new SetCardInfo("Spirit Shackle", 47, Rarity.UNCOMMON, mage.cards.s.SpiritShackle.class)); cards.add(new SetCardInfo("Stasis", 104, Rarity.RARE, mage.cards.s.Stasis.class)); cards.add(new SetCardInfo("Steal Artifact", 105, Rarity.UNCOMMON, mage.cards.s.StealArtifact.class)); cards.add(new SetCardInfo("Stone Giant", 241, Rarity.UNCOMMON, mage.cards.s.StoneGiant.class)); diff --git a/Mage.Sets/src/mage/sets/Homelands.java b/Mage.Sets/src/mage/sets/Homelands.java index 39f394bba3..ab98fecde2 100644 --- a/Mage.Sets/src/mage/sets/Homelands.java +++ b/Mage.Sets/src/mage/sets/Homelands.java @@ -115,6 +115,7 @@ public class Homelands extends ExpansionSet { cards.add(new SetCardInfo("Folk of An-Havva", 58, Rarity.COMMON, FolkOfAnHavva.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Folk of An-Havva", 59, Rarity.COMMON, FolkOfAnHavva.class, new CardGraphicInfo(null, true))); cards.add(new SetCardInfo("Forget", 32, Rarity.RARE, mage.cards.f.Forget.class)); + cards.add(new SetCardInfo("Ghost Hounds", 12, Rarity.UNCOMMON, mage.cards.g.GhostHounds.class)); cards.add(new SetCardInfo("Grandmother Sengir", 13, Rarity.RARE, mage.cards.g.GrandmotherSengir.class)); cards.add(new SetCardInfo("Headstone", 15, Rarity.COMMON, mage.cards.h.Headstone.class)); cards.add(new SetCardInfo("Hungry Mist", 60, Rarity.COMMON, mage.cards.h.HungryMist.class, new CardGraphicInfo(null, true))); diff --git a/Mage.Sets/src/mage/sets/IceAge.java b/Mage.Sets/src/mage/sets/IceAge.java index b8b5459f82..7763765487 100644 --- a/Mage.Sets/src/mage/sets/IceAge.java +++ b/Mage.Sets/src/mage/sets/IceAge.java @@ -277,6 +277,7 @@ public class IceAge extends ExpansionSet { cards.add(new SetCardInfo("Veldt", 358, Rarity.RARE, mage.cards.v.Veldt.class)); cards.add(new SetCardInfo("Vertigo", 222, Rarity.UNCOMMON, mage.cards.v.Vertigo.class)); cards.add(new SetCardInfo("Walking Wall", 321, Rarity.UNCOMMON, mage.cards.w.WalkingWall.class)); + cards.add(new SetCardInfo("Wall of Lava", 223, Rarity.UNCOMMON, mage.cards.w.WallOfLava.class)); cards.add(new SetCardInfo("Wall of Pine Needles", 162, Rarity.UNCOMMON, mage.cards.w.WallOfPineNeedles.class)); cards.add(new SetCardInfo("War Chariot", 323, Rarity.UNCOMMON, mage.cards.w.WarChariot.class)); cards.add(new SetCardInfo("Warning", 279, Rarity.COMMON, mage.cards.w.Warning.class)); diff --git a/Mage.Sets/src/mage/sets/Legends.java b/Mage.Sets/src/mage/sets/Legends.java index 0729bc30ca..5bb2f82516 100644 --- a/Mage.Sets/src/mage/sets/Legends.java +++ b/Mage.Sets/src/mage/sets/Legends.java @@ -204,6 +204,7 @@ public class Legends extends ExpansionSet { cards.add(new SetCardInfo("Sol'kanar the Swamp King", 299, Rarity.RARE, mage.cards.s.SolkanarTheSwampKing.class)); cards.add(new SetCardInfo("Spinal Villain", 161, Rarity.RARE, mage.cards.s.SpinalVillain.class)); cards.add(new SetCardInfo("Spirit Link", 206, Rarity.UNCOMMON, mage.cards.s.SpiritLink.class)); + cards.add(new SetCardInfo("Spirit Shackle", 31, Rarity.COMMON, mage.cards.s.SpiritShackle.class)); cards.add(new SetCardInfo("Storm Seeker", 119, Rarity.UNCOMMON, mage.cards.s.StormSeeker.class)); cards.add(new SetCardInfo("Sunastian Falconer", 301, Rarity.UNCOMMON, mage.cards.s.SunastianFalconer.class)); cards.add(new SetCardInfo("Sylvan Library", 121, Rarity.UNCOMMON, mage.cards.s.SylvanLibrary.class)); @@ -233,7 +234,7 @@ public class Legends extends ExpansionSet { cards.add(new SetCardInfo("Wall of Earth", 166, Rarity.COMMON, mage.cards.w.WallOfEarth.class)); cards.add(new SetCardInfo("Wall of Heat", 167, Rarity.COMMON, mage.cards.w.WallOfHeat.class)); cards.add(new SetCardInfo("Wall of Light", 212, Rarity.UNCOMMON, mage.cards.w.WallOfLight.class)); - cards.add(new SetCardInfo("Wall of Putrid Flesh", 41, Rarity.UNCOMMON, mage.cards.w.WallOfPutridFlesh.class)); + cards.add(new SetCardInfo("Wall of Putrid Flesh", 41, Rarity.UNCOMMON, mage.cards.w.WallOfPutridFlesh.class)); cards.add(new SetCardInfo("Wall of Wonder", 85, Rarity.UNCOMMON, mage.cards.w.WallOfWonder.class)); cards.add(new SetCardInfo("Whirling Dervish", 125, Rarity.UNCOMMON, mage.cards.w.WhirlingDervish.class)); cards.add(new SetCardInfo("Willow Satyr", 126, Rarity.RARE, mage.cards.w.WillowSatyr.class)); diff --git a/Mage.Sets/src/mage/sets/MastersEditionIII.java b/Mage.Sets/src/mage/sets/MastersEditionIII.java index 1551119c2a..ae8ce58ab7 100644 --- a/Mage.Sets/src/mage/sets/MastersEditionIII.java +++ b/Mage.Sets/src/mage/sets/MastersEditionIII.java @@ -204,6 +204,7 @@ public class MastersEditionIII extends ExpansionSet { cards.add(new SetCardInfo("Sivitri Scarzam", 175, Rarity.COMMON, mage.cards.s.SivitriScarzam.class)); cards.add(new SetCardInfo("Slashing Tiger", 133, Rarity.COMMON, mage.cards.s.SlashingTiger.class)); cards.add(new SetCardInfo("Sol Grail", 201, Rarity.COMMON, mage.cards.s.SolGrail.class)); + cards.add(new SetCardInfo("Spirit Shackle", 74, Rarity.COMMON, mage.cards.s.SpiritShackle.class)); cards.add(new SetCardInfo("Spoils of Victory", 134, Rarity.COMMON, mage.cards.s.SpoilsOfVictory.class)); cards.add(new SetCardInfo("Stolen Grain", 75, Rarity.UNCOMMON, mage.cards.s.StolenGrain.class)); cards.add(new SetCardInfo("Strategic Planning", 51, Rarity.COMMON, mage.cards.s.StrategicPlanning.class)); diff --git a/Mage.Sets/src/mage/sets/TheDark.java b/Mage.Sets/src/mage/sets/TheDark.java index 5629aef5f1..a753868ffd 100644 --- a/Mage.Sets/src/mage/sets/TheDark.java +++ b/Mage.Sets/src/mage/sets/TheDark.java @@ -63,7 +63,7 @@ public class TheDark extends ExpansionSet { cards.add(new SetCardInfo("Bog Rats", 4, Rarity.COMMON, mage.cards.b.BogRats.class)); cards.add(new SetCardInfo("Bone Flute", 94, Rarity.UNCOMMON, mage.cards.b.BoneFlute.class)); cards.add(new SetCardInfo("Book of Rass", 95, Rarity.UNCOMMON, mage.cards.b.BookOfRass.class)); - cards.add(new SetCardInfo("Brainwash", 76, Rarity.COMMON, mage.cards.b.Brainwash.class)); + cards.add(new SetCardInfo("Brainwash", 76, Rarity.COMMON, mage.cards.b.Brainwash.class)); cards.add(new SetCardInfo("Brothers of Fire", 58, Rarity.UNCOMMON, mage.cards.b.BrothersOfFire.class)); cards.add(new SetCardInfo("Carnivorous Plant", 38, Rarity.COMMON, mage.cards.c.CarnivorousPlant.class)); cards.add(new SetCardInfo("Cave People", 59, Rarity.UNCOMMON, mage.cards.c.CavePeople.class)); @@ -104,6 +104,7 @@ public class TheDark extends ExpansionSet { cards.add(new SetCardInfo("Marsh Viper", 44, Rarity.COMMON, mage.cards.m.MarshViper.class)); cards.add(new SetCardInfo("Maze of Ith", 114, Rarity.UNCOMMON, mage.cards.m.MazeOfIth.class)); cards.add(new SetCardInfo("Merfolk Assassin", 31, Rarity.UNCOMMON, mage.cards.m.MerfolkAssassin.class)); + cards.add(new SetCardInfo("Morale", 87, Rarity.COMMON, mage.cards.m.Morale.class)); cards.add(new SetCardInfo("Murk Dwellers", 11, Rarity.COMMON, mage.cards.m.MurkDwellers.class)); cards.add(new SetCardInfo("Niall Silvain", 45, Rarity.RARE, mage.cards.n.NiallSilvain.class)); cards.add(new SetCardInfo("Orc General", 72, Rarity.UNCOMMON, mage.cards.o.OrcGeneral.class)); @@ -119,7 +120,7 @@ public class TheDark extends ExpansionSet { cards.add(new SetCardInfo("Sisters of the Flame", 73, Rarity.UNCOMMON, mage.cards.s.SistersOfTheFlame.class)); cards.add(new SetCardInfo("Skull of Orm", 106, Rarity.UNCOMMON, mage.cards.s.SkullOfOrm.class)); cards.add(new SetCardInfo("Squire", 90, Rarity.COMMON, mage.cards.s.Squire.class)); - cards.add(new SetCardInfo("Standing Stones", 107, Rarity.UNCOMMON, mage.cards.s.StandingStones.class)); + cards.add(new SetCardInfo("Standing Stones", 107, Rarity.UNCOMMON, mage.cards.s.StandingStones.class)); cards.add(new SetCardInfo("Stone Calendar", 108, Rarity.RARE, mage.cards.s.StoneCalendar.class)); cards.add(new SetCardInfo("Sunken City", 35, Rarity.COMMON, mage.cards.s.SunkenCity.class)); cards.add(new SetCardInfo("Tivadar's Crusade", 91, Rarity.UNCOMMON, mage.cards.t.TivadarsCrusade.class)); diff --git a/Mage.Sets/src/mage/sets/Visions.java b/Mage.Sets/src/mage/sets/Visions.java index 868a648f50..25b49f8b70 100644 --- a/Mage.Sets/src/mage/sets/Visions.java +++ b/Mage.Sets/src/mage/sets/Visions.java @@ -58,6 +58,7 @@ public class Visions extends ExpansionSet { cards.add(new SetCardInfo("Archangel", 101, Rarity.RARE, mage.cards.a.Archangel.class)); cards.add(new SetCardInfo("Army Ants", 126, Rarity.UNCOMMON, mage.cards.a.ArmyAnts.class)); cards.add(new SetCardInfo("Betrayal", 26, Rarity.COMMON, mage.cards.b.Betrayal.class)); + cards.add(new SetCardInfo("Blanket of Night", 2, Rarity.UNCOMMON, mage.cards.b.BlanketOfNight.class)); cards.add(new SetCardInfo("Breezekeeper", 27, Rarity.COMMON, mage.cards.b.Breezekeeper.class)); cards.add(new SetCardInfo("Chronatog", 28, Rarity.RARE, mage.cards.c.Chronatog.class)); cards.add(new SetCardInfo("City of Solitude", 52, Rarity.RARE, mage.cards.c.CityOfSolitude.class)); diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAllEffect.java new file mode 100644 index 0000000000..459bbb25b9 --- /dev/null +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAllEffect.java @@ -0,0 +1,75 @@ +/* + * 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.abilities.effects.common.continuous; + +import mage.abilities.Ability; +import mage.abilities.effects.ContinuousEffectImpl; +import mage.constants.*; +import mage.filter.FilterPermanent; +import mage.filter.common.FilterLandPermanent; +import mage.game.Game; +import mage.game.permanent.Permanent; + +/** + * @author Galatolol + */ + +public class AddCardSubtypeAllEffect extends ContinuousEffectImpl { + + private static FilterPermanent filter = new FilterLandPermanent(); + private static String addedSubtype; + + public AddCardSubtypeAllEffect(FilterPermanent _filter, String _addedSubtype, DependencyType _dependency) { + super(Duration.WhileOnBattlefield, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Benefit); + filter = _filter; + staticText = ""; + addedSubtype = _addedSubtype; + addDependencyType(_dependency); + } + + public AddCardSubtypeAllEffect(final AddCardSubtypeAllEffect effect) { + super(effect); + } + + @Override + public boolean apply(Game game, Ability source) { + for (Permanent perm : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { + if (perm != null && !perm.getSubtype(game).contains(addedSubtype)) { + perm.getSubtype(game).add(addedSubtype); + } + } + return true; + } + + @Override + public AddCardSubtypeAllEffect copy() { + return new AddCardSubtypeAllEffect(this); + } + +} \ No newline at end of file From 9cbe82299cbe925f95a76390330b8fb3b3e0264c Mon Sep 17 00:00:00 2001 From: Galatolol Date: Sun, 22 Jan 2017 11:40:52 +0100 Subject: [PATCH 13/18] Fixed AddCardSubtypeAllEffect --- .../effects/common/continuous/AddCardSubtypeAllEffect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAllEffect.java index 459bbb25b9..d47f92f5cc 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAllEffect.java @@ -42,7 +42,7 @@ import mage.game.permanent.Permanent; public class AddCardSubtypeAllEffect extends ContinuousEffectImpl { - private static FilterPermanent filter = new FilterLandPermanent(); + private static FilterPermanent filter; private static String addedSubtype; public AddCardSubtypeAllEffect(FilterPermanent _filter, String _addedSubtype, DependencyType _dependency) { From cec9d00a5934a4df5aa36026c9421947cffbbc20 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 24 Jan 2017 23:08:47 +0100 Subject: [PATCH 14/18] * Fixed that non creature spells with morph could not be countered with Remove if cast with morph. --- .../main/java/mage/abilities/keyword/MorphAbility.java | 10 ++++------ Mage/src/main/java/mage/game/stack/Spell.java | 9 ++++++++- Mage/src/main/java/mage/players/PlayerImpl.java | 4 +++- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java b/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java index 2738a54846..7ea7f48f7e 100644 --- a/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java @@ -100,7 +100,7 @@ public class MorphAbility extends StaticAbility implements AlternativeSourceCost protected static final String ABILITY_KEYWORD = "Morph"; protected static final String ABILITY_KEYWORD_MEGA = "Megamorph"; protected static final String REMINDER_TEXT = "(You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)"; - protected static final String REMINDER_TEXT_MEGA = "(You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its megamorph cost and put a +1/+1 counter on it.)"; + protected static final String REMINDER_TEXT_MEGA = "(You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its megamorph cost and put a +1/+1 counter on it.)"; protected String ruleText; protected AlternativeCost2Impl alternateCosts = new AlternativeCost2Impl(ABILITY_KEYWORD, REMINDER_TEXT, new GenericManaCost(3)); protected Costs morphCosts; @@ -194,7 +194,8 @@ public class MorphAbility extends StaticAbility implements AlternativeSourceCost @Override public boolean isAvailable(Ability source, Game game) { - return true; + return game.isMainPhase() && game.getActivePlayerId().equals(source.getControllerId()) + && (game.getStack().isEmpty() || (game.getStack().size() == 1 && game.getStack().getFirst().getSourceId().equals(source.getSourceId()))); } @Override @@ -282,10 +283,7 @@ public class MorphAbility extends StaticAbility implements AlternativeSourceCost @Override public String getCastMessageSuffix(Game game) { - StringBuilder sb = new StringBuilder(); - int position = 0; - sb.append(alternateCosts.getCastSuffixMessage(position)); - return sb.toString(); + return alternateCosts.getCastSuffixMessage(0); } @Override diff --git a/Mage/src/main/java/mage/game/stack/Spell.java b/Mage/src/main/java/mage/game/stack/Spell.java index 57a0fb74f9..bd421709e6 100644 --- a/Mage/src/main/java/mage/game/stack/Spell.java +++ b/Mage/src/main/java/mage/game/stack/Spell.java @@ -432,6 +432,13 @@ public class Spell extends StackObjImpl implements Card { @Override public String getLogName() { + if (faceDown) { + if (getCardType().contains(CardType.CREATURE)) { + return "face down creature spell"; + } else { + return "face down spell"; + } + } return GameLog.getColoredObjectIdName(card); } @@ -451,7 +458,7 @@ public class Spell extends StackObjImpl implements Card { @Override public List getCardType() { - if (this.getSpellAbility().getSpellAbilityType().equals(SpellAbilityType.FACE_DOWN_CREATURE)) { + if (faceDown) { List cardTypes = new ArrayList<>(); cardTypes.add(CardType.CREATURE); return cardTypes; diff --git a/Mage/src/main/java/mage/players/PlayerImpl.java b/Mage/src/main/java/mage/players/PlayerImpl.java index 4b6c31e4ad..0b84f713b1 100644 --- a/Mage/src/main/java/mage/players/PlayerImpl.java +++ b/Mage/src/main/java/mage/players/PlayerImpl.java @@ -2768,7 +2768,9 @@ public abstract class PlayerImpl implements Player, Serializable { case STATIC: if (card.getCardType().contains(CardType.LAND) && ability instanceof AlternativeSourceCosts) { if (canLandPlayAlternateSourceCostsAbility(card, available, ability, game)) { // e.g. Land with Morph - playable.add(card.getId()); + if (game.canPlaySorcery(getId())) { + playable.add(card.getId()); + } break Abilities; } } From e2388374658311f09e245cd39b02e2891cfcfebc Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 24 Jan 2017 23:17:14 +0100 Subject: [PATCH 15/18] Powerstone Minefield some minor changes. --- Mage.Sets/src/mage/cards/p/PowerstoneMinefield.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Mage.Sets/src/mage/cards/p/PowerstoneMinefield.java b/Mage.Sets/src/mage/cards/p/PowerstoneMinefield.java index 97dc6b032b..a86873d965 100644 --- a/Mage.Sets/src/mage/cards/p/PowerstoneMinefield.java +++ b/Mage.Sets/src/mage/cards/p/PowerstoneMinefield.java @@ -27,6 +27,7 @@ */ package mage.cards.p; +import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; @@ -41,8 +42,6 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; -import java.util.UUID; - /** * * @author vereena42 @@ -51,7 +50,6 @@ public class PowerstoneMinefield extends CardImpl { public PowerstoneMinefield(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}{W}"); - // Whenever a creature attacks or blocks, Powerstone Minefield deals 2 damage to it. this.addAbility(new PowerstoneMinefieldTriggeredAbility()); @@ -86,11 +84,10 @@ class PowerstoneMinefieldTriggeredAbility extends TriggeredAbilityImpl { @Override public boolean checkTrigger(GameEvent event, Game game) { - UUID sourceId = event.getSourceId(); - Permanent permanent = game.getPermanent(sourceId); + Permanent permanent = game.getPermanent(event.getSourceId()); if (filter.match(permanent, getSourceId(), getControllerId(), game)) { for (Effect effect : this.getEffects()) { - effect.setTargetPointer(new FixedTarget(sourceId)); + effect.setTargetPointer(new FixedTarget(permanent, game)); } return true; } @@ -99,7 +96,7 @@ class PowerstoneMinefieldTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever a creature attacks or blocks, Powerstone Minefield deals 2 damage to it."; + return "Whenever a creature attacks or blocks, {this} deals 2 damage to it."; } @Override From dd2a1b8b94a3a09f05cf1b54551c7a4a7edbe618 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 24 Jan 2017 23:28:19 +0100 Subject: [PATCH 16/18] Hivestone, Muraganda Petroglyphs some minor updates. --- Mage.Sets/src/mage/cards/h/Hivestone.java | 58 +++++-------------- .../mage/cards/m/MuragandaPetroglyphs.java | 29 +++++----- 2 files changed, 31 insertions(+), 56 deletions(-) diff --git a/Mage.Sets/src/mage/cards/h/Hivestone.java b/Mage.Sets/src/mage/cards/h/Hivestone.java index 1738625eaf..2f5d24e4a4 100644 --- a/Mage.Sets/src/mage/cards/h/Hivestone.java +++ b/Mage.Sets/src/mage/cards/h/Hivestone.java @@ -1,30 +1,37 @@ package mage.cards.h; -import mage.abilities.Ability; +import java.util.ArrayList; +import java.util.UUID; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ContinuousEffectImpl; +import mage.abilities.effects.Effect; +import mage.abilities.effects.common.continuous.BecomesSubtypeAllEffect; 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; +import mage.filter.predicate.permanent.ControllerPredicate; /** * Created by Alexsandr0x. */ public class Hivestone extends CardImpl { + private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures you control"); + + static { + filter.add(new ControllerPredicate(TargetController.YOU)); + } + 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())); + ArrayList subTypes = new ArrayList<>(); + subTypes.add("Slivers"); + Effect effect = new BecomesSubtypeAllEffect(Duration.WhileOnBattlefield, subTypes, filter, false); + effect.setText("Creatures you control are Slivers in addition to their other creature types"); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } public Hivestone(final Hivestone card) { @@ -37,36 +44,3 @@ public class Hivestone extends CardImpl { } } - -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 permanents = game.getBattlefield().getActivePermanents(filter, source.getControllerId(), game); - for (Permanent perm : permanents) { - List 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); - } -} diff --git a/Mage.Sets/src/mage/cards/m/MuragandaPetroglyphs.java b/Mage.Sets/src/mage/cards/m/MuragandaPetroglyphs.java index ae27cf86d9..78181d7245 100644 --- a/Mage.Sets/src/mage/cards/m/MuragandaPetroglyphs.java +++ b/Mage.Sets/src/mage/cards/m/MuragandaPetroglyphs.java @@ -28,7 +28,6 @@ package mage.cards.m; import java.util.UUID; - import mage.MageObject; import mage.abilities.Abilities; import mage.abilities.Ability; @@ -51,14 +50,17 @@ import mage.game.Game; */ public class MuragandaPetroglyphs extends CardImpl { - private static final FilterCreaturePermanent filterNoAbilities = new FilterCreaturePermanent( - "Creatures with no ability"); + private static final FilterCreaturePermanent filterNoAbilities + = new FilterCreaturePermanent("Creatures with no ability"); + + static { + filterNoAbilities.add(new NoAbilityPredicate()); + } public MuragandaPetroglyphs(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT},"{3}{G}"); + 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))); @@ -80,24 +82,23 @@ class NoAbilityPredicate implements Predicate { 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); + 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())) { + for (Ability ability : abilities) { + if (!ability.getSourceId().equals(input.getId())) { return false; } } return true; } - for (Ability ability : abilities){ - if (ability.getClass() != SpellAbility.class){ + for (Ability ability : abilities) { + if (ability.getClass() != SpellAbility.class) { return false; } @@ -109,4 +110,4 @@ class NoAbilityPredicate implements Predicate { public String toString() { return "with no abilities"; } -} \ No newline at end of file +} From fc6dba3da0f6112e8f1bb9868fd9ecef3da33b86 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 25 Jan 2017 00:13:51 +0100 Subject: [PATCH 17/18] Added "MTGO Legacy Cube January 2017" to the server xml. --- Mage.Server/config/config.xml | 1 + Mage.Server/release/config/config.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/Mage.Server/config/config.xml b/Mage.Server/config/config.xml index fd41c97a47..1192fab384 100644 --- a/Mage.Server/config/config.xml +++ b/Mage.Server/config/config.xml @@ -107,6 +107,7 @@ + diff --git a/Mage.Server/release/config/config.xml b/Mage.Server/release/config/config.xml index 0f2c1d167e..e488bf20e9 100644 --- a/Mage.Server/release/config/config.xml +++ b/Mage.Server/release/config/config.xml @@ -104,6 +104,7 @@ + From 082210a4bdcce5a0d712f15e933e355185c0bbb2 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 25 Jan 2017 00:14:05 +0100 Subject: [PATCH 18/18] Xmage 1.4.21V1 --- Mage.Common/src/mage/utils/MageVersion.java | 2 +- Mage/src/main/java/mage/cards/repository/CardRepository.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Mage.Common/src/mage/utils/MageVersion.java b/Mage.Common/src/mage/utils/MageVersion.java index 33185a3fd3..adf31bb5b6 100644 --- a/Mage.Common/src/mage/utils/MageVersion.java +++ b/Mage.Common/src/mage/utils/MageVersion.java @@ -41,7 +41,7 @@ public class MageVersion implements Serializable, Comparable { public final static int MAGE_VERSION_MAJOR = 1; public final static int MAGE_VERSION_MINOR = 4; public final static int MAGE_VERSION_PATCH = 21; - public final static String MAGE_VERSION_MINOR_PATCH = "V0"; + public final static String MAGE_VERSION_MINOR_PATCH = "V1"; public final static String MAGE_VERSION_INFO = ""; private final int major; diff --git a/Mage/src/main/java/mage/cards/repository/CardRepository.java b/Mage/src/main/java/mage/cards/repository/CardRepository.java index 41d39928c7..0662049895 100644 --- a/Mage/src/main/java/mage/cards/repository/CardRepository.java +++ b/Mage/src/main/java/mage/cards/repository/CardRepository.java @@ -60,7 +60,7 @@ public enum CardRepository { // raise this if db structure was changed private static final long CARD_DB_VERSION = 50; // raise this if new cards were added to the server - private static final long CARD_CONTENT_VERSION = 68; + private static final long CARD_CONTENT_VERSION = 69; private final TreeSet landTypes = new TreeSet(); private Dao cardDao; private Set classNames;