From b5ccc44afc973136b422d6ca1e73273e05b96c07 Mon Sep 17 00:00:00 2001
From: PurpleCrowbar <26198472+PurpleCrowbar@users.noreply.github.com>
Date: Sat, 10 Sep 2022 04:27:51 +0100
Subject: [PATCH] [DMC] Implement Ohabi Caleria (#9499)

---
 Mage.Sets/src/mage/cards/o/OhabiCaleria.java  | 54 +++++++++++++++++++
 .../mage/sets/DominariaUnitedCommander.java   |  4 +-
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 Mage.Sets/src/mage/cards/o/OhabiCaleria.java

diff --git a/Mage.Sets/src/mage/cards/o/OhabiCaleria.java b/Mage.Sets/src/mage/cards/o/OhabiCaleria.java
new file mode 100644
index 00000000000..0760d68756c
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/o/OhabiCaleria.java
@@ -0,0 +1,54 @@
+package mage.cards.o;
+
+import mage.MageInt;
+import mage.abilities.common.DealsDamageToACreatureAllTriggeredAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.costs.mana.GenericManaCost;
+import mage.abilities.effects.common.DoIfCostPaid;
+import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.abilities.effects.common.continuous.UntapAllDuringEachOtherPlayersUntapStepEffect;
+import mage.abilities.keyword.ReachAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.*;
+import mage.filter.common.FilterControlledCreaturePermanent;
+
+import java.util.UUID;
+
+/**
+ * @author PurpleCrowbar
+ */
+public final class OhabiCaleria extends CardImpl {
+
+    private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(SubType.ARCHER, "Archers you control");
+    private static final FilterControlledCreaturePermanent filter2 = new FilterControlledCreaturePermanent(SubType.ARCHER, "an Archer you control");
+
+    public OhabiCaleria(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}{W}");
+        addSuperType(SuperType.LEGENDARY);
+        this.subtype.add(SubType.ELF);
+        this.subtype.add(SubType.ARCHER);
+        this.power = new MageInt(1);
+        this.toughness = new MageInt(3);
+
+        // Reach
+        this.addAbility(ReachAbility.getInstance());
+
+        // Untap all Archers you control during each other player's untap step.
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new UntapAllDuringEachOtherPlayersUntapStepEffect(filter)));
+
+        // Whenever an Archer you control deals damage to a creature, you may pay {2}. If you do, draw a card.
+        this.addAbility(new DealsDamageToACreatureAllTriggeredAbility(new DoIfCostPaid(
+                new DrawCardSourceControllerEffect(1), new GenericManaCost(2)
+        ), false, filter2, SetTargetPointer.NONE, false));
+    }
+
+    private OhabiCaleria(final OhabiCaleria card) {
+        super(card);
+    }
+
+    @Override
+    public OhabiCaleria copy() {
+        return new OhabiCaleria(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/DominariaUnitedCommander.java b/Mage.Sets/src/mage/sets/DominariaUnitedCommander.java
index d312e7a00f9..e667083e158 100644
--- a/Mage.Sets/src/mage/sets/DominariaUnitedCommander.java
+++ b/Mage.Sets/src/mage/sets/DominariaUnitedCommander.java
@@ -126,8 +126,10 @@ public final class DominariaUnitedCommander extends ExpansionSet {
         cards.add(new SetCardInfo("Nomad Outpost", 222, Rarity.UNCOMMON, mage.cards.n.NomadOutpost.class));
         cards.add(new SetCardInfo("Obsidian Obelisk", 18, Rarity.RARE, mage.cards.o.ObsidianObelisk.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Obsidian Obelisk", 94, Rarity.RARE, mage.cards.o.ObsidianObelisk.class, NON_FULL_USE_VARIOUS));
-        cards.add(new SetCardInfo("O-Kagachi, Vengeful Kami", 164, Rarity.MYTHIC, mage.cards.o.OKagachiVengefulKami.class));
         cards.add(new SetCardInfo("Odric, Lunarch Marshal", 103, Rarity.RARE, mage.cards.o.OdricLunarchMarshal.class));
+        cards.add(new SetCardInfo("Ohabi Caleria", 36, Rarity.RARE, mage.cards.o.OhabiCaleria.class, NON_FULL_USE_VARIOUS));
+        cards.add(new SetCardInfo("Ohabi Caleria", 58, Rarity.RARE, mage.cards.o.OhabiCaleria.class, NON_FULL_USE_VARIOUS));
+        cards.add(new SetCardInfo("O-Kagachi, Vengeful Kami", 164, Rarity.MYTHIC, mage.cards.o.OKagachiVengefulKami.class));
         cards.add(new SetCardInfo("Oketra's Monument", 188, Rarity.UNCOMMON, mage.cards.o.OketrasMonument.class));
         cards.add(new SetCardInfo("Opulent Palace", 223, Rarity.UNCOMMON, mage.cards.o.OpulentPalace.class));
         cards.add(new SetCardInfo("Orca, Siege Demon", 37, Rarity.RARE, mage.cards.o.OrcaSiegeDemon.class, NON_FULL_USE_VARIOUS));