diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportCards.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportCards.java index cb2e585edda..dd01a81bcfa 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportCards.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportCards.java @@ -505,6 +505,7 @@ public class ScryfallImageSupportCards { add("VOC"); // Crimson Vow Commander add("Y22"); // Alchemy: Innistrad add("DBL"); // Innistrad: Double Feature + add("CC2"); // Commander Collection: Black add("NEO"); // Kamigawa: Neon Dynasty add("NEC"); // Neon Dynasty Commander add("SNC"); // Streets of New Capenna 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 56864206cdf..f914912c649 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 @@ -1740,6 +1740,10 @@ public class ScryfallImageSupportTokens { put ("2X2/Emblem Wrenn and Six", "https://api.scryfall.com/cards/t2x2/24/en?format=image"); put ("2X2/Zombie", "https://api.scryfall.com/cards/t2x2/12/en?format=image"); + // CC2 + put ("CC2/Snake", "https://api.scryfall.com/cards/cc2/9/en?format=image&face=front"); + put ("CC2/Zombie", "https://api.scryfall.com/cards/cc2/9/en?format=image&face=back"); + // generate supported sets supportedSets.clear(); diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt index 9b3c0867623..cb7b7be5cbb 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -1860,4 +1860,8 @@ |Generate|TOK:2X2|Treasure|||TreasureToken| |Generate|TOK:2X2|Vampire|||IxalanVampireToken| |Generate|TOK:2X2|Worm|||BlackGreenWormToken| -|Generate|TOK:2X2|Zombie|||ZombieToken| \ No newline at end of file +|Generate|TOK:2X2|Zombie|||ZombieToken| + +# CC2 +|Generate|TOK:CC2|Snake|||OphiomancerSnakeToken| +|Generate|TOK:CC2|Zombie|||ZombieToken| \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/CommanderCollectionBlack.java b/Mage.Sets/src/mage/sets/CommanderCollectionBlack.java new file mode 100644 index 00000000000..f54c7d6122e --- /dev/null +++ b/Mage.Sets/src/mage/sets/CommanderCollectionBlack.java @@ -0,0 +1,33 @@ +package mage.sets; + +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; + +/** + * @author PurpleCrowbar + */ +public final class CommanderCollectionBlack extends ExpansionSet { + + private static final CommanderCollectionBlack instance = new CommanderCollectionBlack(); + + public static CommanderCollectionBlack getInstance() { + return instance; + } + + private CommanderCollectionBlack() { + super("Commander Collection: Black", "CC2", ExpansionSet.buildDate(2022, 1, 28), SetType.SUPPLEMENTAL); + this.hasBoosters = false; + this.hasBasicLands = false; + + cards.add(new SetCardInfo("Command Tower", 8, Rarity.RARE, mage.cards.c.CommandTower.class)); + cards.add(new SetCardInfo("Ghoulcaller Gisa", 2, Rarity.MYTHIC, mage.cards.g.GhoulcallerGisa.class)); + cards.add(new SetCardInfo("Liliana, Defiant Necromancer", 1, Rarity.MYTHIC, mage.cards.l.LilianaDefiantNecromancer.class)); + cards.add(new SetCardInfo("Liliana, Heretical Healer", 1, Rarity.MYTHIC, mage.cards.l.LilianaHereticalHealer.class)); + cards.add(new SetCardInfo("Ophiomancer", 3, Rarity.RARE, mage.cards.o.Ophiomancer.class)); + cards.add(new SetCardInfo("Phyrexian Arena", 4, Rarity.RARE, mage.cards.p.PhyrexianArena.class)); + cards.add(new SetCardInfo("Reanimate", 5, Rarity.RARE, mage.cards.r.Reanimate.class)); + cards.add(new SetCardInfo("Sol Ring", 7, Rarity.RARE, mage.cards.s.SolRing.class)); + cards.add(new SetCardInfo("Toxic Deluge", 6, Rarity.RARE, mage.cards.t.ToxicDeluge.class)); + } +} diff --git a/Mage/src/main/java/mage/game/permanent/token/OphiomancerSnakeToken.java b/Mage/src/main/java/mage/game/permanent/token/OphiomancerSnakeToken.java index 7a4a0ab65f0..edaad29b191 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OphiomancerSnakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OphiomancerSnakeToken.java @@ -20,6 +20,7 @@ public final class OphiomancerSnakeToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); this.addAbility(DeathtouchAbility.getInstance()); + setOriginalExpansionSetCode("CC2"); } public OphiomancerSnakeToken(final OphiomancerSnakeToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java index 328a40cc8bd..cabae34509d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java @@ -33,7 +33,7 @@ public final class ZombieToken extends TokenImpl { "MIC", "VOW", "UMA", "NCC", "MED", "BBD", "M19", "CM2", "PCA", "AVR", "DDQ", "CN2", - "2X2"); + "2X2", "CC2"); } @Override