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

New Net Deck Category: Deck Modern Archive

Browse Source
This commit is contained in:
Churrufli
2021-02-24 12:07:41 +01:00
parent 16402aed09
commit d16beb8d32
2 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
forge-gui-mobile/src/forge/deck/FDeckChooser.java
View File

@@ -62,6 +62,7 @@ public class FDeckChooser extends FScreen {
private boolean needRefreshOnActivate; private boolean needRefreshOnActivate;
private Callback<Deck> callback; private Callback<Deck> callback;
private NetDeckCategory netDeckCategory; private NetDeckCategory netDeckCategory;
private NetDeckArchiveStandard NetDeckArchiveStandard;
private boolean refreshingDeckType; private boolean refreshingDeckType;
private boolean firstactivation = true; private boolean firstactivation = true;
@@ -530,6 +531,7 @@ public class FDeckChooser extends FScreen {
cmbDeckTypes.addItem(DeckType.THEME_DECK); cmbDeckTypes.addItem(DeckType.THEME_DECK);
cmbDeckTypes.addItem(DeckType.RANDOM_DECK); cmbDeckTypes.addItem(DeckType.RANDOM_DECK);
cmbDeckTypes.addItem(DeckType.NET_DECK); cmbDeckTypes.addItem(DeckType.NET_DECK);
cmbDeckTypes.addItem(DeckType.NET_ARCHIVE_STANDARD_DECK);
break; break;
case Commander: case Commander:
case Oathbreaker: case Oathbreaker:
@@ -543,6 +545,7 @@ public class FDeckChooser extends FScreen {
} }
cmbDeckTypes.addItem(DeckType.RANDOM_COMMANDER_DECK); cmbDeckTypes.addItem(DeckType.RANDOM_COMMANDER_DECK);
cmbDeckTypes.addItem(DeckType.NET_DECK); cmbDeckTypes.addItem(DeckType.NET_DECK);
cmbDeckTypes.addItem(DeckType.NET_ARCHIVE_STANDARD_DECK);
break; break;
case DeckManager: case DeckManager:
cmbDeckTypes.addItem(DeckType.CONSTRUCTED_DECK); cmbDeckTypes.addItem(DeckType.CONSTRUCTED_DECK);
@@ -559,6 +562,7 @@ public class FDeckChooser extends FScreen {
cmbDeckTypes.addItem(DeckType.QUEST_OPPONENT_DECK); cmbDeckTypes.addItem(DeckType.QUEST_OPPONENT_DECK);
cmbDeckTypes.addItem(DeckType.NET_DECK); cmbDeckTypes.addItem(DeckType.NET_DECK);
cmbDeckTypes.addItem(DeckType.NET_COMMANDER_DECK); cmbDeckTypes.addItem(DeckType.NET_COMMANDER_DECK);
cmbDeckTypes.addItem(DeckType.NET_ARCHIVE_STANDARD_DECK);
break; break;
default: default:
cmbDeckTypes.addItem(DeckType.CUSTOM_DECK); cmbDeckTypes.addItem(DeckType.CUSTOM_DECK);
@@ -600,6 +604,34 @@ public class FDeckChooser extends FScreen {
}); });
return; return;
} }
///
if ((deckType == DeckType.NET_ARCHIVE_STANDARD_DECK&& !refreshingDeckType)) {
FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks
@Override
public void run() {
GameType gameType = lstDecks.getGameType();
final NetDeckArchiveStandard category = NetDeckArchiveStandard.selectAndLoad(gameType);
FThreads.invokeInEdtLater(new Runnable() {
@Override
public void run() {
if (category == null) {
cmbDeckTypes.setSelectedItem(selectedDeckType); //restore old selection if user cancels
if (selectedDeckType == deckType && NetDeckArchiveStandard != null) {
cmbDeckTypes.setText(NetDeckArchiveStandard.getDeckType());
}
return;
}
NetDeckArchiveStandard = category;
refreshDecksList(deckType, true, e);
}
});
}
});
return;
}
///
refreshDecksList(deckType, false, e); refreshDecksList(deckType, false, e);
} }
}); });
@@ -793,6 +825,10 @@ public class FDeckChooser extends FScreen {
pool = RandomDeckGenerator.getRandomDecks(lstDecks, isAi); pool = RandomDeckGenerator.getRandomDecks(lstDecks, isAi);
config = ItemManagerConfig.STRING_ONLY; config = ItemManagerConfig.STRING_ONLY;
break; break;
case NET_ARCHIVE_STANDARD_DECK:
pool = DeckProxy.getNetArchiveStandardDecks(NetDeckArchiveStandard);
config = ItemManagerConfig.NET_ARCHIVE_STANDARD_DECKS;
break;
case NET_DECK: case NET_DECK:
case NET_COMMANDER_DECK: case NET_COMMANDER_DECK:
if (netDeckCategory != null) { if (netDeckCategory != null) {
@@ -1056,6 +1092,12 @@ public class FDeckChooser extends FScreen {
netDeckCategory = NetDeckCategory.selectAndLoad(lstDecks.getGameType(), deckType.substring(NetDeckCategory.PREFIX.length())); netDeckCategory = NetDeckCategory.selectAndLoad(lstDecks.getGameType(), deckType.substring(NetDeckCategory.PREFIX.length()));
return DeckType.NET_DECK; return DeckType.NET_DECK;
} }
///
if (deckType.startsWith(NetDeckArchiveStandard.PREFIX)) {
NetDeckArchiveStandard = NetDeckArchiveStandard.selectAndLoad(lstDecks.getGameType(), deckType.substring(NetDeckArchiveStandard.PREFIX.length()));
return DeckType.NET_ARCHIVE_STANDARD_DECK;
}
///
return DeckType.valueOf(deckType); return DeckType.valueOf(deckType);
} }
} }
@@ -1132,7 +1174,8 @@ public class FDeckChooser extends FScreen {
DeckType.LEGACY_CARDGEN_DECK, DeckType.LEGACY_CARDGEN_DECK,
DeckType.VINTAGE_CARDGEN_DECK, DeckType.VINTAGE_CARDGEN_DECK,
DeckType.THEME_DECK, DeckType.THEME_DECK,
DeckType.NET_DECK DeckType.NET_DECK,
DeckType.NET_ARCHIVE_STANDARD_DECK
); );
if (!FModel.isdeckGenMatrixLoaded()) { if (!FModel.isdeckGenMatrixLoaded()) {
deckTypes.remove(DeckType.STANDARD_CARDGEN_DECK); deckTypes.remove(DeckType.STANDARD_CARDGEN_DECK);

2
forge-gui/src/main/java/forge/itemmanager/ItemManagerConfig.java
View File

@@ -100,6 +100,8 @@ public enum ItemManagerConfig {
null, null, 3, 0), null, null, 3, 0),
NET_DECKS(SColumnUtil.getDecksDefaultColumns(false, false), false, false, false, NET_DECKS(SColumnUtil.getDecksDefaultColumns(false, false), false, false, false,
null, null, 3, 0), null, null, 3, 0),
NET_ARCHIVE_STANDARD_DECKS(SColumnUtil.getDecksDefaultColumns(false, false), false, false, false,
null, null, 3, 0),
SIDEBOARD(SColumnUtil.getDeckEditorDefaultColumns(), false, false, true, SIDEBOARD(SColumnUtil.getDeckEditorDefaultColumns(), false, false, true,
GroupDef.DEFAULT, ColumnDef.CMC, 3, 0); GroupDef.DEFAULT, ColumnDef.CMC, 3, 0);