diff --git a/forge-core/src/main/java/forge/deck/DeckFormat.java b/forge-core/src/main/java/forge/deck/DeckFormat.java index 0d26abb8..28f19f84 100644 --- a/forge-core/src/main/java/forge/deck/DeckFormat.java +++ b/forge-core/src/main/java/forge/deck/DeckFormat.java @@ -46,7 +46,27 @@ public enum DeckFormat { Constructed ( Range.between(60, Integer.MAX_VALUE), Range.between(0, 15), 4), QuestDeck ( Range.between(40, Integer.MAX_VALUE), Range.between(0, 15), 4), Limited ( Range.between(40, Integer.MAX_VALUE), null, Integer.MAX_VALUE), - Commander ( Range.is(99), Range.between(0, 10), 1), + Commander ( Range.is(99), Range.between(0, 10), 1, new Predicate() { + private final Set bannedCards = new HashSet(Arrays.asList( + "Adriana's Valor", "Advantageous Proclamation", "Amulet of Quoz", "Ancestral Recall", "Assemble the Rank and Vile", + "Backup Plan", "Balance", "Biorhythm", "Black Lotus", "Brago's Favor", "Braids, Cabal Minion", "Bronze Tablet", + "Channel", "Chaos Orb", "Coalition Victory", "Contract from Below", "Darkpact", "Demonic Attorney", "Double Stroke", + "Echoing Boon", "Emissary's Ploy", "Emrakul, the Aeons Torn", "Erayo, Soratami Ascendant", "Falling Star", + "Fastbond", "Gifts Ungiven", "Griselbrand", "Hired Heist", "Hold the Perimeter", "Hymn of the Wilds", "Immediate Action", + "Incendiary Dissent", "Iterative Analysis", "Jeweled Bird", "Karakas", "Leovold, Emissary of Trest", "Library of Alexandria", + "Limited Resources", "Mox Emerald", "Mox Jet", "Mox Pearl", "Mox Ruby", "Mox Sapphire", "Muzzio's Preparations", + "Natural Unity", "Painter's Servant", "Panoptic Mirror", "Power Play", "Primeval Titan", "Prophet of Kruphix", + "Rebirth", "Recurring Nightmare", "Rofellos, Llanowar Emissary", "Secret Summoning", "Secrets of Paradise", + "Sentinel Dispatch", "Shahrazad", "Sovereign's Realm", "Summoner's Bond", "Sundering Titan", "Sway of the Stars", + "Sylvan Primordial", "Tempest Efreet", "Time Vault", "Time Walk", "Timmerian Fiends", "Tinker", "Tolarian Academy", + "Trade Secrets", "Unexpected Potential", "Upheaval", "Weight Advantage", "Worldfire", "Worldknit", "Yawgmoth's Bargain")); + @Override + public boolean apply(CardRules rules) { + if (bannedCards.contains(rules.getName())) { + return false;} + return true; + } + }), TinyLeaders ( Range.is(49), Range.between(0, 10), 1, new Predicate() { private final Set bannedCards = new HashSet(Arrays.asList( "Ancestral Recall", "Balance", "Black Lotus", "Black Vise", "Channel", "Chaos Orb", "Contract From Below", "Counterbalance", "Darkpact", "Demonic Attorney", "Demonic Tutor", "Earthcraft", "Edric, Spymaster of Trest", "Falling Star", diff --git a/forge-gui/res/blockdata/formats.txt b/forge-gui/res/blockdata/formats.txt index 0e59ac94..ed70b13a 100644 --- a/forge-gui/res/blockdata/formats.txt +++ b/forge-gui/res/blockdata/formats.txt @@ -2,9 +2,10 @@ Sets:KLD, AER, AKH, W17, HOU, XLN Banned: Emrakul, the Promised End; Smuggler's Copter; Reflector Mage; Aetherworks Marvel; Felidar Guardian -[Extended] -Sets:SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC, DGM, M14, THS, BNG, JOU, M15 -Banned:Ponder; Mental Misstep +\\RIP Extended July 1997 - August 2013 +\\[Extended] +\\Sets:SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC, DGM, M14, THS, BNG, JOU, M15 +\\Banned:Ponder; Mental Misstep [Modern] Sets:8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, EVE, SHM, MOR, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC, DGM, M14, THS, BNG, JOU, M15, KTK, FRF, DTK, MM2, ORI, BFZ, OGW, SOI, EMN, KLD, AER, AKH, W17, HOU, XLN @@ -16,3 +17,6 @@ Banned:Advantageous Proclamation; Amulet of Quoz; Ancestral Recall; Backup Plan; [Vintage] Banned:Advantageous Proclamation; Amulet of Quoz; Backup Plan; Brago's Favor; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Double Stroke; Falling Star; Immediate Action; Iterative Analysis; Jeweled Bird; Muzzio's Preparations; Power Play; Rebirth; Secret Summoning; Secrets of Paradise; Sentinel Dispatch; Shahrazad; Tempest Efreet; Timmerian Fiends; Unexpected Potential; Worldknit Restricted:Ancestral Recall; Balance; Black Lotus; Brainstorm; Channel; Chalice of the Void; Demonic Consultation; Demonic Tutor; Dig Through Time; Fastbond; Flash; Gitaxian Probe; Gush; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lodestone Golem; Lotus Petal; Mana Crypt; Mana Vault; Memory Jar; Merchant Scroll; Mind's Desire; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Ponder; Sol Ring; Strip Mine; Time Vault; Time Walk; Timetwister; Tinker; Tolarian Academy; Treasure Cruise; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will + +[Commander] +Banned:Adriana's Valor; Advantageous Proclamation; Amulet of Quoz; Ancestral Recall; Assemble the Rank and Vile; Backup Plan; Balance; Biorhythm; Black Lotus; Brago's Favor; Braids, Cabal Minion; Bronze Tablet; Channel; Chaos Orb; Coalition Victory; Contract from Below; Darkpact; Demonic Attorney; Double Stroke; Echoing Boon; Emissary's Ploy; Emrakul, the Aeons Torn; Erayo, Soratami Ascendant; Falling Star; Fastbond; Gifts Ungiven; Griselbrand; Hired Heist; Hold the Perimeter; Hymn of the Wilds; Immediate Action; Incendiary Dissent; Iterative Analysis; Jeweled Bird; Karakas; Leovold, Emissary of Trest; Library of Alexandria; Limited Resources; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Muzzio's Preparations; Natural Unity; Painter's Servant; Panoptic Mirror; Power Play; Primeval Titan; Prophet of Kruphix; Rebirth; Recurring Nightmare; Rofellos, Llanowar Emissary; Secret Summoning; Secrets of Paradise; Sentinel Dispatch; Shahrazad; Sovereign's Realm; Summoner's Bond; Sundering Titan; Sway of the Stars; Sylvan Primordial; Tempest Efreet; Time Vault; Time Walk; Timmerian Fiends; Tinker; Tolarian Academy; Trade Secrets; Unexpected Potential; Upheaval; Weight Advantage; Worldfire; Worldknit; Yawgmoth's Bargain \ No newline at end of file