github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 19:25:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Ruin in Their Wake - Fixed that the player could not select the basic land.

Browse source
This commit is contained in:
LevelX2 2016-01-13 17:20:06 +01:00
parent b9ed4f4b06
commit 3031d68d7f
3 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/magicorigins/NissaSageAnimist.java
View file

@ -122,7 +122,7 @@ class NissaSageAnimistPlusOneEffect extends OneShotEffect {
if (card.getCardType().contains(CardType.LAND)) {
targetZone = Zone.BATTLEFIELD;
}
return controller.moveCards(card, null, targetZone, source, game);
return controller.moveCards(card, targetZone, source, game);
}
return true;
}

5
Mage.Sets/src/mage/sets/oathofthegatewatch/RuinInTheirWake.java
View file

@ -45,7 +45,6 @@ import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.mageobject.NamePredicate;
import mage.game.Game;
import mage.players.Player;
import mage.target.Target;
import mage.target.common.TargetCardInLibrary;
/**
@ -101,8 +100,8 @@ class RuinInTheirWakeEffect extends OneShotEffect {
Player controller = game.getPlayer(source.getControllerId());
MageObject sourceObject = source.getSourceObject(game);
if (controller != null && sourceObject != null) {
Target target = new TargetCardInLibrary(new FilterBasicLandCard());
if (controller.choose(outcome, target, source.getSourceId(), game)) {
TargetCardInLibrary target = new TargetCardInLibrary(new FilterBasicLandCard());
if (controller.searchLibrary(target, game)) {
Card card = game.getCard(target.getFirstTarget());
if (card != null) {
Cards cardsToReveal = new CardsImpl(card);

16
Mage.Sets/src/mage/sets/shardsofalara/Scourglass.java
View file

@ -29,16 +29,15 @@ package mage.sets.shardsofalara;
import java.util.UUID;
import mage.abilities.Ability;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.abilities.condition.common.IsStepCondition;
import mage.abilities.costs.common.SacrificeSourceCost;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.decorator.ConditionalActivatedAbility;
import mage.abilities.effects.common.DestroyAllEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.PhaseStep;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.filter.FilterPermanent;
import mage.filter.predicate.Predicates;
@ -51,19 +50,18 @@ import mage.filter.predicate.mageobject.CardTypePredicate;
public class Scourglass extends CardImpl {
private static final FilterPermanent filter = new FilterPermanent("permanents except for artifacts and lands");
static{
static {
filter.add(Predicates.not(Predicates.or(new CardTypePredicate(CardType.ARTIFACT), new CardTypePredicate(CardType.LAND))));
}
public Scourglass(UUID ownerId) {
super(ownerId, 25, "Scourglass", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{3}{W}{W}");
this.expansionSetCode = "ALA";
// {tap}, Sacrifice Scourglass: Destroy all permanents except for artifacts and lands. Activate this ability only during your upkeep.
// {T}, Sacrifice Scourglass: Destroy all permanents except for artifacts and lands. Activate this ability only during your upkeep.
Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD,
new DestroyAllEffect(filter), new TapSourceCost(), new IsStepCondition(PhaseStep.UPKEEP), null);
new DestroyAllEffect(filter), new TapSourceCost(), new IsStepCondition(PhaseStep.UPKEEP), null);
ability.addCost(new SacrificeSourceCost());
this.addAbility(ability);
}