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

- Quest editor will now suggest a random set for basic lands in the "Add Basic Lands" window, choosing from the sets allowed in the format that have a complete set of basic lands.

Browse Source
This commit is contained in:
Agetian
2015-09-28 09:24:44 +00:00
parent 7145da0e53
commit cd4c81d4e4
1 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java
View File

@@ -25,8 +25,11 @@ import java.util.Map.Entry;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Supplier; import com.google.common.base.Supplier;
import com.google.common.collect.Lists;
import forge.UiCommand; import forge.UiCommand;
import forge.card.CardEdition;
import forge.deck.CardPool;
import forge.deck.Deck; import forge.deck.Deck;
import forge.deck.DeckSection; import forge.deck.DeckSection;
import forge.gui.framework.DragCell; import forge.gui.framework.DragCell;
@@ -40,12 +43,15 @@ import forge.itemmanager.views.ItemTableColumn;
import forge.model.FModel; import forge.model.FModel;
import forge.properties.ForgePreferences.FPref; import forge.properties.ForgePreferences.FPref;
import forge.quest.QuestController; import forge.quest.QuestController;
import forge.quest.data.GameFormatQuest;
import forge.screens.deckeditor.AddBasicLandsDialog;
import forge.screens.deckeditor.SEditorIO; import forge.screens.deckeditor.SEditorIO;
import forge.screens.deckeditor.views.VAllDecks; import forge.screens.deckeditor.views.VAllDecks;
import forge.screens.deckeditor.views.VCurrentDeck; import forge.screens.deckeditor.views.VCurrentDeck;
import forge.screens.deckeditor.views.VDeckgen; import forge.screens.deckeditor.views.VDeckgen;
import forge.screens.home.quest.CSubmenuQuestDecks; import forge.screens.home.quest.CSubmenuQuestDecks;
import forge.screens.match.controllers.CDetailPicture; import forge.screens.match.controllers.CDetailPicture;
import forge.util.Aggregates;
import forge.util.ItemPool; import forge.util.ItemPool;
/** /**
@@ -60,6 +66,7 @@ import forge.util.ItemPool;
*/ */
public final class CEditorQuest extends ACEditorBase<PaperCard, Deck> { public final class CEditorQuest extends ACEditorBase<PaperCard, Deck> {
private final QuestController questData; private final QuestController questData;
private static GameFormatQuest questFormat;
private final DeckController<Deck> controller; private final DeckController<Deck> controller;
private final List<DeckSection> allSections = new ArrayList<DeckSection>(); private final List<DeckSection> allSections = new ArrayList<DeckSection>();
private DragCell allDecksParent = null; private DragCell allDecksParent = null;
@@ -122,7 +129,8 @@ public final class CEditorQuest extends ACEditorBase<PaperCard, Deck> {
getBtnAddBasicLands().setCommand(new UiCommand() { getBtnAddBasicLands().setCommand(new UiCommand() {
@Override @Override
public void run() { public void run() {
CEditorConstructed.addBasicLands(CEditorQuest.this, questData.getCards().getCardpool()); questFormat = questData.getFormat();
CEditorQuest.addBasicLands(CEditorQuest.this, questData.getCards().getCardpool());
} }
}); });
} }
@@ -300,4 +308,28 @@ public final class CEditorQuest extends ACEditorBase<PaperCard, Deck> {
allDecksParent.addDoc(VAllDecks.SINGLETON_INSTANCE); allDecksParent.addDoc(VAllDecks.SINGLETON_INSTANCE);
} }
} }
public static void addBasicLands(ACEditorBase<PaperCard, Deck> editor, ItemPool<PaperCard> restrictedCatalog) {
Deck deck = editor.getDeckController().getModel();
if (deck == null) { return; }
List<String> landCodes = new ArrayList<>();
List<String> availableEditions = questFormat != null ? questFormat.getAllowedSetCodes() : Lists.newArrayList(FModel.getMagicDb().getEditions().getItemNames());
for (String edCode : availableEditions) {
CardEdition ed = FModel.getMagicDb().getEditions().get(edCode);
// Sets with only 2 types of lands (e.g. duel decks) are handled by Predicated.hasBasicLands
if (CardEdition.Predicates.hasBasicLands.apply(ed)) {
landCodes.add(edCode);
}
}
CardEdition defaultLandSet = FModel.getMagicDb().getEditions().get(landCodes.isEmpty() ? "ZEN" : Aggregates.random(landCodes));
AddBasicLandsDialog dialog = new AddBasicLandsDialog(deck, defaultLandSet, restrictedCatalog);
CardPool landsToAdd = dialog.show();
if (landsToAdd != null) {
editor.onAddItems(landsToAdd, false);
}
}
} }