diff --git a/forge-gui-mobile/src/forge/adventure/data/RewardData.java b/forge-gui-mobile/src/forge/adventure/data/RewardData.java index 1184270922d..350d20095c8 100644 --- a/forge-gui-mobile/src/forge/adventure/data/RewardData.java +++ b/forge-gui-mobile/src/forge/adventure/data/RewardData.java @@ -230,15 +230,20 @@ public class RewardData implements Serializable { .filter(CardEdition::hasBoosterTemplate) .forEach(allEditions::add); ConfigData configData = Config.instance().getConfigData(); + for (String restricted : configData.restrictedEditions) { - allEditions.removeIf(q -> q.getName().equals(restricted)); + allEditions.removeIf(q -> q.getCode().equals(restricted)); + } + for(String restrictedCard: configData.restrictedCards) + { + allEditions.removeIf( + cardEdition -> cardEdition.getAllCardsInSet().stream().anyMatch( + o -> o.name.equals(restrictedCard)) + ); } - System.out.println(allEditions); for(int i=0;i cards = BoosterPack.fromColor(color).getCards(); Deck output = new Deck(); output.getMain().add(cards); diff --git a/forge-gui/res/adventure/common/maps/tileset/buildings1.png b/forge-gui/res/adventure/common/maps/tileset/buildings1.png deleted file mode 100644 index d89c47f85d6..00000000000 Binary files a/forge-gui/res/adventure/common/maps/tileset/buildings1.png and /dev/null differ diff --git a/forge-gui/res/adventure/common/maps/tileset/buildings2.png b/forge-gui/res/adventure/common/maps/tileset/buildings2.png deleted file mode 100644 index 9931a1c14f9..00000000000 Binary files a/forge-gui/res/adventure/common/maps/tileset/buildings2.png and /dev/null differ