From ed04025b3b4f2f67cad522c71756f1c261aa963e Mon Sep 17 00:00:00 2001 From: Hanmac Date: Tue, 21 Aug 2018 15:18:49 +0200 Subject: [PATCH] GameActionUtil: fix CyclingForZero --- forge-game/src/main/java/forge/game/GameActionUtil.java | 3 ++- .../src/main/java/forge/game/spellability/SpellAbility.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/GameActionUtil.java b/forge-game/src/main/java/forge/game/GameActionUtil.java index 7216771ff41..3b9de263e51 100644 --- a/forge-game/src/main/java/forge/game/GameActionUtil.java +++ b/forge-game/src/main/java/forge/game/GameActionUtil.java @@ -174,7 +174,8 @@ public final class GameActionUtil { } if (sa.isCycling() && activator.hasKeyword("CyclingForZero")) { - final SpellAbility newSA = sa.copyWithNoManaCost(); + // set the cost to this directly to buypass non mana cost + final SpellAbility newSA = sa.copyWithDefinedCost("Discard<1/CARDNAME>"); newSA.setBasicSpell(false); newSA.getMapParams().put("CostDesc", ManaCostParser.parse("0")); // makes new SpellDescription diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java index 291948ab16b..435151c0f02 100644 --- a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java +++ b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java @@ -900,6 +900,10 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit return newSA; } + public SpellAbility copyWithDefinedCost(String abCost) { + return copyWithDefinedCost(new Cost(abCost, isAbility())); + } + public boolean isTrigger() { return trigger; }