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

Remove excess deck types from desktop deck chooser combo box

Browse Source
This commit is contained in:
drdev
2015-06-13 20:12:17 +00:00
parent 15e4cd5c88
commit d4c5a35ebe
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-desktop/src/main/java/forge/deckchooser/DecksComboBox.java
View File

@@ -26,7 +26,7 @@ public class DecksComboBox extends FComboBoxWrapper<DeckType> {
} }
public void refresh(final DeckType deckType) { public void refresh(final DeckType deckType) {
setModel(new DefaultComboBoxModel<DeckType>(DeckType.values())); setModel(new DefaultComboBoxModel<DeckType>(DeckType.ConstructedOptions));
setSelectedItem(deckType); setSelectedItem(deckType);
} }

10
forge-gui/src/main/java/forge/deck/DeckType.java
View File

@@ -16,6 +16,16 @@ public enum DeckType {
NET_DECK ("Net Decks"), NET_DECK ("Net Decks"),
NET_COMMANDER_DECK ("Net Commander Decks"); NET_COMMANDER_DECK ("Net Commander Decks");
public static final DeckType[] ConstructedOptions = new DeckType[] {
DeckType.CUSTOM_DECK,
DeckType.PRECONSTRUCTED_DECK,
DeckType.QUEST_OPPONENT_DECK,
DeckType.COLOR_DECK,
DeckType.THEME_DECK,
DeckType.RANDOM_DECK,
DeckType.NET_DECK
};
private String value; private String value;
private DeckType(final String value) { private DeckType(final String value) {
this.value = value; this.value = value;

2
forge-gui/src/main/java/forge/deck/RandomDeckGenerator.java
View File

@@ -81,7 +81,7 @@ public class RandomDeckGenerator extends DeckProxy implements Comparable<RandomD
return DeckgenUtil.generatePlanarDeck(); return DeckgenUtil.generatePlanarDeck();
default: default:
while (true) { while (true) {
switch (Aggregates.random(DeckType.values())) { switch (Aggregates.random(DeckType.ConstructedOptions)) {
case PRECONSTRUCTED_DECK: case PRECONSTRUCTED_DECK:
return Aggregates.random(DeckProxy.getAllPreconstructedDecks(QuestController.getPrecons())).getDeck(); return Aggregates.random(DeckProxy.getAllPreconstructedDecks(QuestController.getPrecons())).getDeck();
case QUEST_OPPONENT_DECK: case QUEST_OPPONENT_DECK: