Merge pull request Card-Forge#9089 from KarlMHanson/restricted-rewards

Adventure mode filtering

Author: Jetz72

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

@@ -20,6 +20,7 @@
 import forge.adventure.data.EnemyData;
 import forge.adventure.data.RewardData;
 import forge.adventure.player.AdventurePlayer;
+import forge.adventure.util.Config;
 import forge.adventure.util.Current;
 import forge.adventure.util.MapDialog;
 import forge.adventure.util.Reward;
@@ -503,7 +504,8 @@ public Array<Reward> getRewards() {
         if(data.rewards != null) { //Collect standard rewards.
             Deck enemyDeck = Current.latestDeck();
             // By popular demand, remove basic lands from the reward pool.
-            CardPool deckNoBasicLands = enemyDeck.getMain().getFilteredPool(PaperCardPredicates.fromRules(CardRulesPredicates.NOT_BASIC_LAND));
+            CardPool deckNoRestrictedEditions = enemyDeck.getMain().getFilteredPool(PaperCardPredicates.onlyPrintedInEditions(Config.instance().getConfigData().restrictedEditions).negate());
+            CardPool deckNoBasicLands = deckNoRestrictedEditions.getFilteredPool(PaperCardPredicates.fromRules(CardRulesPredicates.NOT_BASIC_LAND));
 
             for (RewardData rdata : data.rewards) {
                 rewards.addAll(rdata.generate(false,  enemyDeck == null ? null : deckNoBasicLands.toFlatList(),true ));

forge-gui-mobile/src/forge/adventure/data/RewardData.java

@@ -103,6 +103,10 @@ static private void initializeAllCards(){
         if(legals != null)
             allCards = IterableUtil.filter(allCards, new CardUtil.CardPredicate(legals, true));
 
+        if (Config.instance().getSettingData().excludeAlchemyVariants) {
+            allCards = IterableUtil.filter(allCards, PaperCardPredicates.IS_REBALANCED.negate());
+        }
+        
         // Filter out by editions and obtainability
         if (configData.allowedEditions != null && configData.allowedEditions.length > 0) {
             allCards = IterableUtil.filter(allCards, PaperCardPredicates.printedInAnyEditions(configData.allowedEditions));

forge-gui-mobile/src/forge/adventure/data/SettingData.java

@@ -23,5 +23,6 @@ public class SettingData {
     public boolean disableNotForSale;
     public boolean showShopOverlay;
     public boolean useAllCardVariants;
+    public boolean excludeAlchemyVariants;
     public boolean generateLDADecks;
 }

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

@@ -239,6 +239,13 @@ public void changed(ChangeEvent event, Actor actor) {
                 Config.instance().saveSettings();
             }
         });
+        addSettingField(Forge.getLocalizer().getMessage("lblExcludeAlchemyVariants"), Config.instance().getSettingData().excludeAlchemyVariants, new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                Config.instance().getSettingData().excludeAlchemyVariants = ((CheckBox) actor).isChecked();
+                Config.instance().saveSettings();
+            }
+        });
         addSettingField(Forge.getLocalizer().getMessage("lblGenerateLDADecks"), Config.instance().getSettingData().generateLDADecks, new ChangeListener() {
             @Override
             public void changed(ChangeEvent event, Actor actor) {

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

@@ -19,6 +19,7 @@
 import forge.game.GameFormat;
 import forge.item.BoosterPack;
 import forge.item.PaperCard;
+import forge.item.PaperCardPredicates;
 import forge.item.SealedTemplate;
 import forge.item.generation.UnOpenedProduct;
 import forge.model.FModel;
@@ -771,11 +772,16 @@ private static PaperCard getReplacement(String missingCard, String replacementCa
     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.
-        if (Config.instance().getSettingData().useAllCardVariants)
-            validCards = FModel.getMagicDb().getCommonCards().getAllCards(cardName);
-        else
+        if (Config.instance().getSettingData().useAllCardVariants) {
+            Predicate<PaperCard> not_restricted = card -> (!Arrays.asList(Config.instance().getConfigData().restrictedEditions).contains(card.getEdition()));
+            Predicate<PaperCard> combined_predicate = not_restricted;
+            if (Config.instance().getSettingData().excludeAlchemyVariants) {
+                combined_predicate = not_restricted.and(PaperCardPredicates.IS_REBALANCED.negate());
+            }
+            validCards = FModel.getMagicDb().getCommonCards().getAllCards(cardName, combined_predicate);
+        } else {
             validCards = FModel.getMagicDb().getCommonCards().getUniqueCardsNoAlt(cardName);
-
+        }
         if (validCards.isEmpty()) {
             return getReplacement(cardName, "Wastes");
         }

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

@@ -3093,6 +3093,7 @@ lblDisableWinLose=Deaktivieren Sie Winslose Overlay
 lblDisableNotForSaleOverlay=Disable Not For Sale Overlay
 lblShowShopOverlay=Shop -Artikelname anzeigen
 lblUseAllCardVariants=Use Card Variants from All Sets (Restart Required)
+lblExcludeAlchemyVariants=Exclude variants rebalanced for Arena's Alchemy and Historic formats
 lblGenerateLDADecks=Generate Archetype Decks instead of Genetic AI Decks
 lblExitToWoldMap=Zurück zur Weltkarte?
 lblStartArena=Willst du in die Arena gehen?

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

@@ -3171,6 +3171,7 @@ lblDisableWinLose=Disable WinLose Overlay
 lblDisableNotForSaleOverlay=Disable Not For Sale Overlay
 lblShowShopOverlay=Display Shop Item names
 lblUseAllCardVariants=Use Card Variants from All Sets (Restart Required)
+lblExcludeAlchemyVariants=Exclude variants rebalanced for Arena's Alchemy and Historic formats
 lblGenerateLDADecks=Generate Archetype Decks instead of Genetic AI Decks
 lblExitToWoldMap=Exit to the World Map?
 lblStartArena=Do you want to go into the Arena?

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

@@ -3081,6 +3081,7 @@ lblDisableWinLose=Desactivar WinLose Overlay
 lblDisableNotForSaleOverlay=Disable Not For Sale Overlay
 lblShowShopOverlay=Nombre del artículo de la tienda de exhibición
 lblUseAllCardVariants=Use Card Variants from All Sets (Restart Required)
+lblExcludeAlchemyVariants=Exclude variants rebalanced for Arena's Alchemy and Historic formats
 lblGenerateLDADecks=Generate Archetype Decks instead of Genetic AI Decks
 lblExitToWoldMap=Salir al mapa del mundo?
 lblStartArena=¿Quieres ir a la arena?

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

@@ -3075,6 +3075,7 @@ lblDisableWinLose=Désactiver la superposition Winlose
 lblDisableNotForSaleOverlay=Disable Not For Sale Overlay
 lblShowShopOverlay=Nom de l'article de la boutique d'affichage
 lblUseAllCardVariants=Use Card Variants from All Sets (Restart Required)
+lblExcludeAlchemyVariants=Exclude variants rebalanced for Arena's Alchemy and Historic formats
 lblGenerateLDADecks=Generate Archetype Decks instead of Genetic AI Decks
 lblExitToWoldMap=Sortir sur la carte du monde?
 lblStartArena=Voulez-vous entrer dans l'arène?

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

@@ -3073,6 +3073,7 @@ lblDisableWinLose=Disabilita overlay winlose
 lblDisableNotForSaleOverlay=Disable Not For Sale Overlay
 lblShowShopOverlay=Visualizza il nome dell'articolo del negozio
 lblUseAllCardVariants=Use Card Variants from All Sets (Restart Required)
+lblExcludeAlchemyVariants=Exclude variants rebalanced for Arena's Alchemy and Historic formats
 lblGenerateLDADecks=Generate Archetype Decks instead of Genetic AI Decks
 lblExitToWoldMap=Esci alla mappa del mondo?
 lblStartArena=Vuoi andare nell'arena?