github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-13 19:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix AFR collator common print run ratios (#8256)

Browse source
This commit is contained in:
Alex W. Jackson 2021-09-19 12:43:23 -04:00 committed by GitHub
parent 9767a07b3f
commit b896d20569
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
Mage.Sets/src/mage/sets/AdventuresInTheForgottenRealms.java
View file

@ -27,6 +27,7 @@ public final class AdventuresInTheForgottenRealms extends ExpansionSet {
this.blockName = "Adventures in the Forgotten Realms"; this.blockName = "Adventures in the Forgotten Realms";
this.hasBoosters = true; this.hasBoosters = true;
this.hasBasicLands = true; this.hasBasicLands = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10; this.numBoosterCommon = 10;
this.numBoosterUncommon = 3; this.numBoosterUncommon = 3;
this.numBoosterRare = 1; this.numBoosterRare = 1;
@ -457,7 +458,7 @@ class AdventuresInTheForgottenRealmsCollator implements BoosterCollator {
} }
private static class AdventuresInTheForgottenRealmsStructure extends BoosterStructure { private static class AdventuresInTheForgottenRealmsStructure extends BoosterStructure {
private static final AdventuresInTheForgottenRealmsStructure C1 = new AdventuresInTheForgottenRealmsStructure( private static final AdventuresInTheForgottenRealmsStructure ABBBBBBCCC = new AdventuresInTheForgottenRealmsStructure(
AdventuresInTheForgottenRealmsRun.commonA, AdventuresInTheForgottenRealmsRun.commonA,
AdventuresInTheForgottenRealmsRun.commonB, AdventuresInTheForgottenRealmsRun.commonB,
AdventuresInTheForgottenRealmsRun.commonB, AdventuresInTheForgottenRealmsRun.commonB,
@ -469,19 +470,7 @@ class AdventuresInTheForgottenRealmsCollator implements BoosterCollator {
AdventuresInTheForgottenRealmsRun.commonC, AdventuresInTheForgottenRealmsRun.commonC,
AdventuresInTheForgottenRealmsRun.commonC AdventuresInTheForgottenRealmsRun.commonC
); );
private static final AdventuresInTheForgottenRealmsStructure C2 = new AdventuresInTheForgottenRealmsStructure( private static final AdventuresInTheForgottenRealmsStructure AABBBBBBCC = new AdventuresInTheForgottenRealmsStructure(
AdventuresInTheForgottenRealmsRun.commonA,
AdventuresInTheForgottenRealmsRun.commonA,
AdventuresInTheForgottenRealmsRun.commonB,
AdventuresInTheForgottenRealmsRun.commonB,
AdventuresInTheForgottenRealmsRun.commonB,
AdventuresInTheForgottenRealmsRun.commonB,
AdventuresInTheForgottenRealmsRun.commonB,
AdventuresInTheForgottenRealmsRun.commonC,
AdventuresInTheForgottenRealmsRun.commonC,
AdventuresInTheForgottenRealmsRun.commonC
);
private static final AdventuresInTheForgottenRealmsStructure C3 = new AdventuresInTheForgottenRealmsStructure(
AdventuresInTheForgottenRealmsRun.commonA, AdventuresInTheForgottenRealmsRun.commonA,
AdventuresInTheForgottenRealmsRun.commonA, AdventuresInTheForgottenRealmsRun.commonA,
AdventuresInTheForgottenRealmsRun.commonB, AdventuresInTheForgottenRealmsRun.commonB,
@ -493,12 +482,12 @@ class AdventuresInTheForgottenRealmsCollator implements BoosterCollator {
AdventuresInTheForgottenRealmsRun.commonC, AdventuresInTheForgottenRealmsRun.commonC,
AdventuresInTheForgottenRealmsRun.commonC AdventuresInTheForgottenRealmsRun.commonC
); );
private static final AdventuresInTheForgottenRealmsStructure U1 = new AdventuresInTheForgottenRealmsStructure( private static final AdventuresInTheForgottenRealmsStructure AAA = new AdventuresInTheForgottenRealmsStructure(
AdventuresInTheForgottenRealmsRun.uncommonA, AdventuresInTheForgottenRealmsRun.uncommonA,
AdventuresInTheForgottenRealmsRun.uncommonA, AdventuresInTheForgottenRealmsRun.uncommonA,
AdventuresInTheForgottenRealmsRun.uncommonA AdventuresInTheForgottenRealmsRun.uncommonA
); );
private static final AdventuresInTheForgottenRealmsStructure U2 = new AdventuresInTheForgottenRealmsStructure( private static final AdventuresInTheForgottenRealmsStructure BBB = new AdventuresInTheForgottenRealmsStructure(
AdventuresInTheForgottenRealmsRun.uncommonB, AdventuresInTheForgottenRealmsRun.uncommonB,
AdventuresInTheForgottenRealmsRun.uncommonB, AdventuresInTheForgottenRealmsRun.uncommonB,
AdventuresInTheForgottenRealmsRun.uncommonB AdventuresInTheForgottenRealmsRun.uncommonB
@ -518,23 +507,28 @@ class AdventuresInTheForgottenRealmsCollator implements BoosterCollator {
} }
} }
// In order for equal numbers of each common to exist, the average booster must contain:
// 1.503 A commons (242 / 161)
// 6.012 B commons (968 / 161)
// 2.484 C commons (400 / 161)
// However, boosters with more than six B commons are not known to exist.
// This discrepancy is presumably related to foils--the above values are based on
// 10 commons per booster, but real boosters contain only 9.67 non-foil commons
private final RarityConfiguration commonRuns = new RarityConfiguration( private final RarityConfiguration commonRuns = new RarityConfiguration(
false, AdventuresInTheForgottenRealmsStructure.ABBBBBBCCC,
AdventuresInTheForgottenRealmsStructure.C1, AdventuresInTheForgottenRealmsStructure.AABBBBBBCC
AdventuresInTheForgottenRealmsStructure.C2,
AdventuresInTheForgottenRealmsStructure.C3
); );
private final RarityConfiguration uncommonRuns = new RarityConfiguration( private final RarityConfiguration uncommonRuns = new RarityConfiguration(
false, false,
AdventuresInTheForgottenRealmsStructure.U1, AdventuresInTheForgottenRealmsStructure.U1, AdventuresInTheForgottenRealmsStructure.AAA, AdventuresInTheForgottenRealmsStructure.AAA,
AdventuresInTheForgottenRealmsStructure.U1, AdventuresInTheForgottenRealmsStructure.U1, AdventuresInTheForgottenRealmsStructure.AAA, AdventuresInTheForgottenRealmsStructure.AAA,
AdventuresInTheForgottenRealmsStructure.U1, AdventuresInTheForgottenRealmsStructure.U1, AdventuresInTheForgottenRealmsStructure.AAA, AdventuresInTheForgottenRealmsStructure.AAA,
AdventuresInTheForgottenRealmsStructure.U1, AdventuresInTheForgottenRealmsStructure.U1, AdventuresInTheForgottenRealmsStructure.AAA, AdventuresInTheForgottenRealmsStructure.AAA,
AdventuresInTheForgottenRealmsStructure.U1, AdventuresInTheForgottenRealmsStructure.U1, AdventuresInTheForgottenRealmsStructure.AAA, AdventuresInTheForgottenRealmsStructure.AAA,
AdventuresInTheForgottenRealmsStructure.U1, AdventuresInTheForgottenRealmsStructure.AAA,
AdventuresInTheForgottenRealmsStructure.U2, AdventuresInTheForgottenRealmsStructure.U2, AdventuresInTheForgottenRealmsStructure.BBB, AdventuresInTheForgottenRealmsStructure.BBB,
AdventuresInTheForgottenRealmsStructure.U2, AdventuresInTheForgottenRealmsStructure.U2, AdventuresInTheForgottenRealmsStructure.BBB, AdventuresInTheForgottenRealmsStructure.BBB,
AdventuresInTheForgottenRealmsStructure.U2 AdventuresInTheForgottenRealmsStructure.BBB
); );
private final RarityConfiguration rareRuns = new RarityConfiguration( private final RarityConfiguration rareRuns = new RarityConfiguration(
false, false,