From eaa57597c3c5211ad7b4365f2f8a140370eecf1e Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Mon, 6 May 2013 07:28:01 +0000 Subject: [PATCH] better texts for some sealed options --- .../game/limited/SealedCardPoolGenerator.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/forge/game/limited/SealedCardPoolGenerator.java b/src/main/java/forge/game/limited/SealedCardPoolGenerator.java index e17a8c0a1ac..724ec3c8e68 100644 --- a/src/main/java/forge/game/limited/SealedCardPoolGenerator.java +++ b/src/main/java/forge/game/limited/SealedCardPoolGenerator.java @@ -194,7 +194,7 @@ public class SealedCardPoolGenerator { setCombos.add(String.format("%s, %s, %s", sets[0], sets[0], sets[0])); setCombos.add(String.format("%s, %s, %s", sets[1], sets[0], sets[0])); setCombos.add(String.format("%s, %s, %s", sets[1], sets[1], sets[0])); - setCombos.add(String.format("%s, %s, %s", sets[1], sets[1], sets[1])); + setCombos.add(String.format("3 %s", sets[1])); } if (sets.length >= 3) { setCombos.add(String.format("%s, %s, %s", sets[2], sets[0], sets[0])); @@ -279,17 +279,20 @@ public class SealedCardPoolGenerator { setCombos.add(String.format("%s, %s, %s, %s, %s, %s, %s, %s, %s", sets[4], sets[3], sets[2], sets[1], sets[0], sets[0], sets[0], sets[0], sets[0])); setCombos.add(String.format("%s, %s, %s, %s, %s, %s, %s, %s, %s", sets[3], sets[3], sets[2], sets[2], sets[1], sets[1], sets[0], sets[0], sets[0])); setCombos.add(String.format("%s, %s, %s, %s, %s, %s, %s, %s, %s", sets[3], sets[2], sets[2], sets[1], sets[1], sets[1], sets[0], sets[0], sets[0])); - setCombos.add(String.format("%s, %s, %s, %s, %s, %s, %s, %s, %s", sets[3], sets[2], sets[1], sets[1], sets[0], sets[0], sets[0], sets[0], sets[0])); - setCombos.add(String.format("%s, %s, %s, %s, %s, %s, %s, %s, %s", sets[2], sets[2], sets[2], sets[1], sets[1], sets[1], sets[0], sets[0], sets[0])); - setCombos.add(String.format("%s, %s, %s, %s, %s, %s, %s, %s, %s", sets[2], sets[2], sets[1], sets[1], sets[0], sets[0], sets[0], sets[0], sets[0])); - setCombos.add(String.format("%s, %s, %s, %s, %s, %s, %s, %s, %s", sets[2], sets[1], sets[0], sets[0], sets[0], sets[0], sets[0], sets[0], sets[0])); - setCombos.add(String.format("%s, %s, %s, %s, %s, %s, %s, %s, %s", sets[2], sets[2], sets[2], sets[2], sets[0], sets[0], sets[0], sets[0], sets[0])); - setCombos.add(String.format("%s, %s, %s, %s, %s, %s, %s, %s, %s", sets[1], sets[1], sets[1], sets[1], sets[0], sets[0], sets[0], sets[0], sets[0])); + setCombos.add(String.format("%s, %s, 2 %s, 5 %s", sets[3], sets[2], sets[1], sets[0])); + setCombos.add(String.format("3 %s, 3 %s, 3 %s", sets[2], sets[1], sets[0])); + setCombos.add(String.format("2 %s, 2 %s, 5 %s", sets[2], sets[1], sets[0])); + setCombos.add(String.format("%s, %s, 7 %s", sets[2], sets[1], sets[0])); + setCombos.add(String.format("4 %s, 5 %s", sets[2], sets[0])); + setCombos.add(String.format("4 %s, 5 %s", sets[1], sets[0])); setCombos.add(String.format("9 %s", sets[0])); } else { // Default to 6 packs - if (sets.length >= 2 && !sets[0].equals(sets[1])) { + if (sets.length == 1 || !sets[0].equals(sets[1]) ) { setCombos.add(String.format("6 %s", sets[0])); + } + + if (sets.length >= 2 && !sets[0].equals(sets[1])) { setCombos.add(String.format("4 %s, 2 %s", sets[0], sets[1])); setCombos.add(String.format("3 %s, 3 %s", sets[0], sets[1])); }