From 84dba5917c7e6e6d72c60347549e31de7087add6 Mon Sep 17 00:00:00 2001 From: Agetian Date: Thu, 19 Mar 2026 10:19:24 +0300 Subject: [PATCH 1/2] - Allow nonbasic lands like Towns in Planar Conquest common filter. --- .../screens/planarconquest/ConquestAEtherScreen.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java index ce1cf2227cd..7bc7e1bec76 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java @@ -120,6 +120,11 @@ private void updateFilteredPool() { if (selectedRarity == card.getRarity()) { strictPool.add(card); } + } else if (card.getRarity() == CardRarity.BasicLand + && !card.isVeryBasicLand() + && selectedRarity == CardRarity.Common + && card.getRules().getColorIdentity().hasNoColorsExcept(commander.getCard().getRules().getColorIdentity())) { + filteredPool.add(card); } } updateShardCost(); @@ -153,7 +158,8 @@ private void pullFromTheAEther() { while (true) { final CardRarity allowedRarity = rarity; rewardPool = IterableUtil.filter(filteredPool, card -> allowedRarity == card.getRarity() - || allowedRarity == CardRarity.Rare && card.getRarity() == CardRarity.Special); + || allowedRarity == CardRarity.Rare && card.getRarity() == CardRarity.Special + || allowedRarity == CardRarity.Common && card.getRarity() == CardRarity.BasicLand); // allow L rarity for Common (except very basic lands) if (Iterables.isEmpty(rewardPool)) { //if pool is empty, must reduce rarity and try again if (rarity == minRarity) { return; From a84c1570c9d6f9370275eebc9ad7faad9aaead7b Mon Sep 17 00:00:00 2001 From: Agetian Date: Thu, 19 Mar 2026 10:23:34 +0300 Subject: [PATCH 2/2] - Account for the CMC in the customized filter. --- .../src/forge/screens/planarconquest/ConquestAEtherScreen.java | 1 + 1 file changed, 1 insertion(+) diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java index 7bc7e1bec76..1894264b617 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java @@ -123,6 +123,7 @@ private void updateFilteredPool() { } else if (card.getRarity() == CardRarity.BasicLand && !card.isVeryBasicLand() && selectedRarity == CardRarity.Common + && btnCMCFilter.selectedOption == ConquestUtil.CMCFilter.CMC_LOW && card.getRules().getColorIdentity().hasNoColorsExcept(commander.getCard().getRules().getColorIdentity())) { filteredPool.add(card); }