From b5267d5a648f5d457350d0fb22a56f5c35febbc0 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Fri, 6 May 2022 23:19:35 -0400 Subject: [PATCH 1/3] bribe_taker.txt --- forge-gui/res/cardsfolder/upcoming/bribe_taker.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/bribe_taker.txt diff --git a/forge-gui/res/cardsfolder/upcoming/bribe_taker.txt b/forge-gui/res/cardsfolder/upcoming/bribe_taker.txt new file mode 100644 index 00000000000..8477beef3bd --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/bribe_taker.txt @@ -0,0 +1,10 @@ +Name:Bribe Taker +ManaCost:5 G +Types:Creature Rhino Warrior +PT:6/6 +K:Trample +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, for each kind of counter on permanents you control, you may put your choice of a +1/+1 counter or a counter of that kind on CARDNAME. +SVar:TrigPutCounter:DB$ PutCounter | CounterTypes$ EachType_Permanent.YouCtrl | AltChoiceForEach$ P1P1 +DeckNeeds:Ability$Counters +DckHas:Ability$Counters +Oracle:Trample\nWhen Bribe Taker enters the battlefield, for each kind of counter on permanents you control, you may put your choice of a +1/+1 counter or a counter of that kind on Bribe Taker. From efb713405f13dcf31a7a5750af8d06459eeee2b0 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Fri, 6 May 2022 23:20:13 -0400 Subject: [PATCH 2/3] CountersPutEffect support "AltChoiceForEach" --- .../forge/game/ability/effects/CountersPutEffect.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java index 44b6daac6b1..51fc512417a 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java @@ -298,6 +298,10 @@ public class CountersPutEffect extends SpellAbilityEffect { } } for (CounterType ct : counterTypes) { + if (sa.hasParam("AltChoiceForEach")) { + String typeChoices = sa.getParam("AltChoiceForEach") + "," + ct.toString(); + ct = chooseTypeFromList(sa, typeChoices, obj, pc); + } resolvePerType(sa, placer, ct, counterAmount, table, false); } } else { @@ -596,7 +600,10 @@ public class CountersPutEffect extends SpellAbilityEffect { List choices = Lists.newArrayList(); for (String s : list.split(",")) { if (!s.equals("") && (!sa.hasParam("UniqueType") || obj.getCounters(CounterType.getType(s)) == 0)) { - choices.add(CounterType.getType(s)); + CounterType type = CounterType.getType(s); + if (!choices.contains(type)) { + choices.add(type); + } } } if (sa.hasParam("RandomType")) { From ab2ea6554f54fe4efb56d1be16939d525cb6d6e6 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Sat, 7 May 2022 09:43:16 -0400 Subject: [PATCH 3/3] bribe_taker.txt fix typo --- forge-gui/res/cardsfolder/upcoming/bribe_taker.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/cardsfolder/upcoming/bribe_taker.txt b/forge-gui/res/cardsfolder/upcoming/bribe_taker.txt index 8477beef3bd..65814fb74ab 100644 --- a/forge-gui/res/cardsfolder/upcoming/bribe_taker.txt +++ b/forge-gui/res/cardsfolder/upcoming/bribe_taker.txt @@ -6,5 +6,5 @@ K:Trample T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, for each kind of counter on permanents you control, you may put your choice of a +1/+1 counter or a counter of that kind on CARDNAME. SVar:TrigPutCounter:DB$ PutCounter | CounterTypes$ EachType_Permanent.YouCtrl | AltChoiceForEach$ P1P1 DeckNeeds:Ability$Counters -DckHas:Ability$Counters +DeckHas:Ability$Counters Oracle:Trample\nWhen Bribe Taker enters the battlefield, for each kind of counter on permanents you control, you may put your choice of a +1/+1 counter or a counter of that kind on Bribe Taker.