From be2898d2f969bf61299ca9252803d8d6a23efde2 Mon Sep 17 00:00:00 2001
From: Thomas Winwood <twwinwood@gmail.com>
Date: Tue, 2 Apr 2019 03:46:15 +0100
Subject: [PATCH] Proliferate now doesn't choose a type of counter

---
 .../common/counter/ProliferateEffect.java     | 56 +++----------------
 1 file changed, 7 insertions(+), 49 deletions(-)

diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/ProliferateEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/ProliferateEffect.java
index 30fec0a1cb..a89c8e0c7f 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/counter/ProliferateEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/counter/ProliferateEffect.java
@@ -26,7 +26,7 @@ public class ProliferateEffect extends OneShotEffect {
 
     public ProliferateEffect() {
         super(Outcome.Benefit);
-        staticText = "Proliferate. <i>(You choose any number of permanents and/or players with counters on them, then give each another counter of a kind already there.)</i>";
+        staticText = "Proliferate. <i>(You choose any number of permanents and/or players with counters on them, then give each another counter of each kind already there.)</i>";
     }
 
     public ProliferateEffect(ProliferateEffect effect) {
@@ -48,60 +48,18 @@ public class ProliferateEffect extends OneShotEffect {
             Permanent permanent = game.getPermanent(chosen);
             if (permanent != null) {
                 if (!permanent.getCounters(game).isEmpty()) {
-                    if (permanent.getCounters(game).size() == 1) {
-                        for (Counter counter : permanent.getCounters(game).values()) {
-                            Counter newCounter = new Counter(counter.getName());
-                            permanent.addCounters(newCounter, source, game);
-                        }
-                    } else {
-                        Choice choice = new ChoiceImpl(true);
-                        Set<String> choices = new HashSet<>();
-                        for (Counter counter : permanent.getCounters(game).values()) {
-                            choices.add(counter.getName());
-                        }
-                        choice.setChoices(choices);
-                        choice.setMessage("Choose a counter to proliferate (" + permanent.getIdName() + ')');
-                        if (controller.choose(Outcome.Benefit, choice, game)) {
-                            for (Counter counter : permanent.getCounters(game).values()) {
-                                if (counter.getName().equals(choice.getChoice())) {
-                                    Counter newCounter = new Counter(counter.getName());
-                                    permanent.addCounters(newCounter, source, game);
-                                    break;
-                                }
-                            }
-                        } else {
-                            return false;
-                        }
+                    for (Counter counter : permanent.getCounters(game).values()) {
+                        Counter newCounter = new Counter(counter.getName());
+                        permanent.addCounters(newCounter, source, game);
                     }
                 }
             } else {
                 Player player = game.getPlayer(chosen);
                 if (player != null) {
                     if (!player.getCounters().isEmpty()) {
-                        if (player.getCounters().size() == 1) {
-                            for (Counter counter : player.getCounters().values()) {
-                                Counter newCounter = new Counter(counter.getName());
-                                player.addCounters(newCounter, game);
-                            }
-                        } else {
-                            Choice choice = new ChoiceImpl(true);
-                            Set<String> choices = new HashSet<>();
-                            for (Counter counter : player.getCounters().values()) {
-                                choices.add(counter.getName());
-                            }
-                            choice.setChoices(choices);
-                            choice.setMessage("Choose a counter to proliferate (" + player.getLogName() + ')');
-                            if (controller.choose(Outcome.Benefit, choice, game)) {
-                                for (Counter counter : player.getCounters().values()) {
-                                    if (counter.getName().equals(choice.getChoice())) {
-                                        Counter newCounter = new Counter(counter.getName());
-                                        player.addCounters(newCounter, game);
-                                        break;
-                                    }
-                                }
-                            } else {
-                                return false;
-                            }
+                        for (Counter counter : player.getCounters().values()) {
+                            Counter newCounter = new Counter(counter.getName());
+                            player.addCounters(newCounter, game);
                         }
                     }
                 }