From cf22f5c55ca46bc83e7607ae5c4faf8331baccd6 Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Tue, 26 Apr 2022 11:04:45 +0200 Subject: [PATCH] Daghatar without Pump --- forge-ai/src/main/java/forge/ai/ability/PumpAi.java | 3 +-- forge-gui/res/cardsfolder/d/daghatar_the_adamant.txt | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/ability/PumpAi.java b/forge-ai/src/main/java/forge/ai/ability/PumpAi.java index 95ad7c97d46..4faaa728f51 100644 --- a/forge-ai/src/main/java/forge/ai/ability/PumpAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/PumpAi.java @@ -145,6 +145,7 @@ public class PumpAi extends PumpAiBase { } final String counterType = moveSA.getParam("CounterType"); + final String amountStr = moveSA.getParamOrDefault("CounterNum", "1"); final CounterType cType = "Any".equals(counterType) ? null : CounterType.getType(counterType); final PhaseHandler ph = game.getPhaseHandler(); @@ -157,7 +158,6 @@ public class PumpAi extends PumpAiBase { if (attr.isEmpty()) { return false; } - final String amountStr = moveSA.getParam("CounterNum"); CardCollection best = CardLists.filter(attr, new Predicate() { @Override public boolean apply(Card card) { @@ -198,7 +198,6 @@ public class PumpAi extends PumpAiBase { return true; } } else { - final String amountStr = moveSA.getParam("CounterNum"); final boolean sameCtrl = moveSA.getTargetRestrictions().isSameController(); List list = CardLists.getTargetableCards(game.getCardsIn(ZoneType.Battlefield), sa); diff --git a/forge-gui/res/cardsfolder/d/daghatar_the_adamant.txt b/forge-gui/res/cardsfolder/d/daghatar_the_adamant.txt index da3f1c983fc..f1f159076b0 100644 --- a/forge-gui/res/cardsfolder/d/daghatar_the_adamant.txt +++ b/forge-gui/res/cardsfolder/d/daghatar_the_adamant.txt @@ -4,7 +4,6 @@ Types:Legendary Creature Human Warrior PT:0/0 K:Vigilance K:etbCounter:P1P1:4 -A:AB$ Pump | Cost$ 1 BG BG | ValidTgts$ Creature | TgtPrompt$ Select target creature to remove a +1/+1 counter from | AILogic$ MoveCounter | SubAbility$ DBMove | StackDescription$ None | SpellDescription$ Move a +1/+1 counter from target creature onto a second target creature. -SVar:DBMove:DB$ MoveCounter | Source$ ParentTarget | ValidTgts$ Creature | TgtPrompt$ Select target creature to move a +1/+1 counter to | TargetUnique$ True | CounterType$ P1P1 | CounterNum$ 1 +A:AB$ MoveCounter | Cost$ 1 BG BG | ValidTgts$ Creature | TargetMin$ 2 | TargetMax$ 2 | TgtPrompt$ Select target creatures to move +1/+1 counters | CounterType$ P1P1 | SpellDescription$ Move a +1/+1 counter from target creature onto a second target creature. AI:RemoveDeck:All Oracle:Vigilance\nDaghatar the Adamant enters the battlefield with four +1/+1 counters on it.\n{1}{B/G}{B/G}: Move a +1/+1 counter from target creature onto a second target creature.