mirror of
https://github.com/correl/mage.git
synced 2024-12-26 03:00:11 +00:00
Implement collation for XLN, M19, GRN, RNA and M20
This commit is contained in:
Alex W. Jackson
parent
91df6c1ecb
commit
bcac7bd47c
5 changed files with 514 additions and 5 deletions
|
|
@ -1,9 +1,16 @@
|
|||
package mage.sets;
|
||||
|
||||
import mage.cards.ExpansionSet;
|
||||
import mage.collation.BoosterCollator;
|
||||
import mage.collation.BoosterStructure;
|
||||
import mage.collation.CardRun;
|
||||
import mage.collation.RarityConfiguration;
|
||||
import mage.constants.Rarity;
|
||||
import mage.constants.SetType;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author TheElk801
|
||||
*/
|
||||
|
|
@ -348,4 +355,103 @@ public final class CoreSet2019 extends ExpansionSet {
|
|||
cards.add(new SetCardInfo("Windreader Sphinx", 84, Rarity.RARE, mage.cards.w.WindreaderSphinx.class));
|
||||
cards.add(new SetCardInfo("Woodland Stream", 260, Rarity.COMMON, mage.cards.w.WoodlandStream.class));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BoosterCollator createCollator() {
|
||||
return new CoreSet2019Collator();
|
||||
}
|
||||
}
|
||||
|
||||
// Booster collation info from https://www.lethe.xyz/mtg/collation/m19.html
|
||||
// Using USA collation for common/uncommon, rare collation inferred from other sets
|
||||
class CoreSet2019Collator implements BoosterCollator {
|
||||
private final CardRun commonA = new CardRun(true, "161", "28", "64", "142", "24", "50", "165", "35", "56", "150", "18", "57", "132", "36", "80", "127", "19", "82", "143", "10", "71", "164", "31", "51", "142", "11", "53", "141", "24", "56", "165", "41", "64", "150", "15", "44", "147", "18", "80", "153", "28", "48", "161", "35", "82", "132", "36", "50", "143", "41", "57", "141", "31", "51", "127", "10", "71", "164", "11", "48", "147", "19", "44", "153", "15", "53");
|
||||
private final CardRun commonB = new CardRun(true, "170", "100", "188", "87", "193", "123", "202", "108", "180", "103", "183", "93", "174", "94", "191", "95", "205", "101", "188", "123", "198", "108", "180", "89", "170", "87", "187", "100", "202", "94", "193", "109", "174", "103", "191", "93", "198", "101", "183", "95", "170", "89", "205", "100", "188", "87", "187", "123", "180", "108", "202", "103", "193", "109", "174", "94", "183", "95", "205", "101", "191", "93", "198", "89", "187", "109");
|
||||
private final CardRun commonC1 = new CardRun(true, "234", "46", "166", "195", "120", "146", "204", "12", "118", "83", "40", "199", "139", "126", "75", "237", "177", "158", "105", "12", "245", "70", "120", "131", "83", "195", "239", "85", "58", "7", "46", "237", "146", "16", "118", "204", "32", "158", "177", "245", "75", "105", "239", "40", "58", "139", "126", "7", "166", "70", "199", "85", "131", "16", "32");
|
||||
private final CardRun commonC2 = new CardRun(true, "234", "172", "54", "190", "122", "240", "156", "81", "171", "124", "45", "233", "25", "119", "210", "159", "124", "38", "54", "122", "133", "172", "240", "8", "156", "190", "25", "124", "45", "38", "171", "133", "119", "233", "8", "159", "210", "25", "240", "54", "190", "122", "81", "172", "233", "156", "38", "81", "171", "133", "45", "8", "159", "210", "119");
|
||||
private final CardRun uncommonA = new CardRun(true, "47", "6", "169", "246", "168", "117", "68", "243", "181", "115", "231", "2", "163", "73", "227", "207", "86", "254", "137", "37", "242", "184", "255", "121", "148", "176", "26", "111", "138", "235", "196", "43", "117", "140", "6", "197", "1", "246", "47", "162", "169", "30", "168", "181", "243", "254", "2", "182", "151", "86", "68", "22", "184", "137", "73", "197", "163", "231", "138", "26", "176", "115", "148", "242", "37", "111", "168", "6", "196", "1", "227", "255", "121", "43", "207", "140", "30", "117", "254", "182", "137", "235", "26", "162", "47", "169", "151", "86", "176", "68", "243", "138", "181", "2", "73", "148", "196", "246", "37", "115", "163", "231", "207", "151", "22", "121", "184", "227", "255", "1", "111", "162", "197", "43", "242", "30", "182", "140", "235", "22");
|
||||
private final CardRun uncommonB = new CardRun(true, "222", "49", "145", "216", "125", "178", "78", "215", "114", "241", "221", "157", "77", "224", "206", "98", "55", "213", "14", "92", "211", "110", "236", "223", "72", "116", "74", "167", "217", "96", "61", "220", "175", "114", "59", "222", "145", "125", "173", "215", "152", "78", "5", "98", "216", "178", "77", "92", "221", "157", "241", "224", "96", "49", "13", "223", "20", "167", "213", "110", "55", "29", "14", "217", "236", "152", "78", "220", "114", "5", "74", "211", "206", "59", "215", "173", "125", "216", "49", "20", "222", "13", "116", "72", "175", "241", "92", "221", "29", "61", "224", "145", "98", "178", "213", "77", "217", "14", "55", "157", "220", "5", "74", "96", "206", "72", "20", "236", "110", "173", "223", "59", "167", "175", "116", "211", "13", "61", "29", "152");
|
||||
private final CardRun rare = new CardRun(false, "4", "9", "17", "21", "23", "27", "33", "39", "42", "52", "60", "62", "63", "66", "67", "69", "76", "84", "90", "91", "97", "99", "102", "104", "107", "112", "113", "128", "130", "134", "135", "136", "144", "149", "155", "160", "179", "185", "186", "189", "192", "194", "200", "203", "209", "226", "228", "230", "232", "238", "244", "247", "249", "4", "9", "17", "21", "23", "27", "33", "39", "42", "52", "60", "62", "63", "66", "67", "69", "76", "84", "90", "91", "97", "99", "102", "104", "107", "112", "113", "128", "130", "134", "135", "136", "144", "149", "155", "160", "179", "185", "186", "189", "192", "194", "200", "203", "209", "226", "228", "230", "232", "238", "244", "247", "249", "3", "34", "65", "79", "88", "106", "129", "154", "201", "208", "212", "214", "218", "219", "225", "229");
|
||||
private final CardRun landBasic = new CardRun(false, "261", "262", "263", "264", "265", "266", "267", "268", "269", "270", "271", "272", "273", "274", "275", "276", "277", "278", "279", "280");
|
||||
private final CardRun landNonBasic = new CardRun(false, "248", "250", "251", "252", "253", "256", "257", "258", "259", "260");
|
||||
|
||||
private final BoosterStructure AABBC1C1C1C1C1C1 = new BoosterStructure(
|
||||
commonA, commonA,
|
||||
commonB, commonB,
|
||||
commonC1, commonC1, commonC1, commonC1, commonC1, commonC1
|
||||
);
|
||||
private final BoosterStructure AAABBC1C1C1C1C1 = new BoosterStructure(
|
||||
commonA, commonA, commonA,
|
||||
commonB, commonB,
|
||||
commonC1, commonC1, commonC1, commonC1, commonC1
|
||||
);
|
||||
private final BoosterStructure AAAABBC2C2C2C2 = new BoosterStructure(
|
||||
commonA, commonA, commonA, commonA,
|
||||
commonB, commonB,
|
||||
commonC2, commonC2, commonC2, commonC2
|
||||
);
|
||||
private final BoosterStructure AAAABBBC2C2C2 = new BoosterStructure(
|
||||
commonA, commonA, commonA, commonA,
|
||||
commonB, commonB, commonB,
|
||||
commonC2, commonC2, commonC2
|
||||
);
|
||||
private final BoosterStructure AAAABBBBC2C2 = new BoosterStructure(
|
||||
commonA, commonA, commonA, commonA,
|
||||
commonB, commonB, commonB, commonB,
|
||||
commonC2, commonC2
|
||||
);
|
||||
private final BoosterStructure AAB = new BoosterStructure(uncommonA, uncommonA, uncommonB);
|
||||
private final BoosterStructure ABB = new BoosterStructure(uncommonA, uncommonB, uncommonB);
|
||||
private final BoosterStructure R1 = new BoosterStructure(rare);
|
||||
private final BoosterStructure LB = new BoosterStructure(landBasic);
|
||||
private final BoosterStructure LN = new BoosterStructure(landNonBasic);
|
||||
|
||||
// In order for equal numbers of each common to exist, the average booster must contain:
|
||||
// 3.27 A commons (36 / 11)
|
||||
// 2.18 B commons (24 / 11)
|
||||
// 2.73 C1 commons (30 / 11, or 60 / 11 in each C1 booster)
|
||||
// 1.82 C2 commons (20 / 11, or 40 / 11 in each C2 booster)
|
||||
// These numbers are the same for all sets with 101 commons in A/B/C1/C2 print runs
|
||||
// and with 10 common slots per booster
|
||||
private final RarityConfiguration commonRuns = new RarityConfiguration(
|
||||
AABBC1C1C1C1C1C1,
|
||||
AABBC1C1C1C1C1C1,
|
||||
AABBC1C1C1C1C1C1,
|
||||
AABBC1C1C1C1C1C1,
|
||||
AABBC1C1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBBC2C2C2,
|
||||
AAAABBBC2C2C2,
|
||||
AAAABBBBC2C2
|
||||
);
|
||||
private final RarityConfiguration uncommonRuns = new RarityConfiguration(AAB, ABB);
|
||||
private final RarityConfiguration rareRuns = new RarityConfiguration(R1);
|
||||
private final RarityConfiguration landRuns = new RarityConfiguration(
|
||||
LB, LB, LB, LB, LB, LB, LB,
|
||||
LN, LN, LN, LN, LN
|
||||
);
|
||||
|
||||
@Override
|
||||
public List<String> makeBooster() {
|
||||
List<String> booster = new ArrayList<>();
|
||||
booster.addAll(commonRuns.getNext().makeRun());
|
||||
booster.addAll(uncommonRuns.getNext().makeRun());
|
||||
booster.addAll(rareRuns.getNext().makeRun());
|
||||
booster.addAll(landRuns.getNext().makeRun());
|
||||
return booster;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,16 @@
|
|||
package mage.sets;
|
||||
|
||||
import mage.cards.ExpansionSet;
|
||||
import mage.collation.BoosterCollator;
|
||||
import mage.collation.BoosterStructure;
|
||||
import mage.collation.CardRun;
|
||||
import mage.collation.RarityConfiguration;
|
||||
import mage.constants.Rarity;
|
||||
import mage.constants.SetType;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author TheElk801
|
||||
*/
|
||||
|
|
@ -26,10 +33,10 @@ public final class CoreSet2020 extends ExpansionSet {
|
|||
this.ratioBoosterMythic = 8;
|
||||
this.maxCardNumberInBooster = 280;
|
||||
|
||||
// Core 2020 boosters have a 5/12 chance of basic land being replaced
|
||||
// Core 2020 boosters have a 11/24 chance of basic land being replaced
|
||||
// with the common taplands, which DO NOT appear in the common slot.
|
||||
this.ratioBoosterSpecialLand = 12;
|
||||
this.ratioBoosterSpecialLandNumerator = 5;
|
||||
this.ratioBoosterSpecialLand = 24;
|
||||
this.ratioBoosterSpecialLandNumerator = 11;
|
||||
|
||||
cards.add(new SetCardInfo("Act of Treason", 124, Rarity.COMMON, mage.cards.a.ActOfTreason.class));
|
||||
cards.add(new SetCardInfo("Aerial Assault", 1, Rarity.COMMON, mage.cards.a.AerialAssault.class));
|
||||
|
|
@ -377,4 +384,104 @@ public final class CoreSet2020 extends ExpansionSet {
|
|||
cards.add(new SetCardInfo("Yoked Ox", 41, Rarity.COMMON, mage.cards.y.YokedOx.class));
|
||||
cards.add(new SetCardInfo("Zephyr Charge", 82, Rarity.COMMON, mage.cards.z.ZephyrCharge.class));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BoosterCollator createCollator() {
|
||||
return new CoreSet2020Collator();
|
||||
}
|
||||
}
|
||||
|
||||
// Booster collation info from https://www.lethe.xyz/mtg/collation/m20.html
|
||||
// Using USA collation for all rarities
|
||||
// Foil rare sheet used for regular rares as regular rare sheet is not known
|
||||
class CoreSet2020Collator implements BoosterCollator {
|
||||
private final CardRun commonA = new CardRun(true, "154", "34", "69", "155", "38", "61", "124", "25", "45", "145", "31", "58", "157", "14", "67", "138", "5", "66", "146", "1", "73", "155", "30", "69", "142", "12", "60", "159", "24", "70", "147", "31", "55", "144", "34", "48", "145", "40", "61", "154", "25", "67", "124", "38", "58", "146", "5", "60", "142", "1", "55", "144", "12", "66", "157", "14", "45", "138", "24", "70", "159", "40", "73", "147", "30", "48");
|
||||
private final CardRun commonB = new CardRun(true, "183", "85", "174", "88", "196", "101", "201", "99", "171", "112", "173", "100", "170", "97", "203", "92", "166", "84", "188", "101", "181", "116", "196", "88", "174", "86", "183", "85", "173", "112", "166", "99", "203", "100", "170", "84", "201", "101", "171", "85", "188", "92", "174", "97", "183", "86", "181", "116", "196", "88", "201", "99", "170", "100", "171", "84", "203", "112", "173", "97", "166", "92", "188", "116", "181", "86");
|
||||
private final CardRun commonC1 = new CardRun(true, "20", "108", "54", "161", "192", "241", "82", "178", "7", "160", "176", "231", "134", "75", "41", "133", "221", "195", "102", "161", "80", "108", "192", "82", "21", "175", "152", "37", "241", "83", "176", "54", "134", "20", "240", "178", "62", "133", "119", "231", "75", "41", "102", "175", "160", "240", "195", "7", "80", "119", "21", "83", "62", "152", "37");
|
||||
private final CardRun commonC2 = new CardRun(true, "184", "118", "129", "235", "32", "47", "168", "114", "93", "149", "49", "190", "228", "130", "18", "78", "114", "184", "47", "109", "11", "129", "168", "235", "32", "118", "49", "149", "93", "11", "190", "228", "130", "78", "235", "184", "47", "109", "221", "129", "18", "49", "149", "168", "93", "118", "32", "11", "130", "228", "190", "114", "78", "18", "109");
|
||||
private final CardRun uncommonA = new CardRun(true, "4", "198", "139", "19", "120", "215", "51", "232", "189", "128", "15", "89", "207", "234", "74", "197", "153", "16", "87", "209", "79", "177", "244", "198", "140", "28", "104", "213", "4", "44", "204", "164", "23", "95", "208", "50", "223", "180", "163", "29", "89", "215", "71", "103", "189", "128", "15", "120", "207", "197", "232", "74", "139", "19", "87", "209", "51", "23", "180", "153", "16", "104", "213", "79", "244", "177", "140", "28", "95", "208", "204", "234", "44", "164", "29", "103", "215", "50", "223", "189", "163", "19", "89", "207", "71", "232", "198", "139", "4", "120", "209", "51", "15", "197", "128", "16", "87", "153", "79", "234", "180", "140", "28", "103", "213", "50", "244", "177", "164", "23", "104", "208", "71", "223", "204", "163", "74", "95", "29", "44");
|
||||
private final CardRun uncommonB = new CardRun(true, "123", "205", "63", "214", "158", "76", "237", "110", "165", "17", "217", "151", "72", "236", "187", "117", "3", "206", "137", "53", "230", "90", "191", "6", "91", "143", "238", "81", "224", "110", "182", "35", "218", "132", "76", "225", "121", "186", "13", "219", "151", "42", "237", "123", "205", "3", "63", "158", "214", "236", "90", "165", "17", "217", "135", "81", "230", "6", "187", "117", "206", "143", "72", "238", "91", "191", "13", "218", "137", "53", "224", "121", "182", "35", "214", "132", "76", "225", "110", "186", "3", "205", "158", "42", "236", "123", "165", "6", "63", "135", "219", "237", "90", "187", "17", "217", "151", "81", "230", "182", "117", "137", "206", "143", "72", "238", "121", "191", "13", "218", "132", "53", "224", "91", "186", "35", "219", "135", "42", "225");
|
||||
private final CardRun rare = new CardRun(true, "8", "96", "126", "210", "169", "43", "233", "10", "148", "57", "247", "9", "98", "131", "2", "172", "46", "107", "200", "150", "59", "249", "22", "105", "136", "52", "229", "56", "111", "202", "156", "64", "253", "26", "106", "222", "211", "185", "8", "113", "68", "162", "65", "254", "27", "57", "200", "94", "247", "9", "122", "193", "239", "77", "255", "33", "59", "202", "125", "249", "22", "126", "194", "96", "222", "256", "36", "64", "107", "212", "253", "26", "131", "115", "98", "226", "257", "39", "65", "111", "167", "169", "27", "136", "179", "105", "148", "254", "43", "77", "113", "216", "172", "33", "141", "227", "106", "150", "255", "46", "141", "122", "127", "179", "36", "233", "199", "193", "156", "256", "56", "226", "239", "220", "185", "39", "229", "227", "194", "162", "257");
|
||||
private final CardRun landBasic = new CardRun(false, "261", "262", "263", "264", "265", "266", "267", "268", "269", "270", "271", "272", "273", "274", "275", "276", "277", "278", "279", "280");
|
||||
private final CardRun landNonBasic = new CardRun(false, "242", "243", "245", "246", "248", "250", "251", "252", "258", "259", "260");
|
||||
|
||||
private final BoosterStructure AABBC1C1C1C1C1C1 = new BoosterStructure(
|
||||
commonA, commonA,
|
||||
commonB, commonB,
|
||||
commonC1, commonC1, commonC1, commonC1, commonC1, commonC1
|
||||
);
|
||||
private final BoosterStructure AAABBC1C1C1C1C1 = new BoosterStructure(
|
||||
commonA, commonA, commonA,
|
||||
commonB, commonB,
|
||||
commonC1, commonC1, commonC1, commonC1, commonC1
|
||||
);
|
||||
private final BoosterStructure AAAABBC2C2C2C2 = new BoosterStructure(
|
||||
commonA, commonA, commonA, commonA,
|
||||
commonB, commonB,
|
||||
commonC2, commonC2, commonC2, commonC2
|
||||
);
|
||||
private final BoosterStructure AAAABBBC2C2C2 = new BoosterStructure(
|
||||
commonA, commonA, commonA, commonA,
|
||||
commonB, commonB, commonB,
|
||||
commonC2, commonC2, commonC2
|
||||
);
|
||||
private final BoosterStructure AAAABBBBC2C2 = new BoosterStructure(
|
||||
commonA, commonA, commonA, commonA,
|
||||
commonB, commonB, commonB, commonB,
|
||||
commonC2, commonC2
|
||||
);
|
||||
private final BoosterStructure AAB = new BoosterStructure(uncommonA, uncommonA, uncommonB);
|
||||
private final BoosterStructure ABB = new BoosterStructure(uncommonA, uncommonB, uncommonB);
|
||||
private final BoosterStructure R1 = new BoosterStructure(rare);
|
||||
private final BoosterStructure LB = new BoosterStructure(landBasic);
|
||||
private final BoosterStructure LN = new BoosterStructure(landNonBasic);
|
||||
|
||||
// In order for equal numbers of each common to exist, the average booster must contain:
|
||||
// 3.27 A commons (36 / 11)
|
||||
// 2.18 B commons (24 / 11)
|
||||
// 2.73 C1 commons (30 / 11, or 60 / 11 in each C1 booster)
|
||||
// 1.82 C2 commons (20 / 11, or 40 / 11 in each C2 booster)
|
||||
// These numbers are the same for all sets with 101 commons in A/B/C1/C2 print runs
|
||||
// and with 10 common slots per booster
|
||||
private final RarityConfiguration commonRuns = new RarityConfiguration(
|
||||
AABBC1C1C1C1C1C1,
|
||||
AABBC1C1C1C1C1C1,
|
||||
AABBC1C1C1C1C1C1,
|
||||
AABBC1C1C1C1C1C1,
|
||||
AABBC1C1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBBC2C2C2,
|
||||
AAAABBBC2C2C2,
|
||||
AAAABBBBC2C2
|
||||
);
|
||||
private final RarityConfiguration uncommonRuns = new RarityConfiguration(AAB, ABB);
|
||||
private final RarityConfiguration rareRuns = new RarityConfiguration(R1);
|
||||
private final RarityConfiguration landRuns = new RarityConfiguration(
|
||||
LB, LB, LB, LB, LB, LB, LB, LB, LB, LB, LB, LB, LB,
|
||||
LN, LN, LN, LN, LN, LN, LN, LN, LN, LN, LN
|
||||
);
|
||||
|
||||
@Override
|
||||
public List<String> makeBooster() {
|
||||
List<String> booster = new ArrayList<>();
|
||||
booster.addAll(commonRuns.getNext().makeRun());
|
||||
booster.addAll(uncommonRuns.getNext().makeRun());
|
||||
booster.addAll(rareRuns.getNext().makeRun());
|
||||
booster.addAll(landRuns.getNext().makeRun());
|
||||
return booster;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,15 @@
|
|||
package mage.sets;
|
||||
|
||||
import mage.cards.ExpansionSet;
|
||||
import mage.collation.BoosterCollator;
|
||||
import mage.collation.BoosterStructure;
|
||||
import mage.collation.CardRun;
|
||||
import mage.collation.RarityConfiguration;
|
||||
import mage.cards.repository.CardInfo;
|
||||
import mage.constants.Rarity;
|
||||
import mage.constants.SetType;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public final class GuildsOfRavnica extends ExpansionSet {
|
||||
|
|
@ -311,4 +316,99 @@ public final class GuildsOfRavnica extends ExpansionSet {
|
|||
}
|
||||
return cardInfos;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BoosterCollator createCollator() {
|
||||
return new GuildsOfRavnicaCollator();
|
||||
}
|
||||
}
|
||||
|
||||
// Booster collation info from https://www.lethe.xyz/mtg/collation/grn.html
|
||||
// Using USA collation for all rarities
|
||||
// Foil rare sheet used for regular rares as regular rare sheet is not known
|
||||
class GuildsOfRavnicaCollator implements BoosterCollator {
|
||||
private final CardRun commonA = new CardRun(true, "14", "60", "118", "5", "34", "101", "18", "37", "92", "29", "42", "100", "27", "43", "119", "15", "56", "95", "17", "52", "104", "20", "60", "118", "23", "57", "112", "25", "58", "120", "28", "36", "114", "5", "50", "111", "14", "34", "101", "17", "43", "92", "29", "37", "119", "15", "57", "100", "23", "42", "104", "18", "56", "95", "27", "58", "120", "28", "52", "112", "20", "36", "114", "25", "50", "111");
|
||||
private final CardRun commonB = new CardRun(true, "126", "61", "129", "62", "127", "89", "147", "85", "150", "65", "146", "64", "149", "78", "133", "70", "139", "88", "135", "62", "142", "80", "126", "61", "127", "89", "129", "85", "150", "86", "147", "64", "139", "65", "146", "62", "142", "70", "135", "78", "149", "88", "147", "80", "133", "61", "127", "89", "126", "85", "129", "86", "150", "65", "149", "70", "146", "78", "139", "88", "135", "64", "142", "80", "133", "86");
|
||||
private final CardRun commonC1 = new CardRun(true, "105", "234", "158", "164", "35", "169", "198", "220", "3", "199", "196", "216", "76", "1", "94", "31", "237", "110", "72", "219", "178", "143", "176", "234", "21", "3", "217", "218", "216", "151", "200", "35", "196", "198", "164", "158", "220", "31", "169", "110", "72", "1", "199", "237", "94", "76", "21", "219", "217", "218", "176", "151", "200", "178", "143");
|
||||
private final CardRun commonC2 = new CardRun(true, "105", "59", "140", "197", "238", "68", "134", "22", "172", "46", "240", "67", "210", "96", "247", "174", "144", "231", "193", "140", "59", "240", "96", "238", "68", "134", "197", "172", "46", "247", "67", "210", "22", "231", "144", "174", "193", "240", "59", "140", "197", "172", "68", "238", "96", "134", "46", "247", "67", "210", "22", "231", "144", "174", "193");
|
||||
private final CardRun uncommonA = new CardRun(true, "235", "108", "190", "6", "136", "32", "155", "83", "227", "13", "130", "90", "191", "103", "209", "48", "226", "24", "45", "186", "41", "185", "9", "228", "79", "182", "116", "161", "236", "177", "48", "137", "24", "163", "235", "97", "154", "121", "201", "122", "181", "6", "130", "155", "108", "191", "87", "156", "136", "45", "185", "103", "190", "32", "186", "137", "209", "13", "163", "116", "227", "83", "226", "90", "121", "228", "41", "236", "154", "9", "161", "97", "177", "79", "181", "122", "186", "6", "201", "108", "155", "136", "182", "45", "156", "48", "227", "87", "103", "191", "130", "235", "190", "32", "185", "83", "209", "13", "116", "226", "90", "182", "24", "163", "137", "236", "154", "41", "228", "9", "161", "122", "201", "79", "177", "97", "181", "87", "121", "156");
|
||||
private final CardRun uncommonB = new CardRun(true, "167", "128", "53", "187", "107", "16", "206", "145", "242", "102", "173", "26", "125", "166", "66", "55", "230", "12", "175", "131", "214", "93", "40", "162", "239", "106", "223", "33", "7", "194", "81", "167", "107", "12", "55", "215", "16", "117", "74", "187", "54", "202", "82", "102", "206", "242", "33", "173", "11", "145", "53", "230", "241", "175", "73", "40", "93", "223", "128", "66", "106", "166", "125", "162", "7", "187", "131", "194", "54", "202", "239", "117", "26", "214", "81", "16", "74", "167", "107", "242", "55", "215", "82", "12", "241", "173", "145", "230", "53", "102", "206", "11", "131", "166", "73", "40", "125", "194", "239", "66", "54", "26", "162", "128", "223", "33", "106", "81", "214", "74", "175", "7", "93", "215", "82", "202", "117", "11", "241", "73");
|
||||
private final CardRun rare = new CardRun(true, "152", "63", "51", "2", "153", "123", "253", "39", "69", "171", "98", "221", "71", "171", "4", "159", "124", "152", "44", "232", "179", "99", "157", "75", "179", "8", "184", "132", "221", "47", "138", "180", "109", "160", "77", "180", "233", "188", "141", "157", "49", "254", "183", "113", "222", "84", "183", "258", "189", "148", "160", "63", "19", "192", "115", "165", "30", "192", "2", "195", "39", "222", "71", "91", "229", "257", "168", "98", "229", "4", "207", "44", "165", "75", "232", "203", "123", "170", "99", "203", "8", "208", "47", "168", "77", "38", "204", "124", "224", "109", "204", "233", "211", "49", "170", "84", "259", "205", "132", "225", "113", "205", "250", "213", "51", "224", "30", "253", "212", "141", "254", "115", "212", "258", "19", "257", "225", "259", "10", "250", "148");
|
||||
private final CardRun land = new CardRun(false, "243", "244", "245", "246", "248", "249", "251", "252", "255", "256");
|
||||
|
||||
private final BoosterStructure AABBC1C1C1C1C1C1 = new BoosterStructure(
|
||||
commonA, commonA,
|
||||
commonB, commonB,
|
||||
commonC1, commonC1, commonC1, commonC1, commonC1, commonC1
|
||||
);
|
||||
private final BoosterStructure AAABBC1C1C1C1C1 = new BoosterStructure(
|
||||
commonA, commonA, commonA,
|
||||
commonB, commonB,
|
||||
commonC1, commonC1, commonC1, commonC1, commonC1
|
||||
);
|
||||
private final BoosterStructure AAAABBC2C2C2C2 = new BoosterStructure(
|
||||
commonA, commonA, commonA, commonA,
|
||||
commonB, commonB,
|
||||
commonC2, commonC2, commonC2, commonC2
|
||||
);
|
||||
private final BoosterStructure AAAABBBC2C2C2 = new BoosterStructure(
|
||||
commonA, commonA, commonA, commonA,
|
||||
commonB, commonB, commonB,
|
||||
commonC2, commonC2, commonC2
|
||||
);
|
||||
private final BoosterStructure AAAABBBBC2C2 = new BoosterStructure(
|
||||
commonA, commonA, commonA, commonA,
|
||||
commonB, commonB, commonB, commonB,
|
||||
commonC2, commonC2
|
||||
);
|
||||
private final BoosterStructure AAB = new BoosterStructure(uncommonA, uncommonA, uncommonB);
|
||||
private final BoosterStructure ABB = new BoosterStructure(uncommonA, uncommonB, uncommonB);
|
||||
private final BoosterStructure R1 = new BoosterStructure(rare);
|
||||
private final BoosterStructure L1 = new BoosterStructure(land);
|
||||
|
||||
// In order for equal numbers of each common to exist, the average booster must contain:
|
||||
// 3.27 A commons (36 / 11)
|
||||
// 2.18 B commons (24 / 11)
|
||||
// 2.73 C1 commons (30 / 11, or 60 / 11 in each C1 booster)
|
||||
// 1.82 C2 commons (20 / 11, or 40 / 11 in each C2 booster)
|
||||
// These numbers are the same for all sets with 101 commons in A/B/C1/C2 print runs
|
||||
// and with 10 common slots per booster
|
||||
private final RarityConfiguration commonRuns = new RarityConfiguration(
|
||||
AABBC1C1C1C1C1C1,
|
||||
AABBC1C1C1C1C1C1,
|
||||
AABBC1C1C1C1C1C1,
|
||||
AABBC1C1C1C1C1C1,
|
||||
AABBC1C1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBBC2C2C2,
|
||||
AAAABBBC2C2C2,
|
||||
AAAABBBBC2C2
|
||||
);
|
||||
private final RarityConfiguration uncommonRuns = new RarityConfiguration(AAB, ABB);
|
||||
private final RarityConfiguration rareRuns = new RarityConfiguration(R1);
|
||||
private final RarityConfiguration landRuns = new RarityConfiguration(L1);
|
||||
|
||||
@Override
|
||||
public List<String> makeBooster() {
|
||||
List<String> booster = new ArrayList<>();
|
||||
booster.addAll(commonRuns.getNext().makeRun());
|
||||
booster.addAll(uncommonRuns.getNext().makeRun());
|
||||
booster.addAll(rareRuns.getNext().makeRun());
|
||||
booster.addAll(landRuns.getNext().makeRun());
|
||||
return booster;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,16 @@
|
|||
package mage.sets;
|
||||
|
||||
import mage.cards.ExpansionSet;
|
||||
import mage.collation.BoosterCollator;
|
||||
import mage.collation.BoosterStructure;
|
||||
import mage.collation.CardRun;
|
||||
import mage.collation.RarityConfiguration;
|
||||
import mage.constants.Rarity;
|
||||
import mage.constants.SetType;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author fireshoes
|
||||
*/
|
||||
|
|
@ -24,7 +31,7 @@ public final class Ixalan extends ExpansionSet {
|
|||
this.numBoosterCommon = 10;
|
||||
this.numBoosterUncommon = 3;
|
||||
this.numBoosterRare = 1;
|
||||
this.ratioBoosterMythic = 8;
|
||||
this.ratioBoosterMythic = 9.4;
|
||||
this.numBoosterDoubleFaced = -1;
|
||||
this.maxCardNumberInBooster = 279;
|
||||
|
||||
|
|
@ -328,4 +335,93 @@ public final class Ixalan extends ExpansionSet {
|
|||
cards.add(new SetCardInfo("Wind Strider", 88, Rarity.COMMON, mage.cards.w.WindStrider.class));
|
||||
cards.add(new SetCardInfo("Woodland Stream", 284, Rarity.COMMON, mage.cards.w.WoodlandStream.class));
|
||||
}
|
||||
|
||||
@Override
|
||||
public BoosterCollator createCollator() {
|
||||
return new IxalanCollator();
|
||||
}
|
||||
}
|
||||
|
||||
// Booster collation info from https://www.lethe.xyz/mtg/collation/xln.html
|
||||
// Using USA collation for common/uncommon, rare collation inferred from other sets
|
||||
class IxalanCollator implements BoosterCollator {
|
||||
private final CardRun commonA = new CardRun(true, "142", "20", "102", "169", "23", "114", "134", "21", "123", "146", "28", "115", "160", "6", "112", "158", "36", "107", "152", "40", "101", "164", "43", "98", "166", "21", "122", "142", "37", "102", "141", "20", "113", "146", "38", "114", "134", "23", "115", "144", "28", "92", "169", "29", "123", "158", "6", "112", "152", "36", "98", "160", "40", "107", "164", "43", "101", "144", "37", "122", "141", "38", "113", "166", "29", "92");
|
||||
private final CardRun commonB = new CardRun(true, "64", "182", "78", "194", "75", "198", "76", "193", "77", "202", "52", "181", "73", "209", "68", "192", "65", "178", "85", "204", "69", "186", "77", "194", "64", "193", "78", "202", "75", "198", "73", "182", "76", "181", "85", "178", "52", "204", "68", "209", "65", "192", "69", "186", "78", "202", "75", "198", "64", "182", "76", "181", "73", "193", "65", "194", "77", "204", "69", "178", "85", "209", "68", "192", "52", "186");
|
||||
private final CardRun commonC1 = new CardRun(true, "125", "96", "58", "240", "41", "103", "167", "80", "259", "72", "89", "242", "127", "195", "175", "211", "244", "147", "18", "163", "125", "31", "233", "81", "41", "88", "240", "96", "145", "103", "11", "72", "259", "167", "58", "127", "242", "89", "163", "80", "195", "31", "175", "200", "244", "147", "18", "211", "11", "233", "200", "81", "32", "88", "145");
|
||||
private final CardRun commonC2 = new CardRun(true, "139", "124", "8", "190", "239", "172", "47", "180", "8", "95", "148", "87", "177", "25", "239", "168", "183", "124", "53", "26", "139", "190", "105", "172", "32", "47", "180", "148", "95", "177", "25", "239", "168", "105", "26", "183", "172", "53", "190", "8", "124", "139", "25", "177", "95", "47", "87", "148", "26", "183", "87", "105", "168", "53", "180");
|
||||
private final CardRun uncommonA = new CardRun(true, "216", "83", "116", "247", "151", "196", "16", "79", "236", "162", "188", "35", "56", "110", "245", "174", "214", "39", "108", "237", "171", "212", "30", "67", "128", "218", "150", "216", "83", "131", "254", "140", "207", "9", "51", "119", "241", "162", "196", "63", "109", "247", "151", "214", "15", "62", "108", "237", "157", "212", "79", "116", "236", "174", "188", "39", "56", "110", "245", "150", "216", "67", "131", "254", "171", "196", "30", "83", "128", "218", "140", "16", "51", "119", "241", "162", "207", "9", "63", "109", "245", "150", "35", "56", "110", "247", "151", "214", "15", "62", "108", "237", "157", "39", "79", "109", "254", "174", "188", "16", "51", "131", "241", "140", "35", "63", "119", "236", "171", "212", "30", "67", "116", "218", "207", "9", "62", "128", "157", "15");
|
||||
private final CardRun uncommonB = new CardRun(true, "111", "7", "50", "187", "220", "1", "226", "91", "45", "208", "149", "121", "4", "210", "10", "228", "155", "229", "97", "86", "197", "153", "130", "12", "48", "176", "221", "133", "17", "100", "84", "201", "138", "111", "7", "70", "205", "225", "143", "14", "91", "50", "187", "149", "121", "4", "45", "208", "226", "155", "1", "219", "86", "210", "153", "97", "258", "84", "176", "220", "133", "17", "229", "48", "197", "138", "100", "10", "70", "201", "228", "143", "14", "111", "50", "205", "153", "130", "12", "84", "187", "219", "155", "1", "91", "45", "208", "226", "97", "4", "86", "197", "221", "149", "7", "121", "228", "210", "225", "258", "10", "48", "176", "220", "133", "17", "100", "229", "138", "221", "12", "258", "201", "219", "14", "225", "130", "70", "205", "143");
|
||||
private final CardRun rare = new CardRun(false, "2", "5", "13", "19", "22", "24", "27", "33", "34", "42", "46", "49", "54", "55", "57", "59", "61", "71", "74", "82", "90", "93", "99", "106", "117", "118", "120", "126", "129", "132", "135", "136", "137", "154", "156", "165", "170", "173", "184", "185", "189", "191", "199", "203", "206", "213", "215", "223", "227", "234", "235", "238", "243", "246", "248", "249", "250", "251", "252", "253", "255", "256", "257", "2", "5", "13", "19", "22", "24", "27", "33", "34", "42", "46", "49", "54", "55", "57", "59", "61", "71", "74", "82", "90", "93", "99", "106", "117", "118", "120", "126", "129", "132", "135", "136", "137", "154", "156", "165", "170", "173", "184", "185", "189", "191", "199", "203", "206", "213", "215", "223", "227", "234", "235", "238", "243", "246", "248", "249", "250", "251", "252", "253", "255", "256", "257", "3", "44", "60", "66", "94", "104", "159", "161", "179", "217", "222", "224", "230", "231", "232");
|
||||
private final CardRun land = new CardRun(false, "260", "261", "262", "263", "264", "265", "266", "267", "268", "269", "270", "271", "272", "273", "274", "275", "276", "277", "278", "279");
|
||||
|
||||
private final BoosterStructure AABBC1C1C1C1C1C1 = new BoosterStructure(
|
||||
commonA, commonA,
|
||||
commonB, commonB,
|
||||
commonC1, commonC1, commonC1, commonC1, commonC1, commonC1
|
||||
);
|
||||
private final BoosterStructure AAABBC1C1C1C1C1 = new BoosterStructure(
|
||||
commonA, commonA, commonA,
|
||||
commonB, commonB,
|
||||
commonC1, commonC1, commonC1, commonC1, commonC1
|
||||
);
|
||||
private final BoosterStructure AAAABBC2C2C2C2 = new BoosterStructure(
|
||||
commonA, commonA, commonA, commonA,
|
||||
commonB, commonB,
|
||||
commonC2, commonC2, commonC2, commonC2
|
||||
);
|
||||
private final BoosterStructure AAAABBBBC2C2 = new BoosterStructure(
|
||||
commonA, commonA, commonA, commonA,
|
||||
commonB, commonB, commonB, commonB,
|
||||
commonC2, commonC2
|
||||
);
|
||||
private final BoosterStructure AAB = new BoosterStructure(uncommonA, uncommonA, uncommonB);
|
||||
private final BoosterStructure ABB = new BoosterStructure(uncommonA, uncommonB, uncommonB);
|
||||
private final BoosterStructure R1 = new BoosterStructure(rare);
|
||||
private final BoosterStructure L1 = new BoosterStructure(land);
|
||||
|
||||
// In order for equal numbers of each common to exist, the average booster must contain:
|
||||
// 3.27 A commons (36 / 11)
|
||||
// 2.18 B commons (24 / 11)
|
||||
// 2.73 C1 commons (30 / 11, or 60 / 11 in each C1 booster)
|
||||
// 1.82 C2 commons (20 / 11, or 40 / 11 in each C2 booster)
|
||||
// These numbers are the same for all sets with 101 commons in A/B/C1/C2 print runs
|
||||
// and with 10 common slots per booster
|
||||
private final RarityConfiguration commonRuns = new RarityConfiguration(
|
||||
AABBC1C1C1C1C1C1,
|
||||
AABBC1C1C1C1C1C1,
|
||||
AABBC1C1C1C1C1C1,
|
||||
AABBC1C1C1C1C1C1,
|
||||
AABBC1C1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBBBC2C2,
|
||||
AAAABBBBC2C2
|
||||
);
|
||||
private final RarityConfiguration uncommonRuns = new RarityConfiguration(AAB, ABB);
|
||||
private final RarityConfiguration rareRuns = new RarityConfiguration(R1);
|
||||
private final RarityConfiguration landRuns = new RarityConfiguration(L1);
|
||||
|
||||
@Override
|
||||
public List<String> makeBooster() {
|
||||
List<String> booster = new ArrayList<>();
|
||||
booster.addAll(commonRuns.getNext().makeRun());
|
||||
booster.addAll(uncommonRuns.getNext().makeRun());
|
||||
booster.addAll(rareRuns.getNext().makeRun());
|
||||
booster.addAll(landRuns.getNext().makeRun());
|
||||
return booster;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,10 +1,15 @@
|
|||
package mage.sets;
|
||||
|
||||
import mage.cards.ExpansionSet;
|
||||
import mage.collation.BoosterCollator;
|
||||
import mage.collation.BoosterStructure;
|
||||
import mage.collation.CardRun;
|
||||
import mage.collation.RarityConfiguration;
|
||||
import mage.cards.repository.CardInfo;
|
||||
import mage.constants.Rarity;
|
||||
import mage.constants.SetType;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public final class RavnicaAllegiance extends ExpansionSet {
|
||||
|
|
@ -311,4 +316,99 @@ public final class RavnicaAllegiance extends ExpansionSet {
|
|||
}
|
||||
return cardInfos;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BoosterCollator createCollator() {
|
||||
return new RavnicaAllegianceCollator();
|
||||
}
|
||||
}
|
||||
|
||||
// Booster collation info from https://www.lethe.xyz/mtg/collation/rna.html
|
||||
// Using USA collation for all rarities
|
||||
// Foil rare sheet used for regular rares as regular rare sheet is not known
|
||||
class RavnicaAllegianceCollator implements BoosterCollator {
|
||||
private final CardRun commonA = new CardRun(true, "54", "203", "220", "31", "113", "10", "44", "202", "17", "51", "119", "5", "36", "100", "7", "57", "117", "26", "39", "103", "6", "48", "217", "12", "41", "105", "220", "49", "111", "14", "54", "118", "10", "31", "203", "28", "44", "113", "5", "57", "202", "26", "46", "117", "7", "48", "217", "4", "51", "100", "14", "36", "105", "17", "41", "119", "6", "39", "103", "12", "46", "118", "28", "49", "111", "4");
|
||||
private final CardRun commonB = new CardRun(true, "127", "87", "145", "84", "133", "66", "135", "71", "140", "88", "138", "78", "142", "198", "143", "89", "145", "82", "121", "84", "127", "216", "135", "69", "133", "87", "132", "78", "143", "71", "140", "88", "138", "198", "144", "66", "142", "89", "127", "216", "133", "69", "145", "82", "121", "71", "135", "84", "132", "88", "144", "87", "143", "89", "140", "198", "142", "66", "138", "78", "144", "82", "121", "216", "132", "69");
|
||||
private final CardRun commonC1 = new CardRun(true, "98", "247", "153", "137", "231", "25", "34", "196", "115", "64", "146", "178", "8", "75", "209", "93", "50", "154", "234", "173", "236", "98", "53", "150", "218", "153", "247", "72", "240", "177", "25", "137", "196", "231", "64", "115", "178", "34", "209", "75", "8", "146", "154", "93", "177", "53", "72", "236", "173", "234", "150", "50", "218", "219", "240");
|
||||
private final CardRun commonC2 = new CardRun(true, "13", "176", "67", "33", "110", "63", "30", "171", "77", "94", "152", "237", "33", "110", "24", "139", "190", "104", "63", "13", "171", "91", "184", "77", "176", "30", "152", "104", "219", "67", "24", "139", "33", "110", "190", "237", "94", "67", "184", "91", "176", "13", "171", "237", "63", "104", "24", "139", "152", "77", "190", "91", "184", "30", "94");
|
||||
private final CardRun uncommonA = new CardRun(true, "62", "194", "52", "201", "125", "204", "3", "141", "159", "107", "180", "80", "192", "60", "181", "123", "175", "239", "129", "197", "97", "215", "90", "206", "40", "182", "148", "224", "2", "225", "141", "96", "174", "62", "125", "52", "201", "16", "194", "232", "68", "208", "107", "180", "90", "210", "38", "159", "148", "156", "18", "181", "129", "175", "80", "182", "123", "40", "215", "3", "192", "239", "60", "206", "97", "174", "68", "197", "38", "204", "2", "208", "232", "201", "141", "96", "225", "90", "210", "40", "180", "125", "16", "224", "148", "159", "107", "156", "62", "194", "52", "181", "18", "208", "239", "175", "3", "97", "182", "80", "123", "60", "174", "16", "192", "129", "204", "206", "96", "224", "68", "197", "38", "225", "18", "210", "232", "215", "2", "156");
|
||||
private final CardRun uncommonB = new CardRun(true, "102", "168", "120", "241", "70", "164", "149", "35", "226", "59", "126", "116", "162", "235", "20", "73", "222", "95", "56", "211", "136", "9", "112", "172", "238", "23", "86", "155", "19", "47", "188", "147", "223", "101", "241", "191", "20", "79", "164", "235", "37", "163", "149", "70", "102", "211", "120", "21", "86", "222", "65", "35", "168", "238", "126", "112", "162", "95", "9", "79", "226", "136", "23", "172", "59", "20", "116", "56", "19", "155", "73", "223", "120", "9", "164", "147", "241", "101", "47", "191", "211", "86", "162", "149", "35", "163", "95", "188", "102", "37", "235", "226", "70", "168", "238", "21", "155", "136", "79", "112", "47", "65", "223", "172", "101", "59", "23", "222", "19", "126", "116", "56", "191", "73", "188", "65", "37", "163", "147", "21");
|
||||
private final CardRun rare = new CardRun(true, "11", "160", "251", "151", "32", "170", "74", "193", "108", "166", "124", "207", "61", "213", "134", "42", "1", "245", "221", "99", "242", "187", "76", "233", "167", "157", "130", "179", "254", "165", "45", "15", "85", "229", "81", "22", "158", "128", "230", "55", "169", "27", "246", "189", "109", "212", "259", "32", "186", "227", "131", "161", "106", "83", "228", "11", "122", "185", "61", "214", "248", "151", "58", "99", "199", "207", "74", "221", "124", "193", "15", "92", "200", "42", "170", "251", "158", "29", "187", "259", "114", "179", "76", "157", "134", "22", "213", "254", "205", "128", "228", "108", "161", "45", "165", "81", "183", "245", "229", "212", "55", "242", "227", "109", "43", "130", "27", "189", "246", "106", "230", "233", "195", "131", "83", "214", "248", "29", "58", "92", "185");
|
||||
private final CardRun land = new CardRun(false, "243", "244", "249", "250", "252", "253", "255", "256", "257", "258");
|
||||
|
||||
private final BoosterStructure AABBC1C1C1C1C1C1 = new BoosterStructure(
|
||||
commonA, commonA,
|
||||
commonB, commonB,
|
||||
commonC1, commonC1, commonC1, commonC1, commonC1, commonC1
|
||||
);
|
||||
private final BoosterStructure AAABBC1C1C1C1C1 = new BoosterStructure(
|
||||
commonA, commonA, commonA,
|
||||
commonB, commonB,
|
||||
commonC1, commonC1, commonC1, commonC1, commonC1
|
||||
);
|
||||
private final BoosterStructure AAAABBC2C2C2C2 = new BoosterStructure(
|
||||
commonA, commonA, commonA, commonA,
|
||||
commonB, commonB,
|
||||
commonC2, commonC2, commonC2, commonC2
|
||||
);
|
||||
private final BoosterStructure AAAABBBC2C2C2 = new BoosterStructure(
|
||||
commonA, commonA, commonA, commonA,
|
||||
commonB, commonB, commonB,
|
||||
commonC2, commonC2, commonC2
|
||||
);
|
||||
private final BoosterStructure AAAABBBBC2C2 = new BoosterStructure(
|
||||
commonA, commonA, commonA, commonA,
|
||||
commonB, commonB, commonB, commonB,
|
||||
commonC2, commonC2
|
||||
);
|
||||
private final BoosterStructure AAB = new BoosterStructure(uncommonA, uncommonA, uncommonB);
|
||||
private final BoosterStructure ABB = new BoosterStructure(uncommonA, uncommonB, uncommonB);
|
||||
private final BoosterStructure R1 = new BoosterStructure(rare);
|
||||
private final BoosterStructure L1 = new BoosterStructure(land);
|
||||
|
||||
// In order for equal numbers of each common to exist, the average booster must contain:
|
||||
// 3.27 A commons (36 / 11)
|
||||
// 2.18 B commons (24 / 11)
|
||||
// 2.73 C1 commons (30 / 11, or 60 / 11 in each C1 booster)
|
||||
// 1.82 C2 commons (20 / 11, or 40 / 11 in each C2 booster)
|
||||
// These numbers are the same for all sets with 101 commons in A/B/C1/C2 print runs
|
||||
// and with 10 common slots per booster
|
||||
private final RarityConfiguration commonRuns = new RarityConfiguration(
|
||||
AABBC1C1C1C1C1C1,
|
||||
AABBC1C1C1C1C1C1,
|
||||
AABBC1C1C1C1C1C1,
|
||||
AABBC1C1C1C1C1C1,
|
||||
AABBC1C1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
AAABBC1C1C1C1C1,
|
||||
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBC2C2C2C2,
|
||||
AAAABBBC2C2C2,
|
||||
AAAABBBC2C2C2,
|
||||
AAAABBBBC2C2
|
||||
);
|
||||
private final RarityConfiguration uncommonRuns = new RarityConfiguration(AAB, ABB);
|
||||
private final RarityConfiguration rareRuns = new RarityConfiguration(R1);
|
||||
private final RarityConfiguration landRuns = new RarityConfiguration(L1);
|
||||
|
||||
@Override
|
||||
public List<String> makeBooster() {
|
||||
List<String> booster = new ArrayList<>();
|
||||
booster.addAll(commonRuns.getNext().makeRun());
|
||||
booster.addAll(uncommonRuns.getNext().makeRun());
|
||||
booster.addAll(rareRuns.getNext().makeRun());
|
||||
booster.addAll(landRuns.getNext().makeRun());
|
||||
return booster;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue