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

fix save Quest Commander

Browse Source
This commit is contained in:
Anthony Calosa
2020-12-03 05:48:47 +08:00
parent 8c530ba384
commit 30edd6c9ff
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
forge-gui-mobile/src/forge/deck/FDeckEditor.java
View File

@@ -226,8 +226,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
return new DeckEditorPage[] { return new DeckEditorPage[] {
new CatalogPage(ItemManagerConfig.QUEST_EDITOR_POOL, localizer.getMessage("lblInventory"), FSkinImage.QUEST_BOX), new CatalogPage(ItemManagerConfig.QUEST_EDITOR_POOL, localizer.getMessage("lblInventory"), FSkinImage.QUEST_BOX),
new DeckSectionPage(DeckSection.Main, ItemManagerConfig.QUEST_DECK_EDITOR), new DeckSectionPage(DeckSection.Main, ItemManagerConfig.QUEST_DECK_EDITOR),
new DeckSectionPage(DeckSection.Commander, ItemManagerConfig.COMMANDER_SECTION), new DeckSectionPage(DeckSection.Commander, ItemManagerConfig.COMMANDER_SECTION)
new DeckSectionPage(DeckSection.Sideboard, ItemManagerConfig.QUEST_DECK_EDITOR)
}; };
case PlanarConquest: case PlanarConquest:
return new DeckEditorPage[] { return new DeckEditorPage[] {
@@ -263,7 +262,11 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
private FDeckEditor(EditorType editorType0, String editDeckName, String editDeckPath, Deck newDeck, boolean showMainDeck) { private FDeckEditor(EditorType editorType0, String editDeckName, String editDeckPath, Deck newDeck, boolean showMainDeck) {
super(getPages(editorType0)); super(getPages(editorType0));
editorType = editorType0; if (editorType0 == EditorType.QuestCommander) //fix saving quest commander
editorType = EditorType.Quest;
else
editorType = editorType0;
editorType.getController().editor = this; editorType.getController().editor = this;
//cache specific pages //cache specific pages
@@ -1057,7 +1060,6 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
cardManager.setPool(ItemPool.createFrom(FModel.getMagicDb().getVariantCards().getAllCards(Predicates.compose(CardRulesPredicates.Presets.IS_PLANE_OR_PHENOMENON, PaperCard.FN_GET_RULES)), PaperCard.class), true); cardManager.setPool(ItemPool.createFrom(FModel.getMagicDb().getVariantCards().getAllCards(Predicates.compose(CardRulesPredicates.Presets.IS_PLANE_OR_PHENOMENON, PaperCard.FN_GET_RULES)), PaperCard.class), true);
break; break;
case Quest: case Quest:
case QuestCommander:
final ItemPool<PaperCard> questPool = new ItemPool<>(PaperCard.class); final ItemPool<PaperCard> questPool = new ItemPool<>(PaperCard.class);
questPool.addAll(FModel.getQuest().getCards().getCardpool()); questPool.addAll(FModel.getQuest().getCards().getCardpool());
// remove bottom cards that are in the deck from the card pool // remove bottom cards that are in the deck from the card pool
@@ -1069,6 +1071,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
case PlanarConquest: case PlanarConquest:
cardManager.setPool(ConquestUtil.getAvailablePool(parentScreen.getDeck())); cardManager.setPool(ConquestUtil.getAvailablePool(parentScreen.getDeck()));
break; break;
case QuestCommander:
case Commander: case Commander:
case Oathbreaker: case Oathbreaker:
case TinyLeaders: case TinyLeaders:
@@ -1078,6 +1081,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
//if no commander set for deck, only show valid commanders //if no commander set for deck, only show valid commanders
switch (editorType) { switch (editorType) {
case Commander: case Commander:
case QuestCommander:
additionalFilter = DeckFormat.Commander.isLegalCommanderPredicate(); additionalFilter = DeckFormat.Commander.isLegalCommanderPredicate();
cardManager.setCaption(localizer.getMessage("lblCommanders")); cardManager.setCaption(localizer.getMessage("lblCommanders"));
break; break;
@@ -1101,6 +1105,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
//if a commander has been set, only show cards that match its color identity //if a commander has been set, only show cards that match its color identity
switch (editorType) { switch (editorType) {
case Commander: case Commander:
case QuestCommander:
additionalFilter = DeckFormat.Commander.isLegalCardForCommanderPredicate(commanders); additionalFilter = DeckFormat.Commander.isLegalCardForCommanderPredicate(commanders);
break; break;
case Oathbreaker: case Oathbreaker: