diff --git a/.gitattributes b/.gitattributes index 02030085ed2..300ef3ff570 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3980,6 +3980,7 @@ res/cardsfolder/tower_of_calamities.txt -text svneol=native#text/plain res/cardsfolder/tower_of_champions.txt -text svneol=native#text/plain res/cardsfolder/tower_of_eons.txt -text svneol=native#text/plain res/cardsfolder/tower_of_fortunes.txt -text svneol=native#text/plain +res/cardsfolder/tower_of_murmurs.txt -text svneol=native#text/plain res/cardsfolder/tower_of_the_magistrate.txt -text svneol=native#text/plain res/cardsfolder/towering_baloth.txt -text svneol=native#text/plain res/cardsfolder/toxic_iguanar.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/tower_of_murmurs.txt b/res/cardsfolder/tower_of_murmurs.txt new file mode 100644 index 00000000000..68779525491 --- /dev/null +++ b/res/cardsfolder/tower_of_murmurs.txt @@ -0,0 +1,7 @@ +Name:Tower of Murmurs +ManaCost:4 +Types:Artifact +Text:no text +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/tower_of_murmurs.jpg +End diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index 76cc359baf9..4edcfd731af 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -9119,8 +9119,14 @@ public class CardFactory implements NewConstants { //*************** START *********** START ************************** - else if(cardName.equals("Millstone")) { - Ability_Tap ab1 = new Ability_Tap(card, "2") { + else if(cardName.equals("Millstone") || cardName.equals("Tower of Murmurs")) { + final int millCards = cardName.equals("Millstone") ? 2 : 8; + final String cost = cardName.equals("Millstone") ? "2" : "8"; + final String desc = cardName.equals("Millstone") ? + "2, tap: Target player puts the top two cards of his or her library into his or her graveyard." : + "8, tap: Target player puts the top eight cards of his or her library into his or her graveyard."; + + Ability_Tap ab1 = new Ability_Tap(card, cost) { private static final long serialVersionUID = 42470566751344693L; @@ -9134,12 +9140,12 @@ public class CardFactory implements NewConstants { @Override public void resolve() { - AllZone.GameAction.mill(getTargetPlayer(), 2); + AllZone.GameAction.mill(getTargetPlayer(), millCards); } }; ab1.setChooseTargetAI(CardFactoryUtil.AI_targetHuman()); ab1.setBeforePayMana(CardFactoryUtil.input_targetPlayer(ab1)); - ab1.setDescription("2, tap: Target player puts the top two cards of his or her library into his or her graveyard."); + ab1.setDescription(desc); card.addSpellAbility(ab1); }//*************** END ************ END **************************