From 9c8bda36715720151eea5caeb41999f60858033d Mon Sep 17 00:00:00 2001 From: Sol Date: Fri, 3 May 2013 22:27:41 +0000 Subject: [PATCH] - Adding DGM to RTR block info (except for DGM Maze Run) - DGM Lands will no longer appear in the Common slot --- res/blockdata/blocks.txt | 8 ++++---- res/blockdata/boosters.txt | 2 +- src/main/java/forge/card/BoosterGenerator.java | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/res/blockdata/blocks.txt b/res/blockdata/blocks.txt index 1bc8870f44f..e8bc70e8b71 100644 --- a/res/blockdata/blocks.txt +++ b/res/blockdata/blocks.txt @@ -44,7 +44,7 @@ Magic 2012, 3/6/M12, M12 Innistrad, 3/6/ISD, ISD DKA Avacyn Restored, 3/6/AVR, AVR Magic 2013, 3/6/M13, M13 -Return to Ravnica, 3/6/RTR, RTR -Return to Ravnica Guild Sealed, -/6/RTR, RTR RTR RTR Meta-Choose(Cube(RtRGuildAzorius)Azorius Guild;Cube(RtRGuildIzzet)Izzet Guild;Cube(RtRGuildRakdos)Rakdos Guild;Cube(RtRGuildGolgari)Golgari Guild;Cube(RtRGuildSelesnya)Selesnya Guild)GUILD -Gatecrash, 3/6/RTR, GTC -Gatecrash Guild Sealed, -/6/RTR, GTC GTC GTC Meta-Choose(Cube(GtcGuildBoros)Boros Guild;Cube(GtcGuildDimir)Dimir Guild;Cube(GtcGuildGruul)Gruul Guild;Cube(GtcGuildOrzhov)Orzhov Guild;Cube(GtcGuildSimic)Simic Guild)GUILD \ No newline at end of file +Return to Ravnica, 3/6/RTR, RTR GTC DGM +Return to Ravnica Guild Sealed, -/6/RTR, RTR RTR RTR Meta-Choose(Cube(RtRGuildAzorius)Azorius Guild;Cube(RtRGuildIzzet)Izzet Guild;Cube(RtRGuildRakdos)Rakdos Guild;Cube(RtRGuildGolgari)Golgari Guild;Cube(RtRGuildSelesnya)Selesnya Guild)GUILD +Gatecrash Guild Sealed, -/6/RTR, GTC GTC GTC Meta-Choose(Cube(GtcGuildBoros)Boros Guild;Cube(GtcGuildDimir)Dimir Guild;Cube(GtcGuildGruul)Gruul Guild;Cube(GtcGuildOrzhov)Orzhov Guild;Cube(GtcGuildSimic)Simic Guild)GUILD +#Dragon's Maze Race Sealed, -/6/RTR, DGM DGM DGM ? ? \ No newline at end of file diff --git a/res/blockdata/boosters.txt b/res/blockdata/boosters.txt index 605040ba0b5..52442566758 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, 3 Uncommon, 1 RareMythic:!name("Maze's End"), 1 Custom("Dragon's Maze Lands") +DGM: 3 covers, 10 Common:!type("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/src/main/java/forge/card/BoosterGenerator.java b/src/main/java/forge/card/BoosterGenerator.java index d4749e1fa59..b486c4ba7b7 100644 --- a/src/main/java/forge/card/BoosterGenerator.java +++ b/src/main/java/forge/card/BoosterGenerator.java @@ -168,6 +168,9 @@ public class BoosterGenerator { 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)