From 341d8b9addf1cf82ede92e570dfc3b4fe68fee1f Mon Sep 17 00:00:00 2001
From: xenohedron <xenohedron@users.noreply.github.com>
Date: Sat, 13 Jan 2024 16:26:54 -0500
Subject: [PATCH] fix #11643 (choice for add mana of any type produced)

---
 ...java => AddManaOfAnyTypeProducedTest.java} | 57 ++++++++++++++++++-
 .../mana/AddManaOfAnyTypeProducedEffect.java  | 19 ++++---
 2 files changed, 68 insertions(+), 8 deletions(-)
 rename Mage.Tests/src/test/java/org/mage/test/cards/mana/{VorinclexVoiceOfHungerTest.java => AddManaOfAnyTypeProducedTest.java} (68%)

diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/VorinclexVoiceOfHungerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/AddManaOfAnyTypeProducedTest.java
similarity index 68%
rename from Mage.Tests/src/test/java/org/mage/test/cards/mana/VorinclexVoiceOfHungerTest.java
rename to Mage.Tests/src/test/java/org/mage/test/cards/mana/AddManaOfAnyTypeProducedTest.java
index b3487e42f0f..db6ab097935 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/VorinclexVoiceOfHungerTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/AddManaOfAnyTypeProducedTest.java
@@ -10,7 +10,7 @@ import org.mage.test.serverside.base.CardTestPlayerBase;
 /**
  * @author LevelX2
  */
-public class VorinclexVoiceOfHungerTest extends CardTestPlayerBase {
+public class AddManaOfAnyTypeProducedTest extends CardTestPlayerBase {
 
     /**
      * Vorinclex, Voice of Hunger is not mana doubling River of Tears.
@@ -114,4 +114,59 @@ public class VorinclexVoiceOfHungerTest extends CardTestPlayerBase {
         assertTapped("Gemstone Caverns", true);
 
     }
+
+    private static final String kinnan = "Kinnan, Bonder Prodigy";
+    private static final String signet = "Gruul Signet";
+    private static final String addRG = "{1}, {T}: Add {R}{G}";
+
+    @Test
+    public void testChooseColorRed() {
+        addCard(Zone.BATTLEFIELD, playerA, kinnan); // Whenever you tap a nonland permanent for mana, add one mana of any type that permanent produced.
+        addCard(Zone.BATTLEFIELD, playerA, "Wastes");
+        addCard(Zone.BATTLEFIELD, playerA, signet);
+        String raid = "Massive Raid"; // Massive Raid deals damage to any target equal to the number of creatures you control.
+        addCard(Zone.HAND, playerA, raid); // 1RR
+
+        activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, addRG);
+        setChoice(playerA, "Red");
+        waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN);
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, raid, playerB);
+
+        setStrictChooseMode(true);
+        setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
+        execute();
+
+        assertTapped(signet, true);
+        assertTapped("Wastes", true);
+        assertDamageReceived(playerA, kinnan, 0);
+        assertLife(playerA, 20);
+        assertLife(playerB, 19);
+
+    }
+
+    @Test
+    public void testChooseColorGreen() {
+        addCard(Zone.BATTLEFIELD, playerA, kinnan); // Whenever you tap a nonland permanent for mana, add one mana of any type that permanent produced.
+        addCard(Zone.BATTLEFIELD, playerA, "Wastes");
+        addCard(Zone.BATTLEFIELD, playerA, signet);
+        String hailstorm = "Hail Storm"; // Hail Storm deals 2 damage to each attacking creature and 1 damage to you and each creature you control.
+        addCard(Zone.HAND, playerA, hailstorm); // 1GG
+
+        activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, addRG);
+        setChoice(playerA, "Green");
+        waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN);
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, hailstorm);
+
+        setStrictChooseMode(true);
+        setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
+        execute();
+
+        assertTapped(signet, true);
+        assertTapped("Wastes", true);
+        assertDamageReceived(playerA, kinnan, 1);
+        assertLife(playerA, 19);
+        assertLife(playerB, 20);
+
+    }
+
 }
diff --git a/Mage/src/main/java/mage/abilities/effects/mana/AddManaOfAnyTypeProducedEffect.java b/Mage/src/main/java/mage/abilities/effects/mana/AddManaOfAnyTypeProducedEffect.java
index cc720ac4b2e..fba77289506 100644
--- a/Mage/src/main/java/mage/abilities/effects/mana/AddManaOfAnyTypeProducedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/mana/AddManaOfAnyTypeProducedEffect.java
@@ -100,14 +100,18 @@ public class AddManaOfAnyTypeProducedEffect extends ManaEffect {
             choice.getChoices().add("Colorless");
         }
 
-        if (choice.getChoices().isEmpty()) {
-            return newMana;
+        switch (choice.getChoices().size()) {
+            case 0: // no mana possible to add
+                return newMana;
+            case 1: // no choice necessary for one option
+                choice.setChoice(choice.getChoices().iterator().next());
+                break;
+            default:
+                // attempt to make choice
+                if (!targetController.choose(outcome, choice, game)) {
+                    return newMana; // no mana if no choice made
+                }
         }
-        if (choice.getChoices().size() != 1
-                && !targetController.choose(outcome, choice, game)) {
-            return newMana;
-        }
-        choice.setChoice(choice.getChoices().iterator().next());
 
         switch (choice.getChoice()) {
             case "White":
@@ -128,6 +132,7 @@ public class AddManaOfAnyTypeProducedEffect extends ManaEffect {
             case "Colorless":
                 newMana.setColorless(1);
                 break;
+            default:
         }
         return newMana;
     }