external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Maxmtg
2013-04-26 01:12:36 +00:00
parent c42f05d0d6
commit 2982c5ed21
16 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGES.txt
View File

@@ -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.
---------

38
res/blockdata/boosters.txt
View File

@@ -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
WWK: 3 covers, 10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand ZEN
ZEN: 5 covers, 10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand

2
res/draft/cube_juzamjedi.draft
View File

@@ -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

2
res/draft/cube_skiera.draft
View File

@@ -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

2
res/sealed/GtcGuildBoros.sealed
View File

@@ -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

2
res/sealed/GtcGuildDimir.sealed
View File

@@ -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

2
res/sealed/GtcGuildGruul.sealed
View File

@@ -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

2
res/sealed/GtcGuildOrzhov.sealed
View File

@@ -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

2
res/sealed/GtcGuildSimic.sealed
View File

@@ -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

2
res/sealed/RtRGuildAzorius.sealed
View File

@@ -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

2
res/sealed/RtRGuildGolgari.sealed
View File

@@ -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

2
res/sealed/RtRGuildIzzet.sealed
View File

@@ -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

2
res/sealed/RtRGuildRakdos.sealed
View File

@@ -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

2
res/sealed/RtRGuildSelesnya.sealed
View File

@@ -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

2
res/sealed/juzamjedi.sealed
View File

@@ -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

4
src/main/java/forge/card/BoosterGenerator.java
View File

@@ -126,7 +126,7 @@ public class BoosterGenerator {
Predicate<CardPrinted> 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<CardPrinted> 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<CardPrinted> predicateRare = Predicates.and( setPred, IPaperCard.Predicates.Presets.IS_RARE, extraPred);
ps.addAll(Iterables.filter(src, predicateRare));