diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java index 5626b09def8..7a5c97ab04d 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java @@ -113,7 +113,7 @@ public class GathererSets implements Iterable { "OTC", "OTP", "BIG", "MH3", "M3C", "ACR", "BLB", "BLC", "DSK", "DSC", "MB2", "FDN", "INR", "J25", "DRC", "DFT", "TDC", "TDM", "FCA", "FIC", "FIN", "SIS", "SIR", "SLD", "AKR", "MD1", "ANB", "LTC", "BRR", "HA1", - "HA2", "HA3", "HA4", "HA5", "ZNC" + "HA2", "HA3", "HA4", "HA5", "ZNC", "EOE", "EOC", "SPE", "TLA" // "HHO", "ANA" -- do not exist on gatherer }; diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java index 18c0bdd3d7b..f3a7bf5e3d2 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java @@ -2180,23 +2180,16 @@ public class ScryfallImageSupportTokens { put("WOE/Young Hero", "https://api.scryfall.com/cards/twoe/16/en?format=image"); // WOC - put("WOC/Cat/1", "https://api.scryfall.com/cards/twoc/6/en?format=image"); - put("WOC/Cat/2", "https://api.scryfall.com/cards/twoc/5/en?format=image"); - put("WOC/Elephant", "https://api.scryfall.com/cards/twoc/13/en?format=image"); put("WOC/Faerie", "https://api.scryfall.com/cards/twoc/10/en?format=image"); put("WOC/Faerie Rogue/1", "https://api.scryfall.com/cards/twoc/11/en?format=image"); put("WOC/Faerie Rogue/2", "https://api.scryfall.com/cards/twoc/16/en?format=image"); - put("WOC/Human Monk", "https://api.scryfall.com/cards/twoc/14/en?format=image"); put("WOC/Human Soldier", "https://api.scryfall.com/cards/twoc/7/en?format=image"); put("WOC/Monster", "https://api.scryfall.com/cards/twoc/1/en?format=image"); - put("WOC/Ox", "https://api.scryfall.com/cards/twoc/8/en?format=image"); put("WOC/Pegasus", "https://api.scryfall.com/cards/twoc/9/en?format=image"); put("WOC/Pirate", "https://api.scryfall.com/cards/twoc/12/en?format=image"); put("WOC/Royal", "https://api.scryfall.com/cards/twoc/2/en?format=image"); put("WOC/Saproling", "https://api.scryfall.com/cards/twoc/15/en?format=image"); - put("WOC/Sorcerer", "https://api.scryfall.com/cards/twoc/3/en?format=image"); - put("WOC/Spirit", "https://api.scryfall.com/cards/twoc/17/en?format=image"); - put("WOC/Virtuous", "https://api.scryfall.com/cards/twoc/3/en?format=image"); + put("WOC/Virtuous", "https://api.scryfall.com/cards/twoc/2/en?format=image"); // WHO put("WHO/Alien", "https://api.scryfall.com/cards/twho/2?format=image"); diff --git a/Mage.Sets/src/mage/sets/MediaAndCollaborationPromos.java b/Mage.Sets/src/mage/sets/MediaAndCollaborationPromos.java index 6b0c9612c26..b655cb8f7fc 100644 --- a/Mage.Sets/src/mage/sets/MediaAndCollaborationPromos.java +++ b/Mage.Sets/src/mage/sets/MediaAndCollaborationPromos.java @@ -33,7 +33,7 @@ public class MediaAndCollaborationPromos extends ExpansionSet { cards.add(new SetCardInfo("Chandra's Outrage", "2010-3", Rarity.COMMON, mage.cards.c.ChandrasOutrage.class)); cards.add(new SetCardInfo("Chandra's Spitfire", "2010-4", Rarity.UNCOMMON, mage.cards.c.ChandrasSpitfire.class)); cards.add(new SetCardInfo("Counterspell", "2021-1", Rarity.RARE, mage.cards.c.Counterspell.class)); - cards.add(new SetCardInfo("Crop Rotation", "2020-7ww", Rarity.RARE, mage.cards.c.CropRotation.class)); + cards.add(new SetCardInfo("Crop Rotation", "2020-7", Rarity.RARE, mage.cards.c.CropRotation.class)); cards.add(new SetCardInfo("Culling the Weak", "2023-8", Rarity.RARE, mage.cards.c.CullingTheWeak.class)); cards.add(new SetCardInfo("Cunning Sparkmage", "2010-2", Rarity.UNCOMMON, mage.cards.c.CunningSparkmage.class)); cards.add(new SetCardInfo("Dark Ritual", "2020-4", Rarity.RARE, mage.cards.d.DarkRitual.class)); diff --git a/Mage.Sets/src/mage/sets/SecretLairShowdown.java b/Mage.Sets/src/mage/sets/SecretLairShowdown.java index 2d6802320d5..dfc3fecd8be 100644 --- a/Mage.Sets/src/mage/sets/SecretLairShowdown.java +++ b/Mage.Sets/src/mage/sets/SecretLairShowdown.java @@ -25,7 +25,6 @@ public class SecretLairShowdown extends ExpansionSet { cards.add(new SetCardInfo("Dark Ritual", 16, Rarity.RARE, mage.cards.d.DarkRitual.class)); cards.add(new SetCardInfo("Death's Shadow", 8, Rarity.RARE, mage.cards.d.DeathsShadow.class)); cards.add(new SetCardInfo("Dragonlord Silumgar", 9, Rarity.MYTHIC, mage.cards.d.DragonlordSilumgar.class)); - cards.add(new SetCardInfo("Echo of Death's Wail", 356, Rarity.RARE, mage.cards.e.EchoOfDeathsWail.class)); cards.add(new SetCardInfo("Eldritch Evolution", 5, Rarity.RARE, mage.cards.e.EldritchEvolution.class)); cards.add(new SetCardInfo("Explore", 12, Rarity.RARE, mage.cards.e.Explore.class)); cards.add(new SetCardInfo("Expressive Iteration", 13, Rarity.RARE, mage.cards.e.ExpressiveIteration.class)); @@ -60,7 +59,6 @@ public class SecretLairShowdown extends ExpansionSet { cards.add(new SetCardInfo("Supreme Verdict", 26, Rarity.RARE, mage.cards.s.SupremeVerdict.class)); cards.add(new SetCardInfo("Swamp", 33, Rarity.LAND, mage.cards.basiclands.Swamp.class, FULL_ART_BFZ_VARIOUS)); cards.add(new SetCardInfo("Swords to Plowshares", 20, Rarity.RARE, mage.cards.s.SwordsToPlowshares.class)); - cards.add(new SetCardInfo("Tribute to Horobi", 356, Rarity.RARE, mage.cards.t.TributeToHorobi.class)); cards.add(new SetCardInfo("Ugin, the Spirit Dragon", 6, Rarity.MYTHIC, mage.cards.u.UginTheSpiritDragon.class)); cards.add(new SetCardInfo("Unholy Heat", 4, Rarity.RARE, mage.cards.u.UnholyHeat.class)); cards.add(new SetCardInfo("Valakut, the Molten Pinnacle", 14, Rarity.RARE, mage.cards.v.ValakutTheMoltenPinnacle.class)); diff --git a/Mage.Sets/src/mage/sets/Warhammer40000Commander.java b/Mage.Sets/src/mage/sets/Warhammer40000Commander.java index c009b193fdd..2bb6b66df29 100644 --- a/Mage.Sets/src/mage/sets/Warhammer40000Commander.java +++ b/Mage.Sets/src/mage/sets/Warhammer40000Commander.java @@ -30,7 +30,6 @@ public final class Warhammer40000Commander extends ExpansionSet { cards.add(new SetCardInfo("Abundance", 210, Rarity.RARE, mage.cards.a.Abundance.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Acolyte Hybrid", "70*", Rarity.UNCOMMON, mage.cards.a.AcolyteHybrid.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Acolyte Hybrid", 70, Rarity.UNCOMMON, mage.cards.a.AcolyteHybrid.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Adaptive Automaton", 322, Rarity.RARE, mage.cards.a.AdaptiveAutomaton.class)); cards.add(new SetCardInfo("Aetherize", "191*", Rarity.UNCOMMON, mage.cards.a.Aetherize.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Aetherize", 191, Rarity.UNCOMMON, mage.cards.a.Aetherize.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("And They Shall Know No Fear", "9*", Rarity.UNCOMMON, mage.cards.a.AndTheyShallKnowNoFear.class, NON_FULL_USE_VARIOUS)); diff --git a/Mage/src/main/resources/tokens-database.txt b/Mage/src/main/resources/tokens-database.txt index a7bcc8b051d..8f6f433030e 100644 --- a/Mage/src/main/resources/tokens-database.txt +++ b/Mage/src/main/resources/tokens-database.txt @@ -2235,22 +2235,15 @@ |Generate|TOK:WOE|Young Hero|||YoungHeroRoleToken| # WOC -|Generate|TOK:WOC|Cat|1||CatToken2| -|Generate|TOK:WOC|Cat|2||CatToken| -|Generate|TOK:WOC|Elephant|||ElephantToken| |Generate|TOK:WOC|Faerie|||FaerieToken| |Generate|TOK:WOC|Faerie Rogue|1||FaerieRogueToken| |Generate|TOK:WOC|Faerie Rogue|2||OonaQueenFaerieRogueToken| -|Generate|TOK:WOC|Human Monk|||HumanMonkToken| |Generate|TOK:WOC|Human Soldier|||HumanSoldierToken| |Generate|TOK:WOC|Monster|||MonsterRoleToken| -|Generate|TOK:WOC|Ox|||OxToken| |Generate|TOK:WOC|Pegasus|||PegasusToken2| |Generate|TOK:WOC|Pirate|||NettlingNuisancePirateToken| |Generate|TOK:WOC|Royal|||RoyalRoleToken| |Generate|TOK:WOC|Saproling|||SaprolingToken| -|Generate|TOK:WOC|Sorcerer|||SorcererRoleToken| -|Generate|TOK:WOC|Spirit|||WhiteBlackSpiritToken| |Generate|TOK:WOC|Virtuous|||VirtuousRoleToken| # WHO