Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Merge pull request #3983 from theelk801/master

Browse source 
merge
This commit is contained in:
theelk801 2017-09-13 22:50:55 -04:00 • committed by GitHub
commit 92cd4fcd61
21 changed files with 319 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

116
Mage.Sets/src/mage/cards/a/AxisOfMortality.java Normal file
View file

@ -0,0 +1,116 @@
/*
* 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.a;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
import mage.abilities.effects.OneShotEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.TargetController;
import mage.game.Game;
import mage.players.Player;
import mage.target.TargetPlayer;
/**
*
* @author TheElk801
*/
public class AxisOfMortality extends CardImpl {
public AxisOfMortality(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{W}{W}");
// At the beginning of your upkeep, you may have two target players exchange life totals.
Ability ability = new BeginningOfUpkeepTriggeredAbility(new AxisOfMortalityEffect(), TargetController.YOU, true);
ability.addTarget(new TargetPlayer());
ability.addTarget(new TargetPlayer());
this.addAbility(ability);
}
public AxisOfMortality(final AxisOfMortality card) {
super(card);
}
@Override
public AxisOfMortality copy() {
return new AxisOfMortality(this);
}
}
class AxisOfMortalityEffect extends OneShotEffect {
public AxisOfMortalityEffect() {
super(Outcome.Neutral);
this.staticText = "two target players exchange life totals";
}
public AxisOfMortalityEffect(final AxisOfMortalityEffect effect) {
super(effect);
}
@Override
public AxisOfMortalityEffect copy() {
return new AxisOfMortalityEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
Player player1 = game.getPlayer(source.getFirstTarget());
Player player2 = game.getPlayer(source.getTargets().get(1).getFirstTarget());
if (player1 != null && player2 != null) {
int lifePlayer1 = player1.getLife();
int lifePlayer2 = player2.getLife();
if (lifePlayer1 == lifePlayer2) {
return false;
}
if (!player1.isLifeTotalCanChange() || !player2.isLifeTotalCanChange()) {
return false;
}
// 20110930 - 118.7, 118.8
if (lifePlayer1 < lifePlayer2 && (!player1.isCanGainLife() || !player2.isCanLoseLife())) {
return false;
}
if (lifePlayer1 > lifePlayer2 && (!player1.isCanLoseLife() || !player2.isCanGainLife())) {
return false;
}
player1.setLife(lifePlayer2, game);
player2.setLife(lifePlayer1, game);
return true;
}
return false;
}
}

2
Mage.Sets/src/mage/cards/b/BehindTheScenes.java
View file

@ -52,7 +52,7 @@ public class BehindTheScenes extends CardImpl {
// Creatures you control have skulk.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
new GainAbilityControlledEffect(new SkulkAbility(), Duration.WhileOnBattlefield, FILTER_PERMANENT_CREATURES)));
new GainAbilityControlledEffect(SkulkAbility.getInstance(), Duration.WhileOnBattlefield, FILTER_PERMANENT_CREATURES)));
// {4}{W}: Creatures you control get +1/+1 until end of turn.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD,

2
Mage.Sets/src/mage/cards/f/FarbogRevenant.java
View file

@ -49,7 +49,7 @@ public class FarbogRevenant extends CardImpl {
this.toughness = new MageInt(3);
// Skulk
this.addAbility(new SkulkAbility());
this.addAbility(SkulkAbility.getInstance());
// Lifelink
this.addAbility(LifelinkAbility.getInstance());

2
Mage.Sets/src/mage/cards/f/Fogwalker.java
View file

@ -60,7 +60,7 @@ public class Fogwalker extends CardImpl {
this.toughness = new MageInt(3);
// Skulk
this.addAbility(new SkulkAbility());
this.addAbility(SkulkAbility.getInstance());
// When Fogwalker enters the battlefield, target creature an opponent controls doesn't untap during it controler's next untap step.
EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DontUntapInControllersNextUntapStepTargetEffect());
ability.addTarget(new TargetCreaturePermanent(filter));

2
Mage.Sets/src/mage/cards/f/ForgottenCreation.java
View file

@ -56,7 +56,7 @@ public class ForgottenCreation extends CardImpl {
this.toughness = new MageInt(3);
// Skulk
this.addAbility(new SkulkAbility());
this.addAbility(SkulkAbility.getInstance());
// At the beginning of your upkeep, you may discard all the cards in your hand. If you do, draw that many cards.
this.addAbility(new BeginningOfUpkeepTriggeredAbility(new ForgottenCreationEffect(), TargetController.YOU, true));
}

2
Mage.Sets/src/mage/cards/f/FurtiveHomunculus.java
View file

@ -48,7 +48,7 @@ public class FurtiveHomunculus extends CardImpl {
this.toughness = new MageInt(1);
// Skulk (This creature can't be blocked by creatures with greater power.)
this.addAbility(new SkulkAbility());
this.addAbility(SkulkAbility.getInstance());
}
public FurtiveHomunculus(final FurtiveHomunculus card) {

2
Mage.Sets/src/mage/cards/o/OdricLunarchMarshal.java
View file

@ -171,7 +171,7 @@ class OdricLunarchMarshalEffect extends OneShotEffect {
// Skulk
if (game.getBattlefield().contains(filterSkulk, source.getControllerId(), 1, game)) {
game.addEffect(new GainAbilityControlledEffect(new SkulkAbility(), Duration.EndOfTurn, filterCreatures), source);
game.addEffect(new GainAbilityControlledEffect(SkulkAbility.getInstance(), Duration.EndOfTurn, filterCreatures), source);
}
// Trample

2
Mage.Sets/src/mage/cards/p/PaleRiderOfTrostad.java
View file

@ -50,7 +50,7 @@ public class PaleRiderOfTrostad extends CardImpl {
this.toughness = new MageInt(3);
// Skulk
this.addAbility(new SkulkAbility());
this.addAbility(SkulkAbility.getInstance());
// When Pale Rider of Trostad enters the battlefield, discard a card.
this.addAbility(new EntersBattlefieldTriggeredAbility(new DiscardControllerEffect(1), false));

2
Mage.Sets/src/mage/cards/p/PersistentNightmare.java
View file

@ -54,7 +54,7 @@ public class PersistentNightmare extends CardImpl {
this.nightCard = true;
// Skulk
this.addAbility(new SkulkAbility());
this.addAbility(SkulkAbility.getInstance());
// When Persistent Nightmare deals combat damage to a player, return it to its owner's hand.
this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new ReturnToHandSourceEffect(), false));

2
Mage.Sets/src/mage/cards/r/RancidRats.java
View file

@ -50,7 +50,7 @@ public class RancidRats extends CardImpl {
this.toughness = new MageInt(1);
// Skulk
this.addAbility(new SkulkAbility());
this.addAbility(SkulkAbility.getInstance());
// Deathtouch
this.addAbility(DeathtouchAbility.getInstance());
}

2
Mage.Sets/src/mage/cards/s/SkeletonKey.java
View file

@ -57,7 +57,7 @@ public class SkeletonKey extends CardImpl {
this.subtype.add(SubType.EQUIPMENT);
// Equipped creature has skulk.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new SkulkAbility(), AttachmentType.EQUIPMENT)));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(SkulkAbility.getInstance(), AttachmentType.EQUIPMENT)));
// Whenever equipped creature deals combat damage to a player, you may draw a card. if you do, discard a card.
Ability ability = new DealsDamageToAPlayerAttachedTriggeredAbility(new DrawCardSourceControllerEffect(1), "equipped creature", true);

14
Mage.Sets/src/mage/cards/s/SoulConduit.java
View file

@ -49,7 +49,7 @@ import mage.target.TargetPlayer;
public class SoulConduit extends CardImpl {
public SoulConduit(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}");
super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{6}");
// {6}, {tap}: Two target players exchange life totals.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SoulConduitEffect(), new GenericManaCost(6));
@ -93,18 +93,22 @@ class SoulConduitEffect extends OneShotEffect {
int lifePlayer1 = player1.getLife();
int lifePlayer2 = player2.getLife();
if (lifePlayer1 == lifePlayer2)
if (lifePlayer1 == lifePlayer2) {
return false;
}
if (!player1.isLifeTotalCanChange() || !player2.isLifeTotalCanChange())
if (!player1.isLifeTotalCanChange() || !player2.isLifeTotalCanChange()) {
return false;
}
// 20110930 - 118.7, 118.8
if (lifePlayer1 < lifePlayer2 && (!player1.isCanGainLife() || !player2.isCanLoseLife()))
if (lifePlayer1 < lifePlayer2 && (!player1.isCanGainLife() || !player2.isCanLoseLife())) {
return false;
}
if (lifePlayer1 > lifePlayer2 && (!player1.isCanLoseLife() || !player2.isCanGainLife()))
if (lifePlayer1 > lifePlayer2 && (!player1.isCanLoseLife() || !player2.isCanGainLife())) {
return false;
}
player1.setLife(lifePlayer2, game);
player2.setLife(lifePlayer1, game);

121
Mage.Sets/src/mage/cards/s/SwordPointDiplomacy.java Normal file
View file

@ -0,0 +1,121 @@
/*
* 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.Set;
import java.util.UUID;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.costs.Cost;
import mage.abilities.costs.common.PayLifeCost;
import mage.abilities.effects.OneShotEffect;
import mage.cards.Card;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.cards.Cards;
import mage.cards.CardsImpl;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.game.Game;
import mage.players.Player;
/**
*
* @author TheElk801
*/
public class SwordPointDiplomacy extends CardImpl {
public SwordPointDiplomacy(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{B}");
// Reveal the top three cards of your library. For each of those cards, put that card into your hand unless any opponent pays 3 life. Then exile the rest.
this.getSpellAbility().addEffect(new SwordPointDiplomacyEffect());
}
public SwordPointDiplomacy(final SwordPointDiplomacy card) {
super(card);
}
@Override
public SwordPointDiplomacy copy() {
return new SwordPointDiplomacy(this);
}
}
class SwordPointDiplomacyEffect extends OneShotEffect {
SwordPointDiplomacyEffect() {
super(Outcome.Benefit);
this.staticText = "";
}
SwordPointDiplomacyEffect(final SwordPointDiplomacyEffect effect) {
super(effect);
}
@Override
public SwordPointDiplomacyEffect copy() {
return new SwordPointDiplomacyEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId());
MageObject sourceObject = game.getObject(source.getSourceId());
if (controller == null || sourceObject == null) {
return false;
}
int amount = Math.min(controller.getLibrary().size(), 3);
CardsImpl cards = new CardsImpl();
cards.addAll(controller.getLibrary().getTopCards(game, amount));
controller.revealCards(sourceObject.getIdName(), cards, game);
Set<Card> cardsList = cards.getCards(game);
Cards cardsToHand = new CardsImpl();
for (Card card : cardsList) {
boolean keepIt = true;
Cost cost = new PayLifeCost(3);
for (UUID oppId : game.getOpponents(controller.getId())) {
Player opponent = game.getPlayer(oppId);
if (!(opponent != null
&& cost.canPay(source, source.getSourceId(), opponent.getId(), game)
&& opponent.chooseUse(Outcome.Neutral, "Pay 3 life to prevent " + controller.getLogName() + " from getting " + card.getLogName() + "?", source, game)
&& cost.pay(source, game, source.getSourceId(), opponent.getId(), true))) {
keepIt = false;
}
}
if (keepIt) {
cardsToHand.add(card);
cards.remove(card);
}
}
controller.moveCards(cardsToHand, Zone.HAND, source, game);
controller.moveCards(cards, Zone.EXILED, source, game);
return true;
}
}

2
Mage.Sets/src/mage/cards/u/UninvitedGeist.java
View file

@ -54,7 +54,7 @@ public class UninvitedGeist extends CardImpl {
this.secondSideCardClazz = UnimpededTrespasser.class;
// Skulk (This creature can't be blocked by creatures with greater power.)
this.addAbility(new SkulkAbility());
this.addAbility(SkulkAbility.getInstance());
// When Uninvited Geist deals combat damage to a player, transform it.
this.addAbility(new TransformAbility());

2
Mage.Sets/src/mage/cards/v/VampireCutthroat.java
View file

@ -50,7 +50,7 @@ public class VampireCutthroat extends CardImpl {
this.toughness = new MageInt(1);
// Skulk
this.addAbility(new SkulkAbility());
this.addAbility(SkulkAbility.getInstance());
// Lifelink
this.addAbility(LifelinkAbility.getInstance());
}

2
Mage.Sets/src/mage/cards/w/WharfInfiltrator.java
View file

@ -62,7 +62,7 @@ public class WharfInfiltrator extends CardImpl {
this.toughness = new MageInt(1);
// Skulk
this.addAbility(new SkulkAbility());
this.addAbility(SkulkAbility.getInstance());
// Whenever Wharf Infiltrator deals combat damage to a player, you may draw a card. If you do, discard a card.
Effect effect = new DrawDiscardControllerEffect();

17
Mage.Sets/src/mage/sets/Ixalan.java
View file

@ -38,6 +38,7 @@ public class Ixalan extends ExpansionSet {
cards.add(new SetCardInfo("Arcane Adaptation", 46, Rarity.RARE, mage.cards.a.ArcaneAdaptation.class));
cards.add(new SetCardInfo("Arguel's Blood Fast", 90, Rarity.RARE, mage.cards.a.ArguelsBloodFast.class));
cards.add(new SetCardInfo("Ashes of the Abhorrent", 2, Rarity.RARE, mage.cards.a.AshesOfTheAbhorrent.class));
cards.add(new SetCardInfo("Axis of Mortality", 3, Rarity.MYTHIC, mage.cards.a.AxisOfMortality.class));
cards.add(new SetCardInfo("Azcanta, The Sunken Ruin", 74, Rarity.RARE, mage.cards.a.AzcantaTheSunkenRuin.class));
cards.add(new SetCardInfo("Belligerent Brontodon", 218, Rarity.UNCOMMON, mage.cards.b.BelligerentBrontodon.class));
cards.add(new SetCardInfo("Bellowing Aegisaur", 4, Rarity.UNCOMMON, mage.cards.b.BellowingAegisaur.class));
@ -83,7 +84,10 @@ public class Ixalan extends ExpansionSet {
cards.add(new SetCardInfo("Fathom Fleet Captain", 106, Rarity.RARE, mage.cards.f.FathomFleetCaptain.class));
cards.add(new SetCardInfo("Favorable Winds", 56, Rarity.UNCOMMON, mage.cards.f.FavorableWinds.class));
cards.add(new SetCardInfo("Fell Flagship", 238, Rarity.RARE, mage.cards.f.FellFlagship.class));
cards.add(new SetCardInfo("Forest", 276, Rarity.LAND, mage.cards.basiclands.Forest.class));
cards.add(new SetCardInfo("Forest", 277, Rarity.LAND, mage.cards.basiclands.Forest.class));
cards.add(new SetCardInfo("Forest", 278, Rarity.LAND, mage.cards.basiclands.Forest.class));
cards.add(new SetCardInfo("Forest", 279, Rarity.LAND, mage.cards.basiclands.Forest.class));
cards.add(new SetCardInfo("Gishath, Sun's Avatar", 222, Rarity.MYTHIC, mage.cards.g.GishathSunsAvatar.class));
cards.add(new SetCardInfo("Glacial Fortress", 255, Rarity.RARE, mage.cards.g.GlacialFortress.class));
cards.add(new SetCardInfo("Goring Ceratops", 13, Rarity.RARE, mage.cards.g.GoringCeratops.class));
@ -98,7 +102,10 @@ public class Ixalan extends ExpansionSet {
cards.add(new SetCardInfo("Huatli, Dinosaur Knight", 285, Rarity.MYTHIC, mage.cards.h.HuatliDinosaurKnight.class));
cards.add(new SetCardInfo("Huatli, Warrior Poet", 224, Rarity.MYTHIC, mage.cards.h.HuatliWarriorPoet.class));
cards.add(new SetCardInfo("Imperial Lancer", 15, Rarity.UNCOMMON, mage.cards.i.ImperialLancer.class));
cards.add(new SetCardInfo("Island", 264, Rarity.LAND, mage.cards.basiclands.Island.class));
cards.add(new SetCardInfo("Island", 265, Rarity.LAND, mage.cards.basiclands.Island.class));
cards.add(new SetCardInfo("Island", 266, Rarity.LAND, mage.cards.basiclands.Island.class));
cards.add(new SetCardInfo("Island", 267, Rarity.LAND, mage.cards.basiclands.Island.class));
cards.add(new SetCardInfo("Itlimoc, Cradle of the Sun", 191, Rarity.RARE, mage.cards.i.ItlimocCradleOfTheSun.class));
cards.add(new SetCardInfo("Ixalan's Binding", 17, Rarity.UNCOMMON, mage.cards.i.IxalansBinding.class));
cards.add(new SetCardInfo("Jace's Sentinel", 283, Rarity.UNCOMMON, mage.cards.j.JacesSentinel.class));
@ -120,14 +127,20 @@ public class Ixalan extends ExpansionSet {
cards.add(new SetCardInfo("Marauding Looter", 225, Rarity.UNCOMMON, mage.cards.m.MaraudingLooter.class));
cards.add(new SetCardInfo("Mavren Fein, Dusk Apostle", 24, Rarity.RARE, mage.cards.m.MavrenFeinDuskApostle.class));
cards.add(new SetCardInfo("Merfolk Branchwalker", 197, Rarity.UNCOMMON, mage.cards.m.MerfolkBranchwalker.class));
cards.add(new SetCardInfo("Mountain", 272, Rarity.LAND, mage.cards.basiclands.Mountain.class));
cards.add(new SetCardInfo("Mountain", 273, Rarity.LAND, mage.cards.basiclands.Mountain.class));
cards.add(new SetCardInfo("Mountain", 274, Rarity.LAND, mage.cards.basiclands.Mountain.class));
cards.add(new SetCardInfo("Mountain", 275, Rarity.LAND, mage.cards.basiclands.Mountain.class));
cards.add(new SetCardInfo("Old-Growth Dryads", 199, Rarity.RARE, mage.cards.o.OldGrowthDryads.class));
cards.add(new SetCardInfo("Opt", 65, Rarity.COMMON, mage.cards.o.Opt.class));
cards.add(new SetCardInfo("Otepec Huntmaster", 153, Rarity.UNCOMMON, mage.cards.o.OtepecHuntmaster.class));
cards.add(new SetCardInfo("Overflowing Insight", 64, Rarity.MYTHIC, mage.cards.o.OverflowingInsight.class));
cards.add(new SetCardInfo("Pillar of Origins", 241, Rarity.UNCOMMON, mage.cards.p.PillarOfOrigins.class));
cards.add(new SetCardInfo("Pirate's Cutlass", 242, Rarity.COMMON, mage.cards.p.PiratesCutlass.class));
cards.add(new SetCardInfo("Plains", 260, Rarity.LAND, mage.cards.basiclands.Plains.class));
cards.add(new SetCardInfo("Plains", 261, Rarity.LAND, mage.cards.basiclands.Plains.class));
cards.add(new SetCardInfo("Plains", 262, Rarity.LAND, mage.cards.basiclands.Plains.class));
cards.add(new SetCardInfo("Plains", 263, Rarity.LAND, mage.cards.basiclands.Plains.class));
cards.add(new SetCardInfo("Priest of the Wakening Sun", 27, Rarity.RARE, mage.cards.p.PriestOfTheWakeningSun.class));
cards.add(new SetCardInfo("Primal Amulet", 243, Rarity.RARE, mage.cards.p.PrimalAmulet.class));
cards.add(new SetCardInfo("Primal Wellspring", 243, Rarity.RARE, mage.cards.p.PrimalWellspring.class));
@ -176,7 +189,11 @@ public class Ixalan extends ExpansionSet {
cards.add(new SetCardInfo("Sun-Crowned Hunters", 164, Rarity.COMMON, mage.cards.s.SunCrownedHunters.class));
cards.add(new SetCardInfo("Sunbird's Invocation", 165, Rarity.RARE, mage.cards.s.SunbirdsInvocation.class));
cards.add(new SetCardInfo("Sunpetal Grove", 257, Rarity.RARE, mage.cards.s.SunpetalGrove.class));
cards.add(new SetCardInfo("Swamp", 268, Rarity.LAND, mage.cards.basiclands.Swamp.class));
cards.add(new SetCardInfo("Swamp", 269, Rarity.LAND, mage.cards.basiclands.Swamp.class));
cards.add(new SetCardInfo("Swamp", 270, Rarity.LAND, mage.cards.basiclands.Swamp.class));
cards.add(new SetCardInfo("Swamp", 271, Rarity.LAND, mage.cards.basiclands.Swamp.class));
cards.add(new SetCardInfo("Sword-Point Diplomacy", 126, Rarity.RARE, mage.cards.s.SwordPointDiplomacy.class));
cards.add(new SetCardInfo("Temple of Aclazotz", 90, Rarity.RARE, mage.cards.t.TempleOfAclazotz.class));
cards.add(new SetCardInfo("Thaumatic Compass", 249, Rarity.RARE, mage.cards.t.ThaumaticCompass.class));
cards.add(new SetCardInfo("Thundering Spineback", 210, Rarity.UNCOMMON, mage.cards.t.ThunderingSpineback.class));

22
Mage.Tests/src/test/java/org/mage/test/cards/abilities/add/GainAbilitiesTest.java
View file

@ -14,34 +14,34 @@ public class GainAbilitiesTest extends CardTestPlayerBase {
/*
Reported bug: Behind the Scenes grants skulk to all creatures instead of just ones under owner's control
*/
*/
@Test
public void behindTheScenesShouldOnlyGrantSkulkToCreaturesYouControl() {
/*
Behind the Scenes {2}{B}
Enchantment
Creatures you control have skulk. (They can't be blocked by creatures with greater power.)
{4}{W}: Creatures you control get +1/+1 until end of turn
*/
String bScenes = "Behind the Scenes";
*/
String bScenes = "Behind the Scenes";
String hGiant = "Hill Giant"; // {3}{R} 3/3
String bSable = "Bronze Sable"; // {2} 2/1
String memnite = "Memnite"; // {0} 1/1
String gBears = "Grizzly Bears"; // {1}{G} 2/2
addCard(Zone.BATTLEFIELD, playerA, bScenes);
addCard(Zone.BATTLEFIELD, playerA, hGiant);
addCard(Zone.BATTLEFIELD, playerA, bSable);
addCard(Zone.BATTLEFIELD, playerB, memnite);
addCard(Zone.BATTLEFIELD, playerB, gBears);
setStopAt(1, PhaseStep.PRECOMBAT_MAIN);
execute();
assertAbility(playerA, hGiant, new SkulkAbility(), true);
assertAbility(playerA, bSable, new SkulkAbility(), true);
assertAbility(playerB, memnite, new SkulkAbility(), false);
assertAbility(playerB, gBears, new SkulkAbility(), false);
assertAbility(playerA, hGiant, SkulkAbility.getInstance(), true);
assertAbility(playerA, bSable, SkulkAbility.getInstance(), true);
assertAbility(playerB, memnite, SkulkAbility.getInstance(), false);
assertAbility(playerB, gBears, SkulkAbility.getInstance(), false);
}
}

24
Mage/src/main/java/mage/abilities/keyword/SkulkAbility.java
View file

@ -5,11 +5,12 @@
*/
package mage.abilities.keyword;
import java.io.ObjectStreamException;
import mage.abilities.Ability;
import mage.abilities.StaticAbility;
import mage.abilities.EvasionAbility;
import mage.abilities.MageSingleton;
import mage.abilities.effects.RestrictionEffect;
import mage.constants.Duration;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.permanent.Permanent;
@ -17,26 +18,31 @@ import mage.game.permanent.Permanent;
*
* @author LevelX2
*/
public class SkulkAbility extends StaticAbility {
public class SkulkAbility extends EvasionAbility implements MageSingleton {
public SkulkAbility() {
super(Zone.BATTLEFIELD, new SkulkEffect(Duration.WhileOnBattlefield));
private static final SkulkAbility instance = new SkulkAbility();
private Object readResolve() throws ObjectStreamException {
return instance;
}
public SkulkAbility(final SkulkAbility ability) {
super(ability);
public static SkulkAbility getInstance() {
return instance;
}
private SkulkAbility() {
this.addEffect(new SkulkEffect(Duration.WhileOnBattlefield));
}
@Override
public Ability copy() {
return new SkulkAbility(this);
return instance;
}
@Override
public String getRule() {
return "Skulk <i>(This creature can't be blocked by creatures with greater power.)</i>";
}
}
class SkulkEffect extends RestrictionEffect {

2
Utils/keywords.txt
View file

@ -76,7 +76,7 @@ Shadow|instance|
Shroud|instance|
Soulbond|instance|
Soulshift|number|
Skulk|new|
Skulk|instance|
Storm|new|
Sunburst|new|
Swampcycling|cost|

16
Utils/mtg-cards-data.txt
View file

@ -32330,6 +32330,7 @@ Visage of Bolas|Hour of Devastation|208|R|{4}|Artifact|||When Visage of Bolas en
Cinder Barrens|Hour of Devastation|209|C||Land|||Cinder Barrens enters the battlefield tapped.${t}: Add {B} or {R} to your mana pool.|
Adanto Vanguard|Ixalan|1|U|{1}{W}|Creature - Vampire Soldier|1|1|As long as Adanto Vanguard is attacking, it gets +2/+0.$Pay 4 life: Adanto Vanguard gains indestructible until end of turn.|
Ashes of the Abhorrent|Ixalan|2|R|{1}{W}|Enchantment|||Players can't cast spells from graveyards or activate abilities from graveyards.$Whenever a creature dies, you gain 1 life.|
Axis of Mortality|Ixalan|3|M|{4}{W}{W}|Enchantment|||At the beginning of your upkeep, you may have two target players exchange life totals.|
Bellowing Aegisaur|Ixalan|4|U|{5}{W}|Creature - Dinosaur|3|5|Enrage - Whenever Bellowing Aegisaur is dealt damage, put a +1/+1 counter on each other creature you control.|
Bishop of Rebirth|Ixalan|5|R|Creature - Vampire Cleric|3|4|Vigilance$Whenever Bishop of Rebirth attacks, you may return target creature card with converted mana cost 3 or less from your graveyard to the battlefield.|
Duskborne Skymarcher|Ixalan|9|U|{W}|Creature - Vampire Cleric|1|1|Flying${W}, {T}: Target attacking vampire gets +1/+1 until end of turn.|
@ -32486,11 +32487,26 @@ Glacial Fortress|Ixalan|255|R||Land|||Glacial Fortress enters the battlefield ta
Rootbound Crag|Ixalan|256|R||Land|||Rootbound Crag enters the battlefield tapped unless you control a Mountain or a Forest.${T}: Add {R} or {G} to your mana pool.|
Sunpetal Grove|Ixalan|257|R||Land|||Sunpetal Grove enters the battlefield tapped unless you control a Forest or a Plains.${T}: Add {G} or {W} to your mana pool.|
Unclaimed Territory|Ixalan|258|U||Land|||As Unclaimed Territory enters the battlefield, choose a creature type.${T}: Add {C} to your mana pool.${T}: Add one mana of any color to your mana pool. Spend this mana only to cast a creature spell of the chosen type.|
Plains|Ixalan|260|L||Basic Land - Plains|||{T}: Add {W} to your mana pool.|
Plains|Ixalan|261|L||Basic Land - Plains|||{T}: Add {W} to your mana pool.|
Plains|Ixalan|262|L||Basic Land - Plains|||{T}: Add {W} to your mana pool.|
Plains|Ixalan|263|L||Basic Land - Plains|||{T}: Add {W} to your mana pool.|
Island|Ixalan|264|L||Basic Land - Island|||{T}: Add {U} to your mana pool.|
Island|Ixalan|265|L||Basic Land - Island|||{T}: Add {U} to your mana pool.|
Island|Ixalan|266|L||Basic Land - Island|||{T}: Add {U} to your mana pool.|
Island|Ixalan|267|L||Basic Land - Island|||{T}: Add {U} to your mana pool.|
Swamp|Ixalan|268|L||Basic Land - Swamp|||{T}: Add {B} to your mana pool.|
Swamp|Ixalan|269|L||Basic Land - Swamp|||{T}: Add {B} to your mana pool.|
Swamp|Ixalan|270|L||Basic Land - Swamp|||{T}: Add {B} to your mana pool.|
Swamp|Ixalan|271|L||Basic Land - Swamp|||{T}: Add {B} to your mana pool.|
Mountain|Ixalan|272|L||Basic Land - Mountain|||{T}: Add {R} to your mana pool.|
Mountain|Ixalan|273|L||Basic Land - Mountain|||{T}: Add {R} to your mana pool.|
Mountain|Ixalan|274|L||Basic Land - Mountain|||{T}: Add {R} to your mana pool.|
Mountain|Ixalan|275|L||Basic Land - Mountain|||{T}: Add {R} to your mana pool.|
Forest|Ixalan|276|L||Basic Land - Forest|||{T}: Add {G} to your mana pool.|
Forest|Ixalan|277|L||Basic Land - Forest|||{T}: Add {G} to your mana pool.|
Forest|Ixalan|278|L||Basic Land - Forest|||{T}: Add {G} to your mana pool.|
Forest|Ixalan|279|L||Basic Land - Forest|||{T}: Add {G} to your mana pool.|
Jace, Ingenious Mind-Mage|Ixalan|280|M|{4}{U}{U}|Legendary Planeswalker - Jace|||[+1]: Draw a card.$[+1]: Untap all creatures you control.$[-9]: Gain control of up to three target creatures.|
Castaway's Despair|Ixalan|281|C|{3}{U}|Enchantment - Aura|||Enchant creature$When Castaway's Despair enters the battlefield, tap enchanted creature.$Enchanted creature doesn't untap during its controller's untap step.|
Grasping Current|Ixalan|282|R|{4}{U}|Sorcery|||Return up to two target creature's to their owner's hand.$Search your library and/or graveyard for a card named Jace, Ingenious Mind-Mage, reveal it, then put it into your hand. If you searched your library this way, shuffle it.|