From 2982c5ed210bb807abc0c14bc25b6fff4a67e92d Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Fri, 26 Apr 2013 01:12:36 +0000 Subject: [PATCH] renamed rare slot : "rare" will yeild only rares "RareNotMythic" was ugly, slot named "RareMythic" makes a sheet of 1 copy of all mythic and 2 copies of each rare, which is fine for full sets and produces the ratio 1:8 --- CHANGES.txt | 7 ++-- res/blockdata/boosters.txt | 38 +++++++++---------- res/draft/cube_juzamjedi.draft | 2 +- res/draft/cube_skiera.draft | 2 +- res/sealed/GtcGuildBoros.sealed | 2 +- res/sealed/GtcGuildDimir.sealed | 2 +- res/sealed/GtcGuildGruul.sealed | 2 +- res/sealed/GtcGuildOrzhov.sealed | 2 +- res/sealed/GtcGuildSimic.sealed | 2 +- res/sealed/RtRGuildAzorius.sealed | 2 +- res/sealed/RtRGuildGolgari.sealed | 2 +- res/sealed/RtRGuildIzzet.sealed | 2 +- res/sealed/RtRGuildRakdos.sealed | 2 +- res/sealed/RtRGuildSelesnya.sealed | 2 +- res/sealed/juzamjedi.sealed | 2 +- .../java/forge/card/BoosterGenerator.java | 4 +- 16 files changed, 38 insertions(+), 37 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index b1c0a6335be..ad5e40df61f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -76,15 +76,16 @@ We have created a branch for Dragon's Maze spoilers. These new cards are not inc - Random Deck generation - -Deck generation is now strictly conforming the colors chosen. You won't get any Boros Reckoner in a RG deck, that could be added before the change (because they it red and it's ok). Avacyn's Piligrim won't be added in a deck that has green but doesn't have white, though it does not consume, but produces white mana. As well there won't be added any creatures whose activated abilities require colors not choosen for a given deck. That is to say that now color identity is used for deck generation, that allows a better filtering of cards. +Deck generation is now strictly conforming the colors chosen. You won't get any Boros Reckoner in a RG deck, that could be added before the change (because its manacost could be paid with red mana). Avacyn's Piligrim won't be added in a deck that has green but doesn't have white, though it does not consume, but produces white mana. As well there won't be added any creatures whose activated abilities require colors not choosen for a given deck. +That is to say that now color identity is used for deck generation, that allows a better filtering of cards. - Single declare attackers step - -Combined declare attackers step for all Defending Players/Planeswalkers (see viewtopic.php?f=26&t=10046) +Combined declare attackers step for all Defending Players/Planeswalkers. On declare attackers step you have to click the entiry you are about to attack and then click on the creatures that should attack it. Clicking on a planeswalker or player visually highlights it, so that you will see whos attackers are assigned at the moment. By default your first opponent is pre-selected. - Booster slots - -Booster slots are now way more customizable* (viewtopic.php?f=52&t=10128). Textfiles format in res/blockdata was changed, meta of type "combo" feature cut. +Booster slots are now way more customizable. This change allows us to implement DGM boosters correctly. --------- diff --git a/res/blockdata/boosters.txt b/res/blockdata/boosters.txt index 14bb384ccf1..6d1c7f339dc 100644 --- a/res/blockdata/boosters.txt +++ b/res/blockdata/boosters.txt @@ -8,21 +8,21 @@ 7ED: 5 covers, 10 Common, 3 Uncommon, 1 Rare, 1 BasicLand 8ED: 5 covers, 10 Common, 3 Uncommon, 1 Rare, 1 BasicLand 9ED: 5 covers, 10 Common, 3 Uncommon, 1 Rare, 1 BasicLand -ALA: 5 covers, 10 Common, 3 Uncommon, 1 Rare, 1 BasicLand +ALA: 5 covers, 10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand ALL: 1 covers, 8 Common, 3 Uncommon, 1 Rare APC: 1 covers, 11 Common, 3 Uncommon, 1 Rare -ARB: 3 covers, 10 Common, 3 Uncommon, 1 Rare, 1 BasicLand ALA +ARB: 3 covers, 10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand ALA ARN: 1 covers, 6 Common, 2 UncommonRare ATQ: 1 covers, 6 Common, 2 UncommonRare -AVR: 5 covers, 10 Common, 3 Uncommon, 1 Rare, 1 BasicLand +AVR: 5 covers, 10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand BOK: 3 covers, 11 Common, 3 Uncommon, 1 Rare -CFX: 3 covers, 10 Common, 3 Uncommon, 1 Rare, 1 BasicLand ALA +CFX: 3 covers, 10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand ALA CHK: 5 covers, 11 Common, 3 Uncommon, 1 Rare CHR: 1 covers, 9 Common, 3 UncommonRare CSP: 3 covers, 11 Common, 3 Uncommon, 1 Rare -DGM: 3 covers, 10 Common, 3 Uncommon, 1 Rare:!name("Maze's End"), 1 Custom("Dragon's Maze Lands") +DGM: 3 covers, 10 Common, 3 Uncommon, 1 RareMythic:!name("Maze's End"), 1 Custom("Dragon's Maze Lands") DIS: 3 covers, 11 Common, 3 Uncommon, 1 Rare -DKA: 3 covers, 9 Common:!dfc, 3 Uncommon:!dfc, 1 Rare:!dfc, 1 Any:dfc, 1 BasicLand ISD +DKA: 3 covers, 9 Common:!dfc, 3 Uncommon:!dfc, 1 RareMythic:!dfc, 1 Any:dfc, 1 BasicLand ISD DRK: 1 covers, 6 Common, 2 UncommonRare DST: 3 covers, 11 Common, 3 Uncommon, 1 Rare EVE: 3 covers, 11 Common, 3 Uncommon, 1 Rare @@ -30,28 +30,28 @@ EXO: 1 covers, 11 Common, 3 Uncommon, 1 Rare FEM: 1 covers, 5 Common, 2 Uncommon, 1 Rare FUT: 3 covers, 11 Common, 3 Uncommon, 1 Rare GPT: 3 covers, 11 Common, 3 Uncommon, 1 Rare -GTC: 5 covers, 10 Common, 3 Uncommon, 1 Rare, 1 BasicLand +GTC: 5 covers, 10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand HML: 1 covers, 6 Common, 2 UncommonRare ICE: 5 covers, 11 Common, 3 Uncommon, 1 Rare INV: 3 covers, 11 Common, 3 Uncommon, 1 Rare -ISD: 5 covers, 9 Common:!dfc, 3 Uncommon:!dfc, 1 Rare:!dfc, 1 Any:dfc, 1 BasicLand +ISD: 5 covers, 9 Common:!dfc, 3 Uncommon:!dfc, 1 RareMythic:!dfc, 1 Any:dfc, 1 BasicLand JUD: 1 covers, 11 Common, 3 Uncommon, 1 Rare LEA: 1 covers, 11 Common, 3 Uncommon, 1 Rare LEB: 1 covers, 11 Common, 3 Uncommon, 1 Rare LEG: 1 covers, 11 Common, 3 Uncommon, 1 Rare LGN: 3 covers, 11 Common, 3 Uncommon, 1 Rare LRW: 5 covers, 11 Common, 3 Uncommon, 1 Rare -M10: 5 covers, 10 Common, 3 Uncommon, 1 Rare, 1 BasicLand -M11: 5 covers, 10 Common, 3 Uncommon, 1 Rare, 1 BasicLand -M12: 5 covers, 10 Common, 3 Uncommon, 1 Rare, 1 BasicLand -M13: 5 covers, 10 Common, 3 Uncommon, 1 Rare, 1 BasicLand -MBS: 3 covers, 10 Common, 3 Uncommon, 1 Rare, 1 BasicLand +M10: 5 covers, 10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand +M11: 5 covers, 10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand +M12: 5 covers, 10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand +M13: 5 covers, 10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand +MBS: 3 covers, 10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand MIR: 5 covers, 11 Common, 3 Uncommon, 1 Rare MMQ: 3 covers, 11 Common, 3 Uncommon, 1 Rare MOR: 3 covers, 11 Common, 3 Uncommon, 1 Rare MRD: 5 covers, 11 Common, 3 Uncommon, 1 Rare NMS: 1 covers, 11 Common, 3 Uncommon, 1 Rare -NPH: 3 covers, 10 Common, 3 Uncommon, 1 Rare, 1 BasicLand +NPH: 3 covers, 10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand ODY: 3 covers, 11 Common, 3 Uncommon, 1 Rare ONS: 5 covers, 11 Common, 3 Uncommon, 1 Rare PCY: 1 covers, 11 Common, 3 Uncommon, 1 Rare @@ -61,12 +61,12 @@ PO2: 1 covers, 11 Common, 3 Uncommon, 1 Rare POR: 5 covers, 11 Common, 3 Uncommon, 1 Rare PTK: 1 covers, 5 Common, 2 Uncommon, 1 Rare, 2 BasicLand RAV: 5 covers, 11 Common, 3 Uncommon, 1 Rare -ROE: 5 covers, 10 Common, 3 Uncommon, 1 Rare, 1 BasicLand -RTR: 5 covers, 10 Common, 3 Uncommon, 1 Rare, 1 BasicLand +ROE: 5 covers, 10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand +RTR: 5 covers, 10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand SCG: 3 covers, 11 Common, 3 Uncommon, 1 Rare SHM: 5 covers, 11 Common, 3 Uncommon, 1 Rare SOK: 3 covers, 11 Common, 3 Uncommon, 1 Rare -SOM: 5 covers, 10 Common, 3 Uncommon, 1 Rare, 1 BasicLand +SOM: 5 covers, 10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand STH: 1 covers, 11 Common, 3 Uncommon, 1 Rare TMP: 3 covers, 11 Common, 3 Uncommon, 1 Rare TOR: 1 covers, 11 Common, 3 Uncommon, 1 Rare @@ -76,5 +76,5 @@ ULG: 1 covers, 11 Common, 3 Uncommon, 1 Rare USG: 3 covers, 11 Common, 3 Uncommon, 1 Rare VIS: 1 covers, 11 Common, 3 Uncommon, 1 Rare WTH: 1 covers, 11 Common, 3 Uncommon, 1 Rare -WWK: 3 covers, 10 Common, 3 Uncommon, 1 Rare, 1 BasicLand ZEN -ZEN: 5 covers, 10 Common, 3 Uncommon, 1 Rare, 1 BasicLand \ No newline at end of file +WWK: 3 covers, 10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand ZEN +ZEN: 5 covers, 10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand \ No newline at end of file diff --git a/res/draft/cube_juzamjedi.draft b/res/draft/cube_juzamjedi.draft index f8a8bd81c6c..376a31ed6e5 100644 --- a/res/draft/cube_juzamjedi.draft +++ b/res/draft/cube_juzamjedi.draft @@ -3,5 +3,5 @@ DeckFile:JuzamjediCube IgnoreRarity:True LandSetCode:M11 -Booster: 5 RareNotMythic, 1 Mythic, 5 Common, 5 Uncommon +Booster: 5 Rare, 1 Mythic, 5 Common, 5 Uncommon NumPacks:3 \ No newline at end of file diff --git a/res/draft/cube_skiera.draft b/res/draft/cube_skiera.draft index 42aa6dd72ac..f1abadd34c8 100644 --- a/res/draft/cube_skiera.draft +++ b/res/draft/cube_skiera.draft @@ -2,5 +2,5 @@ Name:SkieraCube DeckFile:SkieraCube LandSetCode:M11 -Booster: 5 Common, 5 Uncommon, 5 RareNotMythic, 1 Mythic +Booster: 5 Common, 5 Uncommon, 5 Rare, 1 Mythic NumPacks:3 \ No newline at end of file diff --git a/res/sealed/GtcGuildBoros.sealed b/res/sealed/GtcGuildBoros.sealed index a87ad98233b..4d4ef06bc5c 100644 --- a/res/sealed/GtcGuildBoros.sealed +++ b/res/sealed/GtcGuildBoros.sealed @@ -3,5 +3,5 @@ DeckFile:GtcGuildBoros IgnoreRarity:False LandSetCode:M13 -Booster:10 Common, 3 Uncommon, 1 Rare, 2 promo("Boros Guildgate|GTC","Foundry Champion|GTC") +Booster:10 Common, 3 Uncommon, 1 RareMythic, 2 promo("Boros Guildgate|GTC","Foundry Champion|GTC") NumPacks:1 diff --git a/res/sealed/GtcGuildDimir.sealed b/res/sealed/GtcGuildDimir.sealed index dba7162467f..165a402794c 100644 --- a/res/sealed/GtcGuildDimir.sealed +++ b/res/sealed/GtcGuildDimir.sealed @@ -3,5 +3,5 @@ DeckFile:GtcGuildDimir IgnoreRarity:False LandSetCode:M13 -Booster:10 Common, 3 Uncommon, 1 Rare, 2 promo("Dimir Guildgate|GTC","Consuming Aberration|GTC") +Booster:10 Common, 3 Uncommon, 1 RareMythic, 2 promo("Dimir Guildgate|GTC","Consuming Aberration|GTC") NumPacks:1 diff --git a/res/sealed/GtcGuildGruul.sealed b/res/sealed/GtcGuildGruul.sealed index 709418f30bb..dd4c12c632e 100644 --- a/res/sealed/GtcGuildGruul.sealed +++ b/res/sealed/GtcGuildGruul.sealed @@ -3,5 +3,5 @@ DeckFile:GtcGuildGruul IgnoreRarity:False LandSetCode:M13 -Booster:10 Common, 3 Uncommon, 1 Rare, 2 promo("Gruul Guildgate|GTC","Rubblehulk|GTC") +Booster:10 Common, 3 Uncommon, 1 RareMythic, 2 promo("Gruul Guildgate|GTC","Rubblehulk|GTC") NumPacks:1 diff --git a/res/sealed/GtcGuildOrzhov.sealed b/res/sealed/GtcGuildOrzhov.sealed index bcf3962c0b2..2d17bc1a694 100644 --- a/res/sealed/GtcGuildOrzhov.sealed +++ b/res/sealed/GtcGuildOrzhov.sealed @@ -2,5 +2,5 @@ Name:GtcGuildOrzhov DeckFile:GtcGuildOrzhov LandSetCode:M13 -Booster:10 Common, 3 Uncommon, 1 Rare, 2 promo("Orzhov Guildgate|GTC","Treasury Thrull|GTC") +Booster:10 Common, 3 Uncommon, 1 RareMythic, 2 promo("Orzhov Guildgate|GTC","Treasury Thrull|GTC") NumPacks:1 diff --git a/res/sealed/GtcGuildSimic.sealed b/res/sealed/GtcGuildSimic.sealed index 8c37200274a..a25e69e3b97 100644 --- a/res/sealed/GtcGuildSimic.sealed +++ b/res/sealed/GtcGuildSimic.sealed @@ -3,5 +3,5 @@ DeckFile:GtcGuildSimic IgnoreRarity:False LandSetCode:M13 -Booster:10 Common, 3 Uncommon, 1 Rare, 2 promo("Simic Guildgate|GTC","Fathom Mage|GTC") +Booster:10 Common, 3 Uncommon, 1 RareMythic, 2 promo("Simic Guildgate|GTC","Fathom Mage|GTC") NumPacks:1 diff --git a/res/sealed/RtRGuildAzorius.sealed b/res/sealed/RtRGuildAzorius.sealed index 94dccfc1996..99856e6eef6 100644 --- a/res/sealed/RtRGuildAzorius.sealed +++ b/res/sealed/RtRGuildAzorius.sealed @@ -3,5 +3,5 @@ DeckFile:RtRGuildAzorius IgnoreRarity:False LandSetCode:M13 -Booster:10 Common, 3 Uncommon, 1 Rare, 2 promo("Azorius Guildgate|RTR","Archon of the Triumvirate|RTR") +Booster:10 Common, 3 Uncommon, 1 RareMythic, 2 promo("Azorius Guildgate|RTR","Archon of the Triumvirate|RTR") NumPacks:1 diff --git a/res/sealed/RtRGuildGolgari.sealed b/res/sealed/RtRGuildGolgari.sealed index 32f103435cd..c3d84d69c04 100644 --- a/res/sealed/RtRGuildGolgari.sealed +++ b/res/sealed/RtRGuildGolgari.sealed @@ -3,5 +3,5 @@ DeckFile:RtRGuildGolgari IgnoreRarity:False LandSetCode:M13 -Booster:10 Common, 3 Uncommon, 1 Rare, 2 promo("Golgari Guildgate|RTR","Corpsejack Menace|RTR") +Booster:10 Common, 3 Uncommon, 1 RareMythic, 2 promo("Golgari Guildgate|RTR","Corpsejack Menace|RTR") NumPacks:1 diff --git a/res/sealed/RtRGuildIzzet.sealed b/res/sealed/RtRGuildIzzet.sealed index f9e9e087602..03e0ca951ee 100644 --- a/res/sealed/RtRGuildIzzet.sealed +++ b/res/sealed/RtRGuildIzzet.sealed @@ -3,5 +3,5 @@ DeckFile:RtRGuildIzzet IgnoreRarity:False LandSetCode:M13 -Booster:10 Common, 3 Uncommon, 1 Rare, 2 promo("Izzet Guildgate|RTR","Hypersonic Dragon|RTR") +Booster:10 Common, 3 Uncommon, 1 RareMythic, 2 promo("Izzet Guildgate|RTR","Hypersonic Dragon|RTR") NumPacks:1 diff --git a/res/sealed/RtRGuildRakdos.sealed b/res/sealed/RtRGuildRakdos.sealed index 8ca7e405c48..37c7cb12561 100644 --- a/res/sealed/RtRGuildRakdos.sealed +++ b/res/sealed/RtRGuildRakdos.sealed @@ -3,5 +3,5 @@ DeckFile:RtRGuildRakdos IgnoreRarity:False LandSetCode:M13 -Booster:10 Common, 3 Uncommon, 1 Rare, 2 promo("Rakdos Guildgate|RTR","Corpsejack Menace|RTR") +Booster:10 Common, 3 Uncommon, 1 RareMythic, 2 promo("Rakdos Guildgate|RTR","Corpsejack Menace|RTR") NumPacks:1 \ No newline at end of file diff --git a/res/sealed/RtRGuildSelesnya.sealed b/res/sealed/RtRGuildSelesnya.sealed index b23f141d407..1fd14225377 100644 --- a/res/sealed/RtRGuildSelesnya.sealed +++ b/res/sealed/RtRGuildSelesnya.sealed @@ -3,5 +3,5 @@ DeckFile:RtRGuildSelesnya IgnoreRarity:False LandSetCode:M13 -Booster:10 Common, 3 Uncommon, 1 Rare, 2 promo("Selesnya Guildgate|RTR","Grove of the Guardian|RTR") +Booster:10 Common, 3 Uncommon, 1 RareMythic, 2 promo("Selesnya Guildgate|RTR","Grove of the Guardian|RTR") NumPacks:1 \ No newline at end of file diff --git a/res/sealed/juzamjedi.sealed b/res/sealed/juzamjedi.sealed index 95db73b40de..fea1661ef62 100644 --- a/res/sealed/juzamjedi.sealed +++ b/res/sealed/juzamjedi.sealed @@ -3,5 +3,5 @@ DeckFile:JuzamjediCube IgnoreRarity:True LandSetCode:M11 -Booster: 5 Common, 5 Uncommon, 5 RareNotMythic, 1 Mythic +Booster: 5 Common, 5 Uncommon, 5 Rare, 1 Mythic NumPacks:3 \ No newline at end of file diff --git a/src/main/java/forge/card/BoosterGenerator.java b/src/main/java/forge/card/BoosterGenerator.java index c0104618341..9ebcafeafa2 100644 --- a/src/main/java/forge/card/BoosterGenerator.java +++ b/src/main/java/forge/card/BoosterGenerator.java @@ -126,7 +126,7 @@ public class BoosterGenerator { Predicate predicateUncommon = Predicates.and( setPred, IPaperCard.Predicates.Presets.IS_UNCOMMON, extraPred); ps.addAll(Iterables.filter(src, predicateUncommon), 3); - } else if ( mainCode.equalsIgnoreCase("rare") ) { + } else if ( mainCode.equalsIgnoreCase("raremythic") ) { // Typical ratio of rares to mythics is 53:15, changing to 35:10 in smaller sets. // To achieve the desired 1:8 are all mythics are added once, and all rares added twice per print sheet. @@ -136,7 +136,7 @@ public class BoosterGenerator { Predicate predicateRare = Predicates.and( setPred, IPaperCard.Predicates.Presets.IS_RARE, extraPred); ps.addAll(Iterables.filter(src, predicateRare), 2); - } else if ( mainCode.equalsIgnoreCase("rarenotmythic") ) { + } else if ( mainCode.equalsIgnoreCase("rare") ) { Predicate predicateRare = Predicates.and( setPred, IPaperCard.Predicates.Presets.IS_RARE, extraPred); ps.addAll(Iterables.filter(src, predicateRare));