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

improved DGM filter

Browse Source 
fixed slot for timeshifted card in tournament packs.
This commit is contained in:
Maxmtg
2013-05-06 03:13:05 +00:00
parent 33276e0d67
commit 085c93cbcd
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/blockdata/boosters.txt
View File

@@ -20,7 +20,7 @@ CFX: 3 covers, 10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand ALA
CHK: 5 covers, 11 Common, 3 Uncommon, 1 Rare CHK: 5 covers, 11 Common, 3 Uncommon, 1 Rare
CHR: 1 covers, 9 Common, 3 UncommonRare CHR: 1 covers, 9 Common, 3 UncommonRare
CSP: 3 covers, 11 Common, 3 Uncommon, 1 Rare CSP: 3 covers, 11 Common, 3 Uncommon, 1 Rare
DGM: 3 covers, 10 Common:!type("Land"), 3 Uncommon, 1 RareMythic:!name("Maze's End"), 1 Custom("Dragon's Maze Lands") DGM: 3 covers, 10 Common:!land, 3 Uncommon, 1 RareMythic:!name("Maze's End"), 1 Custom("Dragon's Maze Lands")
DIS: 3 covers, 11 Common, 3 Uncommon, 1 Rare DIS: 3 covers, 11 Common, 3 Uncommon, 1 Rare
DKA: 3 covers, 9 Common:!dfc, 3 Uncommon:!dfc, 1 RareMythic:!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 DRK: 1 covers, 6 Common, 2 UncommonRare

2
res/blockdata/starters.txt
View File

@@ -16,7 +16,7 @@ ONS: 32 Common, 10 Uncommon, 3 Rare, 30 BasicLand
MRD: 32 Common, 10 Uncommon, 3 Rare, 30 BasicLand MRD: 32 Common, 10 Uncommon, 3 Rare, 30 BasicLand
CHK: 32 Common, 10 Uncommon, 3 Rare, 30 BasicLand CHK: 32 Common, 10 Uncommon, 3 Rare, 30 BasicLand
RAV: 32 Common, 10 Uncommon, 3 Rare, 30 BasicLand RAV: 32 Common, 10 Uncommon, 3 Rare, 30 BasicLand
TSP: 29 Common, 10 Uncommon, 3 Rare, 3 Special, 30 BasicLand TSP: 29 Common, 10 Uncommon, 3 Rare, 3 Special TSB, 30 BasicLand
LRW: 32 Common, 10 Uncommon, 3 Rare, 30 BasicLand LRW: 32 Common, 10 Uncommon, 3 Rare, 30 BasicLand
SHM: 32 Common, 10 Uncommon, 3 Rare, 30 BasicLand SHM: 32 Common, 10 Uncommon, 3 Rare, 30 BasicLand
ALA: 32 Common, 10 Uncommon, 3 RareMythic, 30 BasicLand ALA: 32 Common, 10 Uncommon, 3 RareMythic, 30 BasicLand

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

@@ -164,13 +164,12 @@ public class BoosterGenerator {
Predicate<CardPrinted> toAdd = null; Predicate<CardPrinted> toAdd = null;
if( operator.equals("dfc") ) { if( operator.equals("dfc") ) {
toAdd = Predicates.compose(CardRulesPredicates.splitType(CardSplitType.Transform), CardPrinted.FN_GET_RULES); toAdd = Predicates.compose(CardRulesPredicates.splitType(CardSplitType.Transform), CardPrinted.FN_GET_RULES);
} else if( operator.equals("land") ) {
toAdd = Predicates.compose(CardRulesPredicates.Presets.IS_LAND, CardPrinted.FN_GET_RULES);
} else if ( operator.startsWith("name(") ) { } else if ( operator.startsWith("name(") ) {
operator = StringUtils.strip(operator.substring(4), "() "); operator = StringUtils.strip(operator.substring(4), "() ");
String[] cardNames = TextUtil.splitWithParenthesis(operator, ',', '"', '"'); String[] cardNames = TextUtil.splitWithParenthesis(operator, ',', '"', '"');
toAdd = IPaperCard.Predicates.names(Lists.newArrayList(cardNames)); toAdd = IPaperCard.Predicates.names(Lists.newArrayList(cardNames));
} else if ( operator.startsWith("type(") ) {
operator = StringUtils.strip(operator.substring(4), "()\" ");
toAdd = Predicates.compose(CardRulesPredicates.coreType(true, operator), CardPrinted.FN_GET_RULES);
} }
if(toAdd == null) if(toAdd == null)