From f19ab1a9ab9d8429ade0eba045edd543b0135355 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 14:03:21 +0000 Subject: [PATCH] add Future Sight storage lands - Calciform Pools, Dreadship Reef, Fungal Reaches, Moten Slagheap, and Saltcrusted Steppe. --- .gitattributes | 5 ++ res/cardsfolder/calciform_pools.txt | 9 ++++ res/cardsfolder/dreadship_reef.txt | 9 ++++ res/cardsfolder/fungal_reaches.txt | 9 ++++ res/cardsfolder/molten_slagheap.txt | 9 ++++ res/cardsfolder/saltcrusted_steppe.txt | 9 ++++ src/forge/CardFactory_Lands.java | 73 ++++++++++++++++++++++++++ 7 files changed, 123 insertions(+) create mode 100644 res/cardsfolder/calciform_pools.txt create mode 100644 res/cardsfolder/dreadship_reef.txt create mode 100644 res/cardsfolder/fungal_reaches.txt create mode 100644 res/cardsfolder/molten_slagheap.txt create mode 100644 res/cardsfolder/saltcrusted_steppe.txt diff --git a/.gitattributes b/.gitattributes index 35832191b6f..afc5108a239 100644 --- a/.gitattributes +++ b/.gitattributes @@ -705,6 +705,7 @@ res/cardsfolder/cadaverous_knight.txt -text svneol=native#text/plain res/cardsfolder/cage_of_hands.txt -text svneol=native#text/plain res/cardsfolder/cagemail.txt -text svneol=native#text/plain res/cardsfolder/calciderm.txt -text svneol=native#text/plain +res/cardsfolder/calciform_pools.txt -text svneol=native#text/plain res/cardsfolder/caldera_hellion.txt -text svneol=native#text/plain res/cardsfolder/caldera_lake.txt -text svneol=native#text/plain res/cardsfolder/call_of_the_herd.txt -text svneol=native#text/plain @@ -1331,6 +1332,7 @@ res/cardsfolder/dread_slag.txt -text svneol=native#text/plain res/cardsfolder/dread_specter.txt -text svneol=native#text/plain res/cardsfolder/dread_statuary.txt -text svneol=native#text/plain res/cardsfolder/dread_warlock.txt -text svneol=native#text/plain +res/cardsfolder/dreadship_reef.txt -text svneol=native#text/plain res/cardsfolder/dreadwing.txt -text svneol=native#text/plain res/cardsfolder/dream_cache.txt -text svneol=native#text/plain res/cardsfolder/dream_fracture.txt -text svneol=native#text/plain @@ -1850,6 +1852,7 @@ res/cardsfolder/fume_spitter.txt -text svneol=native#text/plain res/cardsfolder/funeral_charm.txt -text svneol=native#text/plain res/cardsfolder/funeral_pyre.txt -text svneol=native#text/plain res/cardsfolder/fungal_bloom.txt -text svneol=native#text/plain +res/cardsfolder/fungal_reaches.txt -text svneol=native#text/plain res/cardsfolder/fungal_shambler.txt -text svneol=native#text/plain res/cardsfolder/fungus_sliver.txt -text svneol=native#text/plain res/cardsfolder/fungusaur.txt -text svneol=native#text/plain @@ -3166,6 +3169,7 @@ res/cardsfolder/molten_hydra.txt -text svneol=native#text/plain res/cardsfolder/molten_psyche.txt -text svneol=native#text/plain res/cardsfolder/molten_rain.txt -text svneol=native#text/plain res/cardsfolder/molten_ravager.txt -text svneol=native#text/plain +res/cardsfolder/molten_slagheap.txt -text svneol=native#text/plain res/cardsfolder/molting_harpy.txt -text svneol=native#text/plain res/cardsfolder/molting_skin.txt -text svneol=native#text/plain res/cardsfolder/momentous_fall.txt -text svneol=native#text/plain @@ -4062,6 +4066,7 @@ res/cardsfolder/sakura_tribe_elder.txt -text svneol=native#text/plain res/cardsfolder/salt_flats.txt -text svneol=native#text/plain res/cardsfolder/salt_marsh.txt -text svneol=native#text/plain res/cardsfolder/saltblast.txt -text svneol=native#text/plain +res/cardsfolder/saltcrusted_steppe.txt -text svneol=native#text/plain res/cardsfolder/salvage.txt -text svneol=native#text/plain res/cardsfolder/salvage_scout.txt -text svneol=native#text/plain res/cardsfolder/salvage_slasher.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/calciform_pools.txt b/res/cardsfolder/calciform_pools.txt new file mode 100644 index 00000000000..616e1f75d8e --- /dev/null +++ b/res/cardsfolder/calciform_pools.txt @@ -0,0 +1,9 @@ +Name:Calciform Pools +ManaCost:no cost +Types:Land +Text:no text +K:tap: add 1 +A:AB$PutCounter|Cost$1 T|CounterType$STORAGE | CounterNum$1 | SpellDescription$Put a storage counter on CARDNAME. +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/calciform_pools.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/dreadship_reef.txt b/res/cardsfolder/dreadship_reef.txt new file mode 100644 index 00000000000..72b1573826c --- /dev/null +++ b/res/cardsfolder/dreadship_reef.txt @@ -0,0 +1,9 @@ +Name:Dreadship Reef +ManaCost:no cost +Types:Land +Text:no text +K:tap: add 1 +A:AB$PutCounter|Cost$1 T|CounterType$STORAGE | CounterNum$1 | SpellDescription$Put a storage counter on CARDNAME. +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/dreadship_reef.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/fungal_reaches.txt b/res/cardsfolder/fungal_reaches.txt new file mode 100644 index 00000000000..7d308c4b92b --- /dev/null +++ b/res/cardsfolder/fungal_reaches.txt @@ -0,0 +1,9 @@ +Name:Fungal Reaches +ManaCost:no cost +Types:Land +Text:no text +K:tap: add 1 +A:AB$PutCounter|Cost$1 T|CounterType$STORAGE | CounterNum$1 | SpellDescription$Put a storage counter on CARDNAME. +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/fungal_reaches.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/molten_slagheap.txt b/res/cardsfolder/molten_slagheap.txt new file mode 100644 index 00000000000..82cec4498c6 --- /dev/null +++ b/res/cardsfolder/molten_slagheap.txt @@ -0,0 +1,9 @@ +Name:Molten Slagheap +ManaCost:no cost +Types:Land +Text:no text +K:tap: add 1 +A:AB$PutCounter|Cost$1 T|CounterType$STORAGE | CounterNum$1 | SpellDescription$Put a storage counter on CARDNAME. +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/molten_slagheap.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/saltcrusted_steppe.txt b/res/cardsfolder/saltcrusted_steppe.txt new file mode 100644 index 00000000000..7b312552f0c --- /dev/null +++ b/res/cardsfolder/saltcrusted_steppe.txt @@ -0,0 +1,9 @@ +Name:Saltcrusted Steppe +ManaCost:no cost +Types:Land +Text:no text +K:tap: add 1 +A:AB$PutCounter|Cost$1 T|CounterType$STORAGE | CounterNum$1 | SpellDescription$Put a storage counter on CARDNAME. +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/saltcrusted_steppe.jpg +End \ No newline at end of file diff --git a/src/forge/CardFactory_Lands.java b/src/forge/CardFactory_Lands.java index bfde4126528..a41b0cb3b7d 100644 --- a/src/forge/CardFactory_Lands.java +++ b/src/forge/CardFactory_Lands.java @@ -2319,6 +2319,79 @@ class CardFactory_Lands { card.addSpellAbility(mana); }//*************** END ************ END ************************** + + //*************** START ************ START ************************** + else if(cardName.equals("Calciform Pools") || cardName.equals("Dreadship Reef") || + cardName.equals("Fungal Reaches") || cardName.equals("Molten Slagheap") || + cardName.equals("Saltcrusted Steppe")) { + /* + * tap, Remove X storage counters from Calciform Pools: Add X mana in any combination of W and/or U to your mana pool. + */ + final int[] num = new int[1]; + final int[] split = new int[1]; + + String pTemp = ""; + String sTemp = ""; + if(cardName.equals("Calciform Pools")) { pTemp = "W"; sTemp = "U"; } + if(cardName.equals("Dreadship Reef")) { pTemp = "U"; sTemp = "B"; } + if(cardName.equals("Fungal Reaches")) { pTemp = "R"; sTemp = "G"; } + if(cardName.equals("Molten Slagheap")) { pTemp = "B"; sTemp = "R"; } + if(cardName.equals("Saltcrusted Steppe")) { pTemp = "G"; sTemp = "W"; } + + final String primary = pTemp; + final String secondary = sTemp; + + final Ability_Mana addMana = new Ability_Mana(card, "tap, Remove X storage counters from "+cardName+": Add X mana in any combination of "+primary+" and/or "+secondary+" to your mana pool.") { + private static final long serialVersionUID = 7177960799748450242L; + + //@Override + public String mana() { + StringBuilder mana = new StringBuilder(); + for(int i = 0; i < split[0]; i++) { + mana.append(primary).append(" "); + } + for(int j = 0; j < num[0] - split[0]; j++) { + mana.append(secondary).append(" "); + } + return mana.toString().trim(); + } + + @Override + public void resolve() { + card.subtractCounter(Counters.STORAGE, num[0]); + card.tap(); + super.resolve(); + } + }; + + Input runtime = new Input() { + private static final long serialVersionUID = -8808673510875540608L; + + @Override + public void showMessage() { + num[0] = card.getCounters(Counters.STORAGE); + String[] choices = new String[num[0]+1]; + for(int j=0;j<=num[0];j++) { + choices[j] = ""+j; + } + String answer = (String)(AllZone.Display.getChoiceOptional( + "Storage counters to remove", choices)); + num[0] = Integer.parseInt(answer); + + String splitNum = (String)(AllZone.Display.getChoiceOptional( + "Number of "+primary+" to add", choices)); + split[0] = Integer.parseInt(splitNum); + if(num[0] > 0 || split[0] > 0) { + AllZone.Stack.add(addMana); + } + stop(); + } + }; + + addMana.setBeforePayMana(runtime); + card.addSpellAbility(addMana); + }//*************** END ************ END ************************** + return card; }