github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-28 11:09:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Enable booster generation for ONE and MOM (#10318)

Browse source 
* Enable booster generation for ONE and MOM (collation needs future improvement)

* set parameter to fix verify failure

* Fix rarity of Exuberant Fuseling
This commit is contained in:
xenohedron 2023-05-07 13:30:15 -04:00 committed by GitHub
parent 4ace6defde
commit 67ec9d64bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Mage.Sets/src/mage/sets/MarchOfTheMachine.java
View file

@ -1,8 +1,12 @@
package mage.sets;
import mage.cards.Card;
import mage.cards.ExpansionSet;
import mage.constants.Rarity;
import mage.constants.SetType;
import mage.util.RandomUtil;
import java.util.List;
/**
* @author TheElk801
@ -18,7 +22,15 @@ public final class MarchOfTheMachine extends ExpansionSet {
private MarchOfTheMachine() {
super("March of the Machine", "MOM", ExpansionSet.buildDate(2023, 4, 21), SetType.EXPANSION);
this.blockName = "March of the Machine";
this.hasBoosters = false; // temporary
this.hasBoosters = true;
this.numBoosterLands = 0; // TODO: 50% chance basic, 50% chance dual land (currently just adding extra commons)
this.numBoosterCommon = 10; // TODO: Should be 8 commons, 1 battle, 1 DFC, 3 uncommon+
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.numBoosterSpecial = 1; // Multiverse Legends
this.ratioBoosterMythic = 7;
this.numBoosterDoubleFaced = -1; // include normally for now, TODO: Collation
this.maxCardNumberInBooster = 291;
cards.add(new SetCardInfo("Aerial Boost", 2, Rarity.COMMON, mage.cards.a.AerialBoost.class));
cards.add(new SetCardInfo("Aetherblade Agent", 88, Rarity.COMMON, mage.cards.a.AetherbladeAgent.class));
@ -485,6 +497,22 @@ public final class MarchOfTheMachine extends ExpansionSet {
cards.add(new SetCardInfo("Zurgo and Ojutai", 319, Rarity.MYTHIC, mage.cards.z.ZurgoAndOjutai.class, NON_FULL_USE_VARIOUS));
}
@Override
protected void addSpecialCards(List<Card> booster, int number) {
// number is here always 1
// Boosters have one card from MUL, odds are 2/3 for uncommon, 4/15 for rare, 1/15 for mythic
Rarity rarity;
int rarityKey = RandomUtil.nextInt(15);
if (rarityKey == 14) {
rarity = Rarity.MYTHIC;
} else if (rarityKey >= 10) {
rarity = Rarity.RARE;
} else {
rarity = Rarity.UNCOMMON;
}
addToBooster(booster, MultiverseLegends.getInstance().getCardsByRarity(rarity));
}
// @Override
// public BoosterCollator createCollator() {
// return new MarchOfTheMachineCollator();

11
Mage.Sets/src/mage/sets/PhyrexiaAllWillBeOne.java
View file

@ -18,7 +18,14 @@ public final class PhyrexiaAllWillBeOne extends ExpansionSet {
private PhyrexiaAllWillBeOne() {
super("Phyrexia: All Will Be One", "ONE", ExpansionSet.buildDate(2023, 1, 10), SetType.EXPANSION);
this.blockName = "Phyrexia: All Will Be One";
this.hasBoosters = false; // temporary
this.hasBoosters = true;
this.hasBasicLands = true;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 7;
this.maxCardNumberInBooster = 271;
cards.add(new SetCardInfo("Adaptive Sporesinger", 157, Rarity.COMMON, mage.cards.a.AdaptiveSporesinger.class));
cards.add(new SetCardInfo("Against All Odds", 1, Rarity.UNCOMMON, mage.cards.a.AgainstAllOdds.class));
@ -94,7 +101,7 @@ public final class PhyrexiaAllWillBeOne extends ExpansionSet {
cards.add(new SetCardInfo("Evolving Adaptive", 167, Rarity.UNCOMMON, mage.cards.e.EvolvingAdaptive.class));
cards.add(new SetCardInfo("Expand the Sphere", 168, Rarity.UNCOMMON, mage.cards.e.ExpandTheSphere.class));
cards.add(new SetCardInfo("Experimental Augury", 49, Rarity.COMMON, mage.cards.e.ExperimentalAugury.class));
cards.add(new SetCardInfo("Exuberant Fuseling", 129, Rarity.COMMON, mage.cards.e.ExuberantFuseling.class));
cards.add(new SetCardInfo("Exuberant Fuseling", 129, Rarity.UNCOMMON, mage.cards.e.ExuberantFuseling.class));
cards.add(new SetCardInfo("Eye of Malcator", 50, Rarity.COMMON, mage.cards.e.EyeOfMalcator.class));
cards.add(new SetCardInfo("Ezuri, Stalker of Spheres", 201, Rarity.RARE, mage.cards.e.EzuriStalkerOfSpheres.class));
cards.add(new SetCardInfo("Feed the Infection", 93, Rarity.UNCOMMON, mage.cards.f.FeedTheInfection.class));