From fb986e7d1721bedb5fa50eb563f552f43025ccbe Mon Sep 17 00:00:00 2001
From: theelk801 <theelk801@gmail.com>
Date: Sun, 9 Apr 2023 09:11:51 -0400
Subject: [PATCH] [MOC] Implement Vodalian Wave-Knight

---
 .../src/mage/cards/v/VodalianWaveKnight.java  | 54 +++++++++++++++++++
 .../mage/sets/MarchOfTheMachineCommander.java |  1 +
 2 files changed, 55 insertions(+)
 create mode 100644 Mage.Sets/src/mage/cards/v/VodalianWaveKnight.java

diff --git a/Mage.Sets/src/mage/cards/v/VodalianWaveKnight.java b/Mage.Sets/src/mage/cards/v/VodalianWaveKnight.java
new file mode 100644
index 00000000000..0b4bae711a0
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/v/VodalianWaveKnight.java
@@ -0,0 +1,54 @@
+package mage.cards.v;
+
+import mage.MageInt;
+import mage.abilities.common.DrawCardControllerTriggeredAbility;
+import mage.abilities.effects.common.counter.AddCountersAllEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.counters.CounterType;
+import mage.filter.FilterPermanent;
+import mage.filter.common.FilterControlledPermanent;
+import mage.filter.predicate.Predicates;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class VodalianWaveKnight extends CardImpl {
+
+    private static final FilterPermanent filter
+            = new FilterControlledPermanent("other Merfolk and/or Knight you control");
+
+    static {
+        filter.add(Predicates.or(
+                SubType.MERFOLK.getPredicate(),
+                SubType.KNIGHT.getPredicate()
+        ));
+    }
+
+    public VodalianWaveKnight(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}{U}");
+
+        this.subtype.add(SubType.MERFOLK);
+        this.subtype.add(SubType.KNIGHT);
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(3);
+
+        // Whenever you draw a card, put a +1/+1 counter on each other Merfolk and/or Knight you control.
+        this.addAbility(new DrawCardControllerTriggeredAbility(
+                new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter), false
+        ));
+    }
+
+    private VodalianWaveKnight(final VodalianWaveKnight card) {
+        super(card);
+    }
+
+    @Override
+    public VodalianWaveKnight copy() {
+        return new VodalianWaveKnight(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/MarchOfTheMachineCommander.java b/Mage.Sets/src/mage/sets/MarchOfTheMachineCommander.java
index fcfa289e2fd..ab1bb95151b 100644
--- a/Mage.Sets/src/mage/sets/MarchOfTheMachineCommander.java
+++ b/Mage.Sets/src/mage/sets/MarchOfTheMachineCommander.java
@@ -306,6 +306,7 @@ public final class MarchOfTheMachineCommander extends ExpansionSet {
         cards.add(new SetCardInfo("Victimize", 270, Rarity.UNCOMMON, mage.cards.v.Victimize.class));
         cards.add(new SetCardInfo("Village Bell-Ringer", 216, Rarity.COMMON, mage.cards.v.VillageBellRinger.class));
         cards.add(new SetCardInfo("Vineglimmer Snarl", 444, Rarity.RARE, mage.cards.v.VineglimmerSnarl.class));
+        cards.add(new SetCardInfo("Vodalian Wave-Knight", 43, Rarity.RARE, mage.cards.v.VodalianWaveKnight.class));
         cards.add(new SetCardInfo("Vona, Butcher of Magan", 342, Rarity.MYTHIC, mage.cards.v.VonaButcherOfMagan.class));
         cards.add(new SetCardInfo("Wayfarer's Bauble", 389, Rarity.COMMON, mage.cards.w.WayfarersBauble.class));
         cards.add(new SetCardInfo("Wear // Tear", 343, Rarity.UNCOMMON, mage.cards.w.WearTear.class));