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

Resolve "Momir Basic Mode Broken"

Browse Source
This commit is contained in:
Hans Mackowiak
2020-02-03 09:44:42 +00:00
committed by Michael Kamensky
parent 86de537fcb
commit 0482d4636b
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
forge-game/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java
View File

@@ -52,23 +52,27 @@ public class ChooseCardNameEffect extends SpellAbilityEffect {
final List<Player> tgtPlayers = getTargetPlayers(sa);
String valid = "Card";
String validDesc = "card";
String validDesc = null;
String message = null;
if (sa.hasParam("ValidCards")) {
valid = sa.getParam("ValidCards");
validDesc = sa.getParam("ValidDesc");
}
String message;
if (sa.hasParam("SelectPrompt")) {
message = sa.getParam("SelectPrompt");
} else if (validDesc.equals("card")) {
message = Localizer.getInstance().getMessage("lblChooseACardName");
} else {
message = Localizer.getInstance().getMessage("lblChooseASpecificCard", validDesc);
}
boolean randomChoice = sa.hasParam("AtRandom");
boolean chooseFromDefined = sa.hasParam("ChooseFromDefinedCards");
if (!randomChoice) {
if (sa.hasParam("SelectPrompt")) {
message = sa.getParam("SelectPrompt");
} else if (null == validDesc) {
message = Localizer.getInstance().getMessage("lblChooseACardName");
} else {
message = Localizer.getInstance().getMessage("lblChooseASpecificCard", validDesc);
}
}
for (final Player p : tgtPlayers) {
if ((tgt == null) || p.canBeTargetedBy(sa)) {
String chosen = "";