diff --git a/res/cardsfolder/a/acorn_harvest.txt b/res/cardsfolder/a/acorn_harvest.txt index 07128f9680b..a893774101e 100644 --- a/res/cardsfolder/a/acorn_harvest.txt +++ b/res/cardsfolder/a/acorn_harvest.txt @@ -2,8 +2,8 @@ Name:Acorn Harvest ManaCost:3 G Types:Sorcery Text:no text +K:Flashback 1 G PayLife<3> A:SP$ Token | Cost$ 3 G | TokenAmount$ 2 | TokenName$ Squirrel | TokenTypes$ Creature,Squirrel | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put two 1/1 green Squirrel creature tokens onto the battlefield. -A:SP$ Token | Cost$ 1 G PayLife<3> | TokenAmount$ 2 | TokenName$ Squirrel | TokenTypes$ Creature,Squirrel | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | Flashback$ True | CostDesc$ Flashback 1 G, Pay 3 life | SpellDescription$ (You may cast this card from your graveyard for its flashback cost. Then exile it.) SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/acorn_harvest.jpg SetInfo:TOR|Common|http://magiccards.info/scans/en/tr/118.jpg diff --git a/res/cardsfolder/l/lightning_surge.txt b/res/cardsfolder/l/lightning_surge.txt index ae596716829..b9555a2540a 100644 --- a/res/cardsfolder/l/lightning_surge.txt +++ b/res/cardsfolder/l/lightning_surge.txt @@ -2,7 +2,7 @@ Name:Lightning Surge ManaCost:3 R R Types:Sorcery Text:no text -K:Flashback:5 R R +K:Flashback 5 R R A:SP$ DealDamage | Cost$ 3 R R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature or player. A:SP$ DealDamage | Cost$ 3 R R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 6 | NoPrevention$ True | Activation$ Threshold | SpellDescription$ Threshold - If seven or more cards are in your graveyard, instead CARDNAME deals 6 damage to that creature or player and the damage can't be prevented. SVar:Rarity:Rare diff --git a/res/cardsfolder/p/parallel_evolution.txt b/res/cardsfolder/p/parallel_evolution.txt index 3165891acc5..134fe6404ad 100644 --- a/res/cardsfolder/p/parallel_evolution.txt +++ b/res/cardsfolder/p/parallel_evolution.txt @@ -2,6 +2,7 @@ Name:Parallel Evolution ManaCost:3 G G Types:Sorcery Text:no text +K:Flashback 4 G G G SVar:RemRandomDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/parallel_evolution.jpg diff --git a/res/cardsfolder/t/traitors_clutch.txt b/res/cardsfolder/t/traitors_clutch.txt index 258dfe421dd..db9207347e3 100644 --- a/res/cardsfolder/t/traitors_clutch.txt +++ b/res/cardsfolder/t/traitors_clutch.txt @@ -2,7 +2,7 @@ Name:Traitor's Clutch ManaCost:4 B Types:Instant Text:no text -K:Flashback:1 B +K:Flashback 1 B A:SP$ Pump | Cost$ 4 B | ValidTgts$ Creature | NumAtt$ +1 | KW$ Shadow | SubAbility$ DBAnimate | SpellDescription$ Target creature gets +1/+0, becomes black, and gains shadow until end of turn. SVar:DBAnimate:DB$Animate | Defined$ Targeted | Colors$ Black | OverwriteColors$ True SVar:DiscardMe:1 diff --git a/src/main/java/forge/card/cardfactory/CardFactorySorceries.java b/src/main/java/forge/card/cardfactory/CardFactorySorceries.java index 0a1e986ea39..ff3c438e86d 100644 --- a/src/main/java/forge/card/cardfactory/CardFactorySorceries.java +++ b/src/main/java/forge/card/cardfactory/CardFactorySorceries.java @@ -933,7 +933,6 @@ public class CardFactorySorceries { + "that creature onto the battlefield."); card.addSpellAbility(spell); - card.addSpellAbility(CardFactoryUtil.abilityFlashback(card, "4 G G G")); } // *************** END ************ END ************************** // *************** START *********** START ************************** diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java index a774f498252..9bbfe1bd861 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java @@ -856,66 +856,6 @@ public class CardFactoryUtil { return target; } // input_destroyNoRegeneration() - /** - *
- * ability_Flashback. - *
- * - * @param sourceCard - * a {@link forge.Card} object. - * @param cost - * a {@link java.lang.String} object. - * @return a {@link forge.card.spellability.SpellAbility} object. - */ - public static SpellAbility abilityFlashback(final Card sourceCard, final String cost) { - final Cost fbCost = new Cost(cost, sourceCard.getName(), true); - final SpellAbility flashback = new Spell(sourceCard) { - - private static final long serialVersionUID = -4196027546564209412L; - - @Override - public void resolve() { - final SpellAbility[] sa = sourceCard.getSpellAbility(); - sa[0].setSourceCard(AllZone.getGameAction().moveToStack(sourceCard)); - final SpellAbility flash = sa[0]; - flash.setFlashBackAbility(true); - AllZone.getStack().add(flash); - } - - @Override - public boolean canPlayAI() { - return ComputerUtil.canPayCost(this); - } - - @Override - public boolean canPlay() { - final Card sourceCard = this.getSourceCard(); - - return sourceCard.getController().getZone(Zone.Graveyard).contains(sourceCard) - && (sourceCard.isInstant() || Phase.canCastSorcery(sourceCard.getController())); - - } - - }; - - flashback.setPayCosts(fbCost); - flashback.getRestrictions().setZone(Constant.Zone.Graveyard); - - final String costString = fbCost.toString().replace(":", "."); - - final StringBuilder sbDesc = new StringBuilder(); - sbDesc.append("Flashback: ").append(costString); - flashback.setDescription(sbDesc.toString()); - // possibly add Flashback into here? - - final StringBuilder sbStack = new StringBuilder(); - sbStack.append("Flashback: ").append(sourceCard.getName()); - flashback.setStackDescription(sbStack.toString()); - - return flashback; - - } // ability_Flashback() - /** ** ability_Unearth. @@ -4482,18 +4422,6 @@ public class CardFactoryUtil { } } // TypeCycling - if (CardFactoryUtil.hasKeyword(card, "Flashback:") != -1) { - final int n = CardFactoryUtil.hasKeyword(card, "Flashback"); - if (n != -1) { - final String parse = card.getKeyword().get(n).toString(); - // card.removeIntrinsicKeyword(parse); - - final String[] k = parse.split(":"); - - card.addSpellAbility(CardFactoryUtil.abilityFlashback(card, k[1])); - } - } // flashback - if (CardFactoryUtil.hasKeyword(card, "Transmute") != -1) { final int n = CardFactoryUtil.hasKeyword(card, "Transmute"); if (n != -1) {