Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

fix #11643 (choice for add mana of any type produced)

Browse source
This commit is contained in:
xenohedron 2024-01-13 16:26:54 -05:00
parent dba8725b26
commit 341d8b9add
2 changed files with 68 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

57
Mage.Tests/src/test/java/org/mage/test/cards/mana/VorinclexVoiceOfHungerTest.java → Mage.Tests/src/test/java/org/mage/test/cards/mana/AddManaOfAnyTypeProducedTest.java
View file

@ -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);
}
}

19
Mage/src/main/java/mage/abilities/effects/mana/AddManaOfAnyTypeProducedEffect.java
View file

@ -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;
}