From cedb4b2befffd847ed1e6e5bc9f211c1b047a714 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Sat, 4 Nov 2023 22:46:53 +0800 Subject: [PATCH] update AdventureEventData pickWeightedCardBlock --- .../adventure/data/AdventureEventData.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/forge-gui-mobile/src/forge/adventure/data/AdventureEventData.java b/forge-gui-mobile/src/forge/adventure/data/AdventureEventData.java index 714dab1dab3..69ae998eff7 100644 --- a/forge-gui-mobile/src/forge/adventure/data/AdventureEventData.java +++ b/forge-gui-mobile/src/forge/adventure/data/AdventureEventData.java @@ -13,6 +13,7 @@ import forge.adventure.util.Config; import forge.adventure.util.Current; import forge.adventure.util.Reward; import forge.card.CardEdition; +import forge.card.PrintSheet; import forge.deck.Deck; import forge.game.GameType; import forge.gamemodes.limited.BoosterDraft; @@ -351,9 +352,26 @@ public class AdventureEventData implements Serializable { } isOkay = boosterSize == 15; } + for (PrintSheet ps : c.getPrintSheetsBySection()) { + //exclude block with sets containing P9 cards.. + if (ps.containsCardNamed("Black Lotus", 1) + || ps.containsCardNamed("Black Lotus", 1) + || ps.containsCardNamed("Mox Emerald", 1) + || ps.containsCardNamed("Mox Pearl", 1) + || ps.containsCardNamed("Mox Ruby", 1) + || ps.containsCardNamed("Mox Sapphire", 1) + || ps.containsCardNamed("Mox Jet", 1) + || ps.containsCardNamed("Ancestral Recall", 1) + || ps.containsCardNamed("Timetwister", 1) + || ps.containsCardNamed("Time Walk", 1)) { + isOkay = false; + break; + } + } } - if (isOkay) + if (isOkay) { legalBlocks.add(b); + } } for (String restricted : Config.instance().getConfigData().restrictedEditions) {