diff --git a/res/cards.txt b/res/cards.txt index b1e5d38e25e..0287613e4d6 100644 --- a/res/cards.txt +++ b/res/cards.txt @@ -1,3 +1,35 @@ +Altar's Light +2 W W +Instant +Exile target artifact or enchantment. +spBounceTgt:Artifact,Enchantment:Exile + +Hoodwink +1 U +Instant +Return target artifact, enchantment, or land to its owner's hand. +spBounceTgt:Artifact,Enchantment,Land:Hand + +Disperse +1 U +Instant +Return target nonland permanent to its owner's hand. +spBounceTgt:Artifact,Enchantment,Creature,Planeswalker:Hand + +Into Thin Air +5 U +Instant +Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.) Return target artifact to its owner's hand. +spBounceTgt:Artifact:Hand +CostChange:Player:Less:1:Self:All:All:Affinity/Artifact + +Symbol of Unsummoning +2 U +Sorcery +Return target creature to its owner's hand. +spBounceTgt:Creature:Hand +Draw a card. + Deadapult 2 R Enchantment @@ -98,32 +130,6 @@ Sorcery Put target creature on top of its owner's library. spBounceTgt:Creature:TopofLibrary -Hoodwink -1 U -Instant -Return target artifact, enchantment, or land to its owner's hand. -spBounceTgt:Artifact,Enchantment,Land - -Disperse -1 U -Instant -Return target nonland permanent to its owner's hand. -spBounceTgt:Artifact,Enchantment,Creature,Planeswalker - -Into Thin Air -5 U -Instant -Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.) Return target artifact to its owner's hand. -spBounceTgt:Artifact -CostChange:Player:Less:1:Self:All:All:Affinity/Artifact - -Symbol of Unsummoning -2 U -Sorcery -Return target creature to its owner's hand. -spBounceTgt:Creature -Draw a card. - Exiled Boggart 1 B Creature Goblin Rogue diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index 2f277c5a657..86881195cb5 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -2210,7 +2210,7 @@ public class CardFactory implements NewConstants { tmpDesc = tmpDesc.substring(0, i); final String Selec = "Select a target"; - final boolean TopofLibrary = (k.length == 3); + final String Destination = k[2]; card.clearSpellAbility(); @@ -2268,13 +2268,14 @@ public class CardFactory implements NewConstants { return tmpList.getValidCards(Tgts); } - @Override + @Override public void resolve() { if(AllZone.GameAction.isCardInPlay(getTargetCard()) && CardFactoryUtil.canTarget(card, getTargetCard())) { if(getTargetCard().isToken()) AllZone.getZone(getTargetCard()).remove(getTargetCard()); - else { if(TopofLibrary) AllZone.GameAction.moveToTopOfLibrary(getTargetCard()); - else { + else { if(Destination.equals("TopofLibrary")) AllZone.GameAction.moveToTopOfLibrary(getTargetCard()); + else if(Destination.equals("Exile")) AllZone.GameAction.removeFromGame(getTargetCard()); + else if(Destination.equals("Hand")) { PlayerZone hand = AllZone.getZone(Constant.Zone.Hand, getTargetCard().getOwner()); AllZone.GameAction.moveTo(hand, getTargetCard()); }