From d1deb9aef8ec1296fc34b4a7048a7e8d710d3c5a Mon Sep 17 00:00:00 2001 From: swordshine Date: Wed, 16 Apr 2014 06:33:56 +0000 Subject: [PATCH] - JOU: Added Battlefield Thaumaturge and Crystalline Nautilus --- .../main/java/forge/game/mana/ManaCostAdjustment.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/forge-game/src/main/java/forge/game/mana/ManaCostAdjustment.java b/forge-game/src/main/java/forge/game/mana/ManaCostAdjustment.java index 316122e93fe..b083bc581fd 100644 --- a/forge-game/src/main/java/forge/game/mana/ManaCostAdjustment.java +++ b/forge-game/src/main/java/forge/game/mana/ManaCostAdjustment.java @@ -393,14 +393,8 @@ public class ManaCostAdjustment { if (params.containsKey("AffectedZone") && !card.isInZone(ZoneType.smartValueOf(params.get("AffectedZone")))) { return; } - int value = 0; - if ("X".equals(amount)) { - value = CardFactoryUtil.xCount(hostCard, hostCard.getSVar("X")); - } else if ("AffectedX".equals(amount)) { - value = CardFactoryUtil.xCount(card, hostCard.getSVar("AffectedX")); - } else { - value = Integer.valueOf(amount); - } + // CardFactory.xCout() cannot calculate cards like Battlefield Thaumaturge + int value = AbilityUtils.calculateAmount(hostCard, amount, sa); if (!params.containsKey("Color")) { manaCost.decreaseColorlessMana(value);