mirror of
https://github.com/correl/mage.git
synced 2025-01-12 03:00:13 +00:00
Merge branch 'master' of https://github.com/magefree/mage
This commit is contained in:
commit
33f2f3e9fc
6 changed files with 17 additions and 12 deletions
|
@ -70,5 +70,6 @@ public class Standard extends Constructed {
|
|||
banned.add("Emrakul, the Promised End");
|
||||
banned.add("Reflector Mage");
|
||||
banned.add("Smuggler's Copter");
|
||||
banned.add("Felidar Guardian");
|
||||
}
|
||||
}
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
*/
|
||||
package mage.cards.b;
|
||||
|
||||
import java.util.UUID;
|
||||
import mage.MageInt;
|
||||
import mage.abilities.Ability;
|
||||
import mage.abilities.common.SimpleStaticAbility;
|
||||
|
@ -47,8 +48,6 @@ import mage.filter.predicate.mageobject.CardTypePredicate;
|
|||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.target.common.TargetCardInYourGraveyard;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author fireshoes
|
||||
|
@ -85,7 +84,7 @@ public class BrunaTheFadingLight extends CardImpl {
|
|||
this.addAbility(VigilanceAbility.getInstance());
|
||||
|
||||
// <i>(Melds with Gisela, the Broken Blade.)</i>
|
||||
this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("<i>(Melds with Gisela, the Broken Blade.)</i>")));
|
||||
this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("(Melds with Gisela, the Broken Blade.)")));
|
||||
}
|
||||
|
||||
public BrunaTheFadingLight(final BrunaTheFadingLight card) {
|
||||
|
|
|
@ -57,7 +57,7 @@ public class HanweirGarrison extends CardImpl {
|
|||
this.addAbility(new AttacksTriggeredAbility(new CreateTokenEffect(new RedHumanToken(), 2, true, true), false));
|
||||
|
||||
// <i>(Melds with Hanweir Battlements.)</i>
|
||||
this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("<i>(Melds with Hannweir Battlements.)</i>")));
|
||||
this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("(Melds with Hannweir Battlements.)")));
|
||||
}
|
||||
|
||||
public HanweirGarrison(final HanweirGarrison card) {
|
||||
|
|
|
@ -27,9 +27,9 @@
|
|||
*/
|
||||
package mage.cards.m;
|
||||
|
||||
import java.util.UUID;
|
||||
import mage.MageInt;
|
||||
import mage.abilities.Ability;
|
||||
import mage.constants.ComparisonType;
|
||||
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
|
||||
import mage.abilities.common.SimpleStaticAbility;
|
||||
import mage.abilities.effects.common.InfoEffect;
|
||||
|
@ -37,14 +37,13 @@ import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.cards.CardSetInfo;
|
||||
import mage.constants.CardType;
|
||||
import mage.constants.ComparisonType;
|
||||
import mage.constants.Zone;
|
||||
import mage.filter.common.FilterCreatureCard;
|
||||
import mage.filter.predicate.mageobject.ConvertedManaCostPredicate;
|
||||
import mage.target.Target;
|
||||
import mage.target.common.TargetCardInYourGraveyard;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author fireshoes
|
||||
|
@ -71,7 +70,7 @@ public class MidnightScavengers extends CardImpl {
|
|||
this.addAbility(ability);
|
||||
|
||||
// <i>(Melds with Graf Rats.)</i>
|
||||
this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("<i>(Melds with Graf Rats.)</i>")));
|
||||
this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("(Melds with Graf Rats.)")));
|
||||
}
|
||||
|
||||
public MidnightScavengers(final MidnightScavengers card) {
|
||||
|
|
|
@ -135,6 +135,9 @@ public class LandTypeChangingEffectsTest extends CardTestPlayerBase {
|
|||
String bloodmoon = "Blood Moon";
|
||||
String canopyvista = "Canopy Vista";
|
||||
|
||||
/*
|
||||
NOTE: this test is currently failing due to bug in code. See issue #3072
|
||||
*/
|
||||
@Test
|
||||
public void testBloodMoonBeforeUrborg() {
|
||||
// Blood Moon 2R
|
||||
|
@ -164,6 +167,9 @@ public class LandTypeChangingEffectsTest extends CardTestPlayerBase {
|
|||
Assert.assertTrue("The mana the land can produce should be [{R}] but it's " + playerB.getManaAvailable(currentGame).toString(), playerB.getManaAvailable(currentGame).toString().equals("[{R}]"));
|
||||
}
|
||||
|
||||
/*
|
||||
NOTE: this test is currently failing due to bug in code. See issue #3072
|
||||
*/
|
||||
@Test
|
||||
public void testBloodMoonAfterUrborg() {
|
||||
// Blood Moon 2R
|
||||
|
|
|
@ -38,8 +38,8 @@ import org.mage.test.serverside.base.CardTestPlayerBase;
|
|||
public class FluctuatorTest extends CardTestPlayerBase {
|
||||
|
||||
/**
|
||||
* NOTE: As of 4/19/2017 this test is failing due to a bug in code. See
|
||||
* issue #3148
|
||||
* NOTE: As of 4/19/2017 this test is failing due to a bug in code.
|
||||
* See issue #3148
|
||||
*
|
||||
* Fluctuator makes 'Akroma's Vengeance' cyclic cost reduced to {1} Test it
|
||||
* with one Plains on battlefield.
|
||||
|
@ -93,8 +93,8 @@ public class FluctuatorTest extends CardTestPlayerBase {
|
|||
}
|
||||
|
||||
/**
|
||||
* NOTE: As of 4/19/2017 this test is failing due to a bug in code. See
|
||||
* issue #3148
|
||||
* NOTE: As of 4/19/2017 this test is failing due to a bug in code.
|
||||
* See issue #3148
|
||||
*
|
||||
* Test 2 Fluctuators reduce cycling cost up to 4.
|
||||
*/
|
||||
|
|
Loading…
Reference in a new issue