Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

deck: fixed outdated names for some old sets

Browse source
This commit is contained in:
Oleg Agafonov 2025-01-25 00:48:34 +04:00
parent 7bfb0d2dec
commit da3f540a9b
19 changed files with 2060 additions and 2059 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportCards.java
View file

@ -467,7 +467,7 @@ public class ScryfallImageSupportCards {
// add("DD3"); // Duel Decks Anthology // add("DD3"); // Duel Decks Anthology
// add("PZ1"); // Legendary Cube // add("PZ1"); // Legendary Cube
add("IKO"); // Ikoria: Lair of Behemoths add("IKO"); // Ikoria: Lair of Behemoths
add("C20"); // Commander 2020 Edition add("C20"); // Commander 2020
add("M21"); // Core Set 2021 add("M21"); // Core Set 2021
add("JMP"); // Jumpstart add("JMP"); // Jumpstart
add("PH19"); // 2019 Heroes of the Realm add("PH19"); // 2019 Heroes of the Realm
@ -488,7 +488,7 @@ public class ScryfallImageSupportCards {
add("STA"); // Strixhaven Mystical Archive add("STA"); // Strixhaven Mystical Archive
add("HA4"); // Historic Anthology 4 add("HA4"); // Historic Anthology 4
add("HA5"); // Historic Anthology 5 add("HA5"); // Historic Anthology 5
add("C21"); // Commander 2021 Edition add("C21"); // Commander 2021
add("MH2"); // Modern Horizons 2 add("MH2"); // Modern Horizons 2
add("H1R"); // Modern Horizons 1 Timeshifts add("H1R"); // Modern Horizons 1 Timeshifts
add("PLG21"); // Love Your LGS 2021 add("PLG21"); // Love Your LGS 2021
@ -514,7 +514,7 @@ public class ScryfallImageSupportCards {
add("DMU"); // Dominaria United add("DMU"); // Dominaria United
add("DMC"); // Dominaria United Commander add("DMC"); // Dominaria United Commander
add("YDMU"); // Alchemy: Dominaria add("YDMU"); // Alchemy: Dominaria
add("40K"); // Warhammer 40,000 add("40K"); // Warhammer 40,000 Commander
add("UNF"); // Unfinity add("UNF"); // Unfinity
add("GN3"); // Game Night: Free-for-All add("GN3"); // Game Night: Free-for-All
add("BRO"); // The Brothers' War add("BRO"); // The Brothers' War
@ -534,7 +534,7 @@ public class ScryfallImageSupportCards {
add("MOC"); // March of the Machine Commander add("MOC"); // March of the Machine Commander
add("MAT"); // March of the Machine: The Aftermath add("MAT"); // March of the Machine: The Aftermath
add("MUL"); // Multiverse Legends add("MUL"); // Multiverse Legends
add("30A"); // Thirtieth Anniversary Edition add("30A"); // 30th Anniversary Edition
add("LTR"); // The Lord of the Rings: Tales of Middle-Earth add("LTR"); // The Lord of the Rings: Tales of Middle-Earth
add("LTC"); // Tales of Middle-Earth Commander add("LTC"); // Tales of Middle-Earth Commander
add("CMM"); // Commander Masters add("CMM"); // Commander Masters

2
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java
View file

@ -282,7 +282,7 @@ public enum WizardCardsImageSource implements CardImageSource {
setsAliases.put("BOK", "Betrayers of Kamigawa"); setsAliases.put("BOK", "Betrayers of Kamigawa");
setsAliases.put("BRB", "Battle Royale Box Set"); setsAliases.put("BRB", "Battle Royale Box Set");
setsAliases.put("BTD", "Beatdown Box Set"); setsAliases.put("BTD", "Beatdown Box Set");
setsAliases.put("C13", "Commander 2013 Edition"); setsAliases.put("C13", "Commander 2013");
setsAliases.put("C14", "Commander 2014"); setsAliases.put("C14", "Commander 2014");
setsAliases.put("C15", "Commander 2015"); setsAliases.put("C15", "Commander 2015");
setsAliases.put("C16", "Commander 2016"); setsAliases.put("C16", "Commander 2016");

10
Mage.Sets/src/mage/sets/Commander2013Edition.java → Mage.Sets/src/mage/sets/Commander2013.java
View file

@ -7,16 +7,16 @@ import mage.constants.SetType;
/** /**
* @author LevelX2 * @author LevelX2
*/ */
public final class Commander2013Edition extends ExpansionSet { public final class Commander2013 extends ExpansionSet {
private static final Commander2013Edition instance = new Commander2013Edition(); private static final Commander2013 instance = new Commander2013();
public static Commander2013Edition getInstance() { public static Commander2013 getInstance() {
return instance; return instance;
} }
private Commander2013Edition() { private Commander2013() {
super("Commander 2013 Edition", "C13", ExpansionSet.buildDate(2013, 11, 1), SetType.SUPPLEMENTAL); super("Commander 2013", "C13", ExpansionSet.buildDate(2013, 11, 1), SetType.SUPPLEMENTAL);
this.blockName = "Command Zone"; this.blockName = "Command Zone";
cards.add(new SetCardInfo("Acidic Slime", 134, Rarity.UNCOMMON, mage.cards.a.AcidicSlime.class)); cards.add(new SetCardInfo("Acidic Slime", 134, Rarity.UNCOMMON, mage.cards.a.AcidicSlime.class));

10
Mage.Sets/src/mage/sets/Commander2014Edition.java → Mage.Sets/src/mage/sets/Commander2014.java
View file

@ -9,16 +9,16 @@ import mage.constants.SetType;
* *
* @author LevelX2 * @author LevelX2
*/ */
public final class Commander2014Edition extends ExpansionSet { public final class Commander2014 extends ExpansionSet {
private static final Commander2014Edition instance = new Commander2014Edition(); private static final Commander2014 instance = new Commander2014();
public static Commander2014Edition getInstance() { public static Commander2014 getInstance() {
return instance; return instance;
} }
private Commander2014Edition() { private Commander2014() {
super("Commander 2014 Edition", "C14", ExpansionSet.buildDate(2014, 11, 7), SetType.SUPPLEMENTAL); super("Commander 2014", "C14", ExpansionSet.buildDate(2014, 11, 7), SetType.SUPPLEMENTAL);
this.blockName = "Command Zone"; this.blockName = "Command Zone";
cards.add(new SetCardInfo("Abyssal Persecutor", 132, Rarity.MYTHIC, mage.cards.a.AbyssalPersecutor.class)); cards.add(new SetCardInfo("Abyssal Persecutor", 132, Rarity.MYTHIC, mage.cards.a.AbyssalPersecutor.class));
cards.add(new SetCardInfo("Adarkar Valkyrie", 63, Rarity.RARE, mage.cards.a.AdarkarValkyrie.class)); cards.add(new SetCardInfo("Adarkar Valkyrie", 63, Rarity.RARE, mage.cards.a.AdarkarValkyrie.class));

10
Mage.Sets/src/mage/sets/Commander2015Edition.java → Mage.Sets/src/mage/sets/Commander2015.java
View file

@ -9,16 +9,16 @@ import mage.constants.SetType;
* *
* @author fireshoes * @author fireshoes
*/ */
public final class Commander2015Edition extends ExpansionSet { public final class Commander2015 extends ExpansionSet {
private static final Commander2015Edition instance = new Commander2015Edition(); private static final Commander2015 instance = new Commander2015();
public static Commander2015Edition getInstance() { public static Commander2015 getInstance() {
return instance; return instance;
} }
private Commander2015Edition() { private Commander2015() {
super("Commander 2015 Edition", "C15", ExpansionSet.buildDate(2015, 11, 13), SetType.SUPPLEMENTAL); super("Commander 2015", "C15", ExpansionSet.buildDate(2015, 11, 13), SetType.SUPPLEMENTAL);
this.blockName = "Command Zone"; this.blockName = "Command Zone";
cards.add(new SetCardInfo("Acidic Slime", 173, Rarity.UNCOMMON, mage.cards.a.AcidicSlime.class)); cards.add(new SetCardInfo("Acidic Slime", 173, Rarity.UNCOMMON, mage.cards.a.AcidicSlime.class));
cards.add(new SetCardInfo("Act of Aggression", 141, Rarity.UNCOMMON, mage.cards.a.ActOfAggression.class)); cards.add(new SetCardInfo("Act of Aggression", 141, Rarity.UNCOMMON, mage.cards.a.ActOfAggression.class));

10
Mage.Sets/src/mage/sets/Commander2016Edition.java → Mage.Sets/src/mage/sets/Commander2016.java
View file

@ -9,16 +9,16 @@ import mage.constants.SetType;
* *
* @author fireshoeS * @author fireshoeS
*/ */
public final class Commander2016Edition extends ExpansionSet { public final class Commander2016 extends ExpansionSet {
private static final Commander2016Edition instance = new Commander2016Edition(); private static final Commander2016 instance = new Commander2016();
public static Commander2016Edition getInstance() { public static Commander2016 getInstance() {
return instance; return instance;
} }
private Commander2016Edition() { private Commander2016() {
super("Commander 2016 Edition", "C16", ExpansionSet.buildDate(2016, 11, 11), SetType.SUPPLEMENTAL); super("Commander 2016", "C16", ExpansionSet.buildDate(2016, 11, 11), SetType.SUPPLEMENTAL);
this.blockName = "Command Zone"; this.blockName = "Command Zone";
cards.add(new SetCardInfo("Abzan Charm", 177, Rarity.UNCOMMON, mage.cards.a.AbzanCharm.class)); cards.add(new SetCardInfo("Abzan Charm", 177, Rarity.UNCOMMON, mage.cards.a.AbzanCharm.class));
cards.add(new SetCardInfo("Abzan Falconer", 57, Rarity.UNCOMMON, mage.cards.a.AbzanFalconer.class)); cards.add(new SetCardInfo("Abzan Falconer", 57, Rarity.UNCOMMON, mage.cards.a.AbzanFalconer.class));

10
Mage.Sets/src/mage/sets/Commander2017Edition.java → Mage.Sets/src/mage/sets/Commander2017.java
View file

@ -7,16 +7,16 @@ import mage.constants.SetType;
/** /**
* @author fireshoes * @author fireshoes
*/ */
public final class Commander2017Edition extends ExpansionSet { public final class Commander2017 extends ExpansionSet {
private static final Commander2017Edition instance = new Commander2017Edition(); private static final Commander2017 instance = new Commander2017();
public static Commander2017Edition getInstance() { public static Commander2017 getInstance() {
return instance; return instance;
} }
private Commander2017Edition() { private Commander2017() {
super("Commander 2017 Edition", "C17", ExpansionSet.buildDate(2017, 8, 25), SetType.SUPPLEMENTAL); super("Commander 2017", "C17", ExpansionSet.buildDate(2017, 8, 25), SetType.SUPPLEMENTAL);
this.blockName = "Command Zone"; this.blockName = "Command Zone";
cards.add(new SetCardInfo("Abundance", 145, Rarity.RARE, mage.cards.a.Abundance.class)); cards.add(new SetCardInfo("Abundance", 145, Rarity.RARE, mage.cards.a.Abundance.class));

10
Mage.Sets/src/mage/sets/Commander2018Edition.java → Mage.Sets/src/mage/sets/Commander2018.java
View file

@ -7,16 +7,16 @@ import mage.constants.SetType;
/** /**
* @author TheElk801 * @author TheElk801
*/ */
public final class Commander2018Edition extends ExpansionSet { public final class Commander2018 extends ExpansionSet {
private static final Commander2018Edition instance = new Commander2018Edition(); private static final Commander2018 instance = new Commander2018();
public static Commander2018Edition getInstance() { public static Commander2018 getInstance() {
return instance; return instance;
} }
private Commander2018Edition() { private Commander2018() {
super("Commander 2018 Edition", "C18", ExpansionSet.buildDate(2018, 8, 10), SetType.SUPPLEMENTAL); super("Commander 2018", "C18", ExpansionSet.buildDate(2018, 8, 10), SetType.SUPPLEMENTAL);
this.blockName = "Command Zone"; this.blockName = "Command Zone";
cards.add(new SetCardInfo("Acidic Slime", 127, Rarity.UNCOMMON, mage.cards.a.AcidicSlime.class)); cards.add(new SetCardInfo("Acidic Slime", 127, Rarity.UNCOMMON, mage.cards.a.AcidicSlime.class));

10
Mage.Sets/src/mage/sets/Commander2019Edition.java → Mage.Sets/src/mage/sets/Commander2019.java
View file

@ -7,16 +7,16 @@ import mage.constants.SetType;
/** /**
* @author TheElk801 * @author TheElk801
*/ */
public final class Commander2019Edition extends ExpansionSet { public final class Commander2019 extends ExpansionSet {
private static final Commander2019Edition instance = new Commander2019Edition(); private static final Commander2019 instance = new Commander2019();
public static Commander2019Edition getInstance() { public static Commander2019 getInstance() {
return instance; return instance;
} }
private Commander2019Edition() { private Commander2019() {
super("Commander 2019 Edition", "C19", ExpansionSet.buildDate(2019, 8, 23), SetType.SUPPLEMENTAL); super("Commander 2019", "C19", ExpansionSet.buildDate(2019, 8, 23), SetType.SUPPLEMENTAL);
this.blockName = "Command Zone"; this.blockName = "Command Zone";
cards.add(new SetCardInfo("Ainok Survivalist", 156, Rarity.COMMON, mage.cards.a.AinokSurvivalist.class)); cards.add(new SetCardInfo("Ainok Survivalist", 156, Rarity.COMMON, mage.cards.a.AinokSurvivalist.class));

10
Mage.Sets/src/mage/sets/Commander2020Edition.java → Mage.Sets/src/mage/sets/Commander2020.java
View file

@ -10,7 +10,7 @@ import java.util.List;
/** /**
* @author TheElk801 * @author TheElk801
*/ */
public final class Commander2020Edition extends ExpansionSet { public final class Commander2020 extends ExpansionSet {
private static final List<String> mutateNames = Arrays.asList( private static final List<String> mutateNames = Arrays.asList(
"Mindleecher", "Mindleecher",
@ -19,14 +19,14 @@ public final class Commander2020Edition extends ExpansionSet {
"Souvenir Snatcher" "Souvenir Snatcher"
); );
private static final Commander2020Edition instance = new Commander2020Edition(); private static final Commander2020 instance = new Commander2020();
public static Commander2020Edition getInstance() { public static Commander2020 getInstance() {
return instance; return instance;
} }
private Commander2020Edition() { private Commander2020() {
super("Commander 2020 Edition", "C20", ExpansionSet.buildDate(2020, 4, 24), SetType.SUPPLEMENTAL); super("Commander 2020", "C20", ExpansionSet.buildDate(2020, 4, 24), SetType.SUPPLEMENTAL);
this.blockName = "Command Zone"; this.blockName = "Command Zone";
this.hasBasicLands = false; this.hasBasicLands = false;

10
Mage.Sets/src/mage/sets/Commander2021Edition.java → Mage.Sets/src/mage/sets/Commander2021.java
View file

@ -7,16 +7,16 @@ import mage.constants.SetType;
/** /**
* @author TheElk801 * @author TheElk801
*/ */
public final class Commander2021Edition extends ExpansionSet { public final class Commander2021 extends ExpansionSet {
private static final Commander2021Edition instance = new Commander2021Edition(); private static final Commander2021 instance = new Commander2021();
public static Commander2021Edition getInstance() { public static Commander2021 getInstance() {
return instance; return instance;
} }
private Commander2021Edition() { private Commander2021() {
super("Commander 2021 Edition", "C21", ExpansionSet.buildDate(2021, 4, 23), SetType.SUPPLEMENTAL); super("Commander 2021", "C21", ExpansionSet.buildDate(2021, 4, 23), SetType.SUPPLEMENTAL);
this.blockName = "Command Zone"; this.blockName = "Command Zone";
this.hasBasicLands = false; this.hasBasicLands = false;

8
Mage.Sets/src/mage/sets/SecretLair30thAnniversaryCountdownKit.java → Mage.Sets/src/mage/sets/SecretLairThirtiethAnniversaryCountdownKit.java
View file

@ -7,15 +7,15 @@ import mage.constants.SetType;
/** /**
* https://scryfall.com/sets/slc * https://scryfall.com/sets/slc
*/ */
public class SecretLair30thAnniversaryCountdownKit extends ExpansionSet { public class SecretLairThirtiethAnniversaryCountdownKit extends ExpansionSet {
private static final SecretLair30thAnniversaryCountdownKit instance = new SecretLair30thAnniversaryCountdownKit(); private static final SecretLairThirtiethAnniversaryCountdownKit instance = new SecretLairThirtiethAnniversaryCountdownKit();
public static SecretLair30thAnniversaryCountdownKit getInstance() { public static SecretLairThirtiethAnniversaryCountdownKit getInstance() {
return instance; return instance;
} }
private SecretLair30thAnniversaryCountdownKit() { private SecretLairThirtiethAnniversaryCountdownKit() {
super("Secret Lair 30th Anniversary Countdown Kit", "SLC", ExpansionSet.buildDate(2022, 11, 1), SetType.PROMOTIONAL); super("Secret Lair 30th Anniversary Countdown Kit", "SLC", ExpansionSet.buildDate(2022, 11, 1), SetType.PROMOTIONAL);
this.hasBasicLands = false; this.hasBasicLands = false;

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

@ -18,7 +18,7 @@ public class ThirtiethAnniversaryEdition extends ExpansionSet {
} }
private ThirtiethAnniversaryEdition() { private ThirtiethAnniversaryEdition() {
super("Thirtieth Anniversary Edition", "30A", ExpansionSet.buildDate(2022, 11, 28), SetType.PROMOTIONAL); super("30th Anniversary Edition", "30A", ExpansionSet.buildDate(2022, 11, 28), SetType.PROMOTIONAL);
this.hasBasicLands = true; this.hasBasicLands = true;
this.numBoosterLands = 3; this.numBoosterLands = 3;
this.numBoosterCommon = 7; this.numBoosterCommon = 7;

10
Mage.Sets/src/mage/sets/Warhammer40000.java → Mage.Sets/src/mage/sets/Warhammer40000Commander.java
View file

@ -7,16 +7,16 @@ import mage.constants.SetType;
/** /**
* @author TheElk801 * @author TheElk801
*/ */
public final class Warhammer40000 extends ExpansionSet { public final class Warhammer40000Commander extends ExpansionSet {
private static final Warhammer40000 instance = new Warhammer40000(); private static final Warhammer40000Commander instance = new Warhammer40000Commander();
public static Warhammer40000 getInstance() { public static Warhammer40000Commander getInstance() {
return instance; return instance;
} }
private Warhammer40000() { private Warhammer40000Commander() {
super("Warhammer 40,000", "40K", ExpansionSet.buildDate(2022, 4, 29), SetType.SUPPLEMENTAL); super("Warhammer 40,000 Commander", "40K", ExpansionSet.buildDate(2022, 4, 29), SetType.SUPPLEMENTAL);
this.hasBasicLands = true; this.hasBasicLands = true;
this.hasBoosters = false; this.hasBoosters = false;

1
Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
View file

@ -904,6 +904,7 @@ public class VerifyCardDataTest {
String needClassName = Arrays.stream( String needClassName = Arrays.stream(
set.getName() set.getName()
.replaceAll("&", "And") .replaceAll("&", "And")
.replaceAll("30th", "Thirtieth")
.replace("-", " ") .replace("-", " ")
.replaceAll("[.+-/:\"']", "") .replaceAll("[.+-/:\"']", "")
.split(" ") .split(" ")

2
Utils/gen_all_files_in_dck.pl
View file

@ -68,7 +68,7 @@ while (<DIR_LISTING>)
my $line = $_; my $line = $_;
# Eg: Set Trigraph # Eg: Set Trigraph
#super("Commander 2016 Edition", "C16", ExpansionSet.buildDate(2016, 11, 11), SetType.SUPPLEMENTAL); #super("Commander 2016", "C16", ExpansionSet.buildDate(2016, 11, 11), SetType.SUPPLEMENTAL);
$line =~ s/\\\"/'/img; $line =~ s/\\\"/'/img;
if ($line =~ m/super\("[^"]*?", "([^"]*?)", ExpansionSet.buildDate.*/img) if ($line =~ m/super\("[^"]*?", "([^"]*?)", ExpansionSet.buildDate.*/img)
{ {

12
Utils/known-sets.txt
View file

@ -30,11 +30,11 @@ Chronicles|Chronicles|
Clash Pack|ClashPack| Clash Pack|ClashPack|
Classic Sixth Edition|ClassicSixthEdition| Classic Sixth Edition|ClassicSixthEdition|
Coldsnap|Coldsnap| Coldsnap|Coldsnap|
Commander 2013 Edition|Commander2013Edition| Commander 2013|Commander2013Edition|
Commander 2014 Edition|Commander2014Edition| Commander 2014|Commander2014Edition|
Commander 2015 Edition|Commander2015Edition| Commander 2015|Commander2015Edition|
Commander 2016 Edition|Commander2016Edition| Commander 2016|Commander2016Edition|
Commander 2017 Edition|Commander2017Edition| Commander 2017|Commander2017Edition|
Commander 2018|Commander2018Edition| Commander 2018|Commander2018Edition|
Commander 2019|Commander2019Edition| Commander 2019|Commander2019Edition|
Commander 2020|Commander2020Edition| Commander 2020|Commander2020Edition|
@ -272,7 +272,7 @@ Urza's Legacy|UrzasLegacy|
Urza's Saga|UrzasSaga| Urza's Saga|UrzasSaga|
Vintage Masters|VintageMasters| Vintage Masters|VintageMasters|
Visions|Visions| Visions|Visions|
Warhammer 40,000|Warhammer40000| Warhammer 40,000 Commander|Warhammer40000Commander|
War of the Spark|WarOfTheSpark| War of the Spark|WarOfTheSpark|
Weatherlight|Weatherlight| Weatherlight|Weatherlight|
Welcome Deck 2016|WelcomeDeck2016| Welcome Deck 2016|WelcomeDeck2016|

3964
Utils/mtg-cards-data.txt
View file

File diff suppressed because it is too large Load diff

20
Utils/mtg-sets-data.txt
View file

@ -37,15 +37,15 @@ Battle Royale Box Set|BRB|
Beatdown Box Set|BTD| Beatdown Box Set|BTD|
Bloomburrow|BLB| Bloomburrow|BLB|
Bloomburrow Commander|BLC| Bloomburrow Commander|BLC|
Commander 2013 Edition|C13| Commander 2013|C13|
Commander 2014 Edition|C14| Commander 2014|C14|
Commander 2015 Edition|C15| Commander 2015|C15|
Commander 2016 Edition|C16| Commander 2016|C16|
Commander 2017 Edition|C17| Commander 2017|C17|
Commander 2018 Edition|C18| Commander 2018|C18|
Commander 2019 Edition|C19| Commander 2019|C19|
Commander 2020 Edition|C20| Commander 2020|C20|
Commander 2021 Edition|C21| Commander 2021|C21|
Commander Legends|CMR| Commander Legends|CMR|
Commander Legends: Battle for Baldur's Gate|CLB| Commander Legends: Battle for Baldur's Gate|CLB|
Champions of Kamigawa|CHK| Champions of Kamigawa|CHK|
@ -295,4 +295,4 @@ Zendikar Rising|ZNR|
Zendikar Rising Commander|ZNC| Zendikar Rising Commander|ZNC|
Star Wars|SWS| Star Wars|SWS|
Happy Holidays|HHO| Happy Holidays|HHO|
Warhammer 40,000|40K| Warhammer 40,000 Commander|40K|