From f17de03fe25ff2e8f0184d78a72013c766b21a1c Mon Sep 17 00:00:00 2001
From: theelk801 <theelk801@gmail.com>
Date: Tue, 13 May 2025 16:27:34 -0400
Subject: [PATCH] [FIC] Implement O'aka, Traveling Merchant

---
 .../mage/cards/o/OakaTravelingMerchant.java   | 47 +++++++++++++++++++
 .../src/mage/sets/FinalFantasyCommander.java  |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 Mage.Sets/src/mage/cards/o/OakaTravelingMerchant.java

diff --git a/Mage.Sets/src/mage/cards/o/OakaTravelingMerchant.java b/Mage.Sets/src/mage/cards/o/OakaTravelingMerchant.java
new file mode 100644
index 00000000000..50454bd54ea
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/o/OakaTravelingMerchant.java
@@ -0,0 +1,47 @@
+package mage.cards.o;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.RemoveCounterCost;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.effects.common.DrawCardSourceControllerEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.constants.SuperType;
+import mage.filter.StaticFilters;
+import mage.target.TargetPermanent;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class OakaTravelingMerchant extends CardImpl {
+
+    public OakaTravelingMerchant(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}");
+
+        this.supertype.add(SuperType.LEGENDARY);
+        this.subtype.add(SubType.HUMAN);
+        this.subtype.add(SubType.CITIZEN);
+        this.power = new MageInt(1);
+        this.toughness = new MageInt(2);
+
+        // {T}, Remove a counter from a nonland permanent you control: Draw a card.
+        Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new TapSourceCost());
+        ability.addCost(new RemoveCounterCost(new TargetPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_NON_LAND)));
+        this.addAbility(ability);
+    }
+
+    private OakaTravelingMerchant(final OakaTravelingMerchant card) {
+        super(card);
+    }
+
+    @Override
+    public OakaTravelingMerchant copy() {
+        return new OakaTravelingMerchant(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/FinalFantasyCommander.java b/Mage.Sets/src/mage/sets/FinalFantasyCommander.java
index 9b2c58e4eff..bf3297830ef 100644
--- a/Mage.Sets/src/mage/sets/FinalFantasyCommander.java
+++ b/Mage.Sets/src/mage/sets/FinalFantasyCommander.java
@@ -196,6 +196,8 @@ public final class FinalFantasyCommander extends ExpansionSet {
         cards.add(new SetCardInfo("Nesting Grounds", 408, Rarity.UNCOMMON, mage.cards.n.NestingGrounds.class));
         cards.add(new SetCardInfo("Night's Whisper", 280, Rarity.COMMON, mage.cards.n.NightsWhisper.class));
         cards.add(new SetCardInfo("Nomad Outpost", 409, Rarity.UNCOMMON, mage.cards.n.NomadOutpost.class));
+        cards.add(new SetCardInfo("O'aka, Traveling Merchant", 144, Rarity.RARE, mage.cards.o.OakaTravelingMerchant.class, NON_FULL_USE_VARIOUS));
+        cards.add(new SetCardInfo("O'aka, Traveling Merchant", 39, Rarity.RARE, mage.cards.o.OakaTravelingMerchant.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Overflowing Basin", 410, Rarity.RARE, mage.cards.o.OverflowingBasin.class));
         cards.add(new SetCardInfo("Palace Jailer", 247, Rarity.UNCOMMON, mage.cards.p.PalaceJailer.class));
         cards.add(new SetCardInfo("Path of Ancestry", 411, Rarity.COMMON, mage.cards.p.PathOfAncestry.class));