Fix typo for SPM draft

fix crash Android 8-13 NoSuchMethodError, prevent crash for missing card

forge-core/src/main/java/forge/StaticData.java

@@ -878,7 +878,7 @@ public class StaticData {
                 }
             }
         }
-        // stream().toList() causes crash on Android, use Collectors.toList()
+        // stream().toList() causes crash on Android 8-13, use Collectors.toList()
         List<String> NIF = new ArrayList<>(NIF_Q).stream().sorted().collect(Collectors.toList());
         List<String> CNI = new ArrayList<>(CNI_Q).stream().sorted().collect(Collectors.toList());
         List<String> TOK = new ArrayList<>(TOKEN_Q).stream().sorted().collect(Collectors.toList());

forge-core/src/main/java/forge/card/CardEdition.java

@@ -1018,16 +1018,13 @@ public final class CardEdition implements Comparable<CardEdition> {
 
         public static final Predicate<CardEdition> HAS_BOOSTER_BOX = edition -> edition.getBoosterBoxCount() > 0;
 
+        @Deprecated //Use CardEdition::hasBasicLands and a nonnull test.
         public static final Predicate<CardEdition> hasBasicLands = ed -> {
             if (ed == null) {
                 // Happens for new sets with "???" code
                 return false;
             }
-            for(String landName : MagicColor.Constant.BASIC_LANDS) {
+            return ed.hasBasicLands();
-                if (null == StaticData.instance().getCommonCards().getCard(landName, ed.getCode(), 0))
-                    return false;
-            }
-            return true;
         };
     }
 
@@ -1048,7 +1045,7 @@ public final class CardEdition implements Comparable<CardEdition> {
 
     public boolean hasBasicLands() {
         for(String landName : MagicColor.Constant.BASIC_LANDS) {
-            if (null == StaticData.instance().getCommonCards().getCard(landName, this.getCode(), 0))
+            if (this.getCardInSet(landName).isEmpty())
                 return false;
         }
         return true;

forge-core/src/main/java/forge/deck/DeckRecognizer.java

@@ -49,6 +49,16 @@ public class DeckRecognizer {
         LIMITED_CARD,
         CARD_FROM_NOT_ALLOWED_SET,
         CARD_FROM_INVALID_SET,
+        /**
+         * Valid card request, but can't be imported because the player does not have enough copies.
+         * Should be replaced with a different printing if possible.
+         */
+        CARD_NOT_IN_INVENTORY,
+        /**
+         * Valid card request for a card that isn't in the player's inventory, but new copies can be acquired freely.
+         * Usually used for basic lands. Should be supplied to the import controller by the editor.
+         */
+        FREE_CARD_NOT_IN_INVENTORY,
         // Warning messages
         WARNING_MESSAGE,
         UNKNOWN_CARD,
@@ -63,10 +73,14 @@ public class DeckRecognizer {
         CARD_TYPE,
         CARD_RARITY,
         CARD_CMC,
-        MANA_COLOUR
+        MANA_COLOUR;
+
+        public static final EnumSet<TokenType> CARD_TOKEN_TYPES = EnumSet.of(LEGAL_CARD, LIMITED_CARD, CARD_FROM_NOT_ALLOWED_SET, CARD_FROM_INVALID_SET, CARD_NOT_IN_INVENTORY, FREE_CARD_NOT_IN_INVENTORY);
+        public static final EnumSet<TokenType> IN_DECK_TOKEN_TYPES = EnumSet.of(LEGAL_CARD, LIMITED_CARD, DECK_NAME, FREE_CARD_NOT_IN_INVENTORY);
+        public static final EnumSet<TokenType> CARD_PLACEHOLDER_TOKEN_TYPES = EnumSet.of(CARD_TYPE, CARD_RARITY, CARD_CMC, MANA_COLOUR);
     }
 
-    public enum LimitedCardType{
+    public enum LimitedCardType {
         BANNED,
         RESTRICTED,
     }
@@ -108,6 +122,10 @@ public class DeckRecognizer {
             return new Token(TokenType.CARD_FROM_INVALID_SET, count, card, cardRequestHasSetCode);
         }
 
+        public static Token NotInInventoryFree(final PaperCard card, final int count, final DeckSection section) {
+            return new Token(TokenType.FREE_CARD_NOT_IN_INVENTORY, count, card, section, true);
+        }
+
         // WARNING MESSAGES
         // ================
         public static Token UnknownCard(final String cardName, final String setCode, final int count) {
@@ -126,6 +144,10 @@ public class DeckRecognizer {
            return new Token(TokenType.WARNING_MESSAGE, msg);
         }
 
+        public static Token NotInInventory(final PaperCard card, final int count, final DeckSection section) {
+            return new Token(TokenType.CARD_NOT_IN_INVENTORY, count, card, section, false);
+        }
+
         /* =================================
          * DECK SECTIONS
          * ================================= */
@@ -239,14 +261,11 @@ public class DeckRecognizer {
         /**
          * Filters all token types that have a PaperCard instance set (not null)
          * @return true for tokens of type:
-         * LEGAL_CARD, LIMITED_CARD, CARD_FROM_NOT_ALLOWED_SET and CARD_FROM_INVALID_SET.
+         * LEGAL_CARD, LIMITED_CARD, CARD_FROM_NOT_ALLOWED_SET and CARD_FROM_INVALID_SET, CARD_NOT_IN_INVENTORY, FREE_CARD_NOT_IN_INVENTORY.
          * False otherwise.
          */
         public boolean isCardToken() {
-            return (this.type == TokenType.LEGAL_CARD ||
+            return TokenType.CARD_TOKEN_TYPES.contains(this.type);
-                    this.type == TokenType.LIMITED_CARD ||
-                    this.type == TokenType.CARD_FROM_NOT_ALLOWED_SET ||
-                    this.type == TokenType.CARD_FROM_INVALID_SET);
         }
 
         /**
@@ -255,9 +274,7 @@ public class DeckRecognizer {
          * LEGAL_CARD, LIMITED_CARD, DECK_NAME; false otherwise.
          */
         public boolean isTokenForDeck() {
-            return (this.type == TokenType.LEGAL_CARD ||
+            return TokenType.IN_DECK_TOKEN_TYPES.contains(this.type);
-                    this.type == TokenType.LIMITED_CARD ||
-                    this.type == TokenType.DECK_NAME);
         }
 
         /**
@@ -266,7 +283,7 @@ public class DeckRecognizer {
          * False otherwise.
          */
         public boolean isCardTokenForDeck() {
-            return (this.type == TokenType.LEGAL_CARD || this.type == TokenType.LIMITED_CARD);
+            return isCardToken() && isTokenForDeck();
         }
 
         /**
@@ -276,10 +293,7 @@ public class DeckRecognizer {
          * CARD_RARITY, CARD_CMC, CARD_TYPE, MANA_COLOUR
          */
         public boolean isCardPlaceholder(){
-            return (this.type == TokenType.CARD_RARITY ||
+            return TokenType.CARD_PLACEHOLDER_TOKEN_TYPES.contains(this.type);
-                    this.type == TokenType.CARD_CMC ||
-                    this.type == TokenType.MANA_COLOUR ||
-                    this.type == TokenType.CARD_TYPE);
         }
 
         /** Determines if current token is a Deck Section token
@@ -536,7 +550,7 @@ public class DeckRecognizer {
             PaperCard tokenCard = token.getCard();
 
             if (isAllowed(tokenSection)) {
-                if (!tokenSection.equals(referenceDeckSectionInParsing)) {
+                if (tokenSection != referenceDeckSectionInParsing) {
                     Token sectionToken = Token.DeckSection(tokenSection.name(), this.allowedDeckSections);
                     // just check that last token is stack is a card placeholder.
                     // In that case, add the new section token before the placeholder
@@ -575,7 +589,7 @@ public class DeckRecognizer {
         refLine = purgeAllLinks(refLine);
 
         String line;
-        if (StringUtils.startsWith(refLine, LINE_COMMENT_DELIMITER_OR_MD_HEADER))
+        if (refLine.startsWith(LINE_COMMENT_DELIMITER_OR_MD_HEADER))
             line = refLine.replaceAll(LINE_COMMENT_DELIMITER_OR_MD_HEADER, "");
         else
             line = refLine.trim();  // Remove any trailing formatting
@@ -584,7 +598,7 @@ public class DeckRecognizer {
         // Final fantasy cards like Summon: Choco/Mog should be ommited to be recognized. TODO: fix maybe for future cards
         if (!line.contains("Summon:"))
             line = SEARCH_SINGLE_SLASH.matcher(line).replaceFirst(" // ");
-        if (StringUtils.startsWith(line, ASTERISK))  // markdown lists (tappedout md export)
+        if (line.startsWith(ASTERISK))  // Markdown lists (tappedout md export)
             line = line.substring(2);
 
         // == Patches to Corner Cases
@@ -600,8 +614,8 @@ public class DeckRecognizer {
         Token result = recogniseCardToken(line, referenceSection);
         if (result == null)
             result = recogniseNonCardToken(line);
-        return result != null ? result : StringUtils.startsWith(refLine, DOUBLE_SLASH) ||
+        return result != null ? result : refLine.startsWith(DOUBLE_SLASH) ||
-                StringUtils.startsWith(refLine, LINE_COMMENT_DELIMITER_OR_MD_HEADER) ?
+                refLine.startsWith(LINE_COMMENT_DELIMITER_OR_MD_HEADER) ?
                 new Token(TokenType.COMMENT, 0, refLine) : new Token(TokenType.UNKNOWN_TEXT, 0, refLine);
     }
 
@@ -613,7 +627,7 @@ public class DeckRecognizer {
         while (m.find()) {
             line = line.replaceAll(m.group(), "").trim();
         }
-        if (StringUtils.endsWith(line, "()"))
+        if (line.endsWith("()"))
             return line.substring(0, line.length()-2);
         return line;
     }
@@ -741,21 +755,12 @@ public class DeckRecognizer {
     // This would save tons of time in parsing Input + would also allow to return UnsupportedCardTokens beforehand
     private DeckSection getTokenSection(String deckSec, DeckSection currentDeckSection, PaperCard card){
         if (deckSec != null) {
-            DeckSection cardSection;
+            DeckSection cardSection = switch (deckSec.toUpperCase().trim()) {
-            switch (deckSec.toUpperCase().trim()) {
+                case "MB" -> DeckSection.Main;
-                case "MB":
+                case "SB" -> DeckSection.Sideboard;
-                    cardSection = DeckSection.Main;
+                case "CM" -> DeckSection.Commander;
-                    break;
+                default -> DeckSection.matchingSection(card);
-                case "SB":
+            };
-                    cardSection = DeckSection.Sideboard;
-                    break;
-                case "CM":
-                    cardSection = DeckSection.Commander;
-                    break;
-                default:
-                    cardSection = DeckSection.matchingSection(card);
-                    break;
-            }
             if (cardSection.validate(card))
                 return cardSection;
         }
@@ -1017,51 +1022,21 @@ public class DeckRecognizer {
     private static MagicColor.Color getMagicColor(String colorName){
         if (colorName.toLowerCase().startsWith("multi") || colorName.equalsIgnoreCase("m"))
             return null;  // will be handled separately
-
+        return MagicColor.Color.fromByte(MagicColor.fromName(colorName.toLowerCase()));
-        byte color = MagicColor.fromName(colorName.toLowerCase());
-        switch (color) {
-            case MagicColor.WHITE:
-                return MagicColor.Color.WHITE;
-            case MagicColor.BLUE:
-                return MagicColor.Color.BLUE;
-            case MagicColor.BLACK:
-                return MagicColor.Color.BLACK;
-            case MagicColor.RED:
-                return MagicColor.Color.RED;
-            case MagicColor.GREEN:
-                return MagicColor.Color.GREEN;
-            default:
-                return MagicColor.Color.COLORLESS;
-
-        }
     }
 
     public static String getLocalisedMagicColorName(String colorName){
         Localizer localizer = Localizer.getInstance();
-        switch(colorName.toLowerCase()){
+        return switch (colorName.toLowerCase()) {
-            case MagicColor.Constant.WHITE:
+            case MagicColor.Constant.WHITE -> localizer.getMessage("lblWhite");
-                return localizer.getMessage("lblWhite");
+            case MagicColor.Constant.BLUE -> localizer.getMessage("lblBlue");
-
+            case MagicColor.Constant.BLACK -> localizer.getMessage("lblBlack");
-            case MagicColor.Constant.BLUE:
+            case MagicColor.Constant.RED -> localizer.getMessage("lblRed");
-                return localizer.getMessage("lblBlue");
+            case MagicColor.Constant.GREEN -> localizer.getMessage("lblGreen");
-
+            case MagicColor.Constant.COLORLESS -> localizer.getMessage("lblColorless");
-            case MagicColor.Constant.BLACK:
+            case "multicolour", "multicolor" -> localizer.getMessage("lblMulticolor");
-                return localizer.getMessage("lblBlack");
+            default -> "";
-
+        };
-            case MagicColor.Constant.RED:
-                return localizer.getMessage("lblRed");
-
-            case MagicColor.Constant.GREEN:
-                return localizer.getMessage("lblGreen");
-
-            case MagicColor.Constant.COLORLESS:
-                return localizer.getMessage("lblColorless");
-            case "multicolour":
-            case "multicolor":
-                return localizer.getMessage("lblMulticolor");
-            default:
-                return "";
-        }
     }
 
     /**
@@ -1080,37 +1055,6 @@ public class DeckRecognizer {
 
         return "";
     }
-
-
-    private static Pair<String, String> getManaNameAndSymbol(String matchedMana) {
-        if (matchedMana == null)
-            return null;
-
-        Localizer localizer = Localizer.getInstance();
-        switch (matchedMana.toLowerCase()) {
-            case MagicColor.Constant.WHITE:
-            case "w":
-                return Pair.of(localizer.getMessage("lblWhite"), MagicColor.Color.WHITE.getSymbol());
-            case MagicColor.Constant.BLUE:
-            case "u":
-                return Pair.of(localizer.getMessage("lblBlue"), MagicColor.Color.BLUE.getSymbol());
-            case MagicColor.Constant.BLACK:
-            case "b":
-                return Pair.of(localizer.getMessage("lblBlack"), MagicColor.Color.BLACK.getSymbol());
-            case MagicColor.Constant.RED:
-            case "r":
-                return Pair.of(localizer.getMessage("lblRed"), MagicColor.Color.RED.getSymbol());
-            case MagicColor.Constant.GREEN:
-            case "g":
-                return Pair.of(localizer.getMessage("lblGreen"), MagicColor.Color.GREEN.getSymbol());
-            case MagicColor.Constant.COLORLESS:
-            case "c":
-                return Pair.of(localizer.getMessage("lblColorless"), MagicColor.Color.COLORLESS.getSymbol());
-            default: // Multicolour
-                return Pair.of(localizer.getMessage("lblMulticolor"), "");
-        }
-    }
-
     public static boolean isDeckName(final String lineAsIs) {
         if (lineAsIs == null)
             return false;

forge-game/src/main/java/forge/game/card/CardState.java

@@ -367,7 +367,7 @@ public class CardState extends GameObject implements IHasSVars, ITranslatable {
     public final FCollectionView<SpellAbility> getManaAbilities() {
         FCollection<SpellAbility> newCol = new FCollection<>();
         updateSpellAbilities(newCol, true);
-        // stream().toList() causes crash on Android, use Collectors.toList()
+        // stream().toList() causes crash on Android 8-13, use Collectors.toList()
         newCol.addAll(abilities.stream().filter(SpellAbility::isManaAbility).collect(Collectors.toList()));
         card.updateSpellAbilities(newCol, this, true);
         return newCol;
@@ -375,7 +375,7 @@ public class CardState extends GameObject implements IHasSVars, ITranslatable {
     public final FCollectionView<SpellAbility> getNonManaAbilities() {
         FCollection<SpellAbility> newCol = new FCollection<>();
         updateSpellAbilities(newCol, false);
-        // stream().toList() causes crash on Android, use Collectors.toList()
+        // stream().toList() causes crash on Android 8-13, use Collectors.toList()
         newCol.addAll(abilities.stream().filter(Predicate.not(SpellAbility::isManaAbility)).collect(Collectors.toList()));
         card.updateSpellAbilities(newCol, this, false);
         return newCol;
@@ -390,7 +390,7 @@ public class CardState extends GameObject implements IHasSVars, ITranslatable {
                 if (null != mana) {
                     leftAbilities = leftAbilities.stream()
                             .filter(mana ? SpellAbility::isManaAbility : Predicate.not(SpellAbility::isManaAbility))
-                            // stream().toList() causes crash on Android, use Collectors.toList()
+                            // stream().toList() causes crash on Android 8-13, use Collectors.toList()
                             .collect(Collectors.toList());
                 }
                 newCol.addAll(leftAbilities);
@@ -402,7 +402,7 @@ public class CardState extends GameObject implements IHasSVars, ITranslatable {
                 if (null != mana) {
                     rightAbilities = rightAbilities.stream()
                             .filter(mana ? SpellAbility::isManaAbility : Predicate.not(SpellAbility::isManaAbility))
-                            // stream().toList() causes crash on Android, use Collectors.toList()
+                            // stream().toList() causes crash on Android 8-13, use Collectors.toList()
                             .collect(Collectors.toList());
                 }
                 newCol.addAll(rightAbilities);

forge-game/src/main/java/forge/game/keyword/Keyword.java

@@ -1,8 +1,8 @@
 package forge.game.keyword;
 
-import forge.StaticData;
+import forge.card.CardSplitType;
-import forge.game.card.Card;
 import forge.item.PaperCard;
+import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.*;
 
@@ -223,7 +223,7 @@ public enum Keyword {
         displayName = displayName0;
     }
 
-    public static KeywordInterface getInstance(String k) {
+    private static Pair<Keyword, String> getKeywordDetails(String k) {
         Keyword keyword = Keyword.UNDEFINED;
         String details = k;
         // try to get real part
@@ -255,15 +255,20 @@ public enum Keyword {
             keyword = smartValueOf(k);
             details = "";
         }
+        return Pair.of(keyword, details);
+    }
+
+    public static KeywordInterface getInstance(String k) {
+        Pair<Keyword, String> p = getKeywordDetails(k);
 
         KeywordInstance<?> inst;
         try {
-            inst = keyword.type.getConstructor().newInstance();
+            inst = p.getKey().type.getConstructor().newInstance();
         }
         catch (Exception e) {
             inst = new UndefinedKeyword();
         }
-        inst.initialize(k, keyword, details);
+        inst.initialize(k, p.getKey(), p.getValue());
         return inst;
     }
 
@@ -278,36 +283,44 @@ public enum Keyword {
         return keywords;
     }
 
+    private static Keyword get(String k) {
+        if (k == null || k.isEmpty())
+            return Keyword.UNDEFINED;
+
+        return getKeywordDetails(k).getKey();
+    }
+
     private static final Map<String, Set<Keyword>> cardKeywordSetLookup = new HashMap<>();
 
     public static Set<Keyword> getKeywordSet(PaperCard card) {
-        String key = card.getName();
+        String name = card.getName();
-        Set<Keyword> keywordSet = cardKeywordSetLookup.get(key);
+        Set<Keyword> keywordSet = cardKeywordSetLookup.get(name);
         if (keywordSet == null) {
-            keywordSet = new HashSet<>();
+            CardSplitType cardSplitType = card.getRules().getSplitType();
-            for (KeywordInterface inst : Card.getCardForUi(card).getKeywords()) {
+            keywordSet = EnumSet.noneOf(Keyword.class);
-                final Keyword keyword = inst.getKeyword();
+            if (cardSplitType != CardSplitType.None && cardSplitType != CardSplitType.Split) {
-                if (keyword != Keyword.UNDEFINED) {
+                if (card.getRules().getOtherPart() != null) {
-                    keywordSet.add(keyword);
+                    if (card.getRules().getOtherPart().getKeywords() != null) {
+                        for (String key : card.getRules().getOtherPart().getKeywords()) {
+                            Keyword keyword = get(key);
+                            if (!Keyword.UNDEFINED.equals(keyword))
+                                keywordSet.add(keyword);
+                        }
+                    }
                 }
             }
-            cardKeywordSetLookup.put(card.getName(), keywordSet);
+            if (card.getRules().getMainPart().getKeywords() != null) {
+                for (String key : card.getRules().getMainPart().getKeywords()) {
+                    Keyword keyword = get(key);
+                    if (!Keyword.UNDEFINED.equals(keyword))
+                        keywordSet.add(keyword);
+                }
+            }
+            cardKeywordSetLookup.put(name, keywordSet);
         }
         return keywordSet;
     }
 
-    public static Runnable getPreloadTask() {
-        if (cardKeywordSetLookup.size() < 10000) { //allow preloading even if some but not all cards loaded
-            return () -> {
-                final Collection<PaperCard> cards = StaticData.instance().getCommonCards().getUniqueCards();
-                for (PaperCard card : cards) {
-                    getKeywordSet(card);
-                }
-            };
-        }
-        return null;
-    }
-
     public static Keyword smartValueOf(String value) {
         for (final Keyword v : Keyword.values()) {
             if (v.displayName.equalsIgnoreCase(value)) {

forge-gui-desktop/src/main/java/forge/screens/deckeditor/AddBasicLandsDialog.java

@@ -68,7 +68,7 @@ public class AddBasicLandsDialog {
     private static final int LAND_PANEL_PADDING = 3;
 
     private final FComboBoxPanel<CardEdition> cbLandSet = new FComboBoxPanel<>(Localizer.getInstance().getMessage("lblLandSet") + ":", FlowLayout.CENTER,
-            IterableUtil.filter(StaticData.instance().getSortedEditions(), CardEdition.Predicates.hasBasicLands));
+            IterableUtil.filter(StaticData.instance().getSortedEditions(), CardEdition::hasBasicLands));
 
     private final MainPanel panel = new MainPanel();
     private final LandPanel pnlPlains = new LandPanel("Plains");

forge-gui-desktop/src/main/java/forge/screens/deckeditor/DeckImport.java

@@ -46,7 +46,6 @@ import forge.toolbox.*;
 import forge.util.Localizer;
 import forge.view.FDialog;
 import net.miginfocom.swing.MigLayout;
-import org.apache.commons.lang3.StringUtils;
 
 import static forge.deck.DeckRecognizer.TokenType.*;
 
@@ -523,7 +522,7 @@ public class DeckImport<TModel extends DeckBase> extends FDialog {
                 else
                     deck.setName(currentDeckName);
             }
-            host.getDeckController().loadDeck(deck, controller.getCreateNewDeck());
+            host.getDeckController().loadDeck(deck, controller.getImportBehavior() != DeckImportController.ImportBehavior.MERGE);
             processWindowEvent(new WindowEvent(DeckImport.this, WindowEvent.WINDOW_CLOSING));
         });
 
@@ -531,7 +530,7 @@ public class DeckImport<TModel extends DeckBase> extends FDialog {
             this.createNewDeckCheckbox.setSelected(false);
             this.createNewDeckCheckbox.addActionListener(e -> {
                 boolean createNewDeck = createNewDeckCheckbox.isSelected();
-                controller.setCreateNewDeck(createNewDeck);
+                controller.setImportBehavior(createNewDeck ? DeckImportController.ImportBehavior.CREATE_NEW : DeckImportController.ImportBehavior.MERGE);
                 String cmdAcceptLabel = createNewDeck ? CREATE_NEW_DECK_CMD_LABEL : IMPORT_CARDS_CMD_LABEL;
                 cmdAcceptButton.setText(cmdAcceptLabel);
                 String smartCardArtChboxTooltip = createNewDeck ? SMART_CARDART_TT_NO_DECK : SMART_CARDART_TT_WITH_DECK;
@@ -600,7 +599,7 @@ public class DeckImport<TModel extends DeckBase> extends FDialog {
             if (token.getType() == LIMITED_CARD)
                 cssClass = WARN_MSG_CLASS;
             String statusMsg = String.format("<span class=\"%s\" style=\"font-size: 9px;\">%s</span>", cssClass,
-                                                                                        getTokenStatusMessage(token));
+                    controller.getTokenStatusMessage(token));
             statusLbl.append(statusMsg);
         }
 
@@ -740,12 +739,12 @@ public class DeckImport<TModel extends DeckBase> extends FDialog {
     private String toHTML(final DeckRecognizer.Token token) {
         if (token == null)
             return "";
-        String tokenMsg = getTokenMessage(token);
+        String tokenMsg = controller.getTokenMessage(token);
         if (tokenMsg == null)
             return "";
-        String tokenStatus = getTokenStatusMessage(token);
+        String tokenStatus = controller.getTokenStatusMessage(token);
         String cssClass = getTokenCSSClass(token.getType());
-        if (tokenStatus.length() == 0)
+        if (tokenStatus.isEmpty())
             tokenMsg = padEndWithHTMLSpaces(tokenMsg, 2*PADDING_TOKEN_MSG_LENGTH+10);
         else {
             tokenMsg = padEndWithHTMLSpaces(tokenMsg, PADDING_TOKEN_MSG_LENGTH);
@@ -755,11 +754,6 @@ public class DeckImport<TModel extends DeckBase> extends FDialog {
             tokenMsg = String.format("<a class=\"%s\" href=\"%s\">%s</a>", cssClass,
                     token.getKey().toString(), tokenMsg);
 
-        if (tokenStatus == null) {
-            String tokenTag = String.format("<td colspan=\"2\" class=\"%s\">%s</td>", cssClass, tokenMsg);
-            return String.format("<tr>%s</tr>", tokenTag);
-        }
-
         String tokenTag = "<td class=\"%s\">%s</td>";
         String tokenMsgTag = String.format(tokenTag, cssClass, tokenMsg);
         String tokenStatusTag;
@@ -776,97 +770,6 @@ public class DeckImport<TModel extends DeckBase> extends FDialog {
         return String.format("%s%s", targetMsg, spacer);
     }
 
-    private String getTokenMessage(DeckRecognizer.Token token) {
-        switch (token.getType()) {
-            case LEGAL_CARD:
-            case LIMITED_CARD:
-            case CARD_FROM_NOT_ALLOWED_SET:
-            case CARD_FROM_INVALID_SET:
-                return String.format("%s x %s %s", token.getQuantity(), token.getText(), getTokenFoilLabel(token));
-            // Card Warning Msgs
-            case UNKNOWN_CARD:
-            case UNSUPPORTED_CARD:
-                return token.getQuantity() > 0 ? String.format("%s x %s", token.getQuantity(), token.getText())
-                        : token.getText();
-
-            case UNSUPPORTED_DECK_SECTION:
-                return String.format("%s: %s", Localizer.getInstance().getMessage("lblWarningMsgPrefix"),
-                                        Localizer.getInstance()
-                                                .getMessage("lblWarnDeckSectionNotAllowedInEditor", token.getText(),
-                                                        this.currentGameType));
-
-            // Special Case of Card moved into another section (e.g. Commander from Sideboard)
-            case WARNING_MESSAGE:
-                return String.format("%s: %s", Localizer.getInstance()
-                                .getMessage("lblWarningMsgPrefix"), token.getText());
-
-            // Placeholders
-            case DECK_SECTION_NAME:
-                return String.format("%s: %s", Localizer.getInstance().getMessage("lblDeckSection"),
-                                        token.getText());
-
-            case CARD_RARITY:
-                return String.format("%s: %s", Localizer.getInstance().getMessage("lblRarity"),
-                                        token.getText());
-
-            case CARD_TYPE:
-            case CARD_CMC:
-            case MANA_COLOUR:
-            case COMMENT:
-                return token.getText();
-
-            case DECK_NAME:
-                return String.format("%s: %s", Localizer.getInstance().getMessage("lblDeckName"),
-                        token.getText());
-
-            case UNKNOWN_TEXT:
-            default:
-                return null;
-
-        }
-    }
-
-    private String getTokenStatusMessage(DeckRecognizer.Token token){
-        if (token == null)
-            return "";
-
-        switch (token.getType()) {
-            case LIMITED_CARD:
-                return String.format("%s: %s", Localizer.getInstance().getMessage("lblWarningMsgPrefix"),
-                        Localizer.getInstance().getMessage("lblWarnLimitedCard",
-                        StringUtils.capitalize(token.getLimitedCardType().name()), getGameFormatLabel()));
-
-            case CARD_FROM_NOT_ALLOWED_SET:
-                return Localizer.getInstance().getMessage("lblErrNotAllowedCard", getGameFormatLabel());
-
-            case CARD_FROM_INVALID_SET:
-                return Localizer.getInstance().getMessage("lblErrCardEditionDate");
-
-            case UNSUPPORTED_CARD:
-                return Localizer.getInstance().getMessage("lblErrUnsupportedCard", this.currentGameType);
-
-            case UNKNOWN_CARD:
-                return String.format("%s: %s", Localizer.getInstance().getMessage("lblWarningMsgPrefix"),
-                        Localizer.getInstance().getMessage("lblWarnUnknownCardMsg"));
-
-            case UNSUPPORTED_DECK_SECTION:
-            case WARNING_MESSAGE:
-            case COMMENT:
-            case CARD_CMC:
-            case MANA_COLOUR:
-            case CARD_TYPE:
-            case DECK_SECTION_NAME:
-            case CARD_RARITY:
-            case DECK_NAME:
-            case LEGAL_CARD:
-            case UNKNOWN_TEXT:
-            default:
-                return "";
-
-        }
-
-    }
-
     private String getTokenCSSClass(DeckRecognizer.TokenType tokenType){
         switch (tokenType){
             case LEGAL_CARD:
@@ -899,17 +802,6 @@ public class DeckImport<TModel extends DeckBase> extends FDialog {
                 return "";
         }
     }
-
-    private String getTokenFoilLabel(DeckRecognizer.Token token) {
-        if (!token.isCardToken())
-            return "";
-        final String foilMarker = "- (Foil)";
-        return token.getCard().isFoil() ? foilMarker : "";
-    }
-
-    private String getGameFormatLabel() {
-         return String.format("\"%s\"", this.controller.getCurrentGameFormatName());
-    }
 }
 
 class GameFormatDropdownRenderer extends JLabel implements ListCellRenderer<GameFormat> {

forge-gui-mobile/src/forge/adventure/character/EntryActor.java

@@ -43,7 +43,7 @@ public class EntryActor extends MapActor{
     {
         if(targetMap==null||targetMap.isEmpty())
         {
-            stage.exitDungeon(false);
+            stage.exitDungeon(false, false);
         }
         else
         {

forge-gui-mobile/src/forge/adventure/character/PortalActor.java

@@ -39,7 +39,7 @@ public class PortalActor extends EntryActor {
         }
         if (currentAnimationType == PortalAnimationTypes.Active) {
             if (targetMap == null || targetMap.isEmpty()) {
-                stage.exitDungeon(false);
+                stage.exitDungeon(false, false);
             } else {
                 if (targetMap.equals(currentMap)) {
                     stage.spawn(entryTargetObject);

forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java

@@ -1077,6 +1077,25 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
         return items.random();
     }
 
+    public boolean hasEquippedItem() {
+        for (Long id : equippedItems.values()) {
+            ItemData item = getEquippedItem(id);
+            if (item == null)
+                continue;
+            if (isHardorInsaneDifficulty()) {
+                return true;
+            } else {
+                switch (item.equipmentSlot) {
+                    // limit to these for easy and normal
+                    case "Boots", "Body", "Neck" -> {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
     public ItemData getEquippedAbility1() {
         for (Long id : equippedItems.values()) {
             ItemData data = getEquippedItem(id);

forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java

@@ -27,8 +27,6 @@ import forge.item.PaperCard;
 import forge.itemmanager.*;
 import forge.itemmanager.filters.CardColorFilter;
 import forge.itemmanager.filters.CardTypeFilter;
-import forge.localinstance.properties.ForgePreferences;
-import forge.menu.FCheckBoxMenuItem;
 import forge.menu.FDropDownMenu;
 import forge.menu.FMenuItem;
 import forge.menu.FPopupMenu;
@@ -41,6 +39,7 @@ import forge.util.Utils;
 import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 public class AdventureDeckEditor extends FDeckEditor {
     protected static class AdventureEditorConfig extends DeckEditorConfig {
@@ -146,7 +145,8 @@ public class AdventureDeckEditor extends FDeckEditor {
             if(event.cardBlock != null) {
                 if(event.cardBlock.getLandSet() != null)
                     return List.of(event.cardBlock.getLandSet());
-                List<CardEdition> eventSets = event.cardBlock.getSets();
+                List<CardEdition> eventSets = new ArrayList<>(event.cardBlock.getSets());
+                eventSets.removeIf(Predicate.not(CardEdition::hasBasicLands));
                 if(!eventSets.isEmpty())
                     return eventSets;
             }
@@ -558,7 +558,7 @@ public class AdventureDeckEditor extends FDeckEditor {
             currentEvent.participants[i].setDeck(opponentDecks[i]);
         }
         currentEvent.draftedDeck = (Deck) currentEvent.registeredDeck.copyTo("Draft Deck");
-        if (allowsAddBasic()) {
+        if (allowAddBasic()) {
             showAddBasicLandsDialog();
             //Might be annoying if you haven't pruned your deck yet, but best to remind player that
             //this probably needs to be done since it's there since it's not normally part of Adventure
@@ -713,27 +713,6 @@ public class AdventureDeckEditor extends FDeckEditor {
         return this.deckHeader;
     }
 
-    @Override
-    protected FPopupMenu createMoreOptionsMenu() {
-        return new FPopupMenu() {
-            @Override
-            protected void buildMenu() {
-                Localizer localizer = Forge.getLocalizer();
-                addItem(new FMenuItem(localizer.getMessage("btnCopyToClipboard"), Forge.hdbuttons ? FSkinImage.HDEXPORT : FSkinImage.BLANK, e1 -> FDeckViewer.copyDeckToClipboard(getDeck())));
-                if (allowsAddBasic()) {
-                    FMenuItem addBasic = new FMenuItem(localizer.getMessage("lblAddBasicLands"), FSkinImage.LANDLOGO, e1 -> showAddBasicLandsDialog());
-                    addItem(addBasic);
-                }
-                if(FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.DEV_MODE_ENABLED)) {
-                    addItem(new FCheckBoxMenuItem(localizer.getMessage("cbEnforceDeckLegality"), shouldEnforceConformity(), e -> toggleConformity()));
-                    String devSuffix = " (" + localizer.getMessage("lblDev") + ")";
-                    addItem(new FMenuItem(localizer.getMessage("lblAddcard") + devSuffix, FSkinImage.HDPLUS, e -> showDevAddCardDialog()));
-                }
-                ((DeckEditorPage) getSelectedPage()).buildDeckMenu(this);
-            }
-        };
-    }
-
     @Override
     protected void addChosenBasicLands(CardPool landsToAdd) {
         if(isLimitedEditor())
@@ -765,6 +744,12 @@ public class AdventureDeckEditor extends FDeckEditor {
         catalog.moveCards(landsToMove, getMainDeckPage());
     }
 
+    @Override
+    protected PaperCard supplyPrintForImporter(PaperCard missingCard) {
+        PaperCard out = super.supplyPrintForImporter(missingCard);
+        return out == null ? null : out.getNoSellVersion();
+    }
+
     @Override
     protected void cacheTabPages() {
         super.cacheTabPages();
@@ -775,7 +760,9 @@ public class AdventureDeckEditor extends FDeckEditor {
     }
 
     @Override
-    protected boolean allowsAddBasic() {
+    protected boolean allowAddBasic() {
+        if(getEditorConfig() instanceof DeckPreviewConfig)
+            return false;
         AdventureEventData currentEvent = getCurrentEvent();
         if (currentEvent == null)
             return true;

forge-gui-mobile/src/forge/adventure/scene/ArenaScene.java

@@ -157,7 +157,7 @@ public class ArenaScene extends UIScene implements IAfterMatch {
     }
 
     @Override
-    public void setWinner(boolean winner) {
+    public void setWinner(boolean winner, boolean isArena) {
         enable = false;
         Array<ArenaRecord> winners = new Array<>();
         Array<EnemySprite> winnersEnemies = new Array<>();

forge-gui-mobile/src/forge/adventure/scene/DuelScene.java

@@ -142,7 +142,7 @@ public class DuelScene extends ForgeScene {
             Current.player().getStatistic().setResult(enemyName, winner);
 
             if (last instanceof IAfterMatch) {
-                ((IAfterMatch) last).setWinner(winner);
+                ((IAfterMatch) last).setWinner(winner, isArena);
             }
         });
     }

forge-gui-mobile/src/forge/adventure/scene/EventScene.java

@@ -541,7 +541,7 @@ public class EventScene extends MenuScene implements IAfterMatch {
 
     AdventureEventData.AdventureEventMatch humanMatch = null;
 
-    public void setWinner(boolean winner) {
+    public void setWinner(boolean winner, boolean isArena) {
         if (winner) {
             humanMatch.winner = humanMatch.p1;
             humanMatch.p1.wins++;

forge-gui-mobile/src/forge/adventure/scene/HudScene.java

@@ -181,8 +181,8 @@ public abstract class HudScene extends Scene implements InputProcessor, IAfterMa
     }
 
     @Override
-    public void setWinner(boolean winner) {
+    public void setWinner(boolean winner, boolean isArena) {
-        stage.setWinner(winner);
+        stage.setWinner(winner, isArena);
     }
 
     public boolean isInHudOnlyMode() {

forge-gui-mobile/src/forge/adventure/stage/ConsoleCommandInterpreter.java

@@ -203,7 +203,7 @@ public class ConsoleCommandInterpreter {
         });
         registerCommand(new String[]{"leave"}, s -> {
             if (!MapStage.getInstance().isInMap()) return "not on a map";
-            MapStage.getInstance().exitDungeon(false);
+            MapStage.getInstance().exitDungeon(false, false);
             return "Got out";
         });
         registerCommand(new String[]{"debug", "collision"}, s -> {

forge-gui-mobile/src/forge/adventure/stage/GameHUD.java

@@ -893,7 +893,7 @@ public class GameHUD extends Stage {
             @Override
             public boolean act(float v) {
                 if (exitDungeon) {
-                    MapStage.getInstance().exitDungeon(false);
+                    MapStage.getInstance().exitDungeon(false, false);
                     setDisabled(exitToWorldMapActor, true, "[%120][+ExitToWorldMap]", "\u2613");
                     setDisabled(bookmarkActor, true, "[%120][+Bookmark]", "\u2613");
                 }

forge-gui-mobile/src/forge/adventure/stage/GameStage.java

@@ -74,8 +74,8 @@ public abstract class GameStage extends Stage {
     private float touchY = -1;
     private final float timer = 0;
     private float animationTimeout = 0;
-    public static float maximumScrollDistance=1.5f;
+    public static float maximumScrollDistance = 1.5f;
-    public static float minimumScrollDistance=0.3f;
+    public static float minimumScrollDistance = 0.3f;
 
     private String extraAnnouncement = "";
 
@@ -97,8 +97,9 @@ public abstract class GameStage extends Stage {
     public void setDialogStage(Stage dialogStage) {
         this.dialogStage = dialogStage;
     }
+
     public void showDialog() {
-        if (dialogStage == null){
+        if (dialogStage == null) {
             setDialogStage(GameHUD.getInstance());
         }
         GameHUD.getInstance().playerIdle();
@@ -123,6 +124,7 @@ public abstract class GameStage extends Stage {
 
     /**
      * Triggered when the hud is showing a dialog, which is tracked separately
+     *
      * @param isShowing Whether a dialog is currently showing
      */
     public void hudIsShowingDialog(boolean isShowing) {
@@ -248,24 +250,21 @@ public abstract class GameStage extends Stage {
         showDialog();
     }
 
-    
 
     public boolean axisMoved(Controller controller, int axisIndex, float value) {
 
-        if (MapStage.getInstance().isDialogOnlyInput()||isPaused()) {
+        if (MapStage.getInstance().isDialogOnlyInput() || isPaused()) {
             return true;
         }
         player.getMovementDirection().x = controller.getAxis(0);
         player.getMovementDirection().y = -controller.getAxis(1);
-        if(player.getMovementDirection().len()<0.2)
+        if (player.getMovementDirection().len() < 0.2) {
-        {
             player.stop();
         }
         return true;
     }
 
-    enum PlayerModification
+    enum PlayerModification {
-    {
         Sprint,
         Hide,
         Fly
@@ -273,29 +272,32 @@ public abstract class GameStage extends Stage {
     }
 
 
-    HashMap<PlayerModification,Float> currentModifications=new HashMap<>();
+    HashMap<PlayerModification, Float> currentModifications = new HashMap<>();
-    public void modifyPlayer(PlayerModification mod,float value) {
+
-        float currentValue=0;
+    public void modifyPlayer(PlayerModification mod, float value) {
-        if(currentModifications.containsKey(mod))
+        float currentValue = 0;
-        {
+        if (currentModifications.containsKey(mod)) {
-            currentValue=currentModifications.get(mod);
+            currentValue = currentModifications.get(mod);
         }
-        currentModifications.put(mod,currentValue+value);
+        currentModifications.put(mod, currentValue + value);
     }
 
     public void flyFor(float value) {
-        modifyPlayer(PlayerModification.Fly,value);
+        modifyPlayer(PlayerModification.Fly, value);
         player.playEffect(Paths.EFFECT_FLY);
     }
+
     public void hideFor(float value) {
-        modifyPlayer(PlayerModification.Hide,value);
+        modifyPlayer(PlayerModification.Hide, value);
-        player.setColor(player.getColor().r,player.getColor().g,player.getColor().b,0.5f);
+        player.setColor(player.getColor().r, player.getColor().g, player.getColor().b, 0.5f);
         player.playEffect(Paths.EFFECT_HIDE);
     }
+
     public void sprintFor(float value) {
-        modifyPlayer(PlayerModification.Sprint,value);
+        modifyPlayer(PlayerModification.Sprint, value);
         player.playEffect(Paths.EFFECT_SPRINT);
     }
+
     public void startPause(float i) {
         startPause(i, null);
     }
@@ -305,6 +307,7 @@ public abstract class GameStage extends Stage {
         animationTimeout = i;
         player.setMovementDirection(Vector2.Zero);
     }
+
     public boolean isPaused() {
         return animationTimeout > 0;
     }
@@ -330,7 +333,7 @@ public abstract class GameStage extends Stage {
         dialog = Controls.newDialog("");
     }
 
-    public void setWinner(boolean b) {
+    public void setWinner(boolean b, boolean a) {
     }
 
     public void setBounds(float width, float height) {
@@ -365,15 +368,13 @@ public abstract class GameStage extends Stage {
             animationTimeout -= delta;
             return;
         }
-        Array<PlayerModification> modsToRemove=new Array<>();
+        Array<PlayerModification> modsToRemove = new Array<>();
-        for(Map.Entry<PlayerModification, Float> mod:currentModifications.entrySet())
+        for (Map.Entry<PlayerModification, Float> mod : currentModifications.entrySet()) {
-        {
+            mod.setValue(mod.getValue() - delta);
-            mod.setValue(mod.getValue()-delta);
+            if (mod.getValue() < 0)
-            if(mod.getValue()<0)
                 modsToRemove.add(mod.getKey());
         }
-        for(PlayerModification mod:modsToRemove)
+        for (PlayerModification mod : modsToRemove) {
-        {
             currentModifications.remove(mod);
             onRemoveEffect(mod);
         }
@@ -408,10 +409,9 @@ public abstract class GameStage extends Stage {
     }
 
     private void onRemoveEffect(PlayerModification mod) {
-        switch (mod)
+        switch (mod) {
-        {
             case Hide:
-                player.setColor(player.getColor().r,player.getColor().g,player.getColor().b,1f);
+                player.setColor(player.getColor().r, player.getColor().g, player.getColor().b, 1f);
                 break;
             case Fly:
                 player.removeEffect(Paths.EFFECT_FLY);
@@ -430,20 +430,16 @@ public abstract class GameStage extends Stage {
         super.keyDown(keycode);
         if (isPaused())
             return true;
-        if (KeyBinding.Left.isPressed(keycode))
+        if (KeyBinding.Left.isPressed(keycode)) {
-        {
             player.getMovementDirection().x = -1;
         }
-        if (KeyBinding.Right.isPressed(keycode) )
+        if (KeyBinding.Right.isPressed(keycode)) {
-        {
             player.getMovementDirection().x = +1;
         }
-        if (KeyBinding.Up.isPressed(keycode))
+        if (KeyBinding.Up.isPressed(keycode)) {
-        {
             player.getMovementDirection().y = +1;
         }
-        if (KeyBinding.Down.isPressed(keycode))
+        if (KeyBinding.Down.isPressed(keycode)) {
-        {
             player.getMovementDirection().y = -1;
         }
         if (keycode == Input.Keys.F5)//todo config
@@ -483,9 +479,8 @@ public abstract class GameStage extends Stage {
             if (GameHUD.getInstance().isDebugMap()) {
                 TileMapScene S = TileMapScene.instance();
                 PointOfInterestData P = PointOfInterestData.getPointOfInterest("DEBUGZONE");
-                if( P != null)
+                if (P != null) {
-                {
+                    PointOfInterest PoI = new PointOfInterest(P, new Vector2(0, 0), MyRandom.getRandom());
-                    PointOfInterest PoI = new PointOfInterest(P,new Vector2(0,0), MyRandom.getRandom());
                     S.load(PoI);
                     Forge.switchScene(S);
                 }
@@ -571,14 +566,12 @@ public abstract class GameStage extends Stage {
     public boolean keyUp(int keycode) {
         if (isPaused())
             return true;
-        if (KeyBinding.Left.isPressed(keycode)||KeyBinding.Right.isPressed(keycode))
+        if (KeyBinding.Left.isPressed(keycode) || KeyBinding.Right.isPressed(keycode)) {
-        {
             player.getMovementDirection().x = 0;
             if (!player.isMoving())
                 stop();
         }
-        if (KeyBinding.Down.isPressed(keycode)||KeyBinding.Up.isPressed(keycode))
+        if (KeyBinding.Down.isPressed(keycode) || KeyBinding.Up.isPressed(keycode)) {
-        {
             player.getMovementDirection().y = 0;
             if (!player.isMoving())
                 stop();
@@ -658,17 +651,16 @@ public abstract class GameStage extends Stage {
         return Vector2.Zero.cpy();
     }
 
-    protected void teleported(Vector2 position)
+    protected void teleported(Vector2 position) {
-    {
 
     }
+
     public void setPosition(Vector2 position) {
         getPlayerSprite().setPosition(position);
         teleported(position);
     }
 
-    public void resetPlayerLocation()
+    public void resetPlayerLocation() {
-    {
         PointOfInterest poi = Current.world().findPointsOfInterest("Spawn");
         if (poi != null) {
             Forge.advFreezePlayerControls = true;
@@ -677,7 +669,7 @@ public abstract class GameStage extends Stage {
             Timer.schedule(new Timer.Task() {
                 @Override
                 public void run() {
-                showImageDialog(Current.generateDefeatMessage(), getDefeatBadge(),
+                showImageDialog(Current.generateDefeatMessage(true), getDefeatBadge(),
                     () -> FThreads.invokeInEdtNowOrLater(() -> Forge.setTransitionScreen(new CoverScreen(() -> {
                         Forge.advFreezePlayerControls = false;
                         WorldStage.getInstance().setPosition(new Vector2(poi.getPosition().x - 16f, poi.getPosition().y + 16f));
@@ -689,6 +681,21 @@ public abstract class GameStage extends Stage {
             }, 1f);
         }//Spawn shouldn't be null
     }
+
+    public void defeatedFromBoss() {
+        if (!Current.player().hasEquippedItem())
+            return;
+        Forge.advFreezePlayerControls = true;
+        getPlayerSprite().setAnimation(CharacterSprite.AnimationTypes.Hit);
+        getPlayerSprite().playEffect(Paths.EFFECT_BLOOD, 0.5f);
+        Timer.schedule(new Timer.Task() {
+            @Override
+            public void run() {
+                showImageDialog(Current.generateDefeatMessage(false), getDefeatBadge(), () -> Forge.advFreezePlayerControls = false);
+            }
+        }, 1f);
+    }
+
     private FBufferedImage getDefeatBadge() {
         FileHandle defeat = Config.instance().getFile("ui/defeat.png");
         if (defeat.exists()) {

forge-gui-mobile/src/forge/adventure/stage/IAfterMatch.java

@@ -1,5 +1,5 @@
 package forge.adventure.stage;
 
 public interface IAfterMatch {
-    void setWinner(boolean winner);
+    void setWinner(boolean winner, boolean isArena);
 }

forge-gui-mobile/src/forge/adventure/stage/MapStage.java

@@ -606,7 +606,7 @@ public class MapStage extends GameStage {
                         }));
                         break;
                     case "exit":
-                        addMapActor(obj, new OnCollide(() -> MapStage.this.exitDungeon(false)));
+                        addMapActor(obj, new OnCollide(() -> MapStage.this.exitDungeon(false, false)));
                         break;
                     case "dialog":
                         if (obj instanceof TiledMapTileMapObject) {
@@ -750,7 +750,7 @@ public class MapStage extends GameStage {
         }
     }
 
-    public boolean exitDungeon(boolean defeated) {
+    public boolean exitDungeon(boolean defeated, boolean defeatedByBoss) {
         AdventureQuestController.instance().updateQuestsLeave();
         clearIsInMap();
         AdventureQuestController.instance().showQuestDialogs(this);
@@ -758,6 +758,8 @@ public class MapStage extends GameStage {
         effect = null; //Reset dungeon effects.
         if (defeated)
             WorldStage.getInstance().resetPlayerLocation();
+        else if (defeatedByBoss)
+            WorldStage.getInstance().defeatedFromBoss();
         Forge.switchScene(GameScene.instance());
         isPlayerLeavingDungeon = false;
         dialogOnlyInput = false;
@@ -766,7 +768,7 @@ public class MapStage extends GameStage {
 
 
     @Override
-    public void setWinner(boolean playerWins) {
+    public void setWinner(boolean playerWins, boolean isArena) {
         isLoadingMatch = false;
         freezeAllEnemyBehaviors = true;
         if (playerWins) {
@@ -805,16 +807,16 @@ public class MapStage extends GameStage {
                 boolean defeated = Current.player().defeated();
                 //If hardcore mode is added, check and redirect to game over screen here
                 if (canFailDungeon && !defeated)
-                    dungeonFailedDialog(true);
+                    dungeonFailedDialog(true, currentMob.getData().boss && !isArena);
                 else
-                    exitDungeon(defeated);
+                    exitDungeon(defeated, currentMob.getData().boss && !isArena);
                 MapStage.this.stop();
                 currentMob = null;
             });
         }
     }
 
-    private void dungeonFailedDialog(boolean exit) {
+    private void dungeonFailedDialog(boolean exit, boolean defeatedByBoss) {
         dialog.getButtonTable().clear();
         dialog.getContentTable().clear();
         dialog.clearListeners();
@@ -834,7 +836,7 @@ public class MapStage extends GameStage {
                 L.skipToTheEnd();
                 super.clicked(event, x, y);
                 if (exit)
-                    exitDungeon(false);
+                    exitDungeon(false, defeatedByBoss);
             }
         });
         dialog.getButtonTable().add(ok).width(240f);

forge-gui-mobile/src/forge/adventure/stage/WorldStage.java

@@ -162,7 +162,7 @@ public class WorldStage extends GameStage implements SaveFileContent {
     }
 
     @Override
-    public void setWinner(boolean playerIsWinner) {
+    public void setWinner(boolean playerIsWinner, boolean isArena) {
         if (playerIsWinner) {
             currentMob.clearCollisionHeight();
             Current.player().win();
@@ -192,10 +192,13 @@ public class WorldStage extends GameStage implements SaveFileContent {
                 boolean defeated = Current.player().defeated();
                 AdventureQuestController.instance().updateQuestsLose(currentMob);
                 AdventureQuestController.instance().showQuestDialogs(MapStage.getInstance());
+                boolean defeatedFromBoss = currentMob.getData().boss && !isArena;
                 WorldStage.this.removeEnemy(currentMob);
                 currentMob = null;
                 if (defeated) {
                     WorldStage.getInstance().resetPlayerLocation();
+                } else if (defeatedFromBoss) {
+                    WorldStage.getInstance().defeatedFromBoss();
                 }
             });
         }

forge-gui-mobile/src/forge/adventure/util/CardUtil.java

@@ -809,6 +809,11 @@ public class CardUtil {
         return generateBoosterPackAsDeck(edition);
     }
 
+    private static PaperCard getReplacement(String missingCard, String replacementCard) {
+        System.err.println(missingCard + " : Not found in the database.\nReplacement card: " + replacementCard);
+        return FModel.getMagicDb().getCommonCards().getCard(replacementCard);
+    }
+
     public static PaperCard getCardByName(String cardName) {
         List<PaperCard> validCards;
         //Faster to ask the CardDB for a card name than it is to search the pool.
@@ -817,6 +822,10 @@ public class CardUtil {
         else
             validCards = FModel.getMagicDb().getCommonCards().getUniqueCardsNoAlt(cardName);
 
+        if (validCards.isEmpty()) {
+            return getReplacement(cardName, "Wastes");
+        }
+
         return validCards.get(Current.world().getRandom().nextInt(validCards.size()));
     }
 
@@ -828,7 +837,7 @@ public class CardUtil {
                 .filter(input -> input.getEdition().equals(edition)).collect(Collectors.toList());
 
         if (validCards.isEmpty()) {
-            System.err.println("Unexpected behavior: tried to call getCardByNameAndEdition for card " + cardName + " from the edition " + edition + ", but didn't find it in the DB. A random existing instance will be returned.");
+            System.err.println("Unexpected behavior: tried to call getCardByNameAndEdition for card " + cardName + " from the edition " + edition + ", but didn't find it in the DB. A random existing instance will be returned if found.");
             return getCardByName(cardName);
         }
 

forge-gui-mobile/src/forge/adventure/util/Current.java

@@ -27,8 +27,9 @@ public class Current {
     public static void setLatestDeck(Deck generateDeck) {
         deck=generateDeck;
     }
-    public static String generateDefeatMessage() {
+    public static String generateDefeatMessage(boolean hasDied) {
-        String message = Forge.getLocalizer().getMessage("lblYouDied", player().getName());
+        String key = hasDied ? "lblYouDied" : "lblYouLostTheLastGame";
+        String message = Forge.getLocalizer().getMessage(key, player().getName());
         ItemData itemData = player().getRandomEquippedItem();
         if (itemData != null) {
             itemData.isCracked = true;

forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java

@@ -59,7 +59,7 @@ public class AddBasicLandsDialog extends FDialog {
     private final Consumer<CardPool> callback;
 
     private final FLabel lblLandSet = add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblLandSet") + ":").font(FSkinFont.get(12)).textColor(FLabel.getInlineLabelColor()).build());
-    private final FComboBox<CardEdition> cbLandSet = add(new FComboBox<>(IterableUtil.filter(StaticData.instance().getEditions(), CardEdition.Predicates.hasBasicLands)));
+    private final FComboBox<CardEdition> cbLandSet = add(new FComboBox<>(IterableUtil.filter(StaticData.instance().getSortedEditions(), CardEdition::hasBasicLands)));
 
     private final FScrollPane scroller = add(new FScrollPane() {
         @Override

forge-gui-mobile/src/forge/deck/FDeckEditor.java

@@ -81,13 +81,21 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
         public boolean allowsCardReplacement() { return hasInfiniteCardPool() || usePlayerInventory(); }
 
         public List<CardEdition> getBasicLandSets(Deck currentDeck) {
+            if(hasInfiniteCardPool())
+                return FModel.getMagicDb().getSortedEditions().stream().filter(CardEdition::hasBasicLands).collect(Collectors.toList());
             return List.of(DeckProxy.getDefaultLandSet(currentDeck));
         }
 
         protected abstract IDeckController getController();
         protected abstract DeckEditorPage[] getInitialPages();
 
-        protected DeckSection[] getExtraSections() {
+        public DeckSection[] getPrimarySections() {
+            if(getGameType() != null)
+                return getGameType().getPrimaryDeckSections().toArray(new DeckSection[0]);
+            return new DeckSection[]{DeckSection.Main, DeckSection.Sideboard};
+        }
+
+        public DeckSection[] getExtraSections() {
             if(getGameType() != null)
                 return getGameType().getSupplimentalDeckSections().toArray(new DeckSection[0]);
             return new DeckSection[]{DeckSection.Attractions, DeckSection.Contraptions};
@@ -144,7 +152,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
         ItemManagerConfig catalogConfig = null;
         ItemManagerConfig mainSectionConfig = null;
         ItemManagerConfig sideboardConfig = null;
-        Function<Deck, CardEdition> fnGetBasicLandSet = null;
+        Function<Deck, Collection<CardEdition>> fnGetBasicLandSet = null;
         Supplier<ItemPool<PaperCard>> itemPoolSupplier = null;
         String catalogCaption = null;
 
@@ -196,7 +204,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
             this.sideboardConfig = sideboardConfig;
             return this;
         }
-        public GameTypeDeckEditorConfig setBasicLandSetFunction(Function<Deck, CardEdition> fnGetBasicLandSet) {
+        public GameTypeDeckEditorConfig setBasicLandSetFunction(Function<Deck, Collection<CardEdition>> fnGetBasicLandSet) {
             this.fnGetBasicLandSet = fnGetBasicLandSet;
             return this;
         }
@@ -296,9 +304,21 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
         }
 
         @Override
-        protected DeckSection[] getExtraSections() {
+        public DeckSection[] getPrimarySections() {
+            return gameType.getPrimaryDeckSections().toArray(new DeckSection[0]);
+        }
+
+        @Override
+        public DeckSection[] getExtraSections() {
             return gameType.getSupplimentalDeckSections().toArray(new DeckSection[0]);
         }
+
+        @Override
+        public List<CardEdition> getBasicLandSets(Deck currentDeck) {
+            if(this.fnGetBasicLandSet != null)
+                return List.copyOf(fnGetBasicLandSet.apply(currentDeck));
+            return super.getBasicLandSets(currentDeck);
+        }
     }
 
     public static DeckEditorConfig EditorConfigConstructed = new GameTypeDeckEditorConfig(GameType.Constructed,
@@ -348,18 +368,19 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
             .setMainSectionConfig(ItemManagerConfig.QUEST_DECK_EDITOR)
             .setSideboardConfig(ItemManagerConfig.QUEST_DECK_EDITOR)
             .setPlayerInventorySupplier(() -> FModel.getQuest().getCards().getCardpool())
-            .setBasicLandSetFunction(d -> FModel.getQuest().getDefaultLandSet());
+            .setBasicLandSetFunction(d -> FModel.getQuest().getAvailableLandSets());
     public static DeckEditorConfig EditorConfigQuestCommander = new GameTypeDeckEditorConfig(GameType.QuestCommander, DECK_CONTROLLER_QUEST)
             .setCatalogConfig(ItemManagerConfig.QUEST_EDITOR_POOL)
             .setMainSectionConfig(ItemManagerConfig.QUEST_DECK_EDITOR)
             .setSideboardConfig(ItemManagerConfig.QUEST_DECK_EDITOR)
             .setPlayerInventorySupplier(() -> FModel.getQuest().getCards().getCardpool())
-            .setBasicLandSetFunction(d -> FModel.getQuest().getDefaultLandSet());
+            .setBasicLandSetFunction(d -> FModel.getQuest().getAvailableLandSets());
     public static DeckEditorConfig EditorConfigQuestDraft = new GameTypeDeckEditorConfig(GameType.QuestDraft, DECK_CONTROLLER_QUEST_DRAFT);
     public static DeckEditorConfig EditorConfigPlanarConquest = new GameTypeDeckEditorConfig(GameType.PlanarConquest, DECK_CONTROLLER_PLANAR_CONQUEST)
             .setCatalogConfig(ItemManagerConfig.CONQUEST_COLLECTION)
             .setMainSectionConfig(ItemManagerConfig.CONQUEST_DECK_EDITOR)
-            .setPlayerInventorySupplier(ConquestUtil::getAvailablePool);
+            .setPlayerInventorySupplier(ConquestUtil::getAvailablePool)
+            .setBasicLandSetFunction(ConquestUtil::getBasicLandSets);
 
     protected static DeckSectionPage createPageForExtraSection(DeckSection deckSection, DeckEditorConfig editorConfig) {
         CardManager cm = new CardManager(false);
@@ -542,7 +563,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
             @Override
             protected void buildMenu() {
                 final Localizer localizer = Forge.getLocalizer();
-                if (allowsAddBasic())
+                if (allowAddBasic())
                     addItem(new FMenuItem(localizer.getMessage("lblAddBasicLands"), FSkinImage.LANDLOGO, e -> showAddBasicLandsDialog()));
                 if (showAddExtraSectionOption()) {
                     addItem(new FMenuItem(localizer.getMessage("lblAddDeckSection"), FSkinImage.CHAOS, e -> {
@@ -558,28 +579,41 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
                         });
                     }));
                 }
-                if (editorConfig.getGameType() != null && editorConfig.hasInfiniteCardPool()) {
+                if (editorConfig.hasInfiniteCardPool() || editorConfig.usePlayerInventory()) {
                     addItem(new FMenuItem(localizer.getMessage("lblImportFromClipboard"), Forge.hdbuttons ? FSkinImage.HDIMPORT : FSkinImage.OPEN, e -> {
-                        FDeckImportDialog dialog = new FDeckImportDialog(!deck.isEmpty(), FDeckEditor.this.editorConfig);
+                        FDeckImportDialog dialog = new FDeckImportDialog(deck, FDeckEditor.this.editorConfig);
+                        if(editorConfig.usePlayerInventory())
+                            dialog.setFreePrintConverter(FDeckEditor.this::supplyPrintForImporter);
+                        dialog.setImportBannedCards(!FModel.getPreferences().getPrefBoolean(FPref.ENFORCE_DECK_LEGALITY));
                         dialog.setCallback(importedDeck -> {
                             if (deck != null && importedDeck.hasName()) {
                                 deck.setName(importedDeck.getName());
                                 setHeaderText(importedDeck.getName());
                             }
-                            if (dialog.createNewDeck()) {
+                            switch (dialog.getImportBehavior()) {
-                                for (Entry<DeckSection, CardPool> section : importedDeck) {
+                                case REPLACE_CURRENT:
-                                    DeckSectionPage page = getPageForSection(section.getKey());
+                                    for(DeckSectionPage page : pagesBySection.values()) {
-                                    if (page != null)
+                                        if(importedDeck.has(page.deckSection)) {
-                                        page.setCards(section.getValue());
+                                            page.setCards(importedDeck.get(page.deckSection));
-                                }
+                                            if(hiddenExtraSections.contains(page.deckSection))
-                            } else {
+                                                showExtraSectionTab(page.deckSection);
-                                for (Entry<DeckSection, CardPool> section : importedDeck) {
+                                        }
-                                    DeckSectionPage page = getPageForSection(section.getKey());
+                                        else
-                                    if (page != null)
+                                            page.setCards(new CardPool());
-                                        page.addCards(section.getValue());
+                                    }
-                                }
+                                    break;
+                                case CREATE_NEW:
+                                    deckController.setDeck(importedDeck);
+                                    break;
+                                case MERGE:
+                                    for (Entry<DeckSection, CardPool> section : importedDeck) {
+                                        DeckSectionPage page = getPageForSection(section.getKey());
+                                        if (page != null)
+                                            page.addCards(section.getValue());
+                                    }
                             }
                         });
+                        dialog.initParse();
                         dialog.show();
                         setSelectedPage(getMainDeckPage()); //select main deck page if needed so main deck if visible below dialog
                     }));
@@ -643,6 +677,20 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
         getMainDeckPage().addCards(landsToAdd);
     }
 
+    /**
+     * If a card is missing from a player's inventory while importing a deck, it gets run through here.
+     * Returning a PaperCard will let unlimited copies of that card be used as a substitute. Returning null
+     * will leave the card missing from the import.
+     */
+    protected PaperCard supplyPrintForImporter(PaperCard missingCard) {
+        //Could support dungeons here too? Not that we really use them in the editor...
+        if(!missingCard.isVeryBasicLand())
+            return null;
+        List<CardEdition> basicSets = editorConfig.getBasicLandSets(deck);
+        String setCode = basicSets.isEmpty() ? "JMP" : basicSets.get(0).getCode();
+        return FModel.getMagicDb().fetchCard(missingCard.getCardName(), setCode, null);
+    }
+
     protected boolean shouldEnforceConformity() {
         if(FModel.getPreferences().getPrefBoolean(FPref.ENFORCE_DECK_LEGALITY))
             return true;
@@ -695,6 +743,9 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
             showExtraSectionTab(section);
         if(pagesBySection.containsKey(section))
             setSelectedPage(pagesBySection.get(section));
+        else if(section == DeckSection.Main && pagesBySection.containsKey(mainDeckPage.deckSection))
+            //Tried to switch to the Main page in a Planar or Scheme deck.
+            setSelectedPage(pagesBySection.get(mainDeckPage.deckSection));
     }
 
     public void notifyNewControllerModel() {
@@ -1027,7 +1078,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
     protected boolean allowSaveAs() {
         return allowSave() && allowRename();
     }
-    protected boolean allowsAddBasic() {
+    protected boolean allowAddBasic() {
         return !isDrafting();
     }
 

forge-gui-mobile/src/forge/deck/FDeckImportDialog.java

@@ -18,11 +18,12 @@
 package forge.deck;
 
 import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.function.Consumer;
+import java.util.function.Function;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
 
 import forge.Forge;
 import forge.Graphics;
@@ -31,11 +32,15 @@ import forge.deck.DeckRecognizer.TokenType;
 import forge.game.GameType;
 import forge.gui.FThreads;
 import forge.gui.util.SOptionPane;
+import forge.item.PaperCard;
 import forge.toolbox.FCheckBox;
 import forge.toolbox.FComboBox;
 import forge.toolbox.FDialog;
 import forge.toolbox.FOptionPane;
 import forge.toolbox.FTextArea;
+import forge.util.ItemPool;
+import forge.util.Localizer;
+import org.apache.commons.lang3.StringUtils;
 
 
 public class FDeckImportDialog extends FDialog {
@@ -45,7 +50,7 @@ public class FDeckImportDialog extends FDialog {
     private final FCheckBox newEditionCheck = add(new FCheckBox(Forge.getLocalizer().getMessage("lblImportLatestVersionCard"), false));
     private final FCheckBox dateTimeCheck = add(new FCheckBox(Forge.getLocalizer().getMessage("lblUseOnlySetsReleasedBefore"), false));
     private final FCheckBox smartCardArtCheck = add(new FCheckBox(Forge.getLocalizer().getMessage("lblUseSmartCardArt"), false));
-    private final FCheckBox createNewDeckCheck = add(new FCheckBox(Forge.getLocalizer().getMessage("lblNewDeckCheckbox"), false));
+    private final FCheckBox createNewDeckCheck = add(new FCheckBox(Forge.getLocalizer().getMessage("lblReplaceDeckCheckbox"), false));
 //    private final FCheckBox importInDeck = add(new FCheckBox()
     /*setting onlyCoreExpCheck to false allow the copied cards to pass the check of deck contents
       forge-core\src\main\java\forge\deck\Deck.javaDeck.java starting @ Line 320 which is called by
@@ -57,100 +62,60 @@ public class FDeckImportDialog extends FDialog {
     private final FComboBox<String> monthDropdown = add(new FComboBox<>()); //don't need wrappers since skin can't change while this dialog is open
     private final FComboBox<Integer> yearDropdown = add(new FComboBox<>());
 
-    private final boolean showOptions;
+    private boolean showOptions;
-    private final boolean currentDeckIsEmpty;
+    private final Deck currentDeck;
     private boolean createNewDeckControl;
     private final DeckImportController controller;
+    private final FDeckEditor.DeckEditorConfig editorConfig;
 
     private final static ImmutableList<String> importOrCancel = ImmutableList.of(Forge.getLocalizer().getMessage("lblImport"), Forge.getLocalizer().getMessage("lblCancel"));
 
-    public FDeckImportDialog(final boolean replacingDeck, final FDeckEditor.DeckEditorConfig editorConfig) {
+    public FDeckImportDialog(final Deck currentDeck, final FDeckEditor.DeckEditorConfig editorConfig) {
         super(Forge.getLocalizer().getMessage("lblImportFromClipboard"), 2);
+        boolean usingInventory = editorConfig.usePlayerInventory();
+        boolean replacingDeck = !currentDeck.isEmpty() || usingInventory;
+        this.currentDeck = currentDeck;
+        this.editorConfig = editorConfig;
+        ItemPool<PaperCard> cardPool = editorConfig.getCardPool(false);
         controller = new DeckImportController(dateTimeCheck, monthDropdown, yearDropdown, replacingDeck);
         String contents = Forge.getClipboard().getContents();
         if (contents == null)
             contents = ""; //prevent NPE
         txtInput.setText(contents);
 
-        if (editorConfig.allowsCardReplacement()) {
+        GameType gameType = editorConfig.getGameType();
-            GameType gameType = editorConfig.getGameType();
+        controller.setGameFormat(gameType);
-            controller.setGameFormat(gameType);
+        List<DeckSection> supportedSections = new ArrayList<>();
-            List<DeckSection> supportedSections = new ArrayList<>();
+        supportedSections.addAll(List.of(editorConfig.getPrimarySections()));
-            supportedSections.add(DeckSection.Main);
+        supportedSections.addAll(List.of(editorConfig.getExtraSections()));
-            supportedSections.add(DeckSection.Sideboard);
+        controller.setAllowedSections(supportedSections);
-            if (editorConfig.hasCommander())
+        controller.setCurrentDeckInEditor(currentDeck);
-                supportedSections.add(DeckSection.Commander);
+        if(usingInventory)
-            supportedSections.addAll(Lists.newArrayList(editorConfig.getExtraSections()));
+            controller.setPlayerInventory(cardPool);
-            controller.setAllowedSections(supportedSections);
-        }
 
         onlyCoreExpCheck.setSelected(StaticData.instance().isCoreExpansionOnlyFilterSet());
         newEditionCheck.setSelected(StaticData.instance().cardArtPreferenceIsLatest());
         smartCardArtCheck.setSelected(StaticData.instance().isEnabledCardArtSmartSelection());
         createNewDeckCheck.setSelected(replacingDeck);
-        this.currentDeckIsEmpty = !replacingDeck;
         this.createNewDeckControl = replacingDeck;
 
-        initButton(0, Forge.getLocalizer().getMessage("lblImport"), e -> FThreads.invokeInBackgroundThread(() -> {
+        if(usingInventory)
-            List<DeckRecognizer.Token> tokens = controller.parseInput(txtInput.getText()); //ensure deck updated based on any changes to options
+            controller.setImportBehavior(DeckImportController.ImportBehavior.REPLACE_CURRENT);
+        else
+            controller.setImportBehavior(createNewDeckControl ? DeckImportController.ImportBehavior.CREATE_NEW : DeckImportController.ImportBehavior.MERGE);
 
-            if (controller.isSmartCardArtEnabled())
+        initButton(0, Forge.getLocalizer().getMessage("lblImport"), e -> FThreads.invokeInBackgroundThread(this::performImport));
-                tokens = controller.optimiseCardArtInTokens();
-
-            //if there are any cards that cannot be imported, let user know this and give them the option to cancel
-            StringBuilder sb = new StringBuilder();
-            for (DeckRecognizer.Token token : tokens) {
-                if (token.getType() == TokenType.CARD_FROM_NOT_ALLOWED_SET
-                        || token.getType() == TokenType.CARD_FROM_INVALID_SET
-                        || token.getType() == TokenType.UNKNOWN_CARD
-                        || token.getType() == TokenType.UNSUPPORTED_CARD) {
-                    if (sb.length() > 0)
-                        sb.append("\n");
-                    sb.append(token.getQuantity()).append(" ").append(token.getText());
-                }
-            }
-            if (sb.length() > 0) {
-                if (SOptionPane.showOptionDialog(Forge.getLocalizer().getMessage("lblFollowingCardsCannotBeImported") + "\n\n" + sb, Forge.getLocalizer().getMessage("lblImportRemainingCards"), SOptionPane.INFORMATION_ICON, importOrCancel) == 1) {
-                    return;
-                }
-            }
-
-            final Deck deck = controller.accept(); //must accept in background thread in case a dialog is shown
-            if (deck == null) { return; }
-
-            FThreads.invokeInEdtLater(() -> {
-                hide();
-                if (callback != null)
-                    callback.accept(deck);
-            });
-        }));
         initButton(1, Forge.getLocalizer().getMessage("lblCancel"), e -> hide());
 
-        List<DeckRecognizer.Token> tokens = controller.parseInput(txtInput.getText());
+        dateTimeCheck.setCommand(e -> updateDropDownEnabled());
-        if (controller.isSmartCardArtEnabled())
+        newEditionCheck.setCommand(e -> setArtPreferenceInController());
-            tokens = controller.optimiseCardArtInTokens();
+        onlyCoreExpCheck.setCommand(e -> setArtPreferenceInController());
-        //ensure at least one known card found on clipboard
+        smartCardArtCheck.setCommand(e -> controller.setSmartCardArtOptimisation(smartCardArtCheck.isSelected()));
-        for (DeckRecognizer.Token token : tokens) {
+        createNewDeckCheck.setCommand(e -> {
-            if (token.getType() == TokenType.LEGAL_CARD) {
+            createNewDeckControl = createNewDeckCheck.isSelected();
-                showOptions = true;
+            controller.setImportBehavior(createNewDeckControl ? DeckImportController.ImportBehavior.CREATE_NEW : DeckImportController.ImportBehavior.MERGE);
-
+        });
-                dateTimeCheck.setCommand(e -> updateDropDownEnabled());
+        setShowOptions(false);
-                newEditionCheck.setCommand(e -> setArtPreferenceInController());
-                onlyCoreExpCheck.setCommand(e -> setArtPreferenceInController());
-                smartCardArtCheck.setCommand(e -> controller.setSmartCardArtOptimisation(smartCardArtCheck.isSelected()));
-                createNewDeckCheck.setCommand(e -> {
-                    createNewDeckControl = createNewDeckCheck.isSelected();
-                    controller.setCreateNewDeck(createNewDeckControl);
-                });
-                updateDropDownEnabled();
-                setArtPreferenceInController();
-                return;
-            }
-        }
-
-        showOptions = false;
-        setButtonEnabled(0, false);
-        txtInput.setText(Forge.getLocalizer().getMessage("lblNoKnownCardsOnClipboard"));
     }
 
     private void setArtPreferenceInController() {
@@ -160,16 +125,66 @@ public class FDeckImportDialog extends FDialog {
     }
 
     private void updateDropDownEnabled() {
-        boolean enabled = dateTimeCheck.isSelected();
+        boolean enabled = dateTimeCheck.isSelected() && this.showOptions;
         monthDropdown.setEnabled(enabled);
         yearDropdown.setEnabled(enabled);
     }
 
+    private void setShowOptions(boolean showOptions) {
+        this.showOptions = showOptions;
+        dateTimeCheck.setEnabled(showOptions);
+        newEditionCheck.setEnabled(showOptions);
+        onlyCoreExpCheck.setEnabled(showOptions);
+        newEditionCheck.setEnabled(showOptions);
+        smartCardArtCheck.setEnabled(showOptions);
+        createNewDeckCheck.setEnabled(showOptions);
+        updateDropDownEnabled();
+    }
+
     public void setCallback(Consumer<Deck> callback0){
         callback = callback0;
     }
 
-    public boolean createNewDeck(){ return this.createNewDeckControl; }
+    public void setFreePrintConverter(Function<PaperCard, PaperCard> freePrintConverter) {
+        this.controller.setFreePrintConverter(freePrintConverter);
+    }
+
+    public DeckImportController.ImportBehavior getImportBehavior() {
+        return controller.getImportBehavior();
+    }
+
+    public void setImportBannedCards(boolean importBannedCards) {
+        controller.importBannedAndRestrictedCards(importBannedCards);
+    }
+
+    public void initParse() {
+        boolean usingInventory = editorConfig.usePlayerInventory();
+        List<DeckRecognizer.Token> tokens = controller.parseInput(txtInput.getText());
+        if (usingInventory)
+            tokens = controller.constrainTokensToInventory();
+        else if (controller.isSmartCardArtEnabled())
+            tokens = controller.optimiseCardArtInTokens();
+        //ensure at least one known card found on clipboard
+        for (DeckRecognizer.Token token : tokens) {
+            if (token.getType() == TokenType.LEGAL_CARD || token.getType() == TokenType.FREE_CARD_NOT_IN_INVENTORY) {
+
+                if(usingInventory) {
+                    //Settings aren't compatible with player inventories.
+                    setShowOptions(false);
+                    return;
+                }
+
+                setShowOptions(true);
+
+                updateDropDownEnabled();
+                setArtPreferenceInController();
+                return;
+            }
+        }
+
+        setButtonEnabled(0, false);
+        txtInput.setText(Forge.getLocalizer().getMessage("lblNoKnownCardsOnClipboard"));
+    }
 
     @Override
     public void drawOverlay(Graphics g) {
@@ -202,7 +217,7 @@ public class FDeckImportDialog extends FDialog {
             yearDropdown.setBounds(x + dropDownWidth + fieldPadding, y, dropDownWidth, h);
             y += h + fieldPadding;
 
-            if (!this.currentDeckIsEmpty){
+            if (!this.currentDeck.isEmpty()){
                 smartCardArtCheck.setBounds(x, y, w/2, h);
                 createNewDeckCheck.setBounds(x + w/2, y, w/2, h);
             } else
@@ -222,4 +237,50 @@ public class FDeckImportDialog extends FDialog {
         }
         return y;
     }
+
+    private static final EnumSet<TokenType> MISSING_TOKENS = EnumSet.of(TokenType.CARD_FROM_NOT_ALLOWED_SET,
+            TokenType.CARD_FROM_INVALID_SET, TokenType.UNKNOWN_CARD, TokenType.UNSUPPORTED_CARD,
+            TokenType.WARNING_MESSAGE, TokenType.CARD_NOT_IN_INVENTORY);
+
+    private void performImport() {
+        List<DeckRecognizer.Token> tokens = controller.parseInput(txtInput.getText()); //ensure deck updated based on any changes to options
+
+        if (editorConfig.usePlayerInventory())
+            tokens = controller.constrainTokensToInventory();
+        else if (controller.isSmartCardArtEnabled())
+            tokens = controller.optimiseCardArtInTokens();
+
+        //if there are any cards that cannot be imported, let user know this and give them the option to cancel
+        // Android API StringBuilder isEmpty() is unavailable. https://developer.android.com/reference/java/lang/StringBuilder
+        StringBuilder sb = new StringBuilder();
+        for (DeckRecognizer.Token token : tokens) {
+            if (MISSING_TOKENS.contains(token.getType())) {
+                if (sb.length() != 0)
+                    sb.append("\n");
+                String message = controller.getTokenMessage(token);
+                String statusMessage = controller.getTokenStatusMessage(token);
+                if(!StringUtils.isBlank(statusMessage))
+                    sb.append(String.format("%s - (%s)", message, statusMessage));
+                else
+                    sb.append(statusMessage);
+            }
+        }
+        if (sb.length() != 0) {
+            Localizer localizer = Forge.getLocalizer();
+            if (SOptionPane.showOptionDialog(localizer.getMessage("lblFollowingCardsCannotBeImported") + "\n\n" + sb, localizer.getMessage("lblImportRemainingCards"), SOptionPane.WARNING_ICON, importOrCancel) == 1) {
+                return;
+            }
+        }
+
+        final Deck deck = controller.accept(currentDeck.getName()); //must accept in background thread in case a dialog is shown
+        if (deck == null) {
+            return;
+        }
+
+        FThreads.invokeInEdtLater(() -> {
+            hide();
+            if (callback != null)
+                callback.accept(deck);
+        });
+    }
 }

forge-gui/res/adventure/common/custom_cards/emrakul_presence.txt

@@ -0,0 +1,10 @@
+Name:Emrakul's Presence
+ManaCost:no cost
+Types:Artifact
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Command | CheckSVar$ X | SVarCompare$ LT8 | Execute$ TrigDraw | TriggerDescription$ At the beginning of your end step, if you have fewer than eight cards in hand, draw cards equal to the difference.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ Difference
+SVar:X:Count$ValidHand Card.YouOwn
+SVar:Difference:Number$8/Minus.X
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Command | Execute$ TrigWish | TriggerDescription$ At the beginning of your upkeep, put a random permanent card from your graveyard or exile onto the battlefield.
+SVar:TrigWish:DB$ ChangeZone | Origin$ Graveyard,Exile | Destination$ Battlefield | ChangeType$ Permanent.YouCtrl | Hidden$ True | AtRandom$ True
+Oracle:At the beginning of your upkeep, put a random permanent card from your graveyard or exile onto the battlefield.\nAt the beginning of your end step, if you have fewer than eight cards in hand, draw cards equal to the difference.

forge-gui/res/adventure/common/decks/boss/emrakul.dck

@@ -1,19 +1,25 @@
 [metadata]
 Name=Emrakul
 [Main]
-4 Black Lotus
+1 Black Lotus
-4 Crystal Vein
+2 Vesuva
 4 Eldrazi Temple
-3 Emrakul, the Aeons Torn
+3 Forsaken Monument
-3 Emrakul, the Promised End
+2 It That Betrays
+2 Pathrazer of Ulamog
+2 Void Winnower
+2 Emrakul, the Aeons Torn
+2 Emrakul, the Promised End
 4 Expedition Map
 2 Eye of Ugin
-4 Mana Vault
+4 Ancient Tomb
+1 Strip Mine
+4 All is Dust
 2 Kozilek, Butcher of Truth
 2 Kozilek, the Great Distortion
-4 Mana Crypt
+1 Mana Crypt
-4 Sol Ring
+1 Sol Ring
-4 Titan's Presence
+3 Titan's Presence
 2 Ulamog, the Ceaseless Hunger
 2 Ulamog, the Infinite Gyre
 4 Urza's Mine

forge-gui/res/adventure/common/maps/map/emrakul/emrakul_legacy.tmx

@@ -3,6 +3,10 @@
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
+  <properties>
+   <property name="dungeonEffect">{&quot;startBattleWithCardInCommandZone&quot;: [ &quot;Emrakul's Presence&quot; ]
+ }</property>
+  </properties>
  <tileset firstgid="1" source="../../tileset/main.tsx"/>
  <tileset firstgid="10113" source="../../tileset/buildings.tsx"/>
  <layer id="1" name="Background" width="30" height="30">

forge-gui/res/blockdata/blocks.txt

@@ -144,3 +144,4 @@ Tarkir Dragonstorm, 3/6/TDM, TDM
 Final Fantasy, 3/6/FIN, FIN
 Alchemy: Innistrad, 3/6/ISD, YMID
 Edge of Eternities, 3/6/EOE, EOE
+Marvel's Spider-Man, 3/6/SPM, SPM

forge-gui/res/draft/rankings/spm.rnk

@@ -0,0 +1,233 @@
+//Rank|Name|Rarity|Set
+#1|Arachne, Psionic Weaver|R|SPM
+#2|Origin of Spider-Man|R|SPM
+#3|Spectacular Spider-Man|R|SPM
+#4|Silk, Web Weaver|R|SPM
+#5|Rite of Replication|M|SPM
+#6|Skithiryx, the Blight Dragon|M|SPM
+#7|Goblin Bombardment|M|SPM
+#8|Najeela, the Blade-Blossom|M|SPM
+#9|Lizard, Connors's Curse|R|SPM
+#10|Sandman, Shifting Scoundrel|R|SPM
+#11|Biorganic Carapace|R|SPM
+#12|Doctor Octopus, Master Planner|M|SPM
+#13|The Spot, Living Portal|R|SPM
+#14|Agent Venom|R|SPM
+#15|Gwenom, Remorseless|M|SPM
+#16|Miles Morales|M|SPM
+#17|Arana, Heart of the Spider|R|SPM
+#18|Mister Negative|M|SPM
+#19|Scarlet Spider, Ben Reilly|R|SPM
+#20|Symbiote Spider-Man|R|SPM
+#21|Ultimate Green Goblin|R|SPM
+#22|Arasta of the Endless Web|M|SPM
+#23|Mysterio, Master of Illusion|R|SPM
+#24|Villainous Wrath|R|SPM
+#25|Strength of Will|R|SPM
+#26|Iron Spider, Stark Upgrade|R|SPM
+#27|Anti-Venom, Horrifying Healer|M|SPM
+#28|Friendly Neighborhood|R|SPM
+#29|Peter Parker|M|SPM
+#30|With Great Power|R|SPM
+#31|Hydro-Man, Fluid Felon|R|SPM
+#32|Impostor Syndrome|M|SPM
+#33|Behold the Sinister Six!|M|SPM
+#34|Black Cat, Cunning Thief|R|SPM
+#35|Eddie Brock|M|SPM
+#36|Morlun, Devourer of Spiders|R|SPM
+#37|Spider-Punk|R|SPM
+#38|Spinneret and Spiderling|R|SPM
+#39|Kraven's Last Hunt|R|SPM
+#40|Spider-Ham, Peter Porker|R|SPM
+#41|Carnage, Crimson Chaos|R|SPM
+#42|Cheering Crowd|R|SPM
+#43|Cosmic Spider-Man|M|SPM
+#44|Kraven the Hunter|R|SPM
+#45|Mary Jane Watson|R|SPM
+#46|Rhino, Barreling Brute|U|SPM
+#47|Spider-Man 2099|R|SPM
+#48|Mystic Confluence|M|SPM
+#49|Savage Beating|M|SPM
+#50|Silkguard|M|SPM
+#51|Norman Osborn|M|SPM
+#52|Gwen Stacy|M|SPM
+#53|Green Goblin, Revenant|U|SPM
+#54|Morbius the Living Vampire|U|SPM
+#55|SP//Piloted by Peni|U|SPM
+#56|Spider-Woman, Stunning Savior|R|SPM
+#57|Doc Ock's Tentacles|R|SPM
+#58|Silver Sable, Mercenary Leader|U|SPM
+#59|Spectacular Tactics|C|SPM
+#60|Spider-Man, Web-Slinger|C|SPM
+#61|Spider-UK|U|SPM
+#62|Whoosh!|C|SPM
+#63|Scorpion's Sting|C|SPM
+#64|Electro, Assaulting Battery|R|SPM
+#65|J. Jonah Jameson|R|SPM
+#66|Radioactive Spider|R|SPM
+#67|Spiders-Man, Heroic Horde|U|SPM
+#68|Terrific Team-Up|U|SPM
+#69|Gallant Citizen|C|SPM
+#70|Kraven, Proud Predator|U|SPM
+#71|Superior Spider-Man|R|SPM
+#72|Rocket-Powered Goblin Glider|R|SPM
+#73|Urban Retreat|R|SPM
+#74|Vibrant Cityscape|C|SPM
+#75|Oscorp Industries|R|SPM
+#76|Leyline Binding|M|SPM
+#77|Lorthos, the Tidemaker|M|SPM
+#78|Shock MAR|M|SPM
+#79|Arachnogenesis|M|SPM
+#80|Alibou, Ancient Witness|M|SPM
+#81|Daily Bugle Reporters|C|SPM
+#82|Web Up|C|SPM
+#83|Doc Ock, Sinister Scientist|C|SPM
+#84|Madame Web, Clairvoyant|U|SPM
+#85|Spider-Byte, Web Warden|U|SPM
+#86|The Death of Gwen Stacy|R|SPM
+#87|Spider-Man Noir|U|SPM
+#88|The Spot's Portal|U|SPM
+#89|Tombstone, Career Criminal|U|SPM
+#90|Electro's Bolt|C|SPM
+#91|Shadow of the Goblin|R|SPM
+#92|Shock|C|SPM
+#93|Shocker, Unshakable|U|SPM
+#94|Damage Control Crew|U|SPM
+#95|Kapow!|C|SPM
+#96|Scout the City|C|SPM
+#97|Spider-Man, Brooklyn Visionary|C|SPM
+#98|Wall Crawl|U|SPM
+#99|Prowler, Clawed Thief|U|SPM
+#100|Rhino's Rampage|U|SPM
+#101|Scarlet Spider, Kaine|U|SPM
+#102|Spider-Girl, Legacy Hero|U|SPM
+#103|Spider-Man India|U|SPM
+#104|Wraith, Vicious Vigilante|U|SPM
+#105|Clever Impersonator|M|SPM
+#106|Ponder|M|SPM
+#107|Infernal Grasp|M|SPM
+#108|Saw in Half|M|SPM
+#109|Terminate|M|SPM
+#110|Aunt May|U|SPM
+#111|Flash Thompson, Spider-Fan|U|SPM
+#112|Selfless Police Captain|C|SPM
+#113|Wild Pack Squad|C|SPM
+#114|Chameleon, Master of Disguise|U|SPM
+#115|Flying Octobot|U|SPM
+#116|Robotics Mastery|U|SPM
+#117|School Daze|U|SPM
+#118|Secret Identity|U|SPM
+#119|Scorpion, Seething Striker|U|SPM
+#120|Spider-Gwen, Free Spirit|C|SPM
+#121|Spider-Islanders|C|SPM
+#122|Ezekiel Sims, Spider-Totem|U|SPM
+#123|Pictures of Spider-Man|U|SPM
+#124|Pumpkin Bombardment|C|SPM
+#125|Shriek, Treblemaker|U|SPM
+#126|Spider Manifestation|C|SPM
+#127|Path to Exile|M|SPM
+#128|Beetle, Legacy Criminal|C|SPM
+#129|The Clone Saga|R|SPM
+#130|Mysterio's Phantasm|C|SPM
+#131|Prison Break|U|SPM
+#132|Superior Foes of Spider-Man|U|SPM
+#133|Guy in the Chair|C|SPM
+#134|Skyward Spider|C|SPM
+#135|Spider-Bot|C|SPM
+#136|Ominous Asylum|C|SPM
+#137|Savage Mansion|C|SPM
+#138|Sinister Hideout|C|SPM
+#139|Suburban Sanctuary|C|SPM
+#140|University Campus|C|SPM
+#141|Reprieve|M|SPM
+#142|Opposition Agent|M|SPM
+#143|Relentless Assault|M|SPM
+#144|City Pigeon|C|SPM
+#145|Sudden Strike|U|SPM
+#146|Thwip!|C|SPM
+#147|Amazing Acrobatics|C|SPM
+#148|Doc Ock's Henchmen|C|SPM
+#149|Spider-Man No More|C|SPM
+#150|Unstable Experiment|C|SPM
+#151|Common Crook|C|SPM
+#152|Swarm, Being of Bees|C|SPM
+#153|Venom, Evil Unleashed|C|SPM
+#154|Venomized Cat|C|SPM
+#155|Venom's Hunger|C|SPM
+#156|Angry Rabble|C|SPM
+#157|Hobgoblin, Mantled Marauder|U|SPM
+#158|Masked Meower|C|SPM
+#159|Raging Goblinoids|U|SPM
+#160|Romantic Rendezvous|C|SPM
+#161|Stegron the Dinosaur Man|C|SPM
+#162|Taxi Driver|C|SPM
+#163|Wisecrack|U|SPM
+#164|Grow Extra Arms|C|SPM
+#165|Kraven's Cats|C|SPM
+#166|Lurking Lizards|C|SPM
+#167|Professional Wrestler|C|SPM
+#168|Supportive Parents|U|SPM
+#169|Mob Lookout|C|SPM
+#170|Eerie Gravestone|C|SPM
+#171|Living Brain, Mechanical Marvel|U|SPM
+#172|Mechanical Mobster|C|SPM
+#173|Spider-Slayer, Hatred Honed|U|SPM
+#174|Spider-Suit|U|SPM
+#175|Counterspell|M|SPM
+#176|Feed the Swarm|M|SPM
+#177|Thrill of Possibility|M|SPM
+#178|Unexpected Windfall|M|SPM
+#179|Costume Closet|U|SPM
+#180|Starling, Aerial Ally|C|SPM
+#181|Web-Shooters|U|SPM
+#182|Oscorp Research Team|C|SPM
+#183|Inner Demons Gangsters|C|SPM
+#184|Merciless Enforcers|C|SPM
+#185|Risky Research|C|SPM
+#186|Sandman's Quicksand|U|SPM
+#187|Heroes' Hangout|U|SPM
+#188|Spider-Rex, Daring Dino|C|SPM
+#189|Web-Warriors|U|SPM
+#190|Passenger Ferry|C|SPM
+#191|Subway Train|C|SPM
+#192|Vulture, Scheming Scavenger|U|SPM
+#193|Hot Dog Cart|C|SPM
+#194|Interdimensional Web Watch|R|SPM
+#195|Spider-Mobile|U|SPM
+#196|Steel Wrecking Ball|C|SPM
+#197|Rent Is Due|R|SPM
+#198|Hide on the Ceiling|R|SPM
+#199|Lady Octopus, Inspired Inventor|R|SPM
+#200|Alien Symbiosis|U|SPM
+#201|Molten Man, Inferno Incarnate|U|SPM
+#202|Spider-Verse|M|SPM
+#203|Web of Life and Destiny|M|SPM
+#204|Jackal, Genius Geneticist|R|SPM
+#205|Sun-Spider, Nimble Webber|U|SPM
+#206|Bagel and Schmear|C|SPM
+#207|Peter Parker's Camera|R|SPM
+#208|Daily Bugle Building|U|SPM
+#209|Multiversal Passage|R|SPM
+#210|Comeuppance|M|SPM
+#211|Traumatize|M|SPM
+#212|Reanimate|M|SPM
+#213|Heroic Intervention|M|SPM
+#214|News Helicopter|C|SPM
+#215|Parallel Lives|M|SPM
+#216|Hex|M|SPM
+#217|Tangle|M|SPM
+#218|Spider-Sense|R|SPM
+#219|Parker Luck|R|SPM
+#220|The Soul Stone|M|SPM
+#221|Maximum Carnage|R|SPM
+#222|Nine Lives|M|SPM
+#223|Rest in Peace|M|SPM
+#224|Mindbreak Trap|M|SPM
+#225|Winds of Change|M|SPM
+#226|Beast Within|M|SPM
+#227|Hunter's Insight|M|SPM
+#228|Plains|C|SPM
+#229|Island|C|SPM
+#230|Swamp|C|SPM
+#231|Mountain|C|SPM
+#232|Forest|C|SPM

forge-gui/res/editions/Marvel's Spider-Man.txt

@@ -6,6 +6,66 @@ Type=Expansion
 ScryfallCode=SPM
 DoublePick=WhenPodSizeIs4
 RecommendedPodSize=4
+#https://magic.wizards.com/en/news/feature/collecting-marvels-spider-man
+BoosterSlots=Common,Common-Borderless,Uncommon,RareMythic,Land,Wildcard,WildcardFoil
+Booster=6 Common, 1 Common-Borderless, 3 Uncommon, 1 RareMythic, 1 Wildcard, 1 WildcardFoil+, 1 Land
+Prerelease=6 Boosters, 1 RareMythic+
+BoosterBox=30
+
+[Common]
+Base=Common:fromSheet("SPM cards")
+
+[Common-Borderless]
+Base=Common:fromSheet("SPM cards")
+Replace=.0416F fromSheet("SPM borderless")
+
+[Uncommon]
+Base=Uncommon:fromSheet("SPM cards")
+Replace=0.0517 Uncommon:fromSheet("SPM scene cards")
+
+[RareMythic]
+Base=Rare:fromSheet("SPM cards")
+Replace=.117F Mythic:fromSheet("SPM cards")
+Replace=.012F Rare:fromSheet("SPM webslinger")
+Replace=.004F Mythic:fromSheet("SPM webslinger")
+Replace=.021F Rare:fromSheet("SPM panel cards")
+Replace=.004F Mythic:fromSheet("SPM panel cards")
+Replace=.01F Rare:fromSheet("SPM scene cards")
+Replace=.0005F Mythic:fromSheet("SPM scene cards")
+
+[Wildcard]
+Base=Common:fromSheet("SPM cards")
+Replace=0.041F Uncommon:fromSheet("SPM cards")
+Replace=0.209F Rare:fromSheet("SPM cards")
+Replace=0.0029F Mythic:fromSheet("SPM cards")
+Replace=.0012F Rare:fromSheet("SPM webslinger")
+Replace=.0004F Mythic:fromSheet("SPM webslinger")
+Replace=.0021F Rare:fromSheet("SPM panel cards")
+Replace=.0004F Mythic:fromSheet("SPM panel cards")
+Replace=.007F Uncommon:fromSheet("SPM scene cards")
+Replace=.001F Rare:fromSheet("SPM scene cards")
+Replace=.00005F Mythic:fromSheet("SPM scene cards")
+
+[WildcardFoil]
+Base=Common:fromSheet("SPM cards")
+Replace=0.241F Uncommon:fromSheet("SPM cards")
+Replace=0.078F Rare:fromSheet("SPM cards")
+Replace=0.011F Mythic:fromSheet("SPM cards")
+Replace=.0012F Rare:fromSheet("SPM webslinger")
+Replace=.0004F Mythic:fromSheet("SPM webslinger")
+Replace=.0021F Rare:fromSheet("SPM panel cards")
+Replace=.0004F Mythic:fromSheet("SPM panel cards")
+Replace=.007F Uncommon:fromSheet("SPM scene cards")
+Replace=.001F Rare:fromSheet("SPM scene cards")
+Replace=.00005F Mythic:fromSheet("SPM scene cards")
+
+[Land]
+Base=fromSheet("SPM allied lands")
+Replace=0.125F fromSheet("SPM allied lands")+
+Replace=0.20F BasicLand:fromSheet("SPM full art")
+Replace=0.05F BasicLand:fromSheet("SPM full art")+
+Replace=0.20F BasicLand:fromSheet("SPM cards"):!fromSheet("SPM allied lands")
+Replace=0.05F BasicLand:fromSheet("SPM cards"):!fromSheet("SPM allied lands")
 
 [cards]
 1 M Anti-Venom, Horrifying Healer @Néstor Ossandón Leal
@@ -188,24 +248,28 @@ RecommendedPodSize=4
 178 C Subway Train @Jonas De Ro
 179 U Daily Bugle Building @David Álvarez
 180 R Multiversal Passage @Pablo Mendoza
-181 C Ominous Asylum @Pavel Kolomeyets
+181 L Ominous Asylum @Pavel Kolomeyets
 182 R Oscorp Industries @Bastien Grivet
-183 C Savage Mansion @David Álvarez
+183 L Savage Mansion @David Álvarez
-184 C Sinister Hideout @Pavel Kolomeyets
+184 L Sinister Hideout @Pavel Kolomeyets
-185 C Suburban Sanctuary @David Frasheski
+185 L Suburban Sanctuary @David Frasheski
-186 C University Campus @David Álvarez
+186 L University Campus @David Álvarez
 187 R Urban Retreat @Jonas De Ro
 188 C Vibrant Cityscape @Wei Guan
-189 L Plains @Sarah Finnigan
-190 L Island @Sarah Finnigan
-191 L Swamp @Sarah Finnigan
-192 L Mountain @Sarah Finnigan
-193 L Forest @Sarah Finnigan
 194 L Plains @Jonas De Ro
 195 L Island @Jonas De Ro
 196 L Swamp @Jonas De Ro
 197 L Mountain @Jonas De Ro
 198 L Forest @Jonas De Ro
+
+[full art]
+189 L Plains @Sarah Finnigan
+190 L Island @Sarah Finnigan
+191 L Swamp @Sarah Finnigan
+192 L Mountain @Sarah Finnigan
+193 L Forest @Sarah Finnigan
+
+[borderless]
 199 U SP//dr, Piloted by Peni @Jim Cheung & Jay David Ramos
 200 M Miles Morales @Jim Cheung & Jay David Ramos
 201 R Spider-Ham, Peter Porker @Jim Cheung & Jay David Ramos
@@ -242,6 +306,9 @@ RecommendedPodSize=4
 232 M Peter Parker @Jack Kirby & Steve Ditko
 233 M Eddie Brock @Todd McFarlane & Bob Sharen
 234 M Miles Morales @Sara Pichelli & Justin Ponsor
+242 M The Soul Stone @Madeline Boni
+
+[etched]
 235 R Spectacular Spider-Man @Roberta Ingranata
 236 R Spectacular Spider-Man @Roberta Ingranata
 237 R Spectacular Spider-Man @Roberta Ingranata
@@ -249,7 +316,8 @@ RecommendedPodSize=4
 239 R Spectacular Spider-Man @Roberta Ingranata
 240 R Spectacular Spider-Man @Roberta Ingranata
 241 R Spectacular Spider-Man @Roberta Ingranata
-242 M The Soul Stone @Madeline Boni
+
+[extended art]
 243 M The Soul Stone @Leinil Francis Yu & Sunny Gho
 244 M Anti-Venom, Horrifying Healer @Néstor Ossandón Leal
 245 R Arachne, Psionic Weaver @Steve Argyle
@@ -291,10 +359,63 @@ RecommendedPodSize=4
 281 R Rocket-Powered Goblin Glider @Pavel Kolomeyets
 282 R Oscorp Industries @Bastien Grivet
 283 R Urban Retreat @Jonas De Ro
+
+[promo]
 284 R Spider-Sense @David Álvarez
 285 R Radioactive Spider @Toni Infante
 286 M Gwenom, Remorseless @Jesper Ejsing
 
+[allied lands]
+1 Ominous Asylum|SPM
+1 Savage Mansion|SPM
+1 Sinister Hideout|SPM
+1 Suburban Sanctuary|SPM
+1 University Campus|SPM
+
+[scene cards]
+1 SP//dr, Piloted by Peni|SPM|[199]
+1 Miles Morales|SPM|[200]
+1 Spider-Ham, Peter Porker|SPM|[201]
+1 Gwen Stacy|SPM|[202]
+1 Web-Warriors|SPM|[203]
+1 Spider-Man Noir|SPM|[204]
+1 Spider-Man 2099|SPM|[205]
+1 Multiversal Passage|SPM|[206]
+1 Spider-Punk|SPM|[207]
+
+[webslinger]
+1 Peter Parker|SPM|[208]
+1 Gwen Stacy|SPM|[209]
+1 Spider-Punk|SPM|[210]
+1 Miles Morales|SPM|[211]
+1 Radioactive Spider|SPM|[212]
+1 Araña, Heart of the Spider|SPM|[213]
+1 Scarlet Spider, Ben Reilly|SPM|[214]
+1 Silk, Web Weaver|SPM|[215]
+1 Spider-Man 2099|SPM|[216]
+1 Symbiote Spider-Man|SPM|[217]
+
+[panel cards]
+1 Origin of Spider-Man|SPM|[218]
+1 The Clone Saga|SPM|[219]
+1 Norman Osborn|SPM|[220]
+1 Behold the Sinister Six!|SPM|[221]
+1 Black Cat, Cunning Thief|SPM|[222]
+1 The Death of Gwen Stacy|SPM|[223]
+1 Eddie Brock|SPM|[224]
+1 Maximum Carnage|SPM|[225]
+1 Kraven's Last Hunt|SPM|[226]
+1 Carnage, Crimson Chaos|SPM|[227]
+1 Doctor Octopus, Master Planner|SPM|[228]
+1 Mary Jane Watson|SPM|[229]
+1 Spider-Woman, Stunning Savior|SPM|[230]
+1 The Spot, Living Portal|SPM|[231]
+
+[classic comic]
+1 Peter Parker|SPM|[232]
+1 Eddie Brock|SPM|[233]
+1 Miles Morales|SPM|[234]
+
 [tokens]
 2 u_3_3_illusion_villain @Anthony Devine
 3 g_2_1_spider_reach @Domenico Cava

forge-gui/res/editions/Through the Omenpaths 1 Bonus Sheet.txt

@@ -6,43 +6,43 @@ Type=Online
 ScryfallCode=OMB
 
 [cards]
-1 M Comeuppance @
+1 R Comeuppance @Igor Krstic
-2 M Leyline Binding @
+2 R Leyline Binding @Cristi Balanescu
-3 M Nine Lives @
+3 R Nine Lives @Paul Scott Canavan
-4 M Path to Exile @
+4 R Path to Exile @Todd Lockwood
-5 M Reprieve @
+5 U Reprieve @Mariah Tekulve
-6 M Rest in Peace @
+6 R Rest in Peace @Jarel Threat
-7 M Wedding Ring @
+7 M Wedding Ring @Olena Richards
-8 M Clever Impersonator @
+8 M Clever Impersonator @Slawomir Maniak
-9 M Counterspell @
+9 R Counterspell @Gao Yan
-10 M Lorthos, the Tidemaker @
+10 M Lorthos, the Tidemaker @Kekai Kotaki
-11 M Mindbreak Trap @
+11 M Mindbreak Trap @Christopher Moeller
-12 M Mystic Confluence @
+12 R Mystic Confluence @Kieran Yanner
-13 M Ponder @
+13 C Ponder @Ernanda Souza
-14 M Rite of Replication @
+14 R Rite of Replication @Matt Cavotta
-15 M Traumatize @
+15 R Traumatize @Greg Staples
-16 M Feed the Swarm @
+16 C Feed the Swarm @Nino Is
-17 M Hex @
+17 R Hex @Michael Sutfin
-18 M Infernal Grasp @
+18 U Infernal Grasp @Naomi Baker
-19 M Opposition Agent @
+19 M Opposition Agent @Scott Murphy
-20 M Reanimate @
+20 R Reanimate @Johann Bodin
-21 M Saw in Half @
+21 R Saw in Half @Alexander Mokhov
-22 M Skithiryx, the Blight Dragon @
+22 M Skithiryx, the Blight Dragon @Chippy
-23 M Goblin Bombardment @
+23 R Goblin Bombardment @Dave Kendall
-24 M Najeela, the Blade-Blossom @
+24 M Najeela, the Blade-Blossom @Matt Stewart
-25 M Relentless Assault @
+25 R Relentless Assault @Greg Hildebrandt
-26 M Savage Beating @
+26 M Savage Beating @Matt Thompson
-27 M Shock @
+27 C Shock @Jon Foster
-28 M Thrill of Possibility @
+28 C Thrill of Possibility @Izzy
-29 M Unexpected Windfall @
+29 C Unexpected Windfall @Lorenzo Mastroianni
-30 M Winds of Change @
+30 U Winds of Change @Adam Rex
-31 M Arachnogenesis @
+31 R Arachnogenesis @Johannes Voss
-32 M Arasta of the Endless Web @
+32 R Arasta of the Endless Web @Sam Rowan
-33 M Beast Within @
+33 U Beast Within @Jesper Ejsing
-34 M Heroic Intervention @
+34 R Heroic Intervention @James Ryman
-35 M Hunter's Insight @
+35 U Hunter's Insight @Jim Murray
-36 M Parallel Lives @
+36 M Parallel Lives @Steve Prescott
-37 M Silkguard @
+37 R Silkguard @Dan Murayama Scott
-38 M Tangle @
+38 U Tangle @Néstor Ossandón Leal
-39 M Alibou, Ancient Witness @
+39 M Alibou, Ancient Witness @Matt Stewart
-40 M Terminate @
+40 U Terminate @Wayne Reynolds

forge-gui/res/languages/de-DE.properties

@@ -2838,6 +2838,7 @@ lblDecklistTitle=Deckliste
 lblSummaryStats=Gesamt-Statistik
 lblDeckSection=Bereich
 lblNewDeckCheckbox=Erzeuge ein neues Deck
+lblReplaceDeckCheckbox=Replace Current Deck
 lblImportCardsCmd=Importiere Karten
 lblCreateNewCmd=Neues Deck
 lblErrNotAllowedCard=Set ist nicht erlaubt in {0}
@@ -2845,6 +2846,7 @@ lblWarnLimitedCard={0} in {1}
 lblErrCardEditionDate=Set verträgt sich nicht mit der Erscheinungsdatum-Option
 lblErrUnsupportedCard=Ist nicht erlaubt in {0}
 lblWarnUnknownCardMsg=Unbekannte oder in Forge nicht unterstützte Karte
+lblWarnNotInInventory=Card not found in inventory
 lblWarnTooManyCommanders=Aktueller {0}-Bereich enthält {1} mögliche Commander-Karten: {2}
 lblWarnCommandersInSideExtra=Bitte prüfen und, falls nötig, min. eine Karte in den Commander-Bereich verschieben.
 lblWarnDeckSectionNotAllowedInEditor=In {1} ist der {0}-Bereich nicht erlaubt. 
@@ -2936,6 +2938,7 @@ lblCardImportWarning=\nWarnung: Das Deck {0} wird umbenannt in {1}.
 lblConfirmCreateNewDeck=Du bist dabei das neue Deck {0} zu erzeugen. {1}\n\nWillst du fortfahren?\n\n Hinweis: \
   Bitte denk daran den "Save"-Knopf im Deck-Editor zu klicken, um das neue Deck dem Deck-Katalog hinzuzufügen!
 lblNewDeckWarning=\nWarnung: Alle ungesicherten Änderungen am aktuellen Deck {0} werden verlorengehen.
+lblConfirmReplaceDeck=This will replace the contents of the current deck ({0}) with the imported cards.\n\nWould you like to proceed?
 lblImportCardsDialogTitle=Importiere Karten in aktuelles Deck
 lblNewDeckDialogTitle=Erzeuge neues Deck
 #FNetOverlay.java

forge-gui/res/languages/en-US.properties

@@ -2898,6 +2898,7 @@ lblDecklistTitle=Decklist
 lblSummaryStats=Summary Statistics
 lblDeckSection=Section
 lblNewDeckCheckbox=Create a New Deck
+lblReplaceDeckCheckbox=Replace Current Deck
 lblImportCardsCmd=Import Cards
 lblCreateNewCmd=New Deck
 lblErrNotAllowedCard=Set not allowed in {0}
@@ -2905,6 +2906,7 @@ lblWarnLimitedCard={0} in {1}
 lblErrCardEditionDate=Set not compliant with Release Date option
 lblErrUnsupportedCard=Not allowed in {0}
 lblWarnUnknownCardMsg=Unknown Card or Unsupported in Forge
+lblWarnNotInInventory=Card not found in inventory
 lblWarnTooManyCommanders=Current {0} Section contains {1} potential Commander Cards: {2}
 lblWarnCommandersInSideExtra=Please check and move one to the Commander Section, in case.
 lblWarnDeckSectionNotAllowedInEditor={0} Section is not allowed in {1}
@@ -3001,6 +3003,7 @@ lblCardImportWarning=\nWarning: The deck {0} will be renamed as {1}.
 lblConfirmCreateNewDeck=You are about to create a new deck {0}. {1}\n\nWould you like to proceed?\n\n Note: \
   Please remember to click on the "Save" button in the Deck Editor to add the new deck to the Catalog!
 lblNewDeckWarning=\nWarning: Any unsaved changes to the current deck {0} will be lost.
+lblConfirmReplaceDeck=This will replace the contents of the current deck ({0}) with the imported cards.\n\nWould you like to proceed?
 lblImportCardsDialogTitle=Import cards in the Current Deck
 lblNewDeckDialogTitle=Create a New Deck
 #FNetOverlay.java

forge-gui/res/languages/es-ES.properties

@@ -2847,6 +2847,7 @@ lblDecklistTitle=Decklist
 lblSummaryStats=Summary Statistics
 lblDeckSection=Section
 lblNewDeckCheckbox=Create a New Deck
+lblReplaceDeckCheckbox=Replace Current Deck
 lblImportCardsCmd=Import Cards
 lblCreateNewCmd=New Deck
 lblErrNotAllowedCard=Set not allowed in {0}
@@ -2854,6 +2855,7 @@ lblWarnLimitedCard={0} in {1}
 lblErrCardEditionDate=Set not compliant with Release Date option
 lblErrUnsupportedCard=Not allowed in {0}
 lblWarnUnknownCardMsg=Unknown Card or Unsupported in Forge
+lblWarnNotInInventory=Card not found in inventory
 lblWarnTooManyCommanders=Current {0} Section contains {1} potential Commander Cards: {2}
 lblWarnCommandersInSideExtra=Please check and move one to the Commander Section, in case.
 lblWarnDeckSectionNotAllowedInEditor={0} Section is not allowed in {1}
@@ -2950,6 +2952,7 @@ lblCardImportWarning=\nWarning: The deck {0} will be renamed as {1}.
 lblConfirmCreateNewDeck=You are about to create a new deck {0}. {1}\n\nWould you like to proceed?\n\n Note: \
   Please remember to click on the "Save" button in the Deck Editor to add the new deck to the Catalog!
 lblNewDeckWarning=\nWarning: Any unsaved changes to the current deck {0} will be lost.
+lblConfirmReplaceDeck=This will replace the contents of the current deck ({0}) with the imported cards.\n\nWould you like to proceed?
 lblImportCardsDialogTitle=Import cards in the Current Deck
 lblNewDeckDialogTitle=Create a New Deck
 #FNetOverlay.java

forge-gui/res/languages/fr-FR.properties

@@ -2840,6 +2840,7 @@ lblDecklistTitle=Liste de deck
 lblSummaryStats=Statistiques récapitulatives
 lblDeckSection=Section
 lblNewDeckCheckbox=Créer un nouveau deck
+lblReplaceDeckCheckbox=Replace Current Deck
 lblImportCardsCmd=Importer des cartes
 lblCreateNewCmd=Nouveau Deck
 lblErrNotAllowedCard=Définir non autorisé dans {0}
@@ -2847,6 +2848,7 @@ lblWarnLimitedCard={0} dans {1}
 lblErrCardEditionDate=Set non conforme avec l'option de date de sortie
 lblErrUnsupportedCard=Non autorisé dans {0}
 lblWarnUnknownCardMsg=Carte inconnue ou non prise en charge dans Forge
+lblWarnNotInInventory=Card not found in inventory
 lblWarnTooManyCommanders=La section {0} actuelle contient {1} cartes de commandant potentielles : {2}
 lblWarnCommandersInSideExtra=Veuillez vérifier et en déplacer un vers la section Commandant, au cas où.
 lblWarnDeckSectionNotAllowedInEditor={0} La section n'est pas autorisée dans {1}
@@ -2944,6 +2946,7 @@ lblCardImportWarning=\nAttention : Le deck {0} sera renommé en {1}.
 lblConfirmCreateNewDeck=Vous êtes sur le point de créer un nouveau deck {0}. {1}\n\nVoulez-vous continuer ?\n\n Remarque : \
   N'oubliez pas de cliquer sur le bouton "Enregistrer" dans l'éditeur de deck pour ajouter le nouveau deck au catalogue !
 lblNewDeckWarning=\nAttention : Toute modification non enregistrée dans le deck actuel {0} sera perdue.
+lblConfirmReplaceDeck=This will replace the contents of the current deck ({0}) with the imported cards.\n\nWould you like to proceed?
 lblImportCardsDialogTitle=Importer des cartes dans le Deck actuel
 lblNewDeckDialogTitle=Créer un nouveau deck
 #FNetOverlay.java

forge-gui/res/languages/it-IT.properties

@@ -2836,6 +2836,7 @@ lblDecklistTitle=Lista delle Carte da Importare
 lblSummaryStats=Statistiche Generali
 lblDeckSection=Sezione
 lblNewDeckCheckbox=Crea un nuovo mazzo
+lblReplaceDeckCheckbox=Replace Current Deck
 lblImportCardsCmd=Importa le carte
 lblCreateNewCmd=Nuovo mazzo
 lblErrNotAllowedCard=Edizione non permessa in {0}
@@ -2843,6 +2844,7 @@ lblWarnLimitedCard={0} in {1}
 lblErrCardEditionDate=Edizione non valida secondo l'opzione sulla data di pubblicazione selezionata
 lblErrUnsupportedCard=Non Permesso in {0}
 lblWarnUnknownCardMsg=Carta Sconosciuta, o non supportata in Forge
+lblWarnNotInInventory=Card not found in inventory
 lblWarnTooManyCommanders=La Sezione {0} contiene {1} potenziali carte Commander: {2}
 lblWarnCommandersInSideExtra=Per favore, controlla e nel caso spostane una nella sezione Commander.
 lblWarnDeckSectionNotAllowedInEditor={0} Sezione non è permessa in {1}
@@ -2942,6 +2944,7 @@ lblCardImportWarning=\nAttenzione: Il mazzo {0} sarà rinominato come {1}.
 lblConfirmCreateNewDeck=Si sta per creare un nuovo mazzo {0}. {1}\n\nSi desidera procedere?\n\n Nota: \
   Non dimenticare di premere il tasto "Salva" una volta importate le carte per aggiungere il nuovo mazzo al catalogo!
 lblNewDeckWarning=\nAttenzione: Qualsiasi modifica non salvata al mazzo corrente {0} sarà persa.
+lblConfirmReplaceDeck=This will replace the contents of the current deck ({0}) with the imported cards.\n\nWould you like to proceed?
 lblImportCardsDialogTitle=Importa le carte nel mazzo corrente
 lblNewDeckDialogTitle=Crea un nuovo mazzo
 #FNetOverlay.java

forge-gui/res/languages/ja-JP.properties

@@ -2835,6 +2835,7 @@ lblDecklistTitle=Decklist
 lblSummaryStats=Summary Statistics
 lblDeckSection=Section
 lblNewDeckCheckbox=Create a New Deck
+lblReplaceDeckCheckbox=Replace Current Deck
 lblImportCardsCmd=Import Cards
 lblCreateNewCmd=New Deck
 lblErrNotAllowedCard=Set not allowed in {0}
@@ -2842,6 +2843,7 @@ lblWarnLimitedCard={0} in {1}
 lblErrCardEditionDate=Set not compliant with Release Date option
 lblErrUnsupportedCard=Not allowed in {0}
 lblWarnUnknownCardMsg=Unknown Card or Unsupported in Forge
+lblWarnNotInInventory=Card not found in inventory
 lblWarnTooManyCommanders=Current {0} Section contains {1} potential Commander Cards: {2}
 lblWarnCommandersInSideExtra=Please check and move one to the Commander Section, in case.
 lblWarnDeckSectionNotAllowedInEditor={0} Section is not allowed in {1}
@@ -2938,6 +2940,7 @@ lblCardImportWarning=\nWarning: The deck {0} will be renamed as {1}.
 lblConfirmCreateNewDeck=You are about to create a new deck {0}. {1}\n\nWould you like to proceed?\n\n Note: \
   Please remember to click on the "Save" button in the Deck Editor to add the new deck to the Catalog!
 lblNewDeckWarning=\nWarning: Any unsaved changes to the current deck {0} will be lost.
+lblConfirmReplaceDeck=This will replace the contents of the current deck ({0}) with the imported cards.\n\nWould you like to proceed?
 lblImportCardsDialogTitle=Import cards in the Current Deck
 lblNewDeckDialogTitle=Create a New Deck
 #FNetOverlay.java

forge-gui/res/languages/pt-BR.properties

@@ -2917,6 +2917,7 @@ lblDecklistTitle=Lista de decks
 lblSummaryStats=Estatísticas Resumidas
 lblDeckSection=Seção
 lblNewDeckCheckbox=Criar um Novo deck
+lblReplaceDeckCheckbox=Replace Current Deck
 lblImportCardsCmd=Importar Cartas
 lblCreateNewCmd=Novo Deck
 lblErrNotAllowedCard=Coleção não permitida em {0}
@@ -2924,6 +2925,7 @@ lblWarnLimitedCard={0} em {1}
 lblErrCardEditionDate=Coleção não compatível com a opção de Data de Lançamento
 lblErrUnsupportedCard=Não permitido em {0}
 lblWarnUnknownCardMsg=Carta desconhecida ou não suportada no Forge
+lblWarnNotInInventory=Card not found in inventory
 lblWarnTooManyCommanders=Seção {0} Atual contém {1} Cartas de Comandante em potencial\: {2}
 lblWarnCommandersInSideExtra=Verifique e mova um para a seção do Comandante.
 lblWarnDeckSectionNotAllowedInEditor=Seção {0} não é permitida em {1}
@@ -3012,6 +3014,7 @@ Deseja prosseguir?\n\
  Nota\: Por favor, lembre-se de clicar no botão "Salvar" no Editor do Deck para adicioná-lo ao Catálogo\!
 lblNewDeckWarning=\n\
 Aviso\: Qualquer alteração não salva no deck atual {0} será perdida.
+lblConfirmReplaceDeck=This will replace the contents of the current deck ({0}) with the imported cards.\n\nWould you like to proceed?
 lblImportCardsDialogTitle=Importar cartas no Deck Atual
 lblNewDeckDialogTitle=Criar um Novo deck
 #FNetOverlay.java

forge-gui/res/languages/zh-CN.properties

@@ -2844,6 +2844,7 @@ lblDecklistTitle=套牌列表
 lblSummaryStats=统计摘要
 lblDeckSection=部分
 lblNewDeckCheckbox=创建一个新套牌
+lblReplaceDeckCheckbox=Replace Current Deck
 lblImportCardsCmd=导入牌张
 lblCreateNewCmd=新建套牌
 lblErrNotAllowedCard=系列{0}不被允许
@@ -2851,6 +2852,7 @@ lblWarnLimitedCard={0}中的{1}
 lblErrCardEditionDate=不符合上市日期选项
 lblErrUnsupportedCard={0}不被允许
 lblWarnUnknownCardMsg=未知的牌张或未被forge支持的牌张
+lblWarnNotInInventory=Card not found in inventory
 lblWarnTooManyCommanders=现在{0}部分包含{1}张潜在的指挥官牌张: {2}
 lblWarnCommandersInSideExtra=如果确实是指挥官，请进行进行检查并将其中的一张移动到指挥官区。
 lblWarnDeckSectionNotAllowedInEditor={0}部分中的{1}不被允许
@@ -2928,6 +2930,7 @@ lblCardImportWarning=\n警告：套牌{0}将被重命名为{1}。
 lblConfirmCreateNewDeck=你即将创建一个新套牌{0}。{1}\n\n你想要继续吗？\n\n 注意：请记得点击套牌编辑器中的\"保存按钮\"以\
   将新建的套牌保存到目录中！
 lblNewDeckWarning=\n警告：对于当前套牌{0}的任何未保存更改丢将被丢弃。
+lblConfirmReplaceDeck=This will replace the contents of the current deck ({0}) with the imported cards.\n\nWould you like to proceed?
 lblImportCardsDialogTitle=将牌张导入到当前套牌
 lblNewDeckDialogTitle=创建一个新套牌
 #FNetOverlay.java

forge-gui/res/puzzle/PS_EOE3.pzl

@@ -0,0 +1,16 @@
+[metadata]
+Name:Possibility Storm - Edge of Eternities #03
+URL:https://www.cardforge.org
+Goal:Win
+Turns:1
+Difficulty:Rare
+Description:Win this turn. Your opponent has 10000 life! Deal at least that much damage this turn to win. Ensure your solution satisfies all possible blocks. Good luck!
+[state]
+turn=1
+activeplayer=p0
+activephase=MAIN1
+p0life=-1
+p0hand=Welcome the Darkness;Bloodthirsty Conqueror;Vayne's Treachery;Syr Vondam, Sunstar Exemplar
+p0battlefield=Herald of Eternal Dawn;Jumbo Cactuar;The Masamune;Enduring Tenacity;Plains;Plains;Plains;Swamp;Swamp;Swamp;Forest;Forest
+p1life=10000
+p1battlefield=Zidane, Tantalus Thief;Absolute Virtue|Id:1;Pain for All|AttachedTo:1

forge-gui/src/main/java/forge/deck/DeckImportController.java

@@ -13,15 +13,25 @@ import forge.gui.util.SOptionPane;
 import forge.item.PaperCard;
 import forge.localinstance.properties.ForgePreferences;
 import forge.model.FModel;
+import forge.util.ItemPool;
 import forge.util.Localizer;
+import forge.util.StreamUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.text.DateFormatSymbols;
 import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 public class DeckImportController {
-    private boolean createNewDeck;
+    public enum ImportBehavior {
+        MERGE,
+        CREATE_NEW,
+        REPLACE_CURRENT
+    }
+
+    private ImportBehavior importBehavior;
     // Date filter
     private final ICheckBox dateTimeCheck;
     private final IComboBox<String> monthDropdown;
@@ -30,7 +40,7 @@ public class DeckImportController {
     private CardDb.CardArtPreference artPreference;
     private boolean smartCardArt;
     // Block Preference Filter
-    private boolean inlcludeBnRInDeck = false;
+    private boolean includeBnRInDeck = false;
 
     private final List<Token> tokens = new ArrayList<>();
     private final Map<PaperCard, Token> cardsInTokens = new HashMap<>();
@@ -38,7 +48,14 @@ public class DeckImportController {
     private Deck currentDeckInEditor = null;
     private DeckFormat currentDeckFormat;
     private GameFormat currentGameFormat;
+    private GameType currentGameType;
     private final List<DeckSection> allowedSections = new ArrayList<>();
+    private ItemPool<PaperCard> playerInventory;
+    /**
+     * If a free card is missing from a player's inventory (e.g. a basic land), it gets run through this function, which
+     * can handle creation of a usable print.
+     */
+    private Function<PaperCard, PaperCard> freePrintSupplier;
 
     public DeckImportController(ICheckBox dateTimeCheck0,
                                 IComboBox<String> monthDropdown0, IComboBox<Integer> yearDropdown0,
@@ -54,13 +71,14 @@ public class DeckImportController {
          */
         this.currentDeckNotEmpty = currentDeckNotEmpty;
         // this option will control the "new deck" action controlled by UI widget
-        createNewDeck = false;
+        this.importBehavior = ImportBehavior.MERGE;
 
         // Init default parameters
         this.artPreference = StaticData.instance().getCardArtPreference();  // default
         this.smartCardArt = StaticData.instance().isEnabledCardArtSmartSelection();
         this.currentDeckFormat = null;
         this.currentGameFormat = null;
+        this.currentGameType = null;
         fillDateDropdowns();
     }
 
@@ -68,13 +86,23 @@ public class DeckImportController {
         if (gameType == null){
             this.currentGameFormat = null;
             this.currentDeckFormat = null;
+            this.currentGameType = null;
         } else {
             // get the game format with the same name of current game type (if any)
             this.currentDeckFormat = gameType.getDeckFormat();
             this.currentGameFormat = FModel.getFormats().get(gameType.name());
+            this.currentGameType = gameType;
         }
     }
 
+    public void setPlayerInventory(ItemPool<PaperCard> inventory) {
+        this.playerInventory = inventory;
+    }
+
+    public void setFreePrintConverter(Function<PaperCard, PaperCard> freePrintSupplier) {
+        this.freePrintSupplier = freePrintSupplier;
+    }
+
     public void setCurrentDeckInEditor(Deck deckInEditor){
         this.currentDeckInEditor = deckInEditor;
     }
@@ -105,11 +133,13 @@ public class DeckImportController {
         return this.smartCardArt;
     }
 
-    public void setCreateNewDeck(boolean createNewDeck){
+    public void setImportBehavior(ImportBehavior importBehavior) {
-        this.createNewDeck = createNewDeck;
+        this.importBehavior = importBehavior;
     }
 
-    public boolean getCreateNewDeck() { return this.createNewDeck; }
+    public ImportBehavior getImportBehavior() {
+        return importBehavior;
+    }
 
     private void fillDateDropdowns() {
         DateFormatSymbols dfs = new DateFormatSymbols();
@@ -159,10 +189,10 @@ public class DeckImportController {
     }
 
     public void importBannedAndRestrictedCards(boolean includeBannedAndRestricted){
-        this.inlcludeBnRInDeck = includeBannedAndRestricted;
+        this.includeBnRInDeck = includeBannedAndRestricted;
     }
 
-    public boolean importBannedAndRestrictedCards(){ return this.inlcludeBnRInDeck; }
+    public boolean importBannedAndRestrictedCards(){ return this.includeBnRInDeck; }
 
     public List<Token> parseInput(String input) {
         tokens.clear();
@@ -186,7 +216,7 @@ public class DeckImportController {
         if (!this.allowedSections.isEmpty())
             recognizer.setAllowedDeckSections(this.allowedSections);
         // Banned and Restricted Card Policy
-        if (this.inlcludeBnRInDeck)
+        if (this.includeBnRInDeck)
             recognizer.forceImportBannedAndRestrictedCards();
 
         String[] lines = input.split("\n");
@@ -196,8 +226,13 @@ public class DeckImportController {
 
         if (this.currentGameFormatAllowsCommander()) {
             List<Pair<Integer, Token>> commanderTokens = getTokensInSection(DeckSection.Commander);
-            if (commanderTokens.isEmpty())  // Check commanders in Sideboard only if the commander section is empty
+            if (commanderTokens.isEmpty()) {
-                checkAndFixCommanderIn(DeckSection.Sideboard);
+                // Check commanders in Sideboard only if the commander section is empty
+                if(!getTokensInSection(DeckSection.Sideboard).isEmpty())
+                    checkAndFixCommanderIn(DeckSection.Sideboard);
+                else
+                    checkAndFixCommanderIn(DeckSection.Main);
+            }
             checkAndFixCommanderIn(DeckSection.Commander);
         }
 
@@ -309,7 +344,7 @@ public class DeckImportController {
     }
 
     public boolean currentGameFormatAllowsCommander(){
-        return this.allowedSections.contains(DeckSection.Commander);
+        return this.allowedSections.contains(DeckSection.Commander) || this.currentGameType == GameType.PlanarConquest;
     }
 
     public List<Token> optimiseCardArtInTokens(){
@@ -332,13 +367,8 @@ public class DeckImportController {
             else
                 refTokenMap = tokensPerSectionWithSet;
 
-            List<Token> tokensInSection = refTokenMap.getOrDefault(tokenSection, null);
+            List<Token> tokensInSection = refTokenMap.computeIfAbsent(tokenSection, e -> new ArrayList<>());
-            if (tokensInSection == null) {
+            tokensInSection.add(token);
-                tokensInSection = new ArrayList<>();
-                tokensInSection.add(token);
-                refTokenMap.put(tokenSection, tokensInSection);
-            } else
-                tokensInSection.add(token);
         }
 
         if (tokensPerSectionWithNoSet.isEmpty())
@@ -356,7 +386,7 @@ public class DeckImportController {
 
         Map<DeckSection, CardPool> referencePoolPerSection = new HashMap<>();
 
-        if (this.currentDeckNotEmpty && !this.createNewDeck && this.currentDeckInEditor != null){
+        if (this.currentDeckNotEmpty && this.importBehavior == ImportBehavior.MERGE && this.currentDeckInEditor != null){
             // We will always consider ONLY sections for cards needing art optimisation
             for (DeckSection section : tokensPerSectionWithNoSet.keySet()){
                 CardPool cardsInDeck = this.currentDeckInEditor.get(section);
@@ -436,6 +466,102 @@ public class DeckImportController {
         return tokens;
     }
 
+    public List<Token> constrainTokensToInventory() {
+        if(this.playerInventory == null)
+            return tokens;
+        CardPool availableInventory = new CardPool(this.playerInventory);
+        //Map of tokens to the things we're gonna replace them with.
+        Map<Token, List<Token>> tokenReplacers = new LinkedHashMap<>();
+        //If we're adding to our existing deck, ensure we aren't counting the cards already in it.
+        if(this.importBehavior == ImportBehavior.MERGE && this.currentDeckInEditor != null)
+            availableInventory.removeAll(this.currentDeckInEditor.getAllCardsInASinglePool(true, true));
+        if(this.currentGameType == GameType.PlanarConquest && currentDeckInEditor != null)
+            availableInventory.removeAllFlat(this.currentDeckInEditor.getCommanders());
+        //Step 1: For each token, if it's asking for more copies of a print than we can supply, split the difference out
+        //into a token that's indifferent to the edition. Reduce available inventory accordingly.
+        for (Token token : this.tokens) {
+            if (!token.isCardToken())
+                continue;
+            PaperCard card = token.getCard();
+            int requestedAmount = token.getQuantity();
+            if (card == null)
+                continue;
+            if (token.cardRequestHasNoCode()) {
+                List<Token> list = new ArrayList<>();
+                tokenReplacers.put(token, list);
+                continue;
+            }
+            int available = availableInventory.count(card);
+            if (available <= 0) {
+                List<Token> list = new ArrayList<>();
+                tokenReplacers.put(token, list);
+                continue;
+            }
+            int numTaken = Math.min(requestedAmount, available);
+            availableInventory.remove(card, numTaken);
+            if (available >= requestedAmount)
+                continue;
+
+            List<Token> list = new ArrayList<>();
+            list.add(Token.LegalCard(card, numTaken, token.getTokenSection(), true));
+            tokenReplacers.put(token, list);
+        }
+        if(tokenReplacers.isEmpty())
+            return tokens; //We have every card that was requested.
+        //Step 2: Try to find alternative prints for the ones that do not request an edition.
+        int capacity = tokens.size();
+        for(Map.Entry<Token, List<Token>> tokenReplacer : tokenReplacers.entrySet()) {
+            Token token = tokenReplacer.getKey();
+            DeckSection tokenSection = token.getTokenSection();
+            List<Token> replacementList = tokenReplacer.getValue();
+            PaperCard card = token.getCard();
+            String cardName = card.getName();
+            CardPool substitutes = availableInventory.getFilteredPool(c -> c.getName().equals(cardName));
+            // stream().toList() causes crash on Android 8-13, use Collectors.toList()
+            // ref: https://developer.android.com/reference/java/util/stream/Stream#toList()
+            List<Map.Entry<PaperCard, Integer>> sortedSubstitutes = StreamUtil.stream(substitutes).sorted(Comparator.comparingInt(Map.Entry::getValue)).collect(Collectors.toList());
+            int neededQuantity = token.getQuantity();
+            for(Token found : replacementList) {
+                //If there's an item in the replacement list already it means we've already found some of the needed copies.
+                neededQuantity -= found.getQuantity();
+            }
+            for(int i = 0; i < sortedSubstitutes.size() && neededQuantity > 0; i++) {
+                Map.Entry<PaperCard, Integer> item = sortedSubstitutes.get(i);
+                PaperCard replacement = item.getKey();
+                int toMove = Math.min(neededQuantity, item.getValue());
+                replacementList.add(Token.LegalCard(replacement, toMove, tokenSection, true));
+                availableInventory.remove(replacement, toMove);
+                neededQuantity -= toMove;
+                capacity++;
+            }
+            if(neededQuantity > 0) {
+                PaperCard freePrint = getInfiniteSupplyPrinting(card);
+                if(freePrint != null)
+                    replacementList.add(Token.NotInInventoryFree(freePrint, neededQuantity, tokenSection));
+                else
+                    replacementList.add(Token.NotInInventory(card, neededQuantity, tokenSection));
+                capacity++;
+            }
+        }
+        //Step 3: Apply the replacement list.
+        List<Token> newList = new ArrayList<>(capacity);
+        for(Token t : this.tokens) {
+            if(tokenReplacers.containsKey(t))
+                newList.addAll(tokenReplacers.get(t));
+            else
+                newList.add(t);
+        }
+        this.tokens.clear();
+        this.tokens.addAll(newList);
+        return tokens;
+    }
+
+    private PaperCard getInfiniteSupplyPrinting(PaperCard card) {
+        if(this.freePrintSupplier == null)
+            return null;
+        return freePrintSupplier.apply(card);
+    }
+
     private int countTokens(List<Token> tokensInSection){
         if (tokensInSection == null || tokensInSection.isEmpty())
             return 0;
@@ -487,27 +613,31 @@ public class DeckImportController {
         if (tokens.isEmpty()) { return null; }
 
         String deckName = "";
-        if (currentDeckName != null && currentDeckName.trim().length() > 0)
+        if (currentDeckName != null && !currentDeckName.trim().isEmpty())
             deckName = String.format("\"%s\"", currentDeckName.trim());
 
         String tokenDeckName = getTokenDeckNameIfAny();
-        if (tokenDeckName.length() > 0)
+        if (!tokenDeckName.isEmpty())
             tokenDeckName = String.format("\"%s\"", tokenDeckName);
 
-        if (createNewDeck){
+        if(this.currentDeckNotEmpty) {
-            String extraWarning = currentDeckNotEmpty ? localizer.getMessage("lblNewDeckWarning", deckName) : "";
+            final String warning;
-            final String warning = localizer.getMessage("lblConfirmCreateNewDeck", tokenDeckName, extraWarning);
+            final String title;
-            if (!SOptionPane.showConfirmDialog(warning, localizer.getMessage("lblNewDeckDialogTitle"),
+            if (this.importBehavior == ImportBehavior.CREATE_NEW) {
-                    localizer.getMessage("lblYes"), localizer.getMessage("lblNo"))) {
+                String extraWarning = localizer.getMessage("lblNewDeckWarning", deckName);
-                return null;
+                warning = localizer.getMessage("lblConfirmCreateNewDeck", tokenDeckName, extraWarning);
+                title = localizer.getMessage("lblNewDeckDialogTitle");
+            } else if (this.importBehavior == ImportBehavior.MERGE){
+                String extraWarning = (!tokenDeckName.isEmpty() && !tokenDeckName.equals(deckName)) ?
+                        localizer.getMessage("lblCardImportWarning", deckName, tokenDeckName) : "";
+                warning = localizer.getMessage("lblConfirmCardImport", deckName, extraWarning);
+                title = localizer.getMessage("lblImportCardsDialogTitle");
             }
-        }
+            else {
-        else if (this.currentDeckNotEmpty){
+                warning = localizer.getMessage("lblConfirmReplaceDeck", deckName);
-            String extraWarning = (tokenDeckName.length() > 0 && !tokenDeckName.equals(deckName)) ?
+                title = localizer.getMessage("lblNewDeckDialogTitle");
-                    localizer.getMessage("lblCardImportWarning", deckName, tokenDeckName) : "";
+            }
-            final String warning = localizer.getMessage("lblConfirmCardImport", deckName, extraWarning);
+            if (!SOptionPane.showConfirmDialog(warning, title,
-            if (!SOptionPane.showConfirmDialog(warning,
-                    localizer.getMessage("lblImportCardsDialogTitle"),
                     localizer.getMessage("lblYes"), localizer.getMessage("lblNo")))
                 return null;
         }
@@ -516,7 +646,7 @@ public class DeckImportController {
             final TokenType type = t.getType();
             // only Deck Name, legal card and limited card tokens will be analysed!
             if (!t.isTokenForDeck() ||
-                    (type == TokenType.LIMITED_CARD && !this.inlcludeBnRInDeck))
+                    (type == TokenType.LIMITED_CARD && !this.includeBnRInDeck))
                 continue;  // SKIP token
 
             if (type == TokenType.DECK_NAME) {
@@ -547,4 +677,66 @@ public class DeckImportController {
         }
         return "";  // no deck name
     }
+
+    public String getTokenMessage(DeckRecognizer.Token token) {
+        return switch (token.getType()) {
+            case LEGAL_CARD, LIMITED_CARD, CARD_FROM_NOT_ALLOWED_SET, CARD_FROM_INVALID_SET,
+                 CARD_NOT_IN_INVENTORY, FREE_CARD_NOT_IN_INVENTORY ->
+                    String.format("%s x %s %s", token.getQuantity(), token.getText(), getTokenFoilLabel(token));
+            // Card Warning Msgs
+            case UNKNOWN_CARD, UNSUPPORTED_CARD ->
+                    token.getQuantity() > 0 ? String.format("%s x %s", token.getQuantity(), token.getText())
+                            : token.getText();
+            case UNSUPPORTED_DECK_SECTION ->
+                    String.format("%s: %s", Localizer.getInstance().getMessage("lblWarningMsgPrefix"),
+                            Localizer.getInstance()
+                                    .getMessage("lblWarnDeckSectionNotAllowedInEditor", token.getText(),
+                                            this.currentGameType.name()));
+
+            // Special Case of Card moved into another section (e.g. Commander from Sideboard)
+            case WARNING_MESSAGE -> String.format("%s: %s", Localizer.getInstance()
+                    .getMessage("lblWarningMsgPrefix"), token.getText());
+
+            // Placeholders
+            case DECK_SECTION_NAME -> String.format("%s: %s", Localizer.getInstance().getMessage("lblDeckSection"),
+                    token.getText());
+            case CARD_RARITY -> String.format("%s: %s", Localizer.getInstance().getMessage("lblRarity"),
+                    token.getText());
+            case CARD_TYPE, CARD_CMC, MANA_COLOUR, COMMENT, UNKNOWN_TEXT -> token.getText();
+            case DECK_NAME -> String.format("%s: %s", Localizer.getInstance().getMessage("lblDeckName"),
+                    token.getText());
+        };
+    }
+
+    public String getTokenStatusMessage(DeckRecognizer.Token token) {
+        if (token == null)
+            return "";
+
+        final Localizer localizer = Localizer.getInstance();
+        return switch (token.getType()) {
+            case LIMITED_CARD -> String.format("%s: %s", localizer.getMessage("lblWarningMsgPrefix"),
+                    localizer.getMessage("lblWarnLimitedCard",
+                            StringUtils.capitalize(token.getLimitedCardType().name()), getGameFormatLabel()));
+            case CARD_FROM_NOT_ALLOWED_SET ->
+                    localizer.getMessage("lblErrNotAllowedCard", getGameFormatLabel());
+            case CARD_FROM_INVALID_SET -> localizer.getMessage("lblErrCardEditionDate");
+            case UNSUPPORTED_CARD -> localizer.getMessage("lblErrUnsupportedCard", this.currentGameType);
+            case UNKNOWN_CARD -> String.format("%s: %s", localizer.getMessage("lblWarningMsgPrefix"),
+                    localizer.getMessage("lblWarnUnknownCardMsg"));
+            case CARD_NOT_IN_INVENTORY -> localizer.getMessage("lblWarnNotInInventory");
+            default -> "";
+        };
+    }
+
+
+    private String getTokenFoilLabel(DeckRecognizer.Token token) {
+        if (!token.isCardToken())
+            return "";
+        final String foilMarker = "- (Foil)";
+        return token.getCard().isFoil() ? foilMarker : "";
+    }
+
+    private String getGameFormatLabel() {
+        return String.format("\"%s\"", this.getCurrentGameFormatName());
+    }
 }

forge-gui/src/main/java/forge/deck/DeckProxy.java

@@ -774,7 +774,7 @@ public class DeckProxy implements InventoryItem {
 
         for (PaperCard c : deck.getAllCardsInASinglePool().toFlatList()) {
             CardEdition edition = FModel.getMagicDb().getEditions().get(c.getEdition());
-            if (edition == null)
+            if (edition == null || !edition.hasBasicLands())
                 continue;
             availableEditions.add(edition);
         }

forge-gui/src/main/java/forge/gamemodes/limited/BoosterDraft.java

@@ -437,7 +437,7 @@ public class BoosterDraft implements IBoosterDraft {
                 CompletableFuture.allOf(futuresArray).join();
                 futures.clear();
             }
-            // stream().toList() causes crash on Android, use Collectors.toList()
+            // stream().toList() causes crash on Android 8-13, use Collectors.toList()
             customs.addAll(queue.stream().collect(Collectors.toList()));
         }
         return customs;

forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestData.java

@@ -18,15 +18,11 @@
 package forge.gamemodes.planarconquest;
 
 import java.io.File;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
 import java.util.Map.Entry;
 import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 import forge.card.CardDb;
 import forge.gamemodes.planarconquest.ConquestPreferences.CQPref;
@@ -199,14 +195,11 @@ public final class ConquestData {
     }
 
     public int getAccessiblePlaneCount() {
-        // TODO: Java 8 stream implementation of filtering
+        return (int) FModel.getPlanes().stream().filter(Predicate.not(ConquestPlane::isUnreachable)).count();
-        int i = 0;
+    }
-        for (ConquestPlane plane : FModel.getPlanes()) {
+
-            if (!plane.isUnreachable()) {
+    public Set<ConquestPlane> getUnlockedPlanes() {
-                i++;
+        return planeDataMap.values().stream().map(ConquestPlaneData::getLocation).map(ConquestLocation::getPlane).collect(Collectors.toSet());
-            }
-        }
-        return i;
     }
 
     public void unlockPlane(ConquestPlane plane) {
@@ -302,7 +295,7 @@ public final class ConquestData {
                 }
             }
 
-            if (commandersUsingCard.length() > 0) {
+            if (!commandersUsingCard.isEmpty()) {
                 SOptionPane.showMessageDialog(Localizer.getInstance().getMessage("lblCommandersCardCannotBeExiledByCard", CardTranslation.getTranslatedName(card.getName()), commandersUsingCard), title, SOptionPane.INFORMATION_ICON);
                 return false;
             }

forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestPlane.java

@@ -50,6 +50,7 @@ public class ConquestPlane {
     private FCollection<PaperCard> commanders;
     private ConquestAwardPool awardPool;
     private ConquestEvent[] events;
+    private final Set<CardEdition> editions = new HashSet<>();
 
     private ConquestPlane(String name0, String description0, int regionSize0, boolean unreachable0) {
         name = name0;
@@ -153,6 +154,10 @@ public class ConquestPlane {
         return planeCards;
     }
 
+    public Set<CardEdition> getEditions() {
+        return editions;
+    }
+
     private void ensureRegionsLoaded() {
         if (regions != null) { return; }
 
@@ -193,6 +198,8 @@ public class ConquestPlane {
             if (edition == null)
                 continue;
 
+            editions.add(edition);
+
             for (EditionEntry card : edition.getObtainableCards()) {
                 if (bannedCardSet == null || !bannedCardSet.contains(card.name())) {
                     addCard(commonCards.getCard(card.name(), setCode));

forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestUtil.java

@@ -1,22 +1,16 @@
 package forge.gamemodes.planarconquest;
 
-import java.util.EnumSet;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Set;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 
-import forge.card.CardRarity;
+import forge.card.*;
-import forge.card.CardRules;
-import forge.card.CardType;
 import forge.card.CardType.CoreType;
-import forge.card.ColorSet;
-import forge.card.MagicColor;
 import forge.card.mana.ManaCostShard;
 import forge.deck.CardPool;
 import forge.deck.Deck;
@@ -143,6 +137,25 @@ public class ConquestUtil {
         return pool;
     }
 
+    public static List<CardEdition> getBasicLandSets(Deck currentDeck) {
+        ConquestData model = FModel.getConquest().getModel();
+        List<ConquestPlane> planes = new ArrayList<>(model.getUnlockedPlanes());
+        ConquestPlane currentPlane = model.getCurrentPlane();
+        //Move the current plane to the front.
+        if(currentPlane != null && planes.contains(currentPlane)) {
+            planes.remove(currentPlane);
+            planes.add(0, currentPlane);
+        }
+        //Move editions of cards already in the deck to the front.
+        Map<CardEdition, Integer> editionStats = currentDeck.getAllCardsInASinglePool().getCardEditionStatistics(true);
+        List<CardEdition> out = planes.stream()
+                .<CardEdition>mapMulti((p, c) -> p.getEditions().forEach(c))
+                .filter(CardEdition::hasBasicLands)
+                .sorted(Comparator.comparing(e -> editionStats.getOrDefault(e, 0)))
+                .collect(Collectors.toList());
+        return out;
+    }
+
     public static ConquestPlane getPlaneByName(String planeName) {
         for (ConquestPlane plane : FModel.getPlanes()) {
             if (plane.getName().equals(planeName)) {
@@ -189,19 +202,16 @@ public class ConquestUtil {
     public static int getShardValue(CardRarity rarity, CQPref baseValuePref) {
         ConquestPreferences prefs = FModel.getConquestPreferences();
         int baseValue = prefs.getPrefInt(baseValuePref);
-        switch (rarity) {
+        return switch (rarity) {
-        case Common:
+            case Common -> baseValue;
-            return baseValue;
+            case Uncommon ->
-        case Uncommon:
+                    Math.round((float) baseValue * (float) prefs.getPrefInt(CQPref.AETHER_UNCOMMON_MULTIPLIER));
-            return Math.round((float)baseValue * (float)prefs.getPrefInt(CQPref.AETHER_UNCOMMON_MULTIPLIER));
+            case Rare, Special ->
-        case Rare:
+                    Math.round((float) baseValue * (float) prefs.getPrefInt(CQPref.AETHER_RARE_MULTIPLIER));
-        case Special:
+            case MythicRare ->
-            return Math.round((float)baseValue * (float)prefs.getPrefInt(CQPref.AETHER_RARE_MULTIPLIER));
+                    Math.round((float) baseValue * (float) prefs.getPrefInt(CQPref.AETHER_MYTHIC_MULTIPLIER));
-        case MythicRare:
+            default -> 0;
-            return Math.round((float)baseValue * (float)prefs.getPrefInt(CQPref.AETHER_MYTHIC_MULTIPLIER));
+        };
-        default:
-            return 0;
-        }
     }
 
     public enum AEtherFilter implements IHasSkinProp {

forge-gui/src/main/java/forge/gamemodes/quest/QuestController.java

@@ -19,6 +19,7 @@ package forge.gamemodes.quest;
 
 import java.io.File;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import com.google.common.collect.Lists;
 import com.google.common.eventbus.Subscribe;
@@ -620,17 +621,21 @@ public class QuestController {
     }
 
     public CardEdition getDefaultLandSet() {
-        List<String> availableEditionCodes = questFormat != null ? questFormat.getAllowedSetCodes() : Lists.newArrayList(FModel.getMagicDb().getEditions().getItemNames());
+        List<CardEdition> availableEditions = getAvailableLandSets();
-        List<CardEdition> availableEditions = new ArrayList<>();
-
-        for (String s : availableEditionCodes) {
-            availableEditions.add(FModel.getMagicDb().getEditions().get(s));
-        }
 
         CardEdition randomLandSet = CardEdition.Predicates.getRandomSetWithAllBasicLands(availableEditions);
         return randomLandSet == null ? FModel.getMagicDb().getEditions().get("ZEN") : randomLandSet;
     }
 
+    public List<CardEdition> getAvailableLandSets() {
+        List<String> availableEditionCodes = questFormat != null ? questFormat.getAllowedSetCodes() : Lists.newArrayList(FModel.getMagicDb().getEditions().getItemNames());
+        CardEdition.Collection editions = FModel.getMagicDb().getEditions();
+        return availableEditionCodes.stream()
+                .map(editions::get)
+                .filter(CardEdition::hasBasicLands)
+                .collect(Collectors.toList());
+    }
+
     public String getCurrentDeck() {
         return model.currentDeck;
     }

forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java

@@ -57,6 +57,7 @@ public class AdvancedSearch {
             protected String getItemValue(PaperCard input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<String> getItemValues(PaperCard input) {
                 Set<String> names = new HashSet<>();
@@ -77,6 +78,7 @@ public class AdvancedSearch {
             protected String getItemValue(PaperCard input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<String> getItemValues(PaperCard input) {
                 Set<String> names = new HashSet<>();
@@ -98,20 +100,9 @@ public class AdvancedSearch {
             protected Keyword getItemValue(PaperCard input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<Keyword> getItemValues(PaperCard input) {
-                CardSplitType cardSplitType = input.getRules().getSplitType();
-                if (cardSplitType != CardSplitType.None && cardSplitType != CardSplitType.Split) {
-                    Set<Keyword> keywords = new HashSet<>();
-                    if (input.getRules().getOtherPart() != null) {
-                        PaperCard otherPart = FModel.getMagicDb().getCommonCards().getCard(input.getRules().getOtherPart().getName());
-                        if (otherPart != null) {
-                            keywords.addAll(Keyword.getKeywordSet(otherPart));
-                            keywords.addAll(Keyword.getKeywordSet(input));
-                        }
-                    }
-                    return keywords;
-                }
                 return Keyword.getKeywordSet(input);
             }
         }),
@@ -121,11 +112,12 @@ public class AdvancedSearch {
                 return FModel.getMagicDb().getCardEdition(input.getEdition());
             }
         }),
-        CARD_FORMAT("lblFormat", PaperCard.class, FilterOperator.MULTI_LIST_OPS, new CustomListEvaluator<PaperCard, GameFormat>((List<GameFormat>)FModel.getFormats().getFilterList()) {
+        CARD_FORMAT("lblFormat", PaperCard.class, FilterOperator.MULTI_LIST_OPS, new CustomListEvaluator<PaperCard, GameFormat>((List<GameFormat>) FModel.getFormats().getFilterList()) {
             @Override
             protected GameFormat getItemValue(PaperCard input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<GameFormat> getItemValues(PaperCard input) {
                 return FModel.getFormats().getAllFormatsOfCard(input);
@@ -136,6 +128,7 @@ public class AdvancedSearch {
             protected ConquestPlane getItemValue(PaperCard input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<ConquestPlane> getItemValues(PaperCard input) {
                 return ConquestPlane.getAllPlanesOfCard(input);
@@ -146,6 +139,7 @@ public class AdvancedSearch {
             protected ConquestRegion getItemValue(PaperCard input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<ConquestRegion> getItemValues(PaperCard input) {
                 return ConquestRegion.getAllRegionsOfCard(input);
@@ -156,6 +150,7 @@ public class AdvancedSearch {
             protected QuestWorld getItemValue(PaperCard input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<QuestWorld> getItemValues(PaperCard input) {
                 return QuestWorld.getAllQuestWorldsOfCard(input);
@@ -166,6 +161,7 @@ public class AdvancedSearch {
             protected MagicColor.Color getItemValue(PaperCard input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<MagicColor.Color> getItemValues(PaperCard input) {
                 return input.getRules().getColor().toEnumSet();
@@ -176,6 +172,7 @@ public class AdvancedSearch {
             protected MagicColor.Color getItemValue(PaperCard input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<MagicColor.Color> getItemValues(PaperCard input) {
                 return input.getRules().getColorIdentity().toEnumSet();
@@ -192,6 +189,7 @@ public class AdvancedSearch {
             protected String getItemValue(PaperCard input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<String> getItemValues(PaperCard input) {
                 final CardType type = input.getRules().getType();
@@ -228,6 +226,7 @@ public class AdvancedSearch {
             protected String getItemValue(PaperCard input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<String> getItemValues(PaperCard input) {
                 CardSplitType cardSplitType = input.getRules().getSplitType();
@@ -243,7 +242,7 @@ public class AdvancedSearch {
                         return subtypes;
                     }
                 }
-                return (Set<String>)input.getRules().getType().getSubtypes();
+                return (Set<String>) input.getRules().getType().getSubtypes();
             }
         }),
         CARD_CMC("lblCMC", PaperCard.class, FilterOperator.NUMBER_OPS, new NumericEvaluator<PaperCard>(0, 20) {
@@ -294,7 +293,9 @@ public class AdvancedSearch {
             @Override
             protected Boolean getItemValue(PaperCard input) {
                 List<PaperCard> cards = FModel.getMagicDb().getCommonCards().getAllCards(input.getName());
-                if (cards.size() <= 1) { return true; }
+                if (cards.size() <= 1) {
+                    return true;
+                }
 
                 cards.sort(FModel.getMagicDb().getEditions().CARD_EDITION_COMPARATOR);
                 return cards.get(0) == input;
@@ -318,7 +319,7 @@ public class AdvancedSearch {
                 if (!(input instanceof PaperCard)) {
                     return "";
                 }
-                return ((PaperCard)input).getRules().getOracleText();
+                return ((PaperCard) input).getRules().getOracleText();
             }
         }),
         INVITEM_KEYWORDS("lblKeywords", InventoryItem.class, FilterOperator.COLLECTION_OPS, new CustomListEvaluator<InventoryItem, Keyword>(Keyword.getAllKeywords()) {
@@ -326,38 +327,40 @@ public class AdvancedSearch {
             protected Keyword getItemValue(InventoryItem input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<Keyword> getItemValues(InventoryItem input) {
                 if (!(input instanceof PaperCard)) {
                     return new HashSet<>();
                 }
-                return Keyword.getKeywordSet((PaperCard)input);
+                return Keyword.getKeywordSet((PaperCard) input);
             }
         }),
         INVITEM_SET("lblSet", InventoryItem.class, FilterOperator.SINGLE_LIST_OPS, new CustomListEvaluator<InventoryItem, CardEdition>(FModel.getMagicDb().getSortedEditions(), CardEdition::getCode) {
             @Override
             protected CardEdition getItemValue(InventoryItem input) {
                 if (input instanceof PaperCard) {
-                    CardEdition set = FModel.getMagicDb().getEditions().get(((PaperCard)input).getEdition());
+                    CardEdition set = FModel.getMagicDb().getEditions().get(((PaperCard) input).getEdition());
                     return set;
                 } else if (input instanceof SealedProduct) {
-                    return FModel.getMagicDb().getEditions().get(((SealedProduct)input).getEdition());
+                    return FModel.getMagicDb().getEditions().get(((SealedProduct) input).getEdition());
                 } else {
                     return CardEdition.UNKNOWN;
                 }
             }
         }),
-        INVITEM_FORMAT("lblFormat", InventoryItem.class, FilterOperator.MULTI_LIST_OPS, new CustomListEvaluator<InventoryItem, GameFormat>((List<GameFormat>)FModel.getFormats().getFilterList()) {
+        INVITEM_FORMAT("lblFormat", InventoryItem.class, FilterOperator.MULTI_LIST_OPS, new CustomListEvaluator<InventoryItem, GameFormat>((List<GameFormat>) FModel.getFormats().getFilterList()) {
             @Override
             protected GameFormat getItemValue(InventoryItem input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<GameFormat> getItemValues(InventoryItem input) {
                 if (!(input instanceof PaperCard)) {
                     return new HashSet<>();
                 }
-                return FModel.getFormats().getAllFormatsOfCard((PaperCard)input);
+                return FModel.getFormats().getAllFormatsOfCard((PaperCard) input);
             }
         }),
         INVITEM_PLANE("lblPlane", InventoryItem.class, FilterOperator.MULTI_LIST_OPS, new CustomListEvaluator<InventoryItem, ConquestPlane>(ImmutableList.copyOf(FModel.getPlanes())) {
@@ -365,12 +368,13 @@ public class AdvancedSearch {
             protected ConquestPlane getItemValue(InventoryItem input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<ConquestPlane> getItemValues(InventoryItem input) {
                 if (!(input instanceof PaperCard)) {
                     return new HashSet<>();
                 }
-                return ConquestPlane.getAllPlanesOfCard((PaperCard)input);
+                return ConquestPlane.getAllPlanesOfCard((PaperCard) input);
             }
         }),
         INVITEM_REGION("lblRegion", InventoryItem.class, FilterOperator.MULTI_LIST_OPS, new CustomListEvaluator<InventoryItem, ConquestRegion>(ConquestRegion.getAllRegions()) {
@@ -378,12 +382,13 @@ public class AdvancedSearch {
             protected ConquestRegion getItemValue(InventoryItem input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<ConquestRegion> getItemValues(InventoryItem input) {
                 if (!(input instanceof PaperCard)) {
                     return new HashSet<>();
                 }
-                return ConquestRegion.getAllRegionsOfCard((PaperCard)input);
+                return ConquestRegion.getAllRegionsOfCard((PaperCard) input);
             }
         }),
         INVITEM_QUEST_WORLD("lblQuestWorld", InventoryItem.class, FilterOperator.MULTI_LIST_OPS, new CustomListEvaluator<InventoryItem, QuestWorld>(ImmutableList.copyOf(FModel.getWorlds())) {
@@ -391,12 +396,13 @@ public class AdvancedSearch {
             protected QuestWorld getItemValue(InventoryItem input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<QuestWorld> getItemValues(InventoryItem input) {
                 if (!(input instanceof PaperCard)) {
                     return new HashSet<>();
                 }
-                return QuestWorld.getAllQuestWorldsOfCard(((PaperCard)input));
+                return QuestWorld.getAllQuestWorldsOfCard(((PaperCard) input));
             }
         }),
         INVITEM_COLOR("lblColor", InventoryItem.class, FilterOperator.COMBINATION_OPS, new ColorEvaluator<InventoryItem>() {
@@ -404,12 +410,13 @@ public class AdvancedSearch {
             protected MagicColor.Color getItemValue(InventoryItem input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<MagicColor.Color> getItemValues(InventoryItem input) {
                 if (!(input instanceof PaperCard)) {
                     return new HashSet<>();
                 }
-                return ((PaperCard)input).getRules().getColor().toEnumSet();
+                return ((PaperCard) input).getRules().getColor().toEnumSet();
             }
         }),
         INVITEM_COLOR_IDENTITY("lblColorIdentity", InventoryItem.class, FilterOperator.COMBINATION_OPS, new ColorEvaluator<InventoryItem>() {
@@ -417,12 +424,13 @@ public class AdvancedSearch {
             protected MagicColor.Color getItemValue(InventoryItem input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<MagicColor.Color> getItemValues(InventoryItem input) {
                 if (!(input instanceof PaperCard)) {
                     return new HashSet<>();
                 }
-                return ((PaperCard)input).getRules().getColorIdentity().toEnumSet();
+                return ((PaperCard) input).getRules().getColorIdentity().toEnumSet();
             }
         }),
         INVITEM_COLOR_COUNT("lblColorCount", InventoryItem.class, FilterOperator.NUMBER_OPS, new NumericEvaluator<InventoryItem>(0, 5) {
@@ -431,7 +439,7 @@ public class AdvancedSearch {
                 if (!(input instanceof PaperCard)) {
                     return 0;
                 }
-                return ((PaperCard)input).getRules().getColor().countColors();
+                return ((PaperCard) input).getRules().getColor().countColors();
             }
         }),
         INVITEM_TYPE("lblType", InventoryItem.class, FilterOperator.COMBINATION_OPS, new CustomListEvaluator<InventoryItem, String>(CardType.getCombinedSuperAndCoreTypes()) {
@@ -439,12 +447,13 @@ public class AdvancedSearch {
             protected String getItemValue(InventoryItem input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<String> getItemValues(InventoryItem input) {
                 if (!(input instanceof PaperCard)) {
                     return new HashSet<>();
                 }
-                final CardType type = ((PaperCard)input).getRules().getType();
+                final CardType type = ((PaperCard) input).getRules().getType();
                 final Set<String> types = new HashSet<>();
                 for (Supertype t : type.getSupertypes()) {
                     types.add(t.name());
@@ -460,12 +469,13 @@ public class AdvancedSearch {
             protected String getItemValue(InventoryItem input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<String> getItemValues(InventoryItem input) {
                 if (!(input instanceof PaperCard)) {
                     return new HashSet<>();
                 }
-                return (Set<String>)((PaperCard)input).getRules().getType().getSubtypes();
+                return (Set<String>) ((PaperCard) input).getRules().getType().getSubtypes();
             }
         }),
         INVITEM_CMC("lblCMC", InventoryItem.class, FilterOperator.NUMBER_OPS, new NumericEvaluator<InventoryItem>(0, 20) {
@@ -474,7 +484,7 @@ public class AdvancedSearch {
                 if (!(input instanceof PaperCard)) {
                     return 0;
                 }
-                return ((PaperCard)input).getRules().getManaCost().getCMC();
+                return ((PaperCard) input).getRules().getManaCost().getCMC();
             }
         }),
         INVITEM_GENERIC_COST("lblGenericCost", InventoryItem.class, FilterOperator.NUMBER_OPS, new NumericEvaluator<InventoryItem>(0, 20) {
@@ -483,7 +493,7 @@ public class AdvancedSearch {
                 if (!(input instanceof PaperCard)) {
                     return 0;
                 }
-                return ((PaperCard)input).getRules().getManaCost().getGenericCost();
+                return ((PaperCard) input).getRules().getManaCost().getGenericCost();
             }
         }),
         INVITEM_POWER("lblPower", InventoryItem.class, FilterOperator.NUMBER_OPS, new NumericEvaluator<InventoryItem>(0, 20) {
@@ -492,7 +502,7 @@ public class AdvancedSearch {
                 if (!(input instanceof PaperCard)) {
                     return null;
                 }
-                CardRules rules = ((PaperCard)input).getRules();
+                CardRules rules = ((PaperCard) input).getRules();
                 if (rules.getType().isCreature()) {
                     return rules.getIntPower();
                 }
@@ -505,7 +515,7 @@ public class AdvancedSearch {
                 if (!(input instanceof PaperCard)) {
                     return null;
                 }
-                CardRules rules = ((PaperCard)input).getRules();
+                CardRules rules = ((PaperCard) input).getRules();
                 if (rules.getType().isCreature()) {
                     return rules.getIntToughness();
                 }
@@ -518,14 +528,16 @@ public class AdvancedSearch {
                 if (!(input instanceof PaperCard)) {
                     return "";
                 }
-                return ((PaperCard)input).getRules().getManaCost().toString();
+                return ((PaperCard) input).getRules().getManaCost().toString();
             }
         }),
         INVITEM_FIRST_PRINTING("lblFirstPrinting", InventoryItem.class, FilterOperator.BOOLEAN_OPS, new BooleanEvaluator<InventoryItem>() {
             @Override
             protected Boolean getItemValue(InventoryItem input) {
                 List<PaperCard> cards = FModel.getMagicDb().getCommonCards().getAllCards(input.getName());
-                if (cards.size() <= 1) { return true; }
+                if (cards.size() <= 1) {
+                    return true;
+                }
 
                 cards.sort(FModel.getMagicDb().getEditions().CARD_EDITION_COMPARATOR);
                 return cards.get(0) == input;
@@ -537,7 +549,7 @@ public class AdvancedSearch {
                 if (!(input instanceof PaperCard)) {
                     return CardRarity.Special;
                 }
-                return ((PaperCard)input).getRarity();
+                return ((PaperCard) input).getRarity();
             }
         }),
         INVITEM_BUY_PRICE("lblBuyPrice", InventoryItem.class, FilterOperator.NUMBER_OPS, new NumericEvaluator<InventoryItem>(0, 10000000) {
@@ -576,11 +588,12 @@ public class AdvancedSearch {
                 return input.isFavoriteDeck();
             }
         }),
-        DECK_FORMAT("lblFormat", DeckProxy.class, FilterOperator.MULTI_LIST_OPS, new CustomListEvaluator<DeckProxy, GameFormat>((List<GameFormat>)FModel.getFormats().getFilterList()) {
+        DECK_FORMAT("lblFormat", DeckProxy.class, FilterOperator.MULTI_LIST_OPS, new CustomListEvaluator<DeckProxy, GameFormat>((List<GameFormat>) FModel.getFormats().getFilterList()) {
             @Override
             protected GameFormat getItemValue(DeckProxy input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<GameFormat> getItemValues(DeckProxy input) {
                 return input.getExhaustiveFormats();
@@ -591,6 +604,7 @@ public class AdvancedSearch {
             protected QuestWorld getItemValue(DeckProxy input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<QuestWorld> getItemValues(DeckProxy input) {
                 return QuestWorld.getAllQuestWorldsOfDeck(input.getDeck());
@@ -601,6 +615,7 @@ public class AdvancedSearch {
             protected MagicColor.Color getItemValue(DeckProxy input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<MagicColor.Color> getItemValues(DeckProxy input) {
                 return input.getColor().toEnumSet();
@@ -611,6 +626,7 @@ public class AdvancedSearch {
             protected MagicColor.Color getItemValue(DeckProxy input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<MagicColor.Color> getItemValues(DeckProxy input) {
                 return input.getColorIdentity().toEnumSet();
@@ -673,6 +689,7 @@ public class AdvancedSearch {
             protected MagicColor.Color getItemValue(ConquestCommander input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<MagicColor.Color> getItemValues(ConquestCommander input) {
                 return input.getCard().getRules().getColorIdentity().toEnumSet();
@@ -825,6 +842,7 @@ public class AdvancedSearch {
                 }
                 return false;
             }
+
             @Override
             public boolean apply(Set<String> inputs, List<String> values) {
                 if (inputs != null && !inputs.isEmpty() && !values.isEmpty()) {
@@ -846,6 +864,7 @@ public class AdvancedSearch {
                 }
                 return false;
             }
+
             @Override
             public boolean apply(Set<String> inputs, List<String> values) {
                 if (inputs != null && !inputs.isEmpty() && !values.isEmpty()) {
@@ -867,6 +886,7 @@ public class AdvancedSearch {
                 }
                 return false;
             }
+
             @Override
             public boolean apply(Set<String> inputs, List<String> values) {
                 if (inputs != null && !inputs.isEmpty() && !values.isEmpty()) {
@@ -890,6 +910,7 @@ public class AdvancedSearch {
                 }
                 return false;
             }
+
             @Override
             public boolean apply(Set<Object> inputs, List<Object> values) {
                 if (inputs != null && inputs.size() == values.size()) {
@@ -915,6 +936,7 @@ public class AdvancedSearch {
                 }
                 return false;
             }
+
             @Override
             public boolean apply(Set<Object> inputs, List<Object> values) {
                 if (inputs != null) {
@@ -939,6 +961,7 @@ public class AdvancedSearch {
                 }
                 return false;
             }
+
             @Override
             public boolean apply(Set<Object> inputs, List<Object> values) {
                 if (inputs != null) {
@@ -959,6 +982,7 @@ public class AdvancedSearch {
                 }
                 return false;
             }
+
             @Override
             public boolean apply(Set<Object> inputs, List<Object> values) {
                 if (inputs != null) {
@@ -977,6 +1001,7 @@ public class AdvancedSearch {
             public boolean apply(Object input, List<Object> values) {
                 throw new RuntimeException("shouldn't be called with a single input");
             }
+
             @Override
             public boolean apply(Set<Object> inputs, List<Object> values) {
                 if (inputs != null) {
@@ -994,6 +1019,7 @@ public class AdvancedSearch {
             public boolean apply(Object input, List<Object> values) {
                 throw new RuntimeException("shouldn't be called with a single input");
             }
+
             @Override
             public boolean apply(Set<Object> inputs, List<Object> values) {
                 if (inputs != null) {
@@ -1030,32 +1056,32 @@ public class AdvancedSearch {
             }
         });
 
-        public static final FilterOperator[] BOOLEAN_OPS = new FilterOperator[] {
+        public static final FilterOperator[] BOOLEAN_OPS = new FilterOperator[]{
-            IS_TRUE, IS_FALSE
+                IS_TRUE, IS_FALSE
         };
-        public static final FilterOperator[] NUMBER_OPS = new FilterOperator[] {
+        public static final FilterOperator[] NUMBER_OPS = new FilterOperator[]{
-            EQUALS, NOT_EQUALS, GREATER_THAN, LESS_THAN, GT_OR_EQUAL, LT_OR_EQUAL, BETWEEN_INCLUSIVE, BETWEEN_EXCLUSIVE
+                EQUALS, NOT_EQUALS, GREATER_THAN, LESS_THAN, GT_OR_EQUAL, LT_OR_EQUAL, BETWEEN_INCLUSIVE, BETWEEN_EXCLUSIVE
         };
-        public static final FilterOperator[] STRING_OPS = new FilterOperator[] {
+        public static final FilterOperator[] STRING_OPS = new FilterOperator[]{
-            CONTAINS, STARTS_WITH, ENDS_WITH
+                CONTAINS, STARTS_WITH, ENDS_WITH
         };
-        public static final FilterOperator[] STRINGS_OPS = new FilterOperator[] {
+        public static final FilterOperator[] STRINGS_OPS = new FilterOperator[]{
-            CONTAINS, STARTS_WITH, ENDS_WITH
+                CONTAINS, STARTS_WITH, ENDS_WITH
         };
-        public static final FilterOperator[] SINGLE_LIST_OPS = new FilterOperator[] {
+        public static final FilterOperator[] SINGLE_LIST_OPS = new FilterOperator[]{
-            IS_ANY
+                IS_ANY
         };
-        public static final FilterOperator[] MULTI_LIST_OPS = new FilterOperator[] {
+        public static final FilterOperator[] MULTI_LIST_OPS = new FilterOperator[]{
-            IS_ANY
+                IS_ANY
         };
-        public static final FilterOperator[] COMBINATION_OPS = new FilterOperator[] {
+        public static final FilterOperator[] COMBINATION_OPS = new FilterOperator[]{
-            IS_EXACTLY, CONTAINS_ANY, CONTAINS_ALL
+                IS_EXACTLY, CONTAINS_ANY, CONTAINS_ALL
         };
-        public static final FilterOperator[] COLLECTION_OPS = new FilterOperator[] {
+        public static final FilterOperator[] COLLECTION_OPS = new FilterOperator[]{
-            CONTAIN_ANY, CONTAIN_ALL
+                CONTAIN_ANY, CONTAIN_ALL
         };
-        public static final FilterOperator[] DECK_CONTENT_OPS = new FilterOperator[] {
+        public static final FilterOperator[] DECK_CONTENT_OPS = new FilterOperator[]{
-            CONTAINS_CARD, CONTAINS_X_COPIES_OF_CARD
+                CONTAINS_CARD, CONTAINS_X_COPIES_OF_CARD
         };
 
         private final String caption, formatStr;
@@ -1104,8 +1130,8 @@ public class AdvancedSearch {
             final OperatorEvaluator<V> evaluator = (OperatorEvaluator<V>) operator.evaluator;
             Predicate<T> predicate = input -> evaluator.apply(getItemValue(input), values);
 
-            final FilterOperator[][] manyValueOperators = { FilterOperator.MULTI_LIST_OPS,
+            final FilterOperator[][] manyValueOperators = {FilterOperator.MULTI_LIST_OPS,
-                    FilterOperator.COMBINATION_OPS, FilterOperator.COLLECTION_OPS, FilterOperator.STRINGS_OPS };
+                    FilterOperator.COMBINATION_OPS, FilterOperator.COLLECTION_OPS, FilterOperator.STRINGS_OPS};
             for (FilterOperator[] oper : manyValueOperators) {
                 if (option.operatorOptions == oper) {
                     predicate = input -> evaluator.apply(getItemValues(input), values);
@@ -1125,8 +1151,7 @@ public class AdvancedSearch {
             final List<V> values;
             try {
                 values = getValuesFromString(initialValueText, option, operator);
-            }
+            } catch (Exception e) {
-            catch(Exception e) {
                 e.printStackTrace();
                 return null;
             }
@@ -1134,8 +1159,11 @@ public class AdvancedSearch {
         }
 
         protected abstract List<V> getValues(FilterOption option, FilterOperator operator);
+
         protected abstract List<V> getValuesFromString(String valueText, FilterOption option, FilterOperator operator);
+
         protected abstract String getCaption(List<V> values, FilterOption option, FilterOperator operator);
+
         protected abstract V getItemValue(T input);
 
         protected Set<V> getItemValues(T input) { //available for options that have multiple inputs
@@ -1178,12 +1206,13 @@ public class AdvancedSearch {
             String message;
             if (operator.valueCount == FilterValueCount.ONE) {
                 message = option.name + " " + operator.caption + " ?";
-            }
+            } else {
-            else {
                 message = "? " + operator.caption.replace("|", " " + option.name + " ");
             }
             Integer lowerBound = SGuiChoose.getInteger(message, min, max);
-            if (lowerBound == null) { return null; }
+            if (lowerBound == null) {
+                return null;
+            }
 
             final List<Integer> values = new ArrayList<>();
             values.add(lowerBound);
@@ -1195,7 +1224,9 @@ public class AdvancedSearch {
                     upperBoundMin += 2; //if exclusive, ensure it's possible to have numbers in between
                 }
                 Integer upperBound = SGuiChoose.getInteger(message, upperBoundMin, max);
-                if (upperBound == null) { return null; }
+                if (upperBound == null) {
+                    return null;
+                }
 
                 values.add(upperBound);
             }
@@ -1226,7 +1257,9 @@ public class AdvancedSearch {
         protected List<String> getValues(FilterOption option, FilterOperator operator) {
             String message = option.name + " " + operator.caption + " ?";
             String value = SOptionPane.showInputDialog("", message, null, initialInput);
-            if (value == null) { return null; }
+            if (value == null) {
+                return null;
+            }
 
             initialInput = value; //store value as initial input for next time
 
@@ -1253,9 +1286,11 @@ public class AdvancedSearch {
         public CustomListEvaluator(Collection<V> choices0) {
             this(choices0, null, null);
         }
+
         public CustomListEvaluator(Collection<V> choices0, Function<V, String> toShortString0) {
             this(choices0, toShortString0, null);
         }
+
         public CustomListEvaluator(Collection<V> choices0, Function<V, String> toShortString0, Function<V, String> toLongString0) {
             choices = choices0;
             toShortString = toShortString0;
@@ -1276,9 +1311,9 @@ public class AdvancedSearch {
         }
 
         private boolean eitherStringMatches(V choice, String name) {
-            if(toLongString != null && name.equals(toLongString.apply(choice)))
+            if (toLongString != null && name.equals(toLongString.apply(choice)))
                 return true;
-            if(toShortString != null)
+            if (toShortString != null)
                 return name.equals(toShortString.apply(choice));
             return name.equals(choice.toString());
         }
@@ -1287,16 +1322,16 @@ public class AdvancedSearch {
         protected String getCaption(List<V> values, FilterOption option, FilterOperator operator) {
             String valuesStr;
             switch (operator.valueCount) {
-            case MANY:
+                case MANY:
-                valuesStr = formatValues(values, " ", " ");
+                    valuesStr = formatValues(values, " ", " ");
-                break;
+                    break;
-            case MANY_OR:
+                case MANY_OR:
-                valuesStr = formatValues(values, ", ", " or ");
+                    valuesStr = formatValues(values, ", ", " or ");
-                break;
+                    break;
-            case MANY_AND:
+                case MANY_AND:
-            default:
+                default:
-                valuesStr = formatValues(values, ", ", " and ");
+                    valuesStr = formatValues(values, ", ", " and ");
-                break;
+                    break;
             }
             return String.format(operator.formatStr, option.name, valuesStr);
         }
@@ -1304,18 +1339,18 @@ public class AdvancedSearch {
         protected String formatValues(List<V> values, String delim, String finalDelim) {
             int valueCount = values.size();
             switch (valueCount) {
-            case 1:
+                case 1:
-                return formatValue(values.get(0));
+                    return formatValue(values.get(0));
-            case 2:
+                case 2:
-                return formatValue(values.get(0)) + finalDelim + formatValue(values.get(1));
+                    return formatValue(values.get(0)) + finalDelim + formatValue(values.get(1));
-            default:
+                default:
-                int lastValueIdx = valueCount - 1;
+                    int lastValueIdx = valueCount - 1;
-                StringBuilder result = new StringBuilder(formatValue(values.get(0)));
+                    StringBuilder result = new StringBuilder(formatValue(values.get(0)));
-                for (int i = 1; i < lastValueIdx; i++) {
+                    for (int i = 1; i < lastValueIdx; i++) {
-                    result.append(delim).append(formatValue(values.get(i)));
+                        result.append(delim).append(formatValue(values.get(i)));
-                }
+                    }
-                result.append(delim.trim()).append(finalDelim).append(formatValue(values.get(lastValueIdx)));
+                    result.append(delim.trim()).append(finalDelim).append(formatValue(values.get(lastValueIdx)));
-                return result.toString();
+                    return result.toString();
             }
         }
 
@@ -1350,12 +1385,16 @@ public class AdvancedSearch {
         protected List<Map<String, Integer>> getValues(FilterOption option, FilterOperator operator) {
             String message = option.name + " " + operator.caption + " ?";
             PaperCard card = SGuiChoose.oneOrNone(message, FModel.getMagicDb().getCommonCards().getUniqueCards());
-            if (card == null) { return null; }
+            if (card == null) {
+                return null;
+            }
 
             Integer amount = -1;
             if (operator == FilterOperator.CONTAINS_X_COPIES_OF_CARD) { //prompt for quantity if needed
                 amount = SGuiChoose.getInteger(Localizer.getInstance().getMessage("lblHowManyCopiesOfN", CardTranslation.getTranslatedName(card.getName())), 0, 4);
-                if (amount == null) { return null; }
+                if (amount == null) {
+                    return null;
+                }
             }
 
             Map<String, Integer> map = new HashMap<>();
@@ -1370,13 +1409,12 @@ public class AdvancedSearch {
         protected List<Map<String, Integer>> getValuesFromString(String valueText, FilterOption option, FilterOperator operator) {
             int amount = -1;
             String cardName;
-            if(operator == FilterOperator.CONTAINS_X_COPIES_OF_CARD) {
+            if (operator == FilterOperator.CONTAINS_X_COPIES_OF_CARD) {
                 //Take the format "2 Mountain"
                 String[] split = valueText.split(" ", 2);
                 amount = Integer.parseInt(split[0]);
                 cardName = split[1];
-            }
+            } else
-            else
                 cardName = valueText;
             Map<String, Integer> map = new HashMap<>();
             map.put(cardName, amount);
@@ -1412,25 +1450,29 @@ public class AdvancedSearch {
                 }
             }
             option = SGuiChoose.oneOrNone(Localizer.getInstance().getMessage("lblSelectAFilterType"), options, defaultOption, null);
-            if (option == null) { return editFilter; }
+            if (option == null) {
-        }
+                return editFilter;
-        else {
+            }
+        } else {
             option = defaultOption;
         }
 
-        if (option == FilterOption.NONE) { return null; } //allow user to clear filter by selecting "(none)"
+        if (option == FilterOption.NONE) {
+            return null;
+        } //allow user to clear filter by selecting "(none)"
 
         final FilterOperator operator;
         if (option.operatorOptions.length > 1) {
             final FilterOperator defaultOperator = option == defaultOption ? editFilter.operator : null;
             operator = SGuiChoose.oneOrNone(Localizer.getInstance().getMessage("lblSelectOperatorFor", option.name), option.operatorOptions, defaultOperator, null);
-            if (operator == null) { return editFilter; }
+            if (operator == null) {
-        }
+                return editFilter;
-        else {
+            }
+        } else {
             operator = option.operatorOptions[0];
         }
 
-        Filter<T> filter = (Filter<T>)option.evaluator.createFilter(option, operator);
+        Filter<T> filter = (Filter<T>) option.evaluator.createFilter(option, operator);
         if (filter == null) {
             filter = editFilter;
         }
@@ -1440,8 +1482,7 @@ public class AdvancedSearch {
     @SuppressWarnings("unchecked")
     public static <T extends InventoryItem> Filter<T> getFilter(Class<? super T> type, String filterText) {
         String[] words = filterText.split(" ", 3);
-        if(words.length < 2)
+        if (words.length < 2) {
-        {
             System.out.printf("Unable to generate filter from expression '%s'%n", filterText);
             return null;
         }
@@ -1454,8 +1495,7 @@ public class AdvancedSearch {
             System.out.printf("Unable to generate filter from FilterOption '%s'%n", words[0]);
             return null;
         }
-        if(option.type != type)
+        if (option.type != type) {
-        {
             System.out.printf("Unable to generate filter from FilterOption '%s' - filter type '%s' != option type '%s' %n", words[0], type, option.type);
             return null;
         }
@@ -1515,14 +1555,23 @@ public class AdvancedSearch {
 
     public interface IFilterControl<T extends InventoryItem> {
         IButton getBtnNotBeforeParen();
+
         IButton getBtnOpenParen();
+
         IButton getBtnNotAfterParen();
+
         IButton getBtnFilter();
+
         IButton getBtnCloseParen();
+
         IButton getBtnAnd();
+
         IButton getBtnOr();
+
         Filter<T> getFilter();
+
         void setFilter(Filter<T> filter0);
+
         Class<? super T> getGenericType();
     }
 
@@ -1554,23 +1603,18 @@ public class AdvancedSearch {
                 Object piece = iterator.get();
                 if (piece.equals(Operator.OPEN_PAREN)) {
                     predPiece = getPredicatePiece(iterator.next());
-                }
+                } else if (piece.equals(Operator.CLOSE_PAREN)) {
-                else if (piece.equals(Operator.CLOSE_PAREN)) {
                     return pred;
-                }
+                } else if (piece.equals(Operator.AND)) {
-                else if (piece.equals(Operator.AND)) {
                     operator = Operator.AND;
                     continue;
-                }
+                } else if (piece.equals(Operator.OR)) {
-                else if (piece.equals(Operator.OR)) {
                     operator = Operator.OR;
                     continue;
-                }
+                } else if (piece.equals(Operator.NOT)) {
-                else if (piece.equals(Operator.NOT)) {
                     applyNot = !applyNot;
                     continue;
-                }
+                } else {
-                else {
                     predPiece = ((AdvancedSearch.Filter<T>) piece).getPredicate();
                 }
                 if (applyNot) {
@@ -1579,11 +1623,9 @@ public class AdvancedSearch {
                 }
                 if (pred == null) {
                     pred = predPiece;
-                }
+                } else if (operator == Operator.AND) {
-                else if (operator == Operator.AND) {
                     pred = pred.and(predPiece);
-                }
+                } else if (operator == Operator.OR) {
-                else if (operator == Operator.OR) {
                     pred = pred.or(predPiece);
                 }
                 operator = null;
@@ -1626,16 +1668,7 @@ public class AdvancedSearch {
                         control.setFilter(filter);
                         if (filter != null) {
                             control.getBtnFilter().setText(GuiBase.getInterface().encodeSymbols(filter.toString(), false));
-
+                        } else {
-                            if (filter.getOption() == FilterOption.CARD_KEYWORDS) {
-                                //the first time the user selects keywords, preload keywords for all cards
-                                Runnable preloadTask = Keyword.getPreloadTask();
-                                if (preloadTask != null) {
-                                    GuiBase.getInterface().runBackgroundTask(Localizer.getInstance().getMessage("lblLoadingKeywords"), preloadTask);
-                                }
-                            }
-                        }
-                        else {
                             control.getBtnFilter().setText(EMPTY_FILTER_TEXT);
                         }
                         if (onChange != null) {
@@ -1657,32 +1690,31 @@ public class AdvancedSearch {
 
         @SuppressWarnings("unchecked")
         public void updateLabel() {
-            if (label == null) { return; }
+            if (label == null) {
+                return;
+            }
 
             StringBuilder builder = new StringBuilder();
             builder.append("Filter: ");
             if (expression.isEmpty()) {
                 builder.append("(none)");
-            }
+            } else {
-            else {
                 int prevFilterEndIdx = -1;
                 AdvancedSearch.Filter<T> filter, prevFilter = null;
                 for (Object piece : expression) {
                     if (piece instanceof AdvancedSearch.Filter) {
-                        filter = (AdvancedSearch.Filter<T>)piece;
+                        filter = (AdvancedSearch.Filter<T>) piece;
                         if (filter.canMergeCaptionWith(prevFilter)) {
                             //convert boolean operators between filters to lowercase
                             builder.replace(prevFilterEndIdx, builder.length(), builder.substring(prevFilterEndIdx).toLowerCase());
                             //append only values for filter
                             builder.append(filter.extractValuesFromCaption());
-                        }
+                        } else {
-                        else {
                             builder.append(filter);
                         }
                         prevFilter = filter;
                         prevFilterEndIdx = builder.length();
-                    }
+                    } else {
-                    else {
                         if (piece.equals(Operator.OPEN_PAREN) || piece.equals(Operator.CLOSE_PAREN)) {
                             prevFilter = null; //prevent merging filters with parentheses in between
                         }
@@ -1695,7 +1727,9 @@ public class AdvancedSearch {
         }
 
         public String getTooltip() {
-            if (expression.isEmpty()) { return ""; }
+            if (expression.isEmpty()) {
+                return "";
+            }
 
             StringBuilder builder = new StringBuilder();
             builder.append("Filter:\n");
@@ -1718,7 +1752,9 @@ public class AdvancedSearch {
             expression.clear();
 
             for (IFilterControl<T> control : controls) {
-                if (control.getFilter() == null) { continue; } //skip any blank filters
+                if (control.getFilter() == null) {
+                    continue;
+                } //skip any blank filters
 
                 if (control.getBtnNotBeforeParen().isSelected()) {
                     expression.add(Operator.NOT);
@@ -1737,8 +1773,7 @@ public class AdvancedSearch {
                 }
                 if (control.getBtnAnd().isSelected()) {
                     expression.add(Operator.AND);
-                }
+                } else if (control.getBtnOr().isSelected()) {
-                else if (control.getBtnOr().isSelected()) {
                     expression.add(Operator.OR);
                 }
             }
@@ -1748,13 +1783,16 @@ public class AdvancedSearch {
 
         private class ExpressionIterator {
             private int index;
+
             private boolean hasNext() {
                 return index < expression.size();
             }
+
             private ExpressionIterator next() {
                 index++;
                 return this;
             }
+
             private Object get() {
                 return expression.get(index);
             }

forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java

@@ -217,7 +217,8 @@ public class SFilterUtil {
             }
             entry.append(ch);
         }
-       if (entry.length() != 0) { // Android API isEmpty() is unavailable. https://developer.android.com/reference/java/lang/StringBuilder
+        // Android API StringBuilder isEmpty() is unavailable. https://developer.android.com/reference/java/lang/StringBuilder
+       if (entry.length() != 0) {
             splitText.add(entry.toString());
         }
         return splitText;

forge-gui/tools/RankingScraper.py

@@ -3,7 +3,7 @@ import json
 import requests
 
 
-def draftsimRankings(edition='FIN', extra=None):
+def draftsimRankings(edition='SPM', extra=None):
 	edition = edition.upper()
 	url1 = 'https://draftsim.com/generated/%s/' % (edition)
 	url2 = '%s' % edition