diff --git a/res/cardsfolder/bloodthrone_vampire.txt b/res/cardsfolder/bloodthrone_vampire.txt index 761abe5e756..4c028e94911 100644 --- a/res/cardsfolder/bloodthrone_vampire.txt +++ b/res/cardsfolder/bloodthrone_vampire.txt @@ -3,6 +3,7 @@ ManaCost:1 B Types:Creature Vampire Text:no text PT:1/1 +A:AB$Pump | Cost$ Sac<1/Creature> | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ CARDNAME gets +2/+2 until end of turn. SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/bloodthrone_vampire.jpg SetInfo:M11|Common|http://magiccards.info/scans/en/m11/85.jpg diff --git a/res/cardsfolder/fallen_angel.txt b/res/cardsfolder/fallen_angel.txt index 6438b2a1a6c..633689864bc 100644 --- a/res/cardsfolder/fallen_angel.txt +++ b/res/cardsfolder/fallen_angel.txt @@ -4,6 +4,7 @@ Types:Creature Angel Text:no text PT:3/3 K:Flying +A:AB$Pump | Cost$ Sac<1/Creature> | NumAtt$ +2 | NumDef$ +1 | SpellDescription$ CARDNAME gets +2/+1 until end of turn. SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/fallen_angel.jpg SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/133.jpg diff --git a/res/cardsfolder/nantuko_husk.txt b/res/cardsfolder/nantuko_husk.txt index a8818f347f2..870720f9868 100644 --- a/res/cardsfolder/nantuko_husk.txt +++ b/res/cardsfolder/nantuko_husk.txt @@ -3,6 +3,7 @@ ManaCost:2 B Types:Creature Zombie Insect Text:no text PT:2/2 +A:AB$Pump | Cost$ Sac<1/Creature> | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ CARDNAME gets +2/+2 until end of turn. SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/nantuko_husk.jpg SetInfo:ONS|Common|http://magiccards.info/scans/en/on/159.jpg diff --git a/res/cardsfolder/phyrexian_ghoul.txt b/res/cardsfolder/phyrexian_ghoul.txt index 2360cb7c17f..dc0a31e88a9 100644 --- a/res/cardsfolder/phyrexian_ghoul.txt +++ b/res/cardsfolder/phyrexian_ghoul.txt @@ -3,6 +3,7 @@ ManaCost:2 B Types:Creature Zombie Text:no text PT:2/2 +A:AB$Pump | Cost$ Sac<1/Creature> | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ CARDNAME gets +2/+2 until end of turn. SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/phyrexian_ghoul.jpg SetInfo:USG|Common|http://magiccards.info/scans/en/us/148.jpg diff --git a/res/cardsfolder/vampire_aristocrat.txt b/res/cardsfolder/vampire_aristocrat.txt index 648ccf9615a..5ffe3671938 100644 --- a/res/cardsfolder/vampire_aristocrat.txt +++ b/res/cardsfolder/vampire_aristocrat.txt @@ -3,6 +3,7 @@ ManaCost:2 B Types:Creature Vampire Rogue Text:no text PT:2/2 +A:AB$Pump | Cost$ Sac<1/Creature> | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ CARDNAME gets +2/+2 until end of turn. SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/vampire_aristocrat.jpg SetInfo:M10|Common|http://magiccards.info/scans/en/m10/117.jpg diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java index bcba7d3c558..6b2db664500 100644 --- a/src/forge/CardFactory_Creatures.java +++ b/src/forge/CardFactory_Creatures.java @@ -12814,156 +12814,7 @@ public class CardFactory_Creatures { a3.setStackDescription("Saprolings get +X/+X until end of turn."); }//*************** END ************ END ************************** - - - //*************** START *********** START ************************** - else if(cardName.equals("Fallen Angel")) { - final SpellAbility a2 = new Ability(card, "0") { - final Command eot1 = new Command() { - private static final long serialVersionUID = 8955432114774252848L; - - public void execute() { - card.addTempAttackBoost(-2); - card.addTempDefenseBoost(-1); - } - }; - - @Override - public void resolve() { - - Card c = getTargetCard(); - - if(AllZone.GameAction.isCardInPlay(c)) { - //AllZone.getZone(c).remove(c); - AllZone.GameAction.sacrifice(c); - - if(AllZone.GameAction.isCardInPlay(card)) { - card.addTempAttackBoost(2); - card.addTempDefenseBoost(1); - } - } - AllZone.EndOfTurn.addUntil(eot1); - } - - @Override - public boolean canPlayAI() { - return false; - } - - @Override - public boolean canPlay() { - SpellAbility sa; - //this is a hack, check the stack to see if this card has an ability on the stack - //if so, we can't use the ability: this is to prevent using a limited ability too many times - for(int i = 0; i < AllZone.Stack.size(); i++) { - sa = AllZone.Stack.peek(i); - if(sa.getSourceCard().equals(card)) return false; - } - if(super.canPlay()) return true; - return false; - } - };//SpellAbility - - Input runtime = new Input() { - private static final long serialVersionUID = -5917074526767992913L; - - @Override - public void showMessage() { - CardList creats = new CardList( - AllZone.getZone(Constant.Zone.Play, card.getController()).getCards()); - creats = creats.getType("Creature"); - - stopSetNext(CardFactoryUtil.input_targetSpecific(a2, creats, - "Select a creature to sacrifice.", false, false)); - } - }; - - card.addSpellAbility(a2); - a2.setDescription("Sacrifice a creature: Fallen Angel gets +2/+1 until end of turn."); - a2.setStackDescription("Fallen Angel gets +2/+1 until end of turn."); - - a2.setBeforePayMana(runtime); - }//*************** END ************ END ************************** - - - //*************** START *********** START ************************** - else if (cardName.equals("Nantuko Husk") || cardName.equals("Phyrexian Ghoul") || - cardName.equals("Vampire Aristocrat") || cardName.equals("Bloodthrone Vampire")) { - - final SpellAbility a2 = new Ability(card, "0") { - final Command eot1 = new Command() { - private static final long serialVersionUID = 4450272080079173250L; - - public void execute() { - card.addTempAttackBoost(-2); - card.addTempDefenseBoost(-2); - } - }; - - @Override - public void resolve() { - - Card c = getTargetCard(); - - if(AllZone.GameAction.isCardInPlay(c)) { - //AllZone.getZone(c).remove(c); - AllZone.GameAction.sacrifice(c); - - if(AllZone.GameAction.isCardInPlay(card)) { - card.addTempAttackBoost(2); - card.addTempDefenseBoost(2); - } - } - AllZone.EndOfTurn.addUntil(eot1); - } - - @Override - public boolean canPlayAI() { - return false; - } - - @Override - public boolean canPlay() { - SpellAbility sa; - //this is a hack, check the stack to see if this card has an ability on the stack - //if so, we can't use the ability: this is to prevent using a limited ability too many times - for(int i = 0; i < AllZone.Stack.size(); i++) { - sa = AllZone.Stack.peek(i); - if(sa.getSourceCard().equals(card)) return false; - } - if(super.canPlay()) return true; - return false; - } - };//SpellAbility - - Input runtime = new Input() { - private static final long serialVersionUID = 8445133749305465286L; - - @Override - public void showMessage() { - CardList creats = new CardList( - AllZone.getZone(Constant.Zone.Play, card.getController()).getCards()); - creats = creats.getType("Creature"); - - stopSetNext(CardFactoryUtil.input_targetSpecific(a2, creats, - "Select a creature to sacrifice.", false, false)); - } - }; - - card.addSpellAbility(a2); - - StringBuilder sbDesc = new StringBuilder(); - sbDesc.append("Sacrifice a creature: ").append(card.getName()).append(" gets +2/+2 until end of turn."); - a2.setDescription(sbDesc.toString()); - - StringBuilder sbStack = new StringBuilder(); - sbStack.append(card.getName()).append(" gets +2/+2 until end of turn."); - a2.setStackDescription(sbStack.toString()); - - a2.setBeforePayMana(runtime); - }//*************** END ************ END ************************** - - + //*************** START *********** START ************************** else if(cardName.equals("Ranger of Eos")) { final SpellAbility ability = new Ability(card, "0") {