From c2e801341f4be79640bb9cb97f20a62c3bed3822 Mon Sep 17 00:00:00 2001
From: Evan Kranzler <theelk801@gmail.com>
Date: Fri, 4 Sep 2020 10:40:36 -0400
Subject: [PATCH] [ZNR] Implemented Umara Wizard / Umara Skyfalls

---
 Mage.Sets/src/mage/cards/u/UmaraSkyfalls.java | 37 +++++++++++++++
 Mage.Sets/src/mage/cards/u/UmaraWizard.java   | 47 +++++++++++++++++++
 Mage.Sets/src/mage/sets/ZendikarRising.java   |  2 +
 3 files changed, 86 insertions(+)
 create mode 100644 Mage.Sets/src/mage/cards/u/UmaraSkyfalls.java
 create mode 100644 Mage.Sets/src/mage/cards/u/UmaraWizard.java

diff --git a/Mage.Sets/src/mage/cards/u/UmaraSkyfalls.java b/Mage.Sets/src/mage/cards/u/UmaraSkyfalls.java
new file mode 100644
index 00000000000..fefda8b11e4
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/u/UmaraSkyfalls.java
@@ -0,0 +1,37 @@
+package mage.cards.u;
+
+import mage.abilities.common.EntersBattlefieldTappedAbility;
+import mage.abilities.mana.BlueManaAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class UmaraSkyfalls extends CardImpl {
+
+    public UmaraSkyfalls(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.LAND}, "");
+
+        this.modalDFC = true;
+        this.nightCard = true;
+
+        // Umara Skyfalls enters the battlefield tapped.
+        this.addAbility(new EntersBattlefieldTappedAbility());
+
+        // {T}: Add {U}.
+        this.addAbility(new BlueManaAbility());
+    }
+
+    private UmaraSkyfalls(final UmaraSkyfalls card) {
+        super(card);
+    }
+
+    @Override
+    public UmaraSkyfalls copy() {
+        return new UmaraSkyfalls(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/cards/u/UmaraWizard.java b/Mage.Sets/src/mage/cards/u/UmaraWizard.java
new file mode 100644
index 00000000000..373c5f1762e
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/u/UmaraWizard.java
@@ -0,0 +1,47 @@
+package mage.cards.u;
+
+import mage.MageInt;
+import mage.abilities.common.SpellCastControllerTriggeredAbility;
+import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.SubType;
+import mage.filter.StaticFilters;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class UmaraWizard extends CardImpl {
+
+    public UmaraWizard(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{U}");
+
+        this.subtype.add(SubType.MERFOLK);
+        this.subtype.add(SubType.WIZARD);
+        this.power = new MageInt(4);
+        this.toughness = new MageInt(3);
+
+        this.modalDFC = true;
+        this.secondSideCardClazz = mage.cards.u.UmaraSkyfalls.class;
+
+        // Whenever you cast an instant, sorcery, or Wizard spell, Umara Wizard gains flying until end of turn.
+        this.addAbility(new SpellCastControllerTriggeredAbility(
+                new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn),
+                StaticFilters.FILTER_SPELL_INSTANT_SORCERY_WIZARD, false
+        ));
+    }
+
+    private UmaraWizard(final UmaraWizard card) {
+        super(card);
+    }
+
+    @Override
+    public UmaraWizard copy() {
+        return new UmaraWizard(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/ZendikarRising.java b/Mage.Sets/src/mage/sets/ZendikarRising.java
index b9fb9034480..50236783cb5 100644
--- a/Mage.Sets/src/mage/sets/ZendikarRising.java
+++ b/Mage.Sets/src/mage/sets/ZendikarRising.java
@@ -155,6 +155,8 @@ public final class ZendikarRising extends ExpansionSet {
         cards.add(new SetCardInfo("Tazri, Beacon of Unity", 44, Rarity.MYTHIC, mage.cards.t.TazriBeaconOfUnity.class));
         cards.add(new SetCardInfo("Timbercrown Pathway", 261, Rarity.RARE, mage.cards.t.TimbercrownPathway.class));
         cards.add(new SetCardInfo("Umara Mystic", 238, Rarity.UNCOMMON, mage.cards.u.UmaraMystic.class));
+        cards.add(new SetCardInfo("Umara Skyfalls", 86, Rarity.UNCOMMON, mage.cards.u.UmaraSkyfalls.class));
+        cards.add(new SetCardInfo("Umara Wizard", 86, Rarity.UNCOMMON, mage.cards.u.UmaraWizard.class));
         cards.add(new SetCardInfo("Windrider Wizard", 87, Rarity.UNCOMMON, mage.cards.w.WindriderWizard.class));
         cards.add(new SetCardInfo("Zulaport Duelist", 88, Rarity.COMMON, mage.cards.z.ZulaportDuelist.class));