From 1c6f8ae0350c4dcc9f09cfa38bc40b5888656813 Mon Sep 17 00:00:00 2001
From: Evan Kranzler <theelk801@gmail.com>
Date: Thu, 3 Jun 2021 20:10:38 -0400
Subject: [PATCH] [MH2] Implemented Sojourner's Companion

---
 .../src/mage/cards/s/SojournersCompanion.java | 41 +++++++++++++++++++
 Mage.Sets/src/mage/sets/ModernHorizons2.java  |  1 +
 .../keyword/ArtifactLandcyclingAbility.java   | 30 ++++++++++++++
 3 files changed, 72 insertions(+)
 create mode 100644 Mage.Sets/src/mage/cards/s/SojournersCompanion.java
 create mode 100644 Mage/src/main/java/mage/abilities/keyword/ArtifactLandcyclingAbility.java

diff --git a/Mage.Sets/src/mage/cards/s/SojournersCompanion.java b/Mage.Sets/src/mage/cards/s/SojournersCompanion.java
new file mode 100644
index 00000000000..4213dbe9848
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/s/SojournersCompanion.java
@@ -0,0 +1,41 @@
+package mage.cards.s;
+
+import mage.MageInt;
+import mage.abilities.costs.mana.GenericManaCost;
+import mage.abilities.keyword.AffinityForArtifactsAbility;
+import mage.abilities.keyword.ArtifactLandcyclingAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class SojournersCompanion extends CardImpl {
+
+    public SojournersCompanion(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{7}");
+
+        this.subtype.add(SubType.SALAMANDER);
+        this.power = new MageInt(4);
+        this.toughness = new MageInt(4);
+
+        // Affinity for artifacts
+        this.addAbility(new AffinityForArtifactsAbility());
+
+        // Artifact landcycling {2}
+        this.addAbility(new ArtifactLandcyclingAbility(new GenericManaCost(2)));
+    }
+
+    private SojournersCompanion(final SojournersCompanion card) {
+        super(card);
+    }
+
+    @Override
+    public SojournersCompanion copy() {
+        return new SojournersCompanion(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/ModernHorizons2.java b/Mage.Sets/src/mage/sets/ModernHorizons2.java
index a2cd7a23696..553522b71f0 100644
--- a/Mage.Sets/src/mage/sets/ModernHorizons2.java
+++ b/Mage.Sets/src/mage/sets/ModernHorizons2.java
@@ -233,6 +233,7 @@ public final class ModernHorizons2 extends ExpansionSet {
         cards.add(new SetCardInfo("Slag Strider", 141, Rarity.UNCOMMON, mage.cards.s.SlagStrider.class));
         cards.add(new SetCardInfo("Slagwoods Bridge", 256, Rarity.COMMON, mage.cards.s.SlagwoodsBridge.class));
         cards.add(new SetCardInfo("So Shiny", 63, Rarity.COMMON, mage.cards.s.SoShiny.class));
+        cards.add(new SetCardInfo("Sojourner's Companion", 235, Rarity.COMMON, mage.cards.s.SojournersCompanion.class));
         cards.add(new SetCardInfo("Sol Talisman", 236, Rarity.RARE, mage.cards.s.SolTalisman.class));
         cards.add(new SetCardInfo("Solitary Confinement", 265, Rarity.RARE, mage.cards.s.SolitaryConfinement.class));
         cards.add(new SetCardInfo("Solitude", 32, Rarity.MYTHIC, mage.cards.s.Solitude.class));
diff --git a/Mage/src/main/java/mage/abilities/keyword/ArtifactLandcyclingAbility.java b/Mage/src/main/java/mage/abilities/keyword/ArtifactLandcyclingAbility.java
new file mode 100644
index 00000000000..2687b3c7a45
--- /dev/null
+++ b/Mage/src/main/java/mage/abilities/keyword/ArtifactLandcyclingAbility.java
@@ -0,0 +1,30 @@
+package mage.abilities.keyword;
+
+import mage.abilities.costs.Cost;
+import mage.constants.CardType;
+import mage.filter.common.FilterLandCard;
+
+/**
+ * @author TheElk801
+ */
+public class ArtifactLandcyclingAbility extends CyclingAbility {
+
+    private static final FilterLandCard filter = new FilterLandCard("artifact land card");
+
+    static {
+        filter.add(CardType.ARTIFACT.getPredicate());
+    }
+
+    public ArtifactLandcyclingAbility(Cost cost) {
+        super(cost, filter, "Artifact landcycling");
+    }
+
+    private ArtifactLandcyclingAbility(final ArtifactLandcyclingAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public ArtifactLandcyclingAbility copy() {
+        return new ArtifactLandcyclingAbility(this);
+    }
+}