external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Not use VAssignGenericAmount dialog for TwoEach ability

Browse Source
This commit is contained in:
Lyu Zong-Hong
2021-06-18 18:28:15 +09:00
parent afa6c9986a
commit 9a21f038ad
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java
View File

@@ -63,7 +63,7 @@ public class ManaEffect extends SpellAbilityEffect {
boolean differentChoice = abMana.getOrigProduced().contains("Different"); boolean differentChoice = abMana.getOrigProduced().contains("Different");
ColorSet fullOptions = colorOptions; ColorSet fullOptions = colorOptions;
// Use specifyManaCombo if possible // Use specifyManaCombo if possible
if (colorsNeeded == null && amount > 1) { if (colorsNeeded == null && amount > 1 && !sa.hasParam("TwoEach")) {
Map<Byte, Integer> choices = p.getController().specifyManaCombo(sa, colorOptions, amount, differentChoice); Map<Byte, Integer> choices = p.getController().specifyManaCombo(sa, colorOptions, amount, differentChoice);
for (Map.Entry<Byte, Integer> e : choices.entrySet()) { for (Map.Entry<Byte, Integer> e : choices.entrySet()) {
Byte chosenColor = e.getKey(); Byte chosenColor = e.getKey();
@@ -74,9 +74,6 @@ public class ManaEffect extends SpellAbilityEffect {
choiceString.append(" "); choiceString.append(" ");
} }
choiceString.append(choice); choiceString.append(choice);
if (sa.hasParam("TwoEach")) {
choiceString.append(" ").append(choice);
}
--count; --count;
} }
} }