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

disabled draft for Guild sealed (blocks)

Browse Source
This commit is contained in:
Maxmtg
2013-04-25 14:20:46 +00:00
parent c9d275b8fb
commit b930e6fcb1
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/blockdata/blocks.txt
View File

@@ -45,6 +45,6 @@ Innistrad, 3/6/ISD, ISD DKA
Avacyn Restored, 3/6/AVR, AVR Avacyn Restored, 3/6/AVR, AVR
Magic 2013, 3/6/M13, M13 Magic 2013, 3/6/M13, M13
Return to Ravnica, 3/6/RTR, RTR 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, 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 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

6
src/main/java/forge/card/CardBlock.java
View File

@@ -22,6 +22,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.TreeMap; import java.util.TreeMap;
import org.apache.commons.lang3.StringUtils;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
@@ -240,8 +242,8 @@ public final class CardBlock implements Comparable<CardBlock> {
String name = sParts[0]; String name = sParts[0];
String[] numbers = sParts[1].trim().split("/"); String[] numbers = sParts[1].trim().split("/");
int draftBoosters = Integer.parseInt(numbers[0]); int draftBoosters = StringUtils.isNumeric(numbers[0]) ? Integer.parseInt(numbers[0]) : 0;
int sealedBoosters = Integer.parseInt(numbers[1]); int sealedBoosters = StringUtils.isNumeric(numbers[1]) ? Integer.parseInt(numbers[1]) : 0;
CardEdition landSet = editions.getEditionByCodeOrThrow(numbers[2]); CardEdition landSet = editions.getEditionByCodeOrThrow(numbers[2]);
List<CardEdition> sets = new ArrayList<CardEdition>(); List<CardEdition> sets = new ArrayList<CardEdition>();

3
src/main/java/forge/game/limited/BoosterDraft.java
View File

@@ -104,7 +104,8 @@ public final class BoosterDraft implements IBoosterDraft {
? Singletons.getModel().getBlocks() : Singletons.getModel().getFantasyBlocks(); ? Singletons.getModel().getBlocks() : Singletons.getModel().getFantasyBlocks();
for (CardBlock b : storage) { for (CardBlock b : storage) {
blocks.add(b); if( b.getCntBoostersDraft() > 0)
blocks.add(b);
} }
final CardBlock block = GuiChoose.one("Choose Block", blocks); final CardBlock block = GuiChoose.one("Choose Block", blocks);