From 3eff39996fd48678acb7b836208dfb134fd39a70 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Wed, 20 Jan 2021 20:50:28 -0500 Subject: [PATCH] [KHC] added set --- Mage.Sets/src/mage/sets/Kaldheim.java | 1 - .../src/mage/sets/KaldheimCommander.java | 33 +++++++++++++++++++ Utils/known-sets.txt | 1 + Utils/mtg-cards-data.txt | 4 +++ Utils/mtg-sets-data.txt | 1 + 5 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 Mage.Sets/src/mage/sets/KaldheimCommander.java diff --git a/Mage.Sets/src/mage/sets/Kaldheim.java b/Mage.Sets/src/mage/sets/Kaldheim.java index 88585bb47ba..02e2ad21eea 100644 --- a/Mage.Sets/src/mage/sets/Kaldheim.java +++ b/Mage.Sets/src/mage/sets/Kaldheim.java @@ -39,7 +39,6 @@ public final class Kaldheim extends ExpansionSet { "Niko Defies Destiny", "Poison the Cup", "Quakebringer", - "Ranar the Ever-Watchful", "Ravenform", "Return Upon the Tide", "Rise of the Dread Marn", diff --git a/Mage.Sets/src/mage/sets/KaldheimCommander.java b/Mage.Sets/src/mage/sets/KaldheimCommander.java new file mode 100644 index 00000000000..2e17aa924e4 --- /dev/null +++ b/Mage.Sets/src/mage/sets/KaldheimCommander.java @@ -0,0 +1,33 @@ +package mage.sets; + +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; + +import java.util.Arrays; +import java.util.List; + +/** + * @author TheElk801 + */ +public final class KaldheimCommander extends ExpansionSet { + + private static final List unfinished = Arrays.asList( + "Ranar the Ever-Watchful" + ); + + private static final KaldheimCommander instance = new KaldheimCommander(); + + public static KaldheimCommander getInstance() { + return instance; + } + + private KaldheimCommander() { + super("Kaldheim Commander", "KHC", ExpansionSet.buildDate(2021, 2, 5), SetType.SUPPLEMENTAL); + this.hasBasicLands = false; + + cards.add(new SetCardInfo("Inspired Sphinx", 40, Rarity.MYTHIC, mage.cards.i.InspiredSphinx.class)); + + cards.removeIf(setCardInfo -> unfinished.contains(setCardInfo.getName())); // remove when mechanic is fully implemented + } +} diff --git a/Utils/known-sets.txt b/Utils/known-sets.txt index 0e460700f5b..87214b20b23 100644 --- a/Utils/known-sets.txt +++ b/Utils/known-sets.txt @@ -118,6 +118,7 @@ Judgment|Judgment| Jumpstart|Jumpstart| Kaladesh|Kaladesh| Kaldheim|Kaldheim| +Kaldheimm Commander|KaldheimCommander| Khans of Tarkir|KhansOfTarkir| Launch Party|LaunchParty| Legends|Legends| diff --git a/Utils/mtg-cards-data.txt b/Utils/mtg-cards-data.txt index fa4191e3cdc..82b048dd438 100644 --- a/Utils/mtg-cards-data.txt +++ b/Utils/mtg-cards-data.txt @@ -40019,6 +40019,10 @@ Vault of Champions|Commander Legends|715|R||Land|||Vault of Champions enters the War Room|Commander Legends|716|R||Land|||{T}: Add {C}.${3}, {T}, Pay life equal to the number of colors in your commanders' color identity: Draw a card.| Mana Confluence|Commander Legends|721|M||Land|||{T}, Pay 1 life: Add one mana of any color.| Sengir, the Dark Baron|Commander Legends|722|R|{4}{B}{B}|Legendary Creature - Vampire Noble|4|4|Flying$Whenever another creature dies, put two +1/+1 counters on Sengir, the Dark Baron.$Whenever another player loses the game, you gain life equal to that player's life total as the turn began.$Partner| +Lathril, Blade of the Elves|Kaldheim Commander|1|M|{2}{B}{G}|Legendary Creature - Elf Noble|2|3|Menace$Whenever Lathril, Blade of the Elves deals combat damage to a player, create that many 1/1 green Elf Warrior creature tokens.${T}, Tap ten untapped Elves you control: Each opponent loses 10 life and you gain 10 life.| +Ranar the Ever-Watchful|Kaldheim Commander|2|M|{2}{W}{U}|Legendary Creature - Spirit Warrior|2|3|Flying, vigilance$The first card you foretell each turn costs {0} to foretell.$Whenever you exile one or more cards from your hand and/or permanents from the battlefield, create a 1/1 white Spirit creature token with flying.| +Wolverine Riders|Kaldheim Commander|14|R|{4}{G}{G}|Creature - Elf Warrior|4|4|At the beginning of each upkeep, create a 1/1 green Elf Warrior creature token.$Whenever another Elf enters the battlefield under your control, you gain life equal to its toughness.| +Inspired Sphinx|Kaldheim Commander|40|M|{5}{U}{U}|Creature - Sphinx|5|5|Flying$When Inspired Sphinx enters the battlefield, draw cards equal to the number of opponents you have.${3}{U}: Create a 1/1 colorless Thopter artifact creature token with flying.| Axgard Braggart|Kaldheim|1|C|{3}{W}|Creature - Dwarf Warrior|3|3|Boast — {1}{W}: Untap Axgard Braggart. Put a +1/+1 counter on it.| Battershield Warrior|Kaldheim|2|U|{2}{W}|Creature - Human Warrior|||Boast — {1}{W}: Creatures you control get +1/+1 until end of turn.| Battlefield Raptor|Kaldheim|3|C|{W}|Creature - Bird|1|2|Flying, first strike| diff --git a/Utils/mtg-sets-data.txt b/Utils/mtg-sets-data.txt index 76dd4a46066..c7b9e248687 100644 --- a/Utils/mtg-sets-data.txt +++ b/Utils/mtg-sets-data.txt @@ -118,6 +118,7 @@ Judgment|JUD| Jumpstart|JMP| Kaladesh|KLD| Kaldheim|KHM| +Kaldheim Commander|KHC| Khans of Tarkir|KTK| Limited Edition Alpha|LEA| Limited Edition Beta|LEB|