From 45846bb5051a350ad078495e3cc821165e41c34d Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 08:53:40 +0000 Subject: [PATCH] convert Voltaic Key and Wirewood Lodge to keyword. --- res/cardsfolder/voltaic_key.txt | 1 + res/cardsfolder/wirewood_lodge.txt | 1 + src/forge/CardFactory.java | 7 +++++-- src/forge/CardFactory_Lands.java | 3 ++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/res/cardsfolder/voltaic_key.txt b/res/cardsfolder/voltaic_key.txt index cc7c33cc823..321168d536c 100644 --- a/res/cardsfolder/voltaic_key.txt +++ b/res/cardsfolder/voltaic_key.txt @@ -2,6 +2,7 @@ Name:Voltaic Key ManaCost:1 Types:Artifact Text:no text +K:abUntapTgt 1 T:Artifact:Untap target artifact. SVar:RemAIDeck:True SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/voltaic_key.jpg diff --git a/res/cardsfolder/wirewood_lodge.txt b/res/cardsfolder/wirewood_lodge.txt index 015362d6456..4bf698ed22d 100644 --- a/res/cardsfolder/wirewood_lodge.txt +++ b/res/cardsfolder/wirewood_lodge.txt @@ -3,6 +3,7 @@ ManaCost:no cost Types:Land Text:no text K:tap: add 1 +K:abUntapTgt G T:Elf:Untap target Elf. SVar:RemAIDeck:True SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/wirewood_lodge.jpg diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index 0f9882bbb8c..3aa1f681eb6 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -5787,6 +5787,7 @@ public class CardFactory implements NewConstants { CardList tmpList = AllZoneUtil.getPlayerCardsInPlay(Constant.Player.Human); tmpList = tmpList.getValidCards(Tgts); tmpList = tmpList.getTargetableCards(card); + tmpList = tmpList.filter(AllZoneUtil.tapped); return tmpList; } @@ -5876,6 +5877,7 @@ public class CardFactory implements NewConstants { CardList tmpList = AllZoneUtil.getCardsInPlay(); tmpList = tmpList.getValidCards(Tgts); tmpList = tmpList.getTargetableCards(card); + tmpList = tmpList.filter(AllZoneUtil.tapped); return tmpList; } @@ -5975,6 +5977,7 @@ public class CardFactory implements NewConstants { CardList tmpList = AllZoneUtil.getPlayerCardsInPlay(Constant.Player.Human); tmpList = tmpList.getValidCards(Tgts); tmpList = tmpList.getTargetableCards(card); + tmpList = tmpList.filter(AllZoneUtil.untapped); return tmpList; } @@ -8568,7 +8571,7 @@ public class CardFactory implements NewConstants { }//*************** END ************ END ************************** - + /* //*************** START *********** START ************************** else if(cardName.equals("Voltaic Key")) { final Ability_Tap ability = new Ability_Tap(card, "1") { @@ -8615,7 +8618,7 @@ public class CardFactory implements NewConstants { card.addSpellAbility(ability); }//*************** END ************ END ************************** - + */ //*************** START ************ START ************************** else if(cardName.equals("Ashnod's Transmogrant")) { diff --git a/src/forge/CardFactory_Lands.java b/src/forge/CardFactory_Lands.java index 23d4ea6fd7b..f84cf4cc0d4 100644 --- a/src/forge/CardFactory_Lands.java +++ b/src/forge/CardFactory_Lands.java @@ -1790,7 +1790,7 @@ class CardFactory_Lands { }//*************** END ************ END ************************** - + /* //*************** START *********** START ************************** else if(cardName.equals("Wirewood Lodge")) { final Ability_Tap ability = new Ability_Tap(card, "G") { @@ -1846,6 +1846,7 @@ class CardFactory_Lands { ability.setBeforePayMana(runtime); }//*************** END ************ END ************************** + */ /* //*************** START *********** START **************************