diff --git a/res/cardsfolder/goblin_skycutter.txt b/res/cardsfolder/goblin_skycutter.txt index 34f7d861b13..4d6402db836 100644 --- a/res/cardsfolder/goblin_skycutter.txt +++ b/res/cardsfolder/goblin_skycutter.txt @@ -3,7 +3,9 @@ ManaCost:1 R Types:Creature Goblin Warrior Text:no text PT:2/1 +A:AB$ DealDamage | Cost$ 0 | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with flying | NumDmg$ 2 | SubAbility$ DBDebuff | SpellDescription$ CARDNAME deals 2 damage to target creature with flying. That creature loses flying until end of turn. +SVar:DBDebuff:DB$ Debuff | Defined$ Targeted | Keywords$ Flying SVar:Rarity:Common -SVar:Picture:http://resources.wizards.com/magic/cards/tsp/en-us/card124758.jpg +SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_skycutter.jpg SetInfo:TSP|Common|http://magiccards.info/scans/en/ts/159.jpg End \ No newline at end of file diff --git a/src/forge/card/cardFactory/CardFactory_Creatures.java b/src/forge/card/cardFactory/CardFactory_Creatures.java index d0a211905e0..66f1c766018 100644 --- a/src/forge/card/cardFactory/CardFactory_Creatures.java +++ b/src/forge/card/cardFactory/CardFactory_Creatures.java @@ -1630,7 +1630,6 @@ public class CardFactory_Creatures { }//*************** END ************ END ************************** - //*************** START *********** START ************************** else if(cardName.equals("Painter's Servant")) { final long[] timeStamp = new long[1]; @@ -1686,65 +1685,6 @@ public class CardFactory_Creatures { }//*************** END ************ END ************************** - //*************** START *********** START ************************** - else if(cardName.equals("Goblin Skycutter")) { - Cost cost = new Cost("Sac<1/CARDNAME>", cardName, true); - Target target = new Target(card, "Select target creature with flying", "Creature.withFlying"); - final SpellAbility ability = new Ability_Activated(card, cost, target) { - private static final long serialVersionUID = 200207345405088487L; - - @Override - public boolean canPlayAI() { - return getFlying().size() != 0; - } - - @Override - public void chooseTargetAI() { - CardList flying = getFlying(); - flying.shuffle(); - setTargetCard(flying.get(0)); - } - - private CardList getFlying() { - CardList flying = CardFactoryUtil.AI_getHumanCreature("Flying", card, true); - flying = flying.filter(new CardListFilter() { - public boolean addCard(Card c) { - return c.getNetDefense() <= 2; - } - }); - return flying; - }//getFlying() - - @Override - public void resolve() { - final Card tgt = getTargetCard(); - if(AllZoneUtil.isCardInPlay(tgt) && CardFactoryUtil.canTarget(card, tgt)) { - tgt.addDamage(2, card); - tgt.removeIntrinsicKeyword("Flying"); - tgt.removeExtrinsicKeyword("Flying"); - } - - AllZone.EndOfTurn.addUntil(new Command() { - private static final long serialVersionUID = -8889549737746466810L; - - public void execute() { - if(AllZoneUtil.isCardInPlay(tgt)){ - tgt.addIntrinsicKeyword("Flying"); - } - } - }); - }//resolve() - };//SpellAbility - - card.addSpellAbility(ability); - - StringBuilder sb = new StringBuilder(); - sb.append(cost).append("CARDNAME deals 2 damage to target "); - sb.append("creature with flying. That creature loses flying until end of turn."); - ability.setDescription(sb.toString()); - }//*************** END ************ END ************************** - - //*************** START *********** START ************************** else if(cardName.equals("Transluminant")) { final Command atEOT = new Command() {