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

Fixed legacy and vintage deck generation for gauntlets on desktop and android

Browse Source
This commit is contained in:
austinio7116
2018-06-15 22:01:20 +01:00
committed by maustin
parent 4612dbbc59
commit 5cf63692a8
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletQuick.java
View File

@@ -90,9 +90,13 @@ public enum VSubmenuGauntletQuick implements IVSubmenu<CSubmenuGauntletQuick> {
if(FModel.isdeckGenMatrixLoaded()) { if(FModel.isdeckGenMatrixLoaded()) {
boxStandardCardgenDecks.setSelected(true); boxStandardCardgenDecks.setSelected(true);
boxModernCardgenDecks.setSelected(true); boxModernCardgenDecks.setSelected(true);
boxLegacyCardgenDecks.setSelected(true);
boxVintageCardgenDecks.setSelected(true);
}else{ }else{
boxStandardCardgenDecks.setSelected(false); boxStandardCardgenDecks.setSelected(false);
boxModernCardgenDecks.setSelected(false); boxModernCardgenDecks.setSelected(false);
boxLegacyCardgenDecks.setSelected(false);
boxVintageCardgenDecks.setSelected(false);
} }
boxModernColorDecks.setSelected(true); boxModernColorDecks.setSelected(true);
@@ -119,6 +123,8 @@ public enum VSubmenuGauntletQuick implements IVSubmenu<CSubmenuGauntletQuick> {
if(FModel.isdeckGenMatrixLoaded()) { if(FModel.isdeckGenMatrixLoaded()) {
pnlOptions.add(boxStandardCardgenDecks, "w 96%!, h 30px!, gap 2% 0 0 5px"); pnlOptions.add(boxStandardCardgenDecks, "w 96%!, h 30px!, gap 2% 0 0 5px");
pnlOptions.add(boxModernCardgenDecks, "w 96%!, h 30px!, gap 2% 0 0 5px"); pnlOptions.add(boxModernCardgenDecks, "w 96%!, h 30px!, gap 2% 0 0 5px");
pnlOptions.add(boxLegacyCardgenDecks, "w 96%!, h 30px!, gap 2% 0 0 5px");
pnlOptions.add(boxVintageCardgenDecks, "w 96%!, h 30px!, gap 2% 0 0 5px");
} }
pnlOptions.add(boxStandardColorDecks, "w 96%!, h 30px!, gap 2% 0 0 5px"); pnlOptions.add(boxStandardColorDecks, "w 96%!, h 30px!, gap 2% 0 0 5px");
pnlOptions.add(boxModernColorDecks, "w 96%!, h 30px!, gap 2% 0 0 0"); pnlOptions.add(boxModernColorDecks, "w 96%!, h 30px!, gap 2% 0 0 0");

2
forge-gui-mobile/src/forge/screens/gauntlet/NewGauntletScreen.java
View File

@@ -82,7 +82,7 @@ public class NewGauntletScreen extends LaunchScreen {
if (numOpponents == null) { return; } if (numOpponents == null) { return; }
ListChooser<DeckType> chooser = new ListChooser<DeckType>( ListChooser<DeckType> chooser = new ListChooser<DeckType>(
"Choose allowed deck types for opponents", 0, 9, Arrays.asList(new DeckType[] { "Choose allowed deck types for opponents", 0, 11, Arrays.asList(new DeckType[] {
DeckType.CUSTOM_DECK, DeckType.CUSTOM_DECK,
DeckType.PRECONSTRUCTED_DECK, DeckType.PRECONSTRUCTED_DECK,
DeckType.QUEST_OPPONENT_DECK, DeckType.QUEST_OPPONENT_DECK,