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

deck: added booster and reprints from Fallout (PIP), disabled booster from Summer Magic (related to #13160)

Browse source
This commit is contained in:
Oleg Agafonov 2025-01-27 10:45:34 +04:00
parent 6db188ea25
commit c61a206b56
9 changed files with 975 additions and 323 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Mage.Sets/src/mage/cards/b/BehemothOfVault.java → Mage.Sets/src/mage/cards/b/BehemothOfVault0.java
View file

@ -27,9 +27,9 @@ import java.util.UUID;
/**
* @author notgreat
*/
public final class BehemothOfVault extends CardImpl {
public final class BehemothOfVault0 extends CardImpl {
public BehemothOfVault(UUID ownerId, CardSetInfo setInfo) {
public BehemothOfVault0(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{6}");
this.subtype.add(SubType.ROBOT);
@ -49,13 +49,13 @@ public final class BehemothOfVault extends CardImpl {
this.addAbility(ability);
}
private BehemothOfVault(final BehemothOfVault card) {
private BehemothOfVault0(final BehemothOfVault0 card) {
super(card);
}
@Override
public BehemothOfVault copy() {
return new BehemothOfVault(this);
public BehemothOfVault0 copy() {
return new BehemothOfVault0(this);
}
}

9
Mage.Sets/src/mage/sets/AmonkhetRemastered.java
View file

@ -17,14 +17,7 @@ public class AmonkhetRemastered extends ExpansionSet {
private AmonkhetRemastered() {
super("Amonkhet Remastered", "AKR", ExpansionSet.buildDate(2020, 8, 13), SetType.MAGIC_ARENA);
this.hasBoosters = true;
this.hasBasicLands = true;
this.maxCardNumberInBooster = 338; // Regal Caracal is top-boxer, not in booster
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 8;
this.enableArenaBooster(338); // #339 Regal Caracal is top-boxer, not in booster
cards.add(new SetCardInfo("Abandoned Sarcophagus", 268, Rarity.RARE, mage.cards.a.AbandonedSarcophagus.class));
cards.add(new SetCardInfo("Abrade", 136, Rarity.UNCOMMON, mage.cards.a.Abrade.class));

1230
Mage.Sets/src/mage/sets/Fallout.java
View file

File diff suppressed because it is too large Load diff

2
Mage.Sets/src/mage/sets/InnistradRemastered.java
View file

@ -19,7 +19,7 @@ public class InnistradRemastered extends ExpansionSet {
private InnistradRemastered() {
super("Innistrad Remastered", "INR", ExpansionSet.buildDate(2025, 1, 24), SetType.SUPPLEMENTAL);
this.enablePlayOrArenaBooster(480); // play boosters #1–480, collector boosters #1–491
this.enablePlayBooster(480); // play boosters #1–480, collector boosters #1–491
this.numBoosterDoubleFaced = -1;
cards.add(new SetCardInfo("Aberrant Researcher", 454, Rarity.UNCOMMON, mage.cards.a.AberrantResearcher.class, NON_FULL_USE_VARIOUS));

9
Mage.Sets/src/mage/sets/KaladeshRemastered.java
View file

@ -19,14 +19,7 @@ public class KaladeshRemastered extends ExpansionSet {
private KaladeshRemastered() {
super("Kaladesh Remastered", "KLR", ExpansionSet.buildDate(2020, 11, 12), SetType.MAGIC_ARENA);
this.hasBoosters = true;
this.hasBasicLands = true;
this.maxCardNumberInBooster = 301;
this.numBoosterLands = 1;
this.numBoosterCommon = 10;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 8;
this.enableArenaBooster(301); // #302 Sculpting Steel is top-boxer, not in booster
cards.add(new SetCardInfo("Aerial Responder", 1, Rarity.UNCOMMON, mage.cards.a.AerialResponder.class));
cards.add(new SetCardInfo("Aeronaut Admiral", 2, Rarity.UNCOMMON, mage.cards.a.AeronautAdmiral.class));

2
Mage.Sets/src/mage/sets/PioneerMasters.java
View file

@ -23,7 +23,7 @@ public class PioneerMasters extends ExpansionSet {
// bonus sheet already included in the PIO set in scryfall, so simplify it (e.g. use all cards)
// TODO: implement special slot with x1 card from bonus sheet
// https://mtg.fandom.com/wiki/Pioneer_Masters/Bonus_sheet
this.enablePlayOrArenaBooster(Integer.MAX_VALUE);
this.enableArenaBooster(Integer.MAX_VALUE);
this.hasBasicLands = false;
this.numBoosterDoubleFaced = -1;

2
Mage.Sets/src/mage/sets/ShadowsOverInnistradRemastered.java
View file

@ -19,7 +19,7 @@ public class ShadowsOverInnistradRemastered extends ExpansionSet {
private ShadowsOverInnistradRemastered() {
super("Shadows over Innistrad Remastered", "SIR", ExpansionSet.buildDate(2023, 3, 21), SetType.MAGIC_ARENA);
this.enablePlayOrArenaBooster(Integer.MAX_VALUE);
this.enableArenaBooster(Integer.MAX_VALUE);
this.numBoosterDoubleFaced = -1;
// TODO: implement special slot with x1 card from SIS - Shadows of the Past

8
Mage.Sets/src/mage/sets/SummerMagicEdgar.java
View file

@ -17,12 +17,8 @@ public class SummerMagicEdgar extends ExpansionSet {
private SummerMagicEdgar() {
super("Summer Magic / Edgar", "SUM", ExpansionSet.buildDate(1994, 6, 21), SetType.CORE);
this.hasBoosters = true;
this.numBoosterLands = 0;
this.numBoosterCommon = 11;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 0;
this.hasBoosters = false;
this.hasBasicLands = true;
cards.add(new SetCardInfo("Air Elemental", 47, Rarity.UNCOMMON, mage.cards.a.AirElemental.class));
cards.add(new SetCardInfo("Aladdin's Lamp", 231, Rarity.RARE, mage.cards.a.AladdinsLamp.class));

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

@ -760,7 +760,7 @@ public abstract class ExpansionSet implements Serializable {
/**
* New default booster configuration (after 2024 - MKM)
*/
public void enablePlayOrArenaBooster(int maxCardNumberInBooster) {
public void enablePlayBooster(int maxCardNumberInBooster) {
// https://mtg.fandom.com/wiki/Play_Booster
this.hasBoosters = true;
this.maxCardNumberInBooster = maxCardNumberInBooster;
@ -789,4 +789,28 @@ public abstract class ExpansionSet implements Serializable {
this.numBoosterUncommon++;
this.numBoosterRare++;
}
public void enableArenaBooster(int maxCardNumberInBooster) {
// same as play booster on 2024
enablePlayBooster(maxCardNumberInBooster);
}
public void enableCollectorBooster(int maxCardNumberInBooster) {
// simplified rarity distribution
enableCollectorBooster(maxCardNumberInBooster, 1, 5, 4, 5);
}
public void enableCollectorBooster(int maxCardNumberInBooster, int land, int common, int uncommon, int rare) {
// https://mtg.fandom.com/wiki/Collector_Booster
this.hasBoosters = true;
this.maxCardNumberInBooster = maxCardNumberInBooster;
this.numBoosterLands = land;
this.hasBasicLands = land > 0;
this.numBoosterCommon = common;
this.numBoosterUncommon = uncommon;
this.numBoosterRare = rare;
this.ratioBoosterMythic = 8; // 12.5% chance of a mythic rare
}
}