From ab1f1dbf0e2261f190d99a1ea4326674c9fc3797 Mon Sep 17 00:00:00 2001 From: Sloth Date: Mon, 10 Dec 2012 09:12:46 +0000 Subject: [PATCH] - Fixed Yawgmoth's Will. --- res/cardsfolder/y/yawgmoths_will.txt | 5 +++-- src/main/java/forge/GameAction.java | 7 ------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/res/cardsfolder/y/yawgmoths_will.txt b/res/cardsfolder/y/yawgmoths_will.txt index 2528f923665..b722488bb03 100644 --- a/res/cardsfolder/y/yawgmoths_will.txt +++ b/res/cardsfolder/y/yawgmoths_will.txt @@ -2,9 +2,10 @@ Name:Yawgmoth's Will ManaCost:2 B Types:Sorcery Text:no text -A:SP$ Effect | Cost$ 2 B | Name$ Yawgmoth's Will Effect | StaticAbilities$ STPlay | Keywords$ Exile | SpellDescription$ Until end of turn, you may play cards from your graveyard. If a card would be put into your graveyard from anywhere this turn, exile that card instead. +A:SP$ Effect | Cost$ 2 B | Name$ Yawgmoth's Will Effect | ReplacementEffects$ GraveToExile | StaticAbilities$ STPlay | SVars$ Exile | SpellDescription$ Until end of turn, you may play cards from your graveyard. If a card would be put into your graveyard from anywhere this turn, exile that card instead. SVar:STPlay:Mode$ Continuous | EffectZone$ Command | Affected$ Card.YouCtrl | AffectedZone$ Graveyard | AddHiddenKeyword$ May be played | Description$ You may play cards from your graveyard. -SVar:Exile:If a card would be put into your graveyard from anywhere, exile it instead. +SVar:GraveToExile:Event$ Moved | ActiveZones$ Command | Destination$ Graveyard | ValidCard$ Card.nonToken+YouOwn | ReplaceWith$ Exile | Description$ If a card would be put into your graveyard from anywhere, exile it instead. +SVar:Exile:AB$ ChangeZone | Cost$ 0 | Hidden$ True | Origin$ All | Destination$ Exile | Defined$ ReplacedCard SVar:RemAIDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/yawgmoths_will.jpg diff --git a/src/main/java/forge/GameAction.java b/src/main/java/forge/GameAction.java index 3c6ebc4a094..74678fa616f 100644 --- a/src/main/java/forge/GameAction.java +++ b/src/main/java/forge/GameAction.java @@ -479,18 +479,11 @@ public class GameAction { final Player owner = c.getOwner(); final PlayerZone grave = owner.getZone(ZoneType.Graveyard); final PlayerZone exile = owner.getZone(ZoneType.Exile); - final List ownerBoard = new ArrayList(owner.getCardsIn(ZoneType.Battlefield)); if (c.getName().equals("Nissa's Chosen") && origZone.is(ZoneType.Battlefield)) { return this.moveToLibrary(c, -1); } - for (final Card card : ownerBoard) { - if (card.hasKeyword("If a card would be put into your graveyard from anywhere, exile it instead.")) { - return this.moveTo(exile, c); - } - } - if (c.hasKeyword("If CARDNAME would be put into a graveyard, exile it instead.")) { return this.moveTo(exile, c); }