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: fixed outdated names for some old sets (part 2)

Browse source
This commit is contained in:
Oleg Agafonov 2025-01-25 09:58:32 +04:00
parent 166ecb98d0
commit 7d5b117263
18 changed files with 668 additions and 667 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -543,7 +543,7 @@ public class ScryfallImageSupportCards {
add("WOT"); // Wilds of Eldraine: Enchanting Tales add("WOT"); // Wilds of Eldraine: Enchanting Tales
add("WOC"); // Wilds of Eldraine Commander add("WOC"); // Wilds of Eldraine Commander
add("LCI"); // The Lost Caverns of Ixalan add("LCI"); // The Lost Caverns of Ixalan
add("LCC"); // The Lost Caverns of Ixalan Commander add("LCC"); // The The Lost Caverns of Ixalan Commander
add("REX"); // Jurassic World Collection add("REX"); // Jurassic World Collection
add("SPG"); // Special Guests add("SPG"); // Special Guests
add("RVR"); // Ravnica Remastered add("RVR"); // Ravnica Remastered

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

@ -16,7 +16,7 @@ public final class DuelDecksAnthologyDivineVsDemonic extends ExpansionSet {
} }
private DuelDecksAnthologyDivineVsDemonic() { private DuelDecksAnthologyDivineVsDemonic() {
super("Duel Decks: Anthology, Divine vs. Demonic", "DVD", ExpansionSet.buildDate(2014, 12, 5), SetType.SUPPLEMENTAL); super("Duel Decks Anthology: Divine vs. Demonic", "DVD", ExpansionSet.buildDate(2014, 12, 5), SetType.SUPPLEMENTAL);
this.blockName = "Duel Decks: Anthology"; this.blockName = "Duel Decks: Anthology";
this.hasBasicLands = true; this.hasBasicLands = true;

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

@ -16,7 +16,7 @@ public final class DuelDecksAnthologyElvesVsGoblins extends ExpansionSet {
} }
private DuelDecksAnthologyElvesVsGoblins() { private DuelDecksAnthologyElvesVsGoblins() {
super("Duel Decks: Anthology, Elves vs. Goblins", "EVG", ExpansionSet.buildDate(2014, 12, 5), super("Duel Decks Anthology: Elves vs. Goblins", "EVG", ExpansionSet.buildDate(2014, 12, 5),
SetType.SUPPLEMENTAL); SetType.SUPPLEMENTAL);
this.blockName = "Duel Decks: Anthology"; this.blockName = "Duel Decks: Anthology";
this.hasBasicLands = true; this.hasBasicLands = true;

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

@ -17,7 +17,7 @@ public final class DuelDecksAnthologyGarrukVsLiliana extends ExpansionSet {
} }
private DuelDecksAnthologyGarrukVsLiliana() { private DuelDecksAnthologyGarrukVsLiliana() {
super("Duel Decks: Anthology, Garruk vs. Liliana", "GVL", ExpansionSet.buildDate(2014, 12, 5), super("Duel Decks Anthology: Garruk vs. Liliana", "GVL", ExpansionSet.buildDate(2014, 12, 5),
SetType.SUPPLEMENTAL); SetType.SUPPLEMENTAL);
this.blockName = "Duel Decks: Anthology"; this.blockName = "Duel Decks: Anthology";
this.hasBasicLands = true; this.hasBasicLands = true;

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

@ -17,7 +17,7 @@ public final class DuelDecksAnthologyJaceVsChandra extends ExpansionSet {
} }
private DuelDecksAnthologyJaceVsChandra() { private DuelDecksAnthologyJaceVsChandra() {
super("Duel Decks: Anthology, Jace vs. Chandra", "JVC", ExpansionSet.buildDate(2014, 12, 5), super("Duel Decks Anthology: Jace vs. Chandra", "JVC", ExpansionSet.buildDate(2014, 12, 5),
SetType.SUPPLEMENTAL); SetType.SUPPLEMENTAL);
this.blockName = "Duel Decks: Anthology"; this.blockName = "Duel Decks: Anthology";
this.hasBasicLands = true; this.hasBasicLands = true;

10
Mage.Sets/src/mage/sets/GuildsOfRavnicaGuildKits.java → Mage.Sets/src/mage/sets/GRNGuildKit.java
View file

@ -8,16 +8,16 @@ import mage.constants.SetType;
/** /**
* @author TheElk801 * @author TheElk801
*/ */
public final class GuildsOfRavnicaGuildKits extends ExpansionSet { public final class GRNGuildKit extends ExpansionSet {
private static final GuildsOfRavnicaGuildKits instance = new GuildsOfRavnicaGuildKits(); private static final GRNGuildKit instance = new GRNGuildKit();
public static GuildsOfRavnicaGuildKits getInstance() { public static GRNGuildKit getInstance() {
return instance; return instance;
} }
private GuildsOfRavnicaGuildKits() { private GRNGuildKit() {
super("Guilds of Ravnica Guild Kits", "GK1", ExpansionSet.buildDate(2018, 11, 2), SetType.SUPPLEMENTAL); super("GRN Guild Kit", "GK1", ExpansionSet.buildDate(2018, 11, 2), SetType.SUPPLEMENTAL);
this.blockName = "Guild Kits"; this.blockName = "Guild Kits";
this.hasBasicLands = true; this.hasBasicLands = true;

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

@ -16,7 +16,7 @@ public final class GlobalSeriesJiangYangguAndMuYanling extends ExpansionSet {
} }
private GlobalSeriesJiangYangguAndMuYanling() { private GlobalSeriesJiangYangguAndMuYanling() {
super("Global Series: Jiang Yanggu & Mu Yanling", "GS1", ExpansionSet.buildDate(2018, 6, 22), SetType.SUPPLEMENTAL); super("Global Series Jiang Yanggu & Mu Yanling", "GS1", ExpansionSet.buildDate(2018, 6, 22), SetType.SUPPLEMENTAL);
this.blockName = "Global Series"; this.blockName = "Global Series";
this.hasBasicLands = true; this.hasBasicLands = true;

10
Mage.Sets/src/mage/sets/HASCONPromo2017.java → Mage.Sets/src/mage/sets/HasCon2017.java
View file

@ -8,16 +8,16 @@ import mage.constants.SetType;
/** /**
* @author Saga * @author Saga
*/ */
public final class HASCONPromo2017 extends ExpansionSet { public final class HasCon2017 extends ExpansionSet {
private static final HASCONPromo2017 instance = new HASCONPromo2017(); private static final HasCon2017 instance = new HasCon2017();
public static HASCONPromo2017 getInstance() { public static HasCon2017 getInstance() {
return instance; return instance;
} }
private HASCONPromo2017() { private HasCon2017() {
super("HASCON Promo 2017", "H17", ExpansionSet.buildDate(2017, 9, 8), SetType.JOKE_SET); super("HasCon 2017", "H17", ExpansionSet.buildDate(2017, 9, 8), SetType.JOKE_SET);
this.hasBasicLands = false; this.hasBasicLands = false;
cards.add(new ExpansionSet.SetCardInfo("Grimlock, Dinobot Leader", 1, Rarity.MYTHIC, mage.cards.g.GrimlockDinobotLeader.class)); cards.add(new ExpansionSet.SetCardInfo("Grimlock, Dinobot Leader", 1, Rarity.MYTHIC, mage.cards.g.GrimlockDinobotLeader.class));

10
Mage.Sets/src/mage/sets/MysteryBoosterPlaytest.java → Mage.Sets/src/mage/sets/MysteryBoosterPlaytestCards2019.java
View file

@ -10,16 +10,16 @@ import mage.constants.SetType;
* https://scryfall.com/sets/cmb1 * https://scryfall.com/sets/cmb1
* *
*/ */
public class MysteryBoosterPlaytest extends ExpansionSet { public class MysteryBoosterPlaytestCards2019 extends ExpansionSet {
private static final MysteryBoosterPlaytest instance = new MysteryBoosterPlaytest(); private static final MysteryBoosterPlaytestCards2019 instance = new MysteryBoosterPlaytestCards2019();
public static MysteryBoosterPlaytest getInstance() { public static MysteryBoosterPlaytestCards2019 getInstance() {
return instance; return instance;
} }
private MysteryBoosterPlaytest() { private MysteryBoosterPlaytestCards2019() {
super("Mystery Booster Playtest", "CMB1", ExpansionSet.buildDate(2019, 11, 7), SetType.JOKE_SET); super("Mystery Booster Playtest Cards 2019", "CMB1", ExpansionSet.buildDate(2019, 11, 7), SetType.JOKE_SET);
this.hasBoosters = false; this.hasBoosters = false;
this.hasBasicLands = false; this.hasBasicLands = false;

10
Mage.Sets/src/mage/sets/RavnicaAllegianceGuildKits.java → Mage.Sets/src/mage/sets/RNAGuildKit.java
View file

@ -7,16 +7,16 @@ import mage.constants.SetType;
/** /**
* @author JayDi85 * @author JayDi85
*/ */
public final class RavnicaAllegianceGuildKits extends ExpansionSet { public final class RNAGuildKit extends ExpansionSet {
private static final RavnicaAllegianceGuildKits instance = new RavnicaAllegianceGuildKits(); private static final RNAGuildKit instance = new RNAGuildKit();
public static RavnicaAllegianceGuildKits getInstance() { public static RNAGuildKit getInstance() {
return instance; return instance;
} }
private RavnicaAllegianceGuildKits() { private RNAGuildKit() {
super("Ravnica Allegiance Guild Kits", "GK2", ExpansionSet.buildDate(2019, 2, 15), SetType.SUPPLEMENTAL); super("RNA Guild Kit", "GK2", ExpansionSet.buildDate(2019, 2, 15), SetType.SUPPLEMENTAL);
this.blockName = "Guild Kits"; this.blockName = "Guild Kits";
this.hasBasicLands = true; this.hasBasicLands = true;

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

@ -7,15 +7,15 @@ import mage.constants.SetType;
/** /**
* https://scryfall.com/sets/slc * https://scryfall.com/sets/slc
*/ */
public class SecretLairThirtiethAnniversaryCountdownKit extends ExpansionSet { public class SecretLair30thAnniversaryCountdownKit extends ExpansionSet {
private static final SecretLairThirtiethAnniversaryCountdownKit instance = new SecretLairThirtiethAnniversaryCountdownKit(); private static final SecretLair30thAnniversaryCountdownKit instance = new SecretLair30thAnniversaryCountdownKit();
public static SecretLairThirtiethAnniversaryCountdownKit getInstance() { public static SecretLair30thAnniversaryCountdownKit getInstance() {
return instance; return instance;
} }
private SecretLairThirtiethAnniversaryCountdownKit() { private SecretLair30thAnniversaryCountdownKit() {
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;

10
Mage.Sets/src/mage/sets/GiftPack2017.java → Mage.Sets/src/mage/sets/The2017GiftPack.java
View file

@ -7,16 +7,16 @@ import mage.constants.SetType;
/** /**
* https://scryfall.com/sets/g17 * https://scryfall.com/sets/g17
*/ */
public class GiftPack2017 extends ExpansionSet { public class The2017GiftPack extends ExpansionSet {
private static final GiftPack2017 instance = new GiftPack2017(); private static final The2017GiftPack instance = new The2017GiftPack();
public static GiftPack2017 getInstance() { public static The2017GiftPack getInstance() {
return instance; return instance;
} }
private GiftPack2017() { private The2017GiftPack() {
super("Gift Pack 2017", "G17", ExpansionSet.buildDate(2017, 10, 20), SetType.PROMOTIONAL); super("2017 Gift Pack", "G17", ExpansionSet.buildDate(2017, 10, 20), SetType.PROMOTIONAL);
this.hasBoosters = false; this.hasBoosters = false;
this.hasBasicLands = true; this.hasBasicLands = true;

8
Mage.Sets/src/mage/sets/ThirtiethAnniversaryEdition.java → Mage.Sets/src/mage/sets/The30thAnniversaryEdition.java
View file

@ -9,15 +9,15 @@ import mage.constants.SetType;
* *
* @author JayDi85 * @author JayDi85
*/ */
public class ThirtiethAnniversaryEdition extends ExpansionSet { public class The30thAnniversaryEdition extends ExpansionSet {
private static final ThirtiethAnniversaryEdition instance = new ThirtiethAnniversaryEdition(); private static final The30thAnniversaryEdition instance = new The30thAnniversaryEdition();
public static ThirtiethAnniversaryEdition getInstance() { public static The30thAnniversaryEdition getInstance() {
return instance; return instance;
} }
private ThirtiethAnniversaryEdition() { private The30thAnniversaryEdition() {
super("30th 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;

10
Mage.Sets/src/mage/sets/LostCavernsOfIxalanCommander.java → Mage.Sets/src/mage/sets/TheLostCavernsOfIxalanCommander.java
View file

@ -8,16 +8,16 @@ import mage.constants.SetType;
/** /**
* @author Susucr * @author Susucr
*/ */
public final class LostCavernsOfIxalanCommander extends ExpansionSet { public final class TheLostCavernsOfIxalanCommander extends ExpansionSet {
private static final LostCavernsOfIxalanCommander instance = new LostCavernsOfIxalanCommander(); private static final TheLostCavernsOfIxalanCommander instance = new TheLostCavernsOfIxalanCommander();
public static LostCavernsOfIxalanCommander getInstance() { public static TheLostCavernsOfIxalanCommander getInstance() {
return instance; return instance;
} }
private LostCavernsOfIxalanCommander() { private TheLostCavernsOfIxalanCommander() {
super("Lost Caverns of Ixalan Commander", "LCC", ExpansionSet.buildDate(2023, 11, 17), SetType.SUPPLEMENTAL); super("The Lost Caverns of Ixalan Commander", "LCC", ExpansionSet.buildDate(2023, 11, 17), SetType.SUPPLEMENTAL);
this.hasBoosters = false; this.hasBoosters = false;
this.hasBasicLands = false; this.hasBasicLands = false;

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

@ -904,13 +904,14 @@ public class VerifyCardDataTest {
String needClassName = Arrays.stream( String needClassName = Arrays.stream(
set.getName() set.getName()
.replaceAll("&", "And") .replaceAll("&", "And")
.replaceAll("30th", "Thirtieth") .replaceAll("^(\\d+)", "The$1") // replace starting "2007 xxx" by "The2007"
.replace("-", " ") .replace("-", " ")
.replaceAll("[.+-/:\"']", "") .replaceAll("[.+-/:\"']", "")
.split(" ") .split(" ")
).map(CardUtil::getTextWithFirstCharUpperCase).reduce("", String::concat); ).map(CardUtil::getTextWithFirstCharUpperCase).reduce("", String::concat);
if (!className.equals(needClassName)) { if (!className.equals(needClassName)) {
// if set name start with a numbers then add "The" at the start
errorsList.add("Error: set's class name must be equal to set name: " errorsList.add("Error: set's class name must be equal to set name: "
+ className + " from " + set.getClass().getName() + ", caption: " + set.getName() + ", need name: " + needClassName); + className + " from " + set.getClass().getName() + ", caption: " + set.getName() + ", need name: " + needClassName);
} }

14
Utils/known-sets.txt
View file

@ -60,10 +60,10 @@ Dominaria United Commander|DominariaUnitedCommander|
Dragon's Maze|DragonsMaze| Dragon's Maze|DragonsMaze|
Dragons of Tarkir|DragonsOfTarkir| Dragons of Tarkir|DragonsOfTarkir|
Duel Decks: Ajani vs. Nicol Bolas|DuelDecksAjaniVsNicolBolas| Duel Decks: Ajani vs. Nicol Bolas|DuelDecksAjaniVsNicolBolas|
Duel Decks: Anthology, Divine vs. Demonic|DuelDecksAnthologyDivineVsDemonic| Duel Decks Anthology: Divine vs. Demonic|DuelDecksAnthologyDivineVsDemonic|
Duel Decks: Anthology, Elves vs. Goblins|DuelDecksAnthologyElvesVsGoblins| Duel Decks Anthology: Elves vs. Goblins|DuelDecksAnthologyElvesVsGoblins|
Duel Decks: Anthology, Garruk vs. Liliana|DuelDecksAnthologyGarrukVsLiliana| Duel Decks Anthology: Garruk vs. Liliana|DuelDecksAnthologyGarrukVsLiliana|
Duel Decks: Anthology, Jace vs. Chandra|DuelDecksAnthologyJaceVsChandra| Duel Decks Anthology: Jace vs. Chandra|DuelDecksAnthologyJaceVsChandra|
Duel Decks: Blessed vs. Cursed|DuelDecksBlessedVsCursed| Duel Decks: Blessed vs. Cursed|DuelDecksBlessedVsCursed|
Duel Decks: Divine vs. Demonic|DuelDecksDivineVsDemonic| Duel Decks: Divine vs. Demonic|DuelDecksDivineVsDemonic|
Duel Decks: Elspeth vs. Kiora|DuelDecksElspethVsKiora| Duel Decks: Elspeth vs. Kiora|DuelDecksElspethVsKiora|
@ -118,13 +118,13 @@ Game Night|GameNight|
Game Night 2019|GameNight2019| Game Night 2019|GameNight2019|
Game Night: Free-for-All|GameNightFreeforAll| Game Night: Free-for-All|GameNightFreeforAll|
Gatecrash|Gatecrash| Gatecrash|Gatecrash|
Global Series: Jiang Yanggu & Mu Yanling|GlobalSeriesJiangYangguAndMuYanling| Global Series Jiang Yanggu & Mu Yanling|GlobalSeriesJiangYangguAndMuYanling|
Grand Prix|GrandPrixPromos| Grand Prix|GrandPrixPromos|
Guildpact|Guildpact| Guildpact|Guildpact|
Guilds of Ravnica|GuildsOfRavnica| Guilds of Ravnica|GuildsOfRavnica|
Guru|Guru| Guru|Guru|
Happy Holidays|HappyHolidays| Happy Holidays|HappyHolidays|
HASCON Promo 2017|HASCONPromo2017| HasCon 2017|HASCONPromo2017|
Heroes of the Realm|HeroesOfTheRealm| Heroes of the Realm|HeroesOfTheRealm|
Homelands|Homelands| Homelands|Homelands|
Hour of Devastation|HourOfDevastation| Hour of Devastation|HourOfDevastation|
@ -160,7 +160,7 @@ The Lord of the Rings: Tales of Middle-earth|TheLordOfTheRingsTalesOfMiddleEarth
Tales of Middle-earth Commander|TalesOfMiddleEarthCommander| Tales of Middle-earth Commander|TalesOfMiddleEarthCommander|
Lorwyn|Lorwyn| Lorwyn|Lorwyn|
The Lost Caverns of Ixalan|TheLostCavernsOfIxalan| The Lost Caverns of Ixalan|TheLostCavernsOfIxalan|
Lost Caverns of Ixalan Commander|LostCavernsOfIxalanCommander| The Lost Caverns of Ixalan Commander|LostCavernsOfIxalanCommander|
Magic 2010|Magic2010| Magic 2010|Magic2010|
Magic 2011|Magic2011| Magic 2011|Magic2011|
Magic 2012|Magic2012| Magic 2012|Magic2012|

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

File diff suppressed because it is too large Load diff

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

@ -62,10 +62,10 @@ Conflux|CON|
Coldsnap|CSP| Coldsnap|CSP|
Doctor Who|WHO| Doctor Who|WHO|
Duel Decks: Jace vs. Chandra|DD2| Duel Decks: Jace vs. Chandra|DD2|
Duel Decks: Anthology, Divine vs. Demonic|DVD| Duel Decks Anthology: Divine vs. Demonic|DVD|
Duel Decks: Anthology, Elves vs. Goblins|EVG| Duel Decks Anthology: Elves vs. Goblins|EVG|
Duel Decks: Anthology, Garruk vs. Liliana|GVL| Duel Decks Anthology: Garruk vs. Liliana|GVL|
Duel Decks: Anthology, Jace vs. Chandra|JVC| Duel Decks Anthology: Jace vs. Chandra|JVC|
Duel Decks: Divine vs. Demonic|DDC| Duel Decks: Divine vs. Demonic|DDC|
Duel Decks: Garruk vs. Liliana|DDD| Duel Decks: Garruk vs. Liliana|DDD|
Duel Decks: Phyrexia vs. the Coalition|DDE| Duel Decks: Phyrexia vs. the Coalition|DDE|
@ -116,7 +116,7 @@ Fate Reforged|FRF|
Foundations|FDN| Foundations|FDN|
Foundations Jumpstar|J25| Foundations Jumpstar|J25|
Future Sight|FUT| Future Sight|FUT|
Global Series: Jiang Yanggu & Mu Yanling|GS1| Global Series Jiang Yanggu & Mu Yanling|GS1|
Guildpact|GPT| Guildpact|GPT|
Guilds of Ravnica|GRN| Guilds of Ravnica|GRN|
Grand Prix|PGPX| Grand Prix|PGPX|
@ -134,7 +134,7 @@ Ikoria: Lair of Behemoths|IKO|
Invasion|INV| Invasion|INV|
Innistrad|ISD| Innistrad|ISD|
The Lost Caverns of Ixalan|LCI| The Lost Caverns of Ixalan|LCI|
Lost Caverns of Ixalan Commander|LCC| The Lost Caverns of Ixalan Commander|LCC|
Innistrad: Midnight Hunt|MID| Innistrad: Midnight Hunt|MID|
Midnight Hunt Commander|MIC| Midnight Hunt Commander|MIC|
Innistrad: Crimson Vow|VOW| Innistrad: Crimson Vow|VOW|
@ -265,7 +265,7 @@ Unhinged|UNH|
Unfinity|UNF| Unfinity|UNF|
Urza's Saga|USG| Urza's Saga|USG|
Unstable|UST| Unstable|UST|
HASCON Promo 2017|H17| HasCon 2017|H17|
From the Vault: Exiled|V09| From the Vault: Exiled|V09|
From the Vault: Relics|V10| From the Vault: Relics|V10|
From the Vault: Legends|V11| From the Vault: Legends|V11|