From c90d712e58bbc01d748c6950d9868a768a49124b Mon Sep 17 00:00:00 2001
From: Evan Kranzler <theelk801@gmail.com>
Date: Sat, 5 Feb 2022 14:43:06 -0500
Subject: [PATCH] [NEO] Implemented Orochi Merge-Keeper

---
 .../src/mage/cards/o/OrochiMergeKeeper.java   | 63 +++++++++++++++++++
 .../src/mage/sets/KamigawaNeonDynasty.java    |  1 +
 2 files changed, 64 insertions(+)
 create mode 100644 Mage.Sets/src/mage/cards/o/OrochiMergeKeeper.java

diff --git a/Mage.Sets/src/mage/cards/o/OrochiMergeKeeper.java b/Mage.Sets/src/mage/cards/o/OrochiMergeKeeper.java
new file mode 100644
index 00000000000..39b4429664f
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/o/OrochiMergeKeeper.java
@@ -0,0 +1,63 @@
+package mage.cards.o;
+
+import mage.MageInt;
+import mage.Mana;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.condition.Condition;
+import mage.abilities.condition.common.SourceMatchesFilterCondition;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.decorator.ConditionalContinuousEffect;
+import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
+import mage.abilities.mana.GreenManaAbility;
+import mage.abilities.mana.SimpleManaAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.constants.Zone;
+import mage.filter.FilterPermanent;
+import mage.filter.predicate.permanent.ModifiedPredicate;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class OrochiMergeKeeper extends CardImpl {
+
+    private static final FilterPermanent filter = new FilterPermanent();
+
+    static {
+        filter.add(ModifiedPredicate.instance);
+    }
+
+    private static final Condition condition = new SourceMatchesFilterCondition(filter);
+
+    public OrochiMergeKeeper(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}");
+
+        this.subtype.add(SubType.SNAKE);
+        this.subtype.add(SubType.DRUID);
+        this.power = new MageInt(1);
+        this.toughness = new MageInt(1);
+
+        // {T}: Add {G}.
+        this.addAbility(new GreenManaAbility());
+
+        // As long as Orochi Merge-Keeper is modified, it has "{T}: Add {G}{G}."
+        this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(
+                new GainAbilitySourceEffect(new SimpleManaAbility(
+                        Zone.BATTLEFIELD, Mana.GreenMana(2), new TapSourceCost()
+                )), condition, "as long as {this} is modified, it has \"{T}: Add {G}{G}.\""
+        )));
+    }
+
+    private OrochiMergeKeeper(final OrochiMergeKeeper card) {
+        super(card);
+    }
+
+    @Override
+    public OrochiMergeKeeper copy() {
+        return new OrochiMergeKeeper(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/KamigawaNeonDynasty.java b/Mage.Sets/src/mage/sets/KamigawaNeonDynasty.java
index 3faa95cc789..44a87b6ae22 100644
--- a/Mage.Sets/src/mage/sets/KamigawaNeonDynasty.java
+++ b/Mage.Sets/src/mage/sets/KamigawaNeonDynasty.java
@@ -169,6 +169,7 @@ public final class KamigawaNeonDynasty extends ExpansionSet {
         cards.add(new SetCardInfo("Ogre-Head Helm", 155, Rarity.RARE, mage.cards.o.OgreHeadHelm.class));
         cards.add(new SetCardInfo("Okiba Reckoner Raid", 117, Rarity.COMMON, mage.cards.o.OkibaReckonerRaid.class));
         cards.add(new SetCardInfo("Oni-Cult Anvil", 230, Rarity.UNCOMMON, mage.cards.o.OniCultAnvil.class));
+        cards.add(new SetCardInfo("Orochi Merge-Keeper", 203, Rarity.UNCOMMON, mage.cards.o.OrochiMergeKeeper.class));
         cards.add(new SetCardInfo("Otawara, Soaring City", 271, Rarity.RARE, mage.cards.o.OtawaraSoaringCity.class));
         cards.add(new SetCardInfo("Papercraft Decoy", 253, Rarity.COMMON, mage.cards.p.PapercraftDecoy.class));
         cards.add(new SetCardInfo("Patchwork Automaton", 254, Rarity.UNCOMMON, mage.cards.p.PatchworkAutomaton.class));