diff --git a/.gitattributes b/.gitattributes index 1a14e8cd655..1d7cbe984af 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6346,6 +6346,7 @@ res/cardsfolder/stonybrook_angler.txt -text svneol=native#text/plain res/cardsfolder/stonybrook_banneret.txt -text svneol=native#text/plain res/cardsfolder/stonybrook_schoolmaster.txt -text svneol=native#text/plain res/cardsfolder/storm_crow.txt -text svneol=native#text/plain +res/cardsfolder/storm_elemental.txt svneol=native#text/plain res/cardsfolder/storm_entity.txt -text svneol=native#text/plain res/cardsfolder/storm_front.txt -text svneol=native#text/plain res/cardsfolder/storm_herd.txt -text svneol=native#text/plain @@ -7415,6 +7416,7 @@ res/cardsfolder/whipstitched_zombie.txt -text svneol=native#text/plain res/cardsfolder/whiptail_moloch.txt -text svneol=native#text/plain res/cardsfolder/whiptail_wurm.txt -text svneol=native#text/plain res/cardsfolder/whiptongue_frog.txt -text svneol=native#text/plain +res/cardsfolder/whirling_catapult.txt -text svneol=native#text/plain res/cardsfolder/whirling_dervish.txt -text svneol=native#text/plain res/cardsfolder/whirlpool_rider.txt -text svneol=native#text/plain res/cardsfolder/whirlwind.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/storm_elemental.txt b/res/cardsfolder/storm_elemental.txt new file mode 100644 index 00000000000..1adb25d27af --- /dev/null +++ b/res/cardsfolder/storm_elemental.txt @@ -0,0 +1,12 @@ +Name:Storm Elemental +ManaCost:5 U +Types:Creature Elemental +Text:no text +PT:3/4 +K:Flying +A:AB$Tap | Cost$ U ExileFromTop<1/Card> | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with flying | SpellDescription$ Tap target creature with flying. +A:AB$Pump | Cost$ U ExileFromTop<1/Card> | Defined$ Self | NumAtt$ +X | NumDef$ +X | SpellDescription$ If the exiled card is a snow land, CARDNAME gets +1/+1 until end of turn. +SVar:X:Exiled$Valid Land.Snow +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/storm_elemental.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/whirling_catapult.txt b/res/cardsfolder/whirling_catapult.txt new file mode 100644 index 00000000000..43456a9187b --- /dev/null +++ b/res/cardsfolder/whirling_catapult.txt @@ -0,0 +1,8 @@ +Name:Whirling Catapult +ManaCost:4 +Types:Artifact +Text:no text +A:AB$ DamageAll | Cost$ 2 ExileFromTop<2/Card> | NumDmg$ 1 | ValidCards$ Creature.withFlying | ValidPlayers$ Each | ValidDescription$ each creature with flying and each player. | SpellDescription$ CARDNAME deals 1 damage to each creature with flying and each player. +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/whirling_catapult.jpg +End \ No newline at end of file diff --git a/src/forge/card/spellability/Cost.java b/src/forge/card/spellability/Cost.java index d308a02fde6..1e288a491f4 100644 --- a/src/forge/card/spellability/Cost.java +++ b/src/forge/card/spellability/Cost.java @@ -700,14 +700,10 @@ public class Cost { } if(exileType.equals("CARDNAME")) - cost.append(name).append(" "); + cost.append(name).append(" from the top of you library"); else { - cost.append("the top"); - if(exileFromTopAmount != 1) { - cost.append(convertIntAndTypeToWords(exileFromTopAmount, exileFromTopType)); - } - cost.append(" card"); - if(exileFromTopAmount != 1) cost.append("s"); + cost.append("the top "); + cost.append(convertIntAndTypeToWords(exileFromTopAmount, exileFromTopType)); cost.append(" of your library"); } return cost.toString();