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

- Added support for blocks with up to six sets (by RumbleBBU).

Browse Source
This commit is contained in:
Sloth
2012-08-23 10:54:36 +00:00
parent e63085944d
commit ae3d723387
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -221,7 +221,7 @@ public final class CardBlock implements Comparable<CardBlock> {
String name = null; String name = null;
int index = -1; int index = -1;
final List<CardEdition> sets = new ArrayList<CardEdition>(4); final List<CardEdition> sets = new ArrayList<CardEdition>(6);
CardEdition landSet = null; CardEdition landSet = null;
int draftBoosters = 3; int draftBoosters = 3;
int sealedBoosters = 6; int sealedBoosters = 6;
@@ -233,7 +233,8 @@ public final class CardBlock implements Comparable<CardBlock> {
name = kv[1]; name = kv[1];
} else if ("index".equals(key)) { } else if ("index".equals(key)) {
index = Integer.parseInt(kv[1]); index = Integer.parseInt(kv[1]);
} else if ("set0".equals(key) || "set1".equals(key) || "set2".equals(key)) { } else if ("set0".equals(key) || "set1".equals(key) || "set2".equals(key) || "set3".equals(key)
|| "set4".equals(key) || "set5".equals(key)) {
sets.add(editions.getEditionByCodeOrThrow(kv[1])); sets.add(editions.getEditionByCodeOrThrow(kv[1]));
} else if ("landsetcode".equals(key)) { } else if ("landsetcode".equals(key)) {
landSet = editions.getEditionByCodeOrThrow(kv[1]); landSet = editions.getEditionByCodeOrThrow(kv[1]);

10
src/main/java/forge/game/limited/SealedDeckFormat.java
View File

@@ -93,6 +93,16 @@ public class SealedDeckFormat {
setCombos.add(String.format("%s/%s/%s/%s/%s/%s", sets[2], sets[2], sets[2], sets[0], sets[0], sets[0])); setCombos.add(String.format("%s/%s/%s/%s/%s/%s", sets[2], sets[2], sets[2], sets[0], sets[0], sets[0]));
setCombos.add(String.format("%s/%s/%s/%s/%s/%s", sets[2], sets[2], sets[1], sets[1], sets[0], sets[0])); setCombos.add(String.format("%s/%s/%s/%s/%s/%s", sets[2], sets[2], sets[1], sets[1], sets[0], sets[0]));
} }
if (sets.length >= 4) {
setCombos.add(String.format("%s/%s/%s/%s/%s/%s", sets[3], sets[2], sets[1], sets[0], sets[0], sets[0]));
setCombos.add(String.format("%s/%s/%s/%s/%s/%s", sets[3], sets[2], sets[1], sets[1], sets[0], sets[0]));
}
if (sets.length >= 5) {
setCombos.add(String.format("%s/%s/%s/%s/%s/%s", sets[4], sets[3], sets[2], sets[1], sets[0], sets[0]));
}
if (sets.length >= 6) {
setCombos.add(String.format("%s/%s/%s/%s/%s/%s", sets[5], sets[4], sets[3], sets[2], sets[1], sets[0]));
}
if (sets.length > 1) { if (sets.length > 1) {
final Object p = GuiUtils.chooseOne("Choose Set Combination", setCombos.toArray()); final Object p = GuiUtils.chooseOne("Choose Set Combination", setCombos.toArray());