From 4c30997f31326b7ecb33700fd41c9db73c0ca5a7 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 04:52:29 +0000 Subject: [PATCH] Committed Hellfish's Land Pack with LQ pics. --- res/card-pictures.txt | 20 +++++ res/cards.txt | 165 ++++++++++++++++++++++++++++++++++++ src/forge/Ability_Mana.java | 2 + src/forge/CardFactory.java | 27 ++++++ 4 files changed, 214 insertions(+) diff --git a/res/card-pictures.txt b/res/card-pictures.txt index 6d5a237753c..7ac8fecd00b 100644 --- a/res/card-pictures.txt +++ b/res/card-pictures.txt @@ -38,6 +38,26 @@ snow_covered_mountain.jpg http://www.wizards.com/global/images/magic/gene snow_covered_mountain1.jpg http://www.wizards.com/global/images/magic/general/snow_covered_mountain.jpg snow_covered_mountain2.jpg http://www.magickartenmarkt.de/img/cards/Ice_Age/snow_covered_mountain.jpg snow_covered_mountain3.jpg http://www.magickartenmarkt.de/img/cards/Ice_Age/snow_covered_mountain.jpg +adarkar_wastes.jpg http://www.wizards.com/global/images/magic/general/adarkar_wastes.jpg +brushland.jpg http://www.wizards.com/global/images/magic/general/brushland.jpg +karplusan_forest.jpg http://www.wizards.com/global/images/magic/general/karplusan_forest.jpg +sulfurous_springs.jpg http://www.wizards.com/global/images/magic/general/sulfurous_springs.jpg +underground_river.jpg http://www.wizards.com/global/images/magic/general/underground_river.jpg +battlefield_forge.jpg http://www.wizards.com/global/images/magic/general/battlefield_forge.jpg +caves_of_koilos.jpg http://www.wizards.com/global/images/magic/general/caves_of_koilos.jpg +llanowar_wastes.jpg http://www.wizards.com/global/images/magic/general/llanowar_wastes.jpg +shivan_reef.jpg http://www.wizards.com/global/images/magic/general/shivan_reef.jpg +yavimaya_coast.jpg http://www.wizards.com/global/images/magic/general/yavimaya_coast.jpg +salt_flats.jpg http://www.wizards.com/global/images/magic/general/salt_flats.jpg +pine_barrens.jpg http://www.wizards.com/global/images/magic/general/pine_barrens.jpg +skyshroud_forest.jpg http://www.wizards.com/global/images/magic/general/skyshroud_forest.jpg +caldera_lake.jpg http://www.wizards.com/global/images/magic/general/caldera_lake.jpg +scabland.jpg http://www.wizards.com/global/images/magic/general/scabland.jpg +talisman_of_dominance.jpg http://www.wizards.com/global/images/magic/general/talisman_of_dominance.jpg +talisman_of_impulse.jpg http://www.wizards.com/global/images/magic/general/talisman_of_impulse.jpg +talisman_of_indulgence.jpg http://www.wizards.com/global/images/magic/general/talisman_of_indulgence.jpg +talisman_of_progress.jpg http://www.wizards.com/global/images/magic/general/talisman_of_progress.jpg +talisman_of_unity.jpg http://www.wizards.com/global/images/magic/general/talisman_of_unity.jpg predatory_advantage.jpg http://www.wizards.com/global/images/magic/general/predatory_advantage.jpg master_of_the_wild_hunt.jpg http://www.wizards.com/global/images/magic/general/master_of_the_wild_hunt.jpg painters_servant.jpg http://www.wizards.com/global/images/magic/general/painters_servant.jpg diff --git a/res/cards.txt b/res/cards.txt index 82bd5d1cb77..d85b2b4e657 100644 --- a/res/cards.txt +++ b/res/cards.txt @@ -1,3 +1,168 @@ +Adarkar Wastes +no cost +Land +no text +tap: add 1 +paintap:1:W +paintap:1:U + +Brushland +no cost +Land +no text +tap: add 1 +paintap:1:W +paintap:1:G + +Karplusan Forest +no cost +Land +no text +tap: add 1 +paintap:1:R +paintap:1:G + +Sulfurous Springs +no cost +Land +no text +tap: add 1 +paintap:1:B +paintap:1:R + +Underground River +no cost +Land +no text +tap: add 1 +paintap:1:U +paintap:1:B + +Battlefield Forge +no cost +Land +no text +tap: add 1 +paintap:1:W +paintap:1:R + +Caves of Koilos +no cost +Land +no text +tap: add 1 +paintap:1:W +paintap:1:B + +Llanowar Wastes +no cost +Land +no text +tap: add 1 +paintap:1:B +paintap:1:G + +Shivan Reef +no cost +Land +no text +tap: add 1 +paintap:1:U +paintap:1:R + +Yavimaya Coast +no cost +Land +no text +tap: add 1 +paintap:1:U +paintap:1:G + +Salt Flats +no cost +Land +no text +tap: add 1 +paintap:1:W +paintap:1:B +Comes into play tapped. + +Pine Barrens +no cost +Land +no text +tap: add 1 +paintap:1:B +paintap:1:G +Comes into play tapped. + +Skyshroud Forest +no cost +Land +no text +tap: add 1 +paintap:1:G +paintap:1:U +Comes into play tapped. + +Caldera Lake +no cost +Land +no text +tap: add 1 +paintap:1:U +paintap:1:R +Comes into play tapped. + +Scabland +no cost +Land +no text +tap: add 1 +paintap:1:R +paintap:1:W +Comes into play tapped. + +Talisman of Dominance +2 +Artifact +no text +tap: add 1 +paintap:1:U +paintap:1:B + +Talisman of Impulse +2 +Artifact +no text +tap: add 1 +paintap:1:R +paintap:1:G + +Talisman of Indulgence +2 +Artifact +no text +tap: add 1 +paintap:1:B +paintap:1:R + +Talisman of Progress +2 +Artifact +no text +tap: add 1 +paintap:1:W +paintap:1:U + +Talisman of Unity +2 +Artifact +no text +tap: add 1 +paintap:1:G +paintap:1:W + Predatory Advantage 3 R G Enchantment diff --git a/src/forge/Ability_Mana.java b/src/forge/Ability_Mana.java index 04baf9ad085..e50727a5830 100644 --- a/src/forge/Ability_Mana.java +++ b/src/forge/Ability_Mana.java @@ -137,6 +137,7 @@ abstract public class Ability_Mana extends SpellAbility implements java.io.Seria //cost = cost.replaceAll("T, ", ""); setManaCost(cost.replaceAll("T", "").split(",")[0]); if(getManaCost().equals("")) setManaCost("0"); + /** //pain lands ArrayList pain = new ArrayList(); pain.add("Battlefield Forge"); @@ -157,6 +158,7 @@ abstract public class Ability_Mana extends SpellAbility implements java.io.Seria AllZone.GameAction.getPlayerLife(getController()).subtractLife(1); } }); + **/ //parseCosts(); /*for(String subcost : cost.split(",")) { diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index 8f600ba9f73..8c7b6a74eb0 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -3760,6 +3760,33 @@ public class CardFactory implements NewConstants { } } + while(hasKeyword(card,"paintap") != -1) + { + String toParse = card.getIntrinsicKeyword().get(hasKeyword(card,"paintap")); + card.removeIntrinsicKeyword(toParse); + String[] splitkeyword = toParse.split(":"); + + final int amountHurt = Integer.parseInt(splitkeyword[1]); + final String manaGenerated = splitkeyword[2]; + final Ability_Mana addMana = new Ability_Mana(card, "tap: add " + manaGenerated + " to your mana pool.CARDNAME deals " + amountHurt + " damage to you.") { + private static final long serialVersionUID = -259088242789L; + + @Override + public void resolve() + { + AllZone.GameAction.getPlayerLife(getController()).subtractLife(amountHurt); + super.resolve(); + } + + @Override + public String mana() { + return manaGenerated; + } + + }; + card.addSpellAbility(addMana); + }//paintap + //////////////////////////////////////////////////////////////// if (card.getKeyword().contains("When CARDNAME enters the battlefield, draw a card.") ||