From fbd692e1feb9438e67c00c9e87d38c6c12394e46 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 08:42:58 +0000 Subject: [PATCH] abMakeToken fixes --- res/cardsfolder/avenger_of_zendikar.txt | 2 ++ src/forge/Ability_Activated.java | 1 + src/forge/CardFactory.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/res/cardsfolder/avenger_of_zendikar.txt b/res/cardsfolder/avenger_of_zendikar.txt index b830e1285cb..5885092c7ed 100644 --- a/res/cardsfolder/avenger_of_zendikar.txt +++ b/res/cardsfolder/avenger_of_zendikar.txt @@ -4,6 +4,8 @@ Types:Creature Elemental Text:When Avenger of Zendikar enters the battlefield, put a 0/1 green Plant creature token onto the battlefield for each land you control.\r\nLandfall - Whenever a land enters the battlefield under your control, you may put a +1/+1 counter on each Plant creature you control. PT:5/5 K:Landfall +K:etbMakeToken<>X<>Plant<>G 0 1 Plant<>Controller<>G<>Creature;Plant<>0<>1<>None<>put a 0/1 green Plant creature token onto the battlefield for each land you control. +SVar:X:Count$NumTypeYouCtrl.Land SVar:BuffedBy:Land SVar:Rarity:Mythic SVar:Picture:http://www.wizards.com/global/images/magic/general/avenger_of_zendikar.jpg diff --git a/src/forge/Ability_Activated.java b/src/forge/Ability_Activated.java index 666196e37f7..600475da587 100644 --- a/src/forge/Ability_Activated.java +++ b/src/forge/Ability_Activated.java @@ -36,5 +36,6 @@ abstract public class Ability_Activated extends SpellAbility implements java.io. } return AllZone.GameAction.isCardInPlay(c) && !c.isFaceDown(); //TODO: make sure you can't play the Computer's activated abilities + //TODO: should summoning sickness be checked here as well? } } diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index ad35a38578d..6fa086238be 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -5730,7 +5730,7 @@ public class CardFactory implements NewConstants { @Override public boolean canPlay(){ Cost_Payment pay = new Cost_Payment(abCost, this); - return (pay.canPayAdditionalCosts() && CardFactoryUtil.canUseAbility(card) && super.canPlay()); + return !card.hasSickness() && (pay.canPayAdditionalCosts() && CardFactoryUtil.canUseAbility(card) && super.canPlay()); } @Override