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

Merge pull request #3226 from kevlahnota/newmaster2

Browse Source 
filter out invalid option for BoosterDraft
This commit is contained in:
Anthony Calosa
2023-06-11 06:19:56 +08:00
committed by GitHub
parent 16fd08ee02 370f0aa808
commit 6e1d6c9dfb
3 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuDraft.java
View File

@@ -208,7 +208,7 @@ public enum CSubmenuDraft implements ICDoc {
private void setupDraft() { private void setupDraft() {
final Localizer localizer = Localizer.getInstance(); final Localizer localizer = Localizer.getInstance();
// Determine what kind of booster draft to run // Determine what kind of booster draft to run
final LimitedPoolType poolType = GuiChoose.oneOrNone(localizer.getMessage("lblChooseDraftFormat"), LimitedPoolType.values()); final LimitedPoolType poolType = GuiChoose.oneOrNone(localizer.getMessage("lblChooseDraftFormat"), LimitedPoolType.values(true));
if (poolType == null) { return; } if (poolType == null) { return; }
final BoosterDraft draft = BoosterDraft.createDraft(poolType); final BoosterDraft draft = BoosterDraft.createDraft(poolType);

2
forge-gui-mobile/src/forge/screens/limited/NewDraftScreen.java
View File

@@ -43,7 +43,7 @@ public class NewDraftScreen extends LaunchScreen {
protected void startMatch() { protected void startMatch() {
//must run in game thread to prevent blocking UI thread //must run in game thread to prevent blocking UI thread
ThreadUtil.invokeInGameThread(() -> { ThreadUtil.invokeInGameThread(() -> {
final LimitedPoolType poolType = SGuiChoose.oneOrNone(Forge.getLocalizer().getMessage("lblChooseDraftFormat"), LimitedPoolType.values()); final LimitedPoolType poolType = SGuiChoose.oneOrNone(Forge.getLocalizer().getMessage("lblChooseDraftFormat"), LimitedPoolType.values(true));
if (poolType == null) { return; } if (poolType == null) { return; }
final BoosterDraft draft = BoosterDraft.createDraft(poolType); final BoosterDraft draft = BoosterDraft.createDraft(poolType);

31
forge-gui/src/main/java/forge/gamemodes/limited/LimitedPoolType.java
View File

@@ -5,16 +5,45 @@ import forge.util.Localizer;
public enum LimitedPoolType { public enum LimitedPoolType {
Full(Localizer.getInstance().getMessage("lblLimitedPoolFull")), Full(Localizer.getInstance().getMessage("lblLimitedPoolFull")),
Block(Localizer.getInstance().getMessage("lblLimitedBlock")), Block(Localizer.getInstance().getMessage("lblLimitedBlock")),
Prerelease(Localizer.getInstance().getMessage("lblLimitedPrerelease")), Prerelease(Localizer.getInstance().getMessage("lblLimitedPrerelease"), false),
FantasyBlock(Localizer.getInstance().getMessage("lblLimitedFantasy")), FantasyBlock(Localizer.getInstance().getMessage("lblLimitedFantasy")),
Custom(Localizer.getInstance().getMessage("lblLimitedCustom")), Custom(Localizer.getInstance().getMessage("lblLimitedCustom")),
Chaos(Localizer.getInstance().getMessage("lblLimitedChaos")); Chaos(Localizer.getInstance().getMessage("lblLimitedChaos"));
private final String displayName; private final String displayName;
private final boolean draftable;
LimitedPoolType(String name) { LimitedPoolType(String name) {
this(name, true);
}
LimitedPoolType(String name, boolean draftable) {
this.draftable = draftable;
displayName = name; displayName = name;
} }
public static LimitedPoolType[] values(boolean draftable) {
if (!draftable) {
return values();
}
int n = 0;
for (LimitedPoolType lpt : values()) {
if (lpt.draftable) {
n++;
}
}
LimitedPoolType[] draftableFormats = new LimitedPoolType[n];
n = 0;
for (LimitedPoolType lpt : values()) {
if (lpt.draftable) {
draftableFormats[n] = lpt;
n++;
}
}
return draftableFormats;
}
@Override @Override
public String toString() { public String toString() {
return displayName; return displayName;