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

PlayerControllerHuman: translate chooseColor

Browse Source
This commit is contained in:
Hans Mackowiak
2025-09-12 10:01:47 +02:00
parent 21e458237d
commit 07ee5ccddf
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -1863,22 +1863,20 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
private byte chooseColorCommon(final String message, final Card c, final ColorSet colors, private byte chooseColorCommon(final String message, final Card c, final ColorSet colors,
final boolean withColorless) { final boolean withColorless) {
final ImmutableList.Builder<String> colorNamesBuilder = ImmutableList.builder(); List<MagicColor.Color> options = Lists.newArrayList(colors.toEnumSet());
if (withColorless) { if (withColorless && colors.countColors() > 0) {
colorNamesBuilder.add(MagicColor.toLongString(MagicColor.COLORLESS)); options.add(MagicColor.Color.COLORLESS);
} }
for (final Byte b : colors) {
colorNamesBuilder.add(MagicColor.toLongString(b)); if (options.size() > 2) {
} return getGui().one(message, options).getColormask();
final ImmutableList<String> colorNames = colorNamesBuilder.build();
if (colorNames.size() > 2) {
return MagicColor.fromName(getGui().one(message, colorNames));
} }
boolean confirmed = false; boolean confirmed = false;
confirmed = InputConfirm.confirm(this, CardView.get(c), message, true, colorNames); confirmed = InputConfirm.confirm(this, CardView.get(c), message, true,
options.stream().map(MagicColor.Color::toString).collect(Collectors.toList()));
final int idxChosen = confirmed ? 0 : 1; final int idxChosen = confirmed ? 0 : 1;
return MagicColor.fromName(colorNames.get(idxChosen)); return options.get(idxChosen).getColormask();
} }
@Override @Override