From c5a10bdb18944ed19d967051a6df18f6c0fed5ed Mon Sep 17 00:00:00 2001 From: Sloth Date: Fri, 30 Sep 2011 19:45:54 +0000 Subject: [PATCH] - Added Shimmer. --- res/cardsfolder/b/barbed_back_wurm.txt | 18 +++++++++-------- src/main/java/forge/CardUtil.java | 9 +++++++++ .../abilityFactory/AbilityFactory_Choose.java | 20 +++++++++++++++++++ 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/res/cardsfolder/b/barbed_back_wurm.txt b/res/cardsfolder/b/barbed_back_wurm.txt index 5c5e2c950bd..2c9835cf80f 100644 --- a/res/cardsfolder/b/barbed_back_wurm.txt +++ b/res/cardsfolder/b/barbed_back_wurm.txt @@ -1,9 +1,11 @@ -Name:Barbed-Back Wurm -ManaCost:4 B -Types:Creature Wurm -Text:no text -PT:4/3 -A:AB$ Pump | Cost$ B | ValidTgts$ Creature.Green+blockingSource | TgtPrompt$ Select target green creature blocking Barbed-Back Wurm | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | SpellDescription$ Target green creature blocking CARDNAME gets -1/-1 until end of turn. -SVar:Rarity:Uncommon -SVar:Picture:http://www.wizards.com/global/images/magic/general/barbed_back_wurm.jpg +Name:Barbed-Back Wurm +ManaCost:4 B +Types:Creature Wurm +Text:no text +PT:4/3 +A:AB$ Pump | Cost$ B | ValidTgts$ Creature.Green+blockingSource | TgtPrompt$ Select target green creature blocking Barbed-Back Wurm | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | SpellDescription$ Target green creature blocking CARDNAME gets -1/-1 until end of turn. +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/barbed_back_wurm.jpg +SetInfo:MIR|Uncommon|http://magiccards.info/scans/en/mr/3.jpg +Oracle:{B}: Target green creature blocking Barbed-Back Wurm gets -1/-1 until end of turn. End \ No newline at end of file diff --git a/src/main/java/forge/CardUtil.java b/src/main/java/forge/CardUtil.java index dfef5d310b1..c9bd8f633ad 100644 --- a/src/main/java/forge/CardUtil.java +++ b/src/main/java/forge/CardUtil.java @@ -425,6 +425,15 @@ public final class CardUtil { return types; } + + public static ArrayList getLandTypes() { + ArrayList types = new ArrayList(); + + types.addAll(Constant.CardTypes.basicTypes[0].list); + types.addAll(Constant.CardTypes.landTypes[0].list); + + return types; + } /** *

isASuperType.

diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_Choose.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_Choose.java index 5c88f8a9867..d9520f3c991 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory_Choose.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_Choose.java @@ -333,6 +333,26 @@ public class AbilityFactory_Choose { //computer will need to choose a type } } + } + else if (type.equals("Land")) { + boolean valid = false; + while (!valid) { + if (sa.getActivatingPlayer().isHuman()) { + Object o = GuiUtils.getChoice("Choose a basic land type", + CardUtil.getLandTypes().toArray()); + if (null == o) { + return; + } + String choice = (String) o; + if (!invalidTypes.contains(choice)) { + valid = true; + card.setChosenType(choice); + } + } else { + //TODO + //computer will need to choose a type + } + } } //end if-else if } }