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 36c20fbf7a9..a49bd184791 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 @@ -340,6 +340,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 { @@ -659,7 +663,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")) { 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..65814fb74ab --- /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 +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.