From 5141be475ba7425b7ec64aac3624f4b470fe4419 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Wed, 2 Jun 2021 15:04:38 -0400
Subject: [PATCH 1/3] sojourners_companion.txt

---
 .../res/cardsfolder/upcoming/sojourners_companion.txt      | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/sojourners_companion.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/sojourners_companion.txt b/forge-gui/res/cardsfolder/upcoming/sojourners_companion.txt
new file mode 100644
index 00000000000..97185fbabe5
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/sojourners_companion.txt
@@ -0,0 +1,7 @@
+Name:Sojourner's Companion
+ManaCost:7
+Types:Artifact Creature Salamander
+PT:4/4
+K:Affinity:Artifact
+K:TypeCycling:Land.Artifact:2
+Oracle:Affinity for artifacts\nArtifact landcycling {2} (({2}, Discard this card: Search your library for an artifact land card, reveal it, put it into your hand, then shuffle.)

From 9aba2db8ce1a96bf8039ece0d49d79649083d069 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Wed, 2 Jun 2021 15:05:30 -0400
Subject: [PATCH 2/3] KeywordWithCostAndType.java set artifact landcycling for
 reminder text

---
 .../main/java/forge/game/keyword/KeywordWithCostAndType.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/forge-game/src/main/java/forge/game/keyword/KeywordWithCostAndType.java b/forge-game/src/main/java/forge/game/keyword/KeywordWithCostAndType.java
index 167cc20dce5..f6aa73dd3cf 100644
--- a/forge-game/src/main/java/forge/game/keyword/KeywordWithCostAndType.java
+++ b/forge-game/src/main/java/forge/game/keyword/KeywordWithCostAndType.java
@@ -24,6 +24,8 @@ public class KeywordWithCostAndType extends KeywordInstance<KeywordWithCostAndTy
                     n[i] = n[i].toLowerCase();
                 } else if (n[i].equals("Basic")) {
                     n[i] = "basic land";
+                } else if (n[i].equals("Land.Artifact")) {
+                    n[i] = "artifact land";
                 }
             }
 

From da2a92b74a94bf5c0eabd8ca5bec0d0ae13978ff Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Wed, 2 Jun 2021 15:06:29 -0400
Subject: [PATCH 3/3] CardFactoryUtil prep TypeCycling for Artifact landcycling

---
 forge-game/src/main/java/forge/game/card/CardFactoryUtil.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
index 968b0b9d1de..f02e5e074df 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
@@ -3208,6 +3208,8 @@ public class CardFactoryUtil {
             String desc = type;
             if (type.equals("Basic")) {
                 desc = "Basic land";
+            } else if (type.equals("Land.Artifact")) {
+                desc = "Artifact land";
             }
 
             sb.append(" Discard<1/CARDNAME> | ActivationZone$ Hand | PrecostDesc$ ").append(desc).append("cycling ");