From b930e6fcb1b4d5aab8d515865ff5361998a76a75 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Thu, 25 Apr 2013 14:20:46 +0000 Subject: [PATCH] disabled draft for Guild sealed (blocks) --- res/blockdata/blocks.txt | 4 ++-- src/main/java/forge/card/CardBlock.java | 6 ++++-- src/main/java/forge/game/limited/BoosterDraft.java | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/res/blockdata/blocks.txt b/res/blockdata/blocks.txt index 7676dfde0be..d3dafe59bab 100644 --- a/res/blockdata/blocks.txt +++ b/res/blockdata/blocks.txt @@ -45,6 +45,6 @@ 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, 3/6/RTR, RTR 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 +Return to Ravnica Guild Sealed, -/6/RTR, RTR 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, 3/6/RTR, GTC 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 +Gatecrash Guild Sealed, -/6/RTR, GTC 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 diff --git a/src/main/java/forge/card/CardBlock.java b/src/main/java/forge/card/CardBlock.java index 76ce48675b8..44510d02f97 100644 --- a/src/main/java/forge/card/CardBlock.java +++ b/src/main/java/forge/card/CardBlock.java @@ -22,6 +22,8 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; +import org.apache.commons.lang3.StringUtils; + import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -240,8 +242,8 @@ public final class CardBlock implements Comparable { String name = sParts[0]; String[] numbers = sParts[1].trim().split("/"); - int draftBoosters = Integer.parseInt(numbers[0]); - int sealedBoosters = Integer.parseInt(numbers[1]); + int draftBoosters = StringUtils.isNumeric(numbers[0]) ? Integer.parseInt(numbers[0]) : 0; + int sealedBoosters = StringUtils.isNumeric(numbers[1]) ? Integer.parseInt(numbers[1]) : 0; CardEdition landSet = editions.getEditionByCodeOrThrow(numbers[2]); List sets = new ArrayList(); diff --git a/src/main/java/forge/game/limited/BoosterDraft.java b/src/main/java/forge/game/limited/BoosterDraft.java index 8932b537820..78e54f0cc6b 100644 --- a/src/main/java/forge/game/limited/BoosterDraft.java +++ b/src/main/java/forge/game/limited/BoosterDraft.java @@ -104,7 +104,8 @@ public final class BoosterDraft implements IBoosterDraft { ? Singletons.getModel().getBlocks() : Singletons.getModel().getFantasyBlocks(); for (CardBlock b : storage) { - blocks.add(b); + if( b.getCntBoostersDraft() > 0) + blocks.add(b); } final CardBlock block = GuiChoose.one("Choose Block", blocks);