From f31af9c1f801822dcaaa7b7b5c7a434e4e58cafa Mon Sep 17 00:00:00 2001 From: excessum Date: Sun, 8 May 2016 12:32:48 +0000 Subject: [PATCH] - Added check for discard cost for TapAi (eg. Stern Constable) - Added SacMe and DiscardMe flags for Drownyard Temple --- forge-ai/src/main/java/forge/ai/ability/TapAi.java | 8 ++++++++ forge-gui/res/cardsfolder/d/drownyard_temple.txt | 2 ++ 2 files changed, 10 insertions(+) diff --git a/forge-ai/src/main/java/forge/ai/ability/TapAi.java b/forge-ai/src/main/java/forge/ai/ability/TapAi.java index 3d05cbb0d00..5e745239032 100644 --- a/forge-ai/src/main/java/forge/ai/ability/TapAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/TapAi.java @@ -1,9 +1,11 @@ package forge.ai.ability; import forge.ai.ComputerUtil; +import forge.ai.ComputerUtilCost; import forge.ai.SpellAbilityAi; import forge.game.ability.AbilityUtils; import forge.game.card.Card; +import forge.game.cost.Cost; import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseType; import forge.game.player.Player; @@ -37,6 +39,12 @@ public class TapAi extends TapAiBase { final TargetRestrictions tgt = sa.getTargetRestrictions(); final Card source = sa.getHostCard(); + final Cost abCost = sa.getPayCosts(); + if (abCost != null) { + if (!ComputerUtilCost.checkDiscardCost(ai, abCost, source)) { + return false; + } + } if (tgt == null) { final List defined = AbilityUtils.getDefinedCards(source, sa.getParam("Defined"), sa); diff --git a/forge-gui/res/cardsfolder/d/drownyard_temple.txt b/forge-gui/res/cardsfolder/d/drownyard_temple.txt index 0cf443aef23..608bde33d56 100644 --- a/forge-gui/res/cardsfolder/d/drownyard_temple.txt +++ b/forge-gui/res/cardsfolder/d/drownyard_temple.txt @@ -4,4 +4,6 @@ Types:Land A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C} to your mana pool. A:AB$ ChangeZone | Cost$ 3 | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True | ActivationZone$ Graveyard | SpellDescription$ Return CARDNAME from your graveyard to the battlefield tapped. SVar:Picture:http://www.wizards.com/global/images/magic/general/drownyard_temple.jpg +SVar:SacMe:4 +SVar:DiscardMe:3 Oracle:{T}: Add {C} to your mana pool.\n{3}: Return Drownyard Temple from your graveyard to the battlefield tapped. \ No newline at end of file