External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 02:30:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge d559914205 into acc180d1d4

Browse source
This commit is contained in:
tiera3 2025-12-16 15:37:14 -06:00 • committed by GitHub
commit ee68ad1783
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Mage/src/main/java/mage/cards/ExpansionSet.java
View file

@ -282,10 +282,28 @@ public abstract class ExpansionSet implements Serializable {
}
}
while (theBooster.size() > 15) {
// removing positional cards from collated boosters is going to mess with balancing and as-fan
// also for sets with common lands in the land slot, this may eliminate the majority of fixing from a pack
// instead removing a random card that is not in the last four (where rare and uncommons usually are - though some uncommons may be displayed by cards with special collation - eg DFC or bonus sheet).
if (theBooster.size() > 15 && theBooster.get(0).getRarity() == Rarity.LAND) {
theBooster.remove(0);
}
int keepCards = 4;
ArrayList<Rarity> dontRemove = new ArrayList<>(Arrays.asList(Rarity.UNCOMMON, Rarity.RARE, Rarity.MYTHIC));
int toRemove;
while (theBooster.size() > 15) {
if (theBooster.size() > keepCards) {
toRemove = RandomUtil.nextInt(theBooster.size() - keepCards);
if( dontRemove.contains( theBooster.get(toRemove).getRarity() )) {
keepCards = theBooster.size() - toRemove ;
} else {
theBooster.remove(toRemove);
}
} else {
theBooster.remove(0);
}
}
return theBooster;
}