diff --git a/res/cardsfolder/fork.txt b/res/cardsfolder/fork.txt index 4a7da8f1dd9..c299ade1054 100644 --- a/res/cardsfolder/fork.txt +++ b/res/cardsfolder/fork.txt @@ -1,7 +1,8 @@ Name:Fork ManaCost:R R Types:Instant -Text:Copy target instant or sorcery spell. You may choose new targets for the copy. +Text:no text +A:SP$ CopySpell | Cost$ R R | ValidTgts$ Instant,Sorcery | SpellDescription$ Copy target instant or sorcery spell. You may choose new targets for the copy. SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/fork.jpg SetInfo:LEA|Rare|http://magiccards.info/scans/en/al/153.jpg diff --git a/res/cardsfolder/reverberate.txt b/res/cardsfolder/reverberate.txt index 8f0fc5856c7..e0dc2c23ed0 100644 --- a/res/cardsfolder/reverberate.txt +++ b/res/cardsfolder/reverberate.txt @@ -1,7 +1,8 @@ Name:Reverberate ManaCost:R R Types:Instant -Text:Copy target instant or sorcery spell. You may choose new targets for the copy. +Text:no text +A:SP$ CopySpell | Cost$ R R | ValidTgts$ Instant,Sorcery | SpellDescription$ Copy target instant or sorcery spell. You may choose new targets for the copy. SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/reverberate.jpg SetInfo:M11|Rare|http://magiccards.info/scans/en/m11/155.jpg diff --git a/res/cardsfolder/twincast.txt b/res/cardsfolder/twincast.txt index 2a633c276d0..79290cc3e9d 100644 --- a/res/cardsfolder/twincast.txt +++ b/res/cardsfolder/twincast.txt @@ -1,7 +1,8 @@ Name:Twincast ManaCost:U U Types:Instant -Text:Copy target instant or sorcery spell. You may choose new targets for the copy. +Text:no text +A:SP$ CopySpell | Cost$ U U | ValidTgts$ Instant,Sorcery | SpellDescription$ Copy target instant or sorcery spell. You may choose new targets for the copy. SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/twincast.jpg SetInfo:M10|Rare|http://magiccards.info/scans/en/m10/78.jpg diff --git a/src/forge/card/cardFactory/CardFactory_Instants.java b/src/forge/card/cardFactory/CardFactory_Instants.java index 65a6103297d..b71acaa47ef 100644 --- a/src/forge/card/cardFactory/CardFactory_Instants.java +++ b/src/forge/card/cardFactory/CardFactory_Instants.java @@ -249,63 +249,7 @@ public class CardFactory_Instants { card.addSpellAbility(spell_two); }//*************** END ************ END ************************** - - - //*************** START *********** START ************************** - else if(cardName.equals("Twincast") || cardName.equals("Reverberate") || cardName.equals("Fork")) { - final SpellAbility spell = new Spell(card) { - - private static final long serialVersionUID = -659841515428746L; - - @Override - public void resolve() { - AllZone.CardFactory.copySpellontoStack(card,getTargetCard(), true); - } - - public boolean canPlay() - { - ArrayList list = AllZone.Stack.getSourceCards(); - CardList StackList = new CardList(); - for(int i = 0; i < list.size(); i++) StackList.add(list.get(i)); - - StackList = StackList.filter(new CardListFilter() { - public boolean addCard(Card c) { - return c.isSorcery() || c.isInstant(); - } - }); - return StackList.size() > 0 && super.canPlay(); - } - };//SpellAbility - Input runtime = new Input() { - private static final long serialVersionUID = -7823269301012427007L; - - @Override - public void showMessage() { - ArrayList list = AllZone.Stack.getSourceCards(); - CardList StackList = new CardList(); - for(int i = 0; i < list.size(); i++) StackList.add(list.get(i)); - - StackList = StackList.filter(new CardListFilter() - { - public boolean addCard(Card c) - { - return c.isSorcery() || c.isInstant(); - } - }); - - stopSetNext(CardFactoryUtil.input_Spell(spell, StackList, false)); - - }//showMessage() - };//Input - - // Do not remove SpellAbilities created by AbilityFactory or Keywords. - card.clearFirstSpellAbility(); - - card.setCopiesSpells(true); - card.addSpellAbility(spell); - spell.setBeforePayMana(runtime); - }//*************** END ************ END ************************** - + //*************** START *********** START ************************** else if(cardName.equals("Fact or Fiction")) {