diff --git a/Mage.Sets/src/mage/sets/Kaldheim.java b/Mage.Sets/src/mage/sets/Kaldheim.java index 6e9f089192..060c1c4bbf 100644 --- a/Mage.Sets/src/mage/sets/Kaldheim.java +++ b/Mage.Sets/src/mage/sets/Kaldheim.java @@ -502,16 +502,20 @@ public final class Kaldheim extends ExpansionSet { // Booster collation info from https://www.lethe.xyz/mtg/collation/khm.html // Using USA collation for common/uncommon and JP for rare/mythic class KaldheimCollator implements BoosterCollator { - - private final CardRun commonA = new CardRun(true, "34","77","136","13","78","149","3","47","127","14","67","140","19","54","124","38","49","147","39","55","157","1","53","141","37","66","126","10","71","155","4","65","121","13","77","136","34","78","127","3","47","149","14","54","124","38","67","140","19","55","147","39","49","157","37","53","141","10","65","155","1","71","121","4","66","126"); - private final CardRun commonB = new CardRun(true, "102","176","87","183","93","184","104","178","117","174","111","171","96","194","84","176","119","180","83","164","89","172","87","175","102","183","104","178","93","174","117","184","111","171","84","194","119","164","96","180","89","176","83","172","102","175","87","178","104","174","93","183","117","171","119","184","84","164","111","194","89","180","96","172","83","175"); - private final CardRun commonC1 = new CardRun(true, "187","152","242","46","173","23","101","246","48","190","32","151","99","68","267","31","91","192","143","57","100","243","105","16","134","42","196","238","187","46","23","242","152","173","48","32","246","190","151","101","31","68","99","267","91","134","105","57","16","192","100","143","243","196","42"); - private final CardRun commonC2 = new CardRun(true, "11","193","95","158","17","239","44","159","129","7","118","85","138","74","165","11","129","193","150","72","5","95","159","74","158","17","85","239","118","138","44","7","238","193","150","165","5","72","158","95","11","44","159","239","129","17","85","74","7","118","5","150","165","138","72"); - private final CardRun uncommonA = new CardRun(true, "215","236","212","208","195","224","332","6","232","18","106","268","209","162","8","76","122","88","182","206","202","62","110","132","200","325","271","211","144","103","215","236","258","56","163","113","28","226","2","58","263","148","232","162","224","208","195","323","268","18","106","6","233","8","76","122","209","88","182","206","202","62","110","132","321","220","271","211","144","258","2","28","263","113","226","103","236","163","56","215","148","58","329","195","6","232","233","18","212","162","268","106","208","103","322","76","122","88","182","206","202","62","110","132","200","220","271","211","144","8","58","28","258","113","56","148","2","263","226","163"); - private final CardRun uncommonB = new CardRun(true, "30","166","75","201","265","222","45","135","256","191","231","235","36","250","316","128","25","247","264","35","97","186","223","59","60","130","216","80","244","259","217","133","64","245","108","189","331","137","116","253","30","166","75","201","265","327","45","128","256","247","235","36","191","25","170","250","135","231","186","35","60","324","97","130","59","264","244","80","328","259","133","217","64","245","108","189","230","137","116","253","30","166","75","201","265","222","45","256","191","235","170","135","36","128","25","247","250","231","35","223","60","130","97","264","216","186","59","244","80","259","217","133","304","245","108","189","230","137","116","253"); - private final CardRun rareA = new CardRun(false, "9","12","20","21","24","26","27","29","43","50","51","52","61","63","69","73","79","82","86","90","92","107","109","112","115","120","123","125","131","142","146","153","156","161","167","169","177","179","181","185","188","197","203","204","205","207","210","213","214","219","227","228","229","234","237","240","241","251","252","254","255","260","272","275","9","12","20","21","24","26","27","29","43","50","51","52","61","63","69","73","79","82","86","90","92","107","109","112","115","120","123","125","131","142","146","153","156","161","167","169","177","179","181","185","188","197","203","204","205","207","210","213","214","219","227","228","229","234","237","240","241","251","252","254","255","260","272","275","15","22","33","40","41","70","81","94","98","114","139","145","154","160","168","198","199","218","221","225"); - private final CardRun rareB = new CardRun(false, "9","12","20","300","24","26","27","301","43","303","51","52","61","63","69","73","79","82","86","90","306","107","109","307","309","310","311","125","131","312","146","153","156","161","167","315","177","317","318","185","188","319","203","204","205","207","210","213","214","219","227","330","229","234","237","240","241","290","291","292","255","293","272","275","9","12","20","300","24","26","27","301","43","303","51","52","61","63","69","73","79","82","86","90","306","107","109","307","309","310","311","125","131","312","146","153","156","161","167","315","177","317","318","185","188","319","203","204","205","207","210","213","214","219","227","330","229","234","237","240","241","290","291","292","255","293","272","275","299","22","294","302","295","305","81","94","296","308","139","297","313","298","314","287","320","288","326","289"); - private final CardRun land = new CardRun(true, "270","282","248","277","276","280","278","266","270","283","282","285","274","277","281","279","262","284","282","248","283","276","269","276","280","285","281","249","257","284","277","249","281","284","283","266","257","281","269","280","261","276","277","283","249","278","285","248","276","285","279","261","269","257","249","248","283","270","285","277","282","284","270","278","248","279","269","281","274","280","279","257","281","284","277","257","274","273","279","276","262","266","284","281","273","282","278","262","280","279","274","262","282","283","278","262","279","261","285","273","266","283","261","280","284","266","278","270","285","282","280","276","277","273","278","269","273","249","261","274"); + private final CardRun commonA = new CardRun(true, "34", "77", "136", "13", "78", "149", "3", "47", "127", "14", "67", "140", "19", "54", "124", "38", "49", "147", "39", "55", "157", "1", "53", "141", "37", "66", "126", "10", "71", "155", "4", "65", "121", "13", "77", "136", "34", "78", "127", "3", "47", "149", "14", "54", "124", "38", "67", "140", "19", "55", "147", "39", "49", "157", "37", "53", "141", "10", "65", "155", "1", "71", "121", "4", "66", "126"); + private final CardRun commonB = new CardRun(true, "102", "176", "87", "183", "93", "184", "104", "178", "117", "174", "111", "171", "96", "194", "84", "176", "119", "180", "83", "164", "89", "172", "87", "175", "102", "183", "104", "178", "93", "174", "117", "184", "111", "171", "84", "194", "119", "164", "96", "180", "89", "176", "83", "172", "102", "175", "87", "178", "104", "174", "93", "183", "117", "171", "119", "184", "84", "164", "111", "194", "89", "180", "96", "172", "83", "175"); + private final CardRun commonC1 = new CardRun(true, "187", "152", "242", "46", "173", "23", "101", "246", "48", "190", "32", "151", "99", "68", "267", "31", "91", "192", "143", "57", "100", "243", "105", "16", "134", "42", "196", "238", "187", "46", "23", "242", "152", "173", "48", "32", "246", "190", "151", "101", "31", "68", "99", "267", "91", "134", "105", "57", "16", "192", "100", "143", "243", "196", "42"); + private final CardRun commonC2 = new CardRun(true, "11", "193", "95", "158", "17", "239", "44", "159", "129", "7", "118", "85", "138", "74", "165", "11", "129", "193", "150", "72", "5", "95", "159", "74", "158", "17", "85", "239", "118", "138", "44", "7", "238", "193", "150", "165", "5", "72", "158", "95", "11", "44", "159", "239", "129", "17", "85", "74", "7", "118", "5", "150", "165", "138", "72"); + private final CardRun uncommonA = new CardRun(true, "215", "236", "212", "208", "195", "224", "332", "6", "232", "18", "106", "268", "209", "162", "8", "76", "122", "88", "182", "206", "202", "62", "110", "132", "200", "325", "271", "211", "144", "103", "215", "236", "258", "56", "163", "113", "28", "226", "2", "58", "263", "148", "232", "162", "224", "208", "195", "323", "268", "18", "106", "6", "233", "8", "76", "122", "209", "88", "182", "206", "202", "62", "110", "132", "321", "220", "271", "211", "144", "258", "2", "28", "263", "113", "226", "103", "236", "163", "56", "215", "148", "58", "329", "195", "6", "232", "233", "18", "212", "162", "268", "106", "208", "103", "322", "76", "122", "88", "182", "206", "202", "62", "110", "132", "200", "220", "271", "211", "144", "8", "58", "28", "258", "113", "56", "148", "2", "263", "226", "163"); + private final CardRun uncommonB = new CardRun(true, "30", "166", "75", "201", "265", "222", "45", "135", "256", "191", "231", "235", "36", "250", "316", "128", "25", "247", "264", "35", "97", "186", "223", "59", "60", "130", "216", "80", "244", "259", "217", "133", "64", "245", "108", "189", "331", "137", "116", "253", "30", "166", "75", "201", "265", "327", "45", "128", "256", "247", "235", "36", "191", "25", "170", "250", "135", "231", "186", "35", "60", "324", "97", "130", "59", "264", "244", "80", "328", "259", "133", "217", "64", "245", "108", "189", "230", "137", "116", "253", "30", "166", "75", "201", "265", "222", "45", "256", "191", "235", "170", "135", "36", "128", "25", "247", "250", "231", "35", "223", "60", "130", "97", "264", "216", "186", "59", "244", "80", "259", "217", "133", "304", "245", "108", "189", "230", "137", "116", "253"); + // rares and mythics with no variants that can appear in Draft Boosters + private final CardRun rareNoVariant = new CardRun(false, "9", "12", "20", "24", "26", "27", "43", "51", "52", "61", "63", "69", "73", "79", "82", "86", "90", "107", "109", "125", "131", "146", "153", "156", "161", "167", "177", "185", "188", "203", "204", "205", "207", "210", "213", "214", "219", "227", "229", "234", "237", "240", "241", "255", "272", "275", "9", "12", "20", "24", "26", "27", "43", "51", "52", "61", "63", "69", "73", "79", "82", "86", "90", "107", "109", "125", "131", "146", "153", "156", "161", "167", "177", "185", "188", "203", "204", "205", "207", "210", "213", "214", "219", "227", "229", "234", "237", "240", "241", "255", "272", "275", "22", "81", "94", "139"); + // non-variant versions of rares and mythics with one variant + private final CardRun rareNonVariant = new CardRun(false, "21", "29", "50", "92", "112", "115", "120", "123", "142", "169", "179", "181", "197", "228", "251", "252", "254", "260", "21", "29", "50", "92", "112", "115", "120", "123", "142", "169", "179", "181", "197", "228", "251", "252", "254", "260", "15", "33", "40", "41", "70", "98", "114", "145", "154", "160", "168", "198", "199", "218", "221", "225"); + // variant versions of rares and mythics + private final CardRun rareVariantA = new CardRun(false, "290", "291", "292", "293", "300", "301", "303", "306", "307", "309", "310", "311", "312", "315", "317", "318", "319", "330", "290", "291", "292", "293", "300", "301", "303", "306", "307", "309", "310", "311", "312", "315", "317", "318", "319", "330", "287", "288", "289", "294", "295", "296", "297", "298", "299", "302", "305", "313", "314", "326", "308", "320"); + private final CardRun rareVariantB = new CardRun(false, "290", "291", "292", "293", "300", "301", "303", "306", "307", "309", "310", "311", "312", "315", "317", "318", "319", "330", "290", "291", "292", "293", "300", "301", "303", "306", "307", "309", "310", "311", "312", "315", "317", "318", "319", "330", "287", "288", "289", "294", "295", "296", "297", "298", "299", "302", "305", "313", "314", "326", "286", "333"); + private final CardRun land = new CardRun(true, "270", "282", "248", "277", "276", "280", "278", "266", "270", "283", "282", "285", "274", "277", "281", "279", "262", "284", "282", "248", "283", "276", "269", "276", "280", "285", "281", "249", "257", "284", "277", "249", "281", "284", "283", "266", "257", "281", "269", "280", "261", "276", "277", "283", "249", "278", "285", "248", "276", "285", "279", "261", "269", "257", "249", "248", "283", "270", "285", "277", "282", "284", "270", "278", "248", "279", "269", "281", "274", "280", "279", "257", "281", "284", "277", "257", "274", "273", "279", "276", "262", "266", "284", "281", "273", "282", "278", "262", "280", "279", "274", "262", "282", "283", "278", "262", "279", "261", "285", "273", "266", "283", "261", "280", "284", "266", "278", "270", "285", "282", "280", "276", "277", "273", "278", "269", "273", "249", "261", "274"); private final BoosterStructure AABBC1C1C1C1C1C1 = new BoosterStructure( commonA, commonA, @@ -535,8 +539,10 @@ class KaldheimCollator implements BoosterCollator { ); private final BoosterStructure AAA = new BoosterStructure(uncommonA, uncommonA, uncommonA); private final BoosterStructure BBB = new BoosterStructure(uncommonB, uncommonB, uncommonB); - private final BoosterStructure R1 = new BoosterStructure(rareA); - private final BoosterStructure R2 = new BoosterStructure(rareB); + private final BoosterStructure R1 = new BoosterStructure(rareNoVariant); + private final BoosterStructure R2 = new BoosterStructure(rareNonVariant); + private final BoosterStructure R3 = new BoosterStructure(rareVariantA); + private final BoosterStructure R4 = new BoosterStructure(rareVariantB); private final BoosterStructure L1 = new BoosterStructure(land); // In order for equal numbers of each common to exist, the average booster must contain: @@ -572,7 +578,12 @@ class KaldheimCollator implements BoosterCollator { AAAABBBC2C2C2 ); private final RarityConfiguration uncommonRuns = new RarityConfiguration(AAA, BBB); - private final RarityConfiguration rareRuns = new RarityConfiguration(R1, R1, R2); + private final RarityConfiguration rareRuns = new RarityConfiguration( + R1, R1, R1, R1, R1, R1, R1, R1, R1, R1, R1, R1, + R1, R1, R1, R1, R1, R1, R1, R1, R1, R1, R1, R1, + R2, R2, R2, R2, R2, R2, R2, R2, R2, + R3, R3, R4, R4 + ); private final RarityConfiguration landRuns = new RarityConfiguration(L1); @Override diff --git a/Mage.Sets/src/mage/sets/TherosBeyondDeath.java b/Mage.Sets/src/mage/sets/TherosBeyondDeath.java index fdf322c4a7..0bd4ff8a96 100644 --- a/Mage.Sets/src/mage/sets/TherosBeyondDeath.java +++ b/Mage.Sets/src/mage/sets/TherosBeyondDeath.java @@ -408,8 +408,12 @@ class TherosBeyondDeathCollator implements BoosterCollator { private final CardRun commonC2 = new CardRun(true, "44", "96", "197", "145", "232", "34", "126", "204", "249", "54", "135", "231", "187", "175", "44", "143", "95", "96", "197", "135", "107", "6", "32", "204", "126", "34", "54", "249", "145", "231", "187", "96", "6", "143", "44", "107", "34", "175", "135", "249", "95", "197", "54", "204", "126", "32", "6", "175", "95", "231", "145", "107", "187", "32", "143"); private final CardRun uncommonA = new CardRun(true, "223", "65", "153", "8", "112", "227", "99", "167", "33", "138", "4", "189", "228", "45", "59", "180", "105", "1", "136", "196", "206", "139", "83", "89", "233", "31", "131", "91", "219", "193", "27", "133", "64", "199", "213", "264", "42", "153", "205", "8", "136", "4", "189", "33", "223", "2", "138", "112", "27", "233", "260", "180", "31", "59", "99", "131", "105", "267", "81", "139", "228", "167", "133", "219", "65", "1", "83", "125", "206", "193", "42", "91", "227", "89", "199", "153", "8", "81", "213", "64", "112", "223", "4", "136", "205", "105", "139", "99", "65", "2", "180", "228", "59", "1", "233", "45", "189", "227", "33", "196", "83", "138", "206", "42", "219", "167", "131", "31", "89", "193", "91", "125", "213", "199", "81", "27", "2", "64", "133", "205"); private final CardRun uncommonB = new CardRun(true, "226", "101", "128", "183", "21", "234", "87", "50", "242", "176", "239", "132", "9", "216", "62", "119", "172", "160", "104", "69", "168", "225", "130", "237", "63", "15", "102", "166", "5", "129", "121", "53", "239", "70", "182", "128", "21", "234", "92", "69", "101", "160", "23", "230", "75", "130", "104", "172", "50", "7", "162", "87", "183", "226", "62", "216", "258", "132", "176", "237", "263", "15", "242", "63", "5", "225", "168", "129", "121", "53", "230", "21", "70", "102", "166", "128", "92", "234", "23", "183", "160", "104", "75", "226", "162", "7", "239", "182", "9", "132", "101", "69", "172", "216", "242", "50", "176", "87", "225", "62", "15", "168", "119", "237", "130", "5", "70", "102", "166", "63", "23", "129", "121", "53", "182", "7", "162", "230", "92", "75"); - private final CardRun rareA = new CardRun(false, "207", "84", "165", "3", "43", "209", "210", "212", "214", "169", "90", "12", "13", "215", "94", "217", "98", "218", "19", "24", "222", "243", "178", "55", "181", "108", "188", "235", "148", "60", "151", "198", "236", "37", "156", "157", "39", "158", "244", "245", "246", "247", "248", "72", "73", "124", "170", "76", "117", "118", "161", "80", "123", "207", "84", "165", "3", "43", "209", "210", "212", "214", "169", "90", "12", "13", "215", "94", "217", "98", "218", "19", "24", "222", "243", "178", "55", "181", "108", "188", "235", "148", "60", "151", "198", "236", "37", "156", "157", "39", "158", "244", "245", "246", "247", "248", "72", "73", "124", "170", "76", "117", "118", "161", "80", "123", "14", "18", "52", "71", "93", "147", "150", "185", "190", "208", "211", "220", "221", "224", "229"); - private final CardRun rareB = new CardRun(false, "207", "84", "165", "3", "43", "209", "210", "212", "214", "169", "90", "12", "13", "215", "94", "217", "98", "218", "19", "24", "222", "243", "178", "55", "181", "108", "188", "235", "148", "60", "151", "198", "236", "37", "156", "157", "39", "158", "244", "245", "246", "247", "248", "72", "73", "124", "170", "76", "117", "118", "161", "80", "123", "207", "84", "165", "3", "43", "209", "210", "212", "214", "169", "90", "12", "13", "215", "94", "217", "98", "218", "19", "24", "222", "243", "178", "55", "181", "108", "188", "235", "148", "60", "151", "198", "236", "37", "156", "157", "39", "158", "244", "245", "246", "247", "248", "72", "73", "124", "170", "76", "117", "118", "161", "80", "123", "255", "259", "52", "261", "262", "147", "265", "266", "190", "256", "257", "268", "221", "224", "229"); + // rares and mythics with no variants that can appear in Draft Bosters + private final CardRun rareNoVariant = new CardRun(false, "3", "12", "13", "19", "24", "37", "39", "43", "55", "60", "72", "73", "76", "80", "84", "90", "94", "98", "108", "117", "118", "123", "124", "148", "151", "156", "157", "158", "161", "165", "169", "170", "178", "181", "188", "198", "207", "209", "210", "212", "214", "215", "217", "218", "222", "235", "236", "243", "244", "245", "246", "247", "248", "3", "12", "13", "19", "24", "37", "39", "43", "55", "60", "72", "73", "76", "80", "84", "90", "94", "98", "108", "117", "118", "123", "124", "148", "151", "156", "157", "158", "161", "165", "169", "170", "178", "181", "188", "198", "207", "209", "210", "212", "214", "215", "217", "218", "222", "235", "236", "243", "244", "245", "246", "247", "248", "52", "147", "190", "221", "224", "229"); + // non-variant versions of mythics with variants + private final CardRun mythicNonVariant = new CardRun(false, "14", "18", "71", "93", "150", "185", "208", "211", "220"); + // variant versions of mythics + private final CardRun mythicVariant = new CardRun(false, "255", "256", "257", "259", "261", "262", "265", "266", "268"); private final CardRun land = new CardRun(false, "250", "251", "252", "253", "254"); private final BoosterStructure AABBC1C1C1C1C1C1 = new BoosterStructure( @@ -439,8 +443,9 @@ class TherosBeyondDeathCollator implements BoosterCollator { ); private final BoosterStructure AAB = new BoosterStructure(uncommonA, uncommonA, uncommonB); private final BoosterStructure ABB = new BoosterStructure(uncommonA, uncommonB, uncommonB); - private final BoosterStructure R1 = new BoosterStructure(rareA); - private final BoosterStructure R2 = new BoosterStructure(rareB); + private final BoosterStructure R1 = new BoosterStructure(rareNoVariant); + private final BoosterStructure R2 = new BoosterStructure(mythicNonVariant); + private final BoosterStructure R3 = new BoosterStructure(mythicVariant); private final BoosterStructure L1 = new BoosterStructure(land); // In order for equal numbers of each common to exist, the average booster must contain: @@ -476,7 +481,12 @@ class TherosBeyondDeathCollator implements BoosterCollator { AAAABBBBC2C2 ); private final RarityConfiguration uncommonRuns = new RarityConfiguration(AAB, ABB); - private final RarityConfiguration rareRuns = new RarityConfiguration(R1, R1, R2); + private final RarityConfiguration rareRuns = new RarityConfiguration( + R1, R1, R1, R1, R1, R1, R1, R1, R1, R1, + R1, R1, R1, R1, R1, R1, R1, R1, R1, R1, + R1, R1, R1, R1, R1, R1, R1, R1, R1, R1, + R1, R1, R1, R1, R1, R1, R1, R2, R2, R3 + ); private final RarityConfiguration landRuns = new RarityConfiguration(L1); @Override diff --git a/Mage.Sets/src/mage/sets/ThroneOfEldraine.java b/Mage.Sets/src/mage/sets/ThroneOfEldraine.java index 22c630f758..c111e7bbfa 100644 --- a/Mage.Sets/src/mage/sets/ThroneOfEldraine.java +++ b/Mage.Sets/src/mage/sets/ThroneOfEldraine.java @@ -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 */ @@ -424,4 +431,104 @@ public final class ThroneOfEldraine extends ExpansionSet { cards.add(new SetCardInfo("Yorvo, Lord of Garenbrig", 376, Rarity.RARE, mage.cards.y.YorvoLordOfGarenbrig.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Youthful Knight", 37, Rarity.COMMON, mage.cards.y.YouthfulKnight.class)); } + + @Override + public BoosterCollator createCollator() { + return new ThroneOfEldraineCollator(); + } +} + +// Booster collation info from https://www.lethe.xyz/mtg/collation/eld.html +// Using USA collation for common/uncommon, rare collation inferred from other sets +class ThroneOfEldraineCollator implements BoosterCollator { + private final CardRun commonA = new CardRun(true, "141", "23", "59", "113", "29", "62", "131", "37", "61", "132", "13", "68", "119", "6", "57", "112", "4", "56", "146", "31", "64", "137", "23", "42", "148", "24", "52", "134", "21", "74", "141", "11", "62", "121", "29", "68", "132", "34", "73", "113", "13", "57", "131", "37", "59", "146", "6", "64", "112", "4", "56", "148", "11", "61", "119", "31", "52", "134", "21", "42", "137", "34", "74", "121", "24", "73"); + private final CardRun commonB = new CardRun(true, "96", "175", "108", "162", "89", "174", "92", "176", "88", "150", "102", "180", "105", "156", "91", "184", "87", "173", "94", "153", "108", "176", "95", "162", "96", "174", "92", "175", "88", "158", "105", "180", "89", "156", "87", "150", "94", "184", "102", "173", "96", "153", "92", "162", "91", "158", "95", "175", "88", "176", "89", "174", "108", "184", "105", "156", "87", "180", "102", "173", "91", "150", "94", "158", "95", "153"); + private final CardRun commonC1 = new CardRun(true, "228", "41", "12", "217", "219", "93", "249", "166", "30", "140", "86", "40", "225", "33", "126", "229", "77", "41", "157", "243", "236", "116", "220", "178", "72", "246", "225", "103", "126", "12", "249", "166", "221", "140", "7", "40", "228", "243", "93", "219", "33", "220", "246", "157", "86", "229", "116", "217", "178", "77", "236", "7", "72", "221", "103"); + private final CardRun commonC2 = new CardRun(true, "5", "224", "170", "114", "76", "231", "70", "19", "136", "247", "53", "154", "227", "109", "245", "65", "183", "139", "224", "5", "19", "70", "231", "76", "114", "5", "247", "170", "227", "136", "245", "109", "114", "154", "224", "139", "183", "76", "30", "65", "231", "136", "53", "170", "247", "70", "19", "109", "227", "139", "53", "154", "245", "65", "183"); + private final CardRun uncommonA = new CardRun(true, "209", "216", "202", "104", "214", "38", "223", "25", "201", "122", "159", "204", "15", "297", "118", "212", "230", "58", "218", "207", "85", "28", "205", "232", "283", "106", "188", "168", "145", "210", "163", "142", "196", "226", "25", "38", "209", "90", "60", "234", "204", "155", "223", "202", "85", "214", "248", "188", "216", "104", "292", "208", "168", "118", "201", "232", "15", "159", "212", "90", "58", "230", "207", "163", "106", "196", "278", "49", "10", "205", "218", "60", "145", "210", "226", "142", "204", "216", "25", "223", "209", "280", "104", "234", "214", "155", "248", "208", "15", "201", "159", "202", "230", "118", "85", "302", "168", "106", "207", "232", "122", "58", "205", "49", "10", "218", "210", "226", "248", "188", "28", "163", "60", "196", "234", "142", "286", "208", "145", "10"); + private final CardRun uncommonB = new CardRun(true, "45", "213", "123", "149", "83", "237", "2", "78", "129", "194", "63", "32", "151", "193", "81", "67", "130", "3", "211", "69", "22", "107", "143", "50", "206", "179", "27", "222", "99", "47", "200", "177", "192", "80", "35", "117", "149", "237", "215", "45", "83", "32", "130", "193", "167", "50", "107", "2", "123", "194", "69", "3", "135", "164", "211", "47", "81", "213", "22", "222", "143", "63", "206", "179", "27", "78", "200", "45", "129", "151", "288", "35", "192", "177", "117", "67", "3", "167", "215", "80", "50", "237", "135", "164", "83", "193", "2", "211", "130", "194", "179", "107", "63", "123", "213", "177", "32", "69", "22", "206", "78", "129", "295", "222", "67", "81", "151", "215", "143", "27", "135", "200", "99", "167", "117", "47", "192", "35", "80", "164"); + private final CardRun rare = new CardRun(false, "1", "8", "14", "16", "18", "20", "36", "43", "44", "46", "48", "54", "55", "66", "71", "75", "79", "84", "97", "98", "100", "110", "111", "115", "124", "125", "127", "128", "133", "144", "147", "152", "160", "165", "169", "172", "181", "182", "185", "186", "187", "189", "190", "195", "203", "233", "235", "238", "239", "240", "241", "242", "244", "1", "8", "14", "16", "18", "20", "36", "43", "44", "46", "48", "54", "55", "66", "71", "75", "79", "84", "97", "98", "100", "110", "111", "115", "124", "125", "127", "128", "133", "144", "147", "152", "160", "165", "169", "172", "181", "182", "185", "186", "187", "189", "190", "195", "203", "233", "235", "238", "239", "240", "241", "242", "244", "9", "17", "26", "39", "51", "82", "101", "120", "138", "161", "171", "191", "197", "198", "199"); + private final CardRun rareVariant = new CardRun(false, "275", "282", "287", "291", "299", "275", "282", "287", "291", "299", "270", "271", "272", "277", "281"); + private final CardRun land = new CardRun(false, "250", "251", "252", "253", "254", "255", "256", "257", "258", "259", "260", "261", "262", "263", "264", "265", "266", "267", "268", "269"); + + 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 R2 = new BoosterStructure(rareVariant); + 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, R1, R1, R1, R1, R1, R1, R1, R1, + R1, R1, R1, R1, R1, R1, R1, R1, R1, + R1, R1, R1, R1, R1, R1, R1, R1, R2 + ); + private final RarityConfiguration landRuns = new RarityConfiguration(L1); + + @Override + public List makeBooster() { + List 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; + } }