From 8df75688d5d0a54204709df5f947f6809cf0618b Mon Sep 17 00:00:00 2001
From: theelk801 <theelk801@gmail.com>
Date: Wed, 9 Jul 2025 11:12:04 -0400
Subject: [PATCH] [EOE] Implement Starfield Shepherd

---
 .../src/mage/cards/s/StarfieldShepherd.java   | 68 +++++++++++++++++++
 Mage.Sets/src/mage/sets/EdgeOfEternities.java |  1 +
 2 files changed, 69 insertions(+)
 create mode 100644 Mage.Sets/src/mage/cards/s/StarfieldShepherd.java

diff --git a/Mage.Sets/src/mage/cards/s/StarfieldShepherd.java b/Mage.Sets/src/mage/cards/s/StarfieldShepherd.java
new file mode 100644
index 00000000000..ae1dbb445fb
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/s/StarfieldShepherd.java
@@ -0,0 +1,68 @@
+package mage.cards.s;
+
+import mage.MageInt;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.abilities.keyword.WarpAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.ComparisonType;
+import mage.constants.SubType;
+import mage.constants.SuperType;
+import mage.filter.FilterCard;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.ManaValuePredicate;
+import mage.target.common.TargetCardInLibrary;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class StarfieldShepherd extends CardImpl {
+
+    private static final FilterCard filter = new FilterCard("a basic Plains card or a creature card with mana value 1 or less");
+
+    static {
+        filter.add(Predicates.or(
+                Predicates.and(
+                        SuperType.BASIC.getPredicate(),
+                        SubType.PLAINS.getPredicate()
+                ),
+                Predicates.and(
+                        CardType.CREATURE.getPredicate(),
+                        new ManaValuePredicate(ComparisonType.FEWER_THAN, 2)
+                )
+        ));
+    }
+
+    public StarfieldShepherd(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}{W}");
+
+        this.subtype.add(SubType.ANGEL);
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(2);
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+
+        // When this creature enters, search your library for a basic Plains card or a creature card with mana value 1 or less, reveal it, put it into your hand, then shuffle.
+        this.addAbility(new EntersBattlefieldTriggeredAbility(
+                new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true)
+        ));
+
+        // Warp {1}{W}
+        this.addAbility(new WarpAbility(this, "{1}{W}"));
+    }
+
+    private StarfieldShepherd(final StarfieldShepherd card) {
+        super(card);
+    }
+
+    @Override
+    public StarfieldShepherd copy() {
+        return new StarfieldShepherd(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/EdgeOfEternities.java b/Mage.Sets/src/mage/sets/EdgeOfEternities.java
index 562a6d3ab3a..613c0cc81d7 100644
--- a/Mage.Sets/src/mage/sets/EdgeOfEternities.java
+++ b/Mage.Sets/src/mage/sets/EdgeOfEternities.java
@@ -108,6 +108,7 @@ public final class EdgeOfEternities extends ExpansionSet {
         cards.add(new SetCardInfo("Sothera, the Supervoid", 382, Rarity.MYTHIC, mage.cards.s.SotheraTheSupervoid.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Sothera, the Supervoid", 386, Rarity.MYTHIC, mage.cards.s.SotheraTheSupervoid.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Starbreach Whale", 77, Rarity.COMMON, mage.cards.s.StarbreachWhale.class));
+        cards.add(new SetCardInfo("Starfield Shepherd", 37, Rarity.UNCOMMON, mage.cards.s.StarfieldShepherd.class));
         cards.add(new SetCardInfo("Starfield Vocalist", 328, Rarity.RARE, mage.cards.s.StarfieldVocalist.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Starfield Vocalist", 359, Rarity.MYTHIC, mage.cards.s.StarfieldVocalist.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Starfield Vocalist", 385, Rarity.RARE, mage.cards.s.StarfieldVocalist.class, NON_FULL_USE_VARIOUS));