From 1cf3d9c9753ef42b030fca9aca134642a4bb6f9c Mon Sep 17 00:00:00 2001 From: Agetian Date: Thu, 11 May 2017 04:51:06 +0000 Subject: [PATCH] - Added code support for Optional$ True in DB RemoveCounter. Fixed Shed Weakness not being optional. --- .../forge/game/ability/effects/CountersRemoveEffect.java | 8 ++++++++ forge-gui/res/cardsfolder/s/shed_weakness.txt | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/CountersRemoveEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersRemoveEffect.java index c9b64ce35d8..7c004f8e20a 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CountersRemoveEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CountersRemoveEffect.java @@ -71,11 +71,19 @@ public class CountersRemoveEffect extends SpellAbilityEffect { final Game game = card.getGame(); final String type = sa.getParam("CounterType"); final String num = sa.getParam("CounterNum"); + int cntToRemove = 0; if (!num.equals("All") && !num.equals("Remembered")) { cntToRemove = AbilityUtils.calculateAmount(sa.getHostCard(), num, sa); } + if (sa.hasParam("Optional")) { + String ctrs = cntToRemove > 1 ? "counters" : num.equals("All") ? "all counters" : "a counter"; + if (!sa.getActivatingPlayer().getController().confirmAction(sa, null, "Remove " + ctrs + "?")) { + return; + } + } + CounterType counterType = null; if (!type.equals("Any") && !type.equals("All")) { diff --git a/forge-gui/res/cardsfolder/s/shed_weakness.txt b/forge-gui/res/cardsfolder/s/shed_weakness.txt index 0d2f7b3848d..c8e4c0fb531 100644 --- a/forge-gui/res/cardsfolder/s/shed_weakness.txt +++ b/forge-gui/res/cardsfolder/s/shed_weakness.txt @@ -2,6 +2,6 @@ Name:Shed Weakness ManaCost:G Types:Instant A:SP$ Pump | Cost$ G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | SubAbility$ DBRemoveCounter | SpellDescription$ Target creature gets +2/+2 until end of turn. You may remove a -1/-1 counter from it. -SVar:DBRemoveCounter:DB$RemoveCounter | Defined$ Targeted | OptionalDecider$ You | CounterType$ M1M1 | CounterNum$ 1 +SVar:DBRemoveCounter:DB$RemoveCounter | Defined$ Targeted | Optional$ True | CounterType$ M1M1 | CounterNum$ 1 SVar:Picture:http://www.wizards.com/global/images/magic/general/shed_weakness.jpg Oracle:Target creature gets +2/+2 until end of turn. You may remove a -1/-1 counter from it. \ No newline at end of file