diff --git a/res/blockdata/boosters.txt b/res/blockdata/boosters.txt index 52442566758..92da3797ac9 100644 --- a/res/blockdata/boosters.txt +++ b/res/blockdata/boosters.txt @@ -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 CHR: 1 covers, 9 Common, 3 UncommonRare 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 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 diff --git a/res/blockdata/starters.txt b/res/blockdata/starters.txt index ec6f9f7a72d..7195208fd65 100644 --- a/res/blockdata/starters.txt +++ b/res/blockdata/starters.txt @@ -16,7 +16,7 @@ ONS: 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 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 SHM: 32 Common, 10 Uncommon, 3 Rare, 30 BasicLand ALA: 32 Common, 10 Uncommon, 3 RareMythic, 30 BasicLand diff --git a/src/main/java/forge/card/BoosterGenerator.java b/src/main/java/forge/card/BoosterGenerator.java index b486c4ba7b7..e8f028689e0 100644 --- a/src/main/java/forge/card/BoosterGenerator.java +++ b/src/main/java/forge/card/BoosterGenerator.java @@ -164,13 +164,12 @@ public class BoosterGenerator { Predicate toAdd = null; if( operator.equals("dfc") ) { 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(") ) { operator = StringUtils.strip(operator.substring(4), "() "); String[] cardNames = TextUtil.splitWithParenthesis(operator, ',', '"', '"'); 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)