From 8a06b41d898234b4509e7dd92d5dc3e279fdced6 Mon Sep 17 00:00:00 2001
From: Evan Kranzler <theelk801@gmail.com>
Date: Wed, 8 Sep 2021 09:06:43 -0400
Subject: [PATCH] [MID] Implemented Patrician Geist

---
 .../src/mage/cards/g/GravebreakerLamia.java   |  5 +-
 .../src/mage/cards/p/PatricianGeist.java      | 60 +++++++++++++++++++
 .../src/mage/sets/InnistradMidnightHunt.java  |  1 +
 3 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 Mage.Sets/src/mage/cards/p/PatricianGeist.java

diff --git a/Mage.Sets/src/mage/cards/g/GravebreakerLamia.java b/Mage.Sets/src/mage/cards/g/GravebreakerLamia.java
index f000c0d51eb..a769bc31a85 100644
--- a/Mage.Sets/src/mage/cards/g/GravebreakerLamia.java
+++ b/Mage.Sets/src/mage/cards/g/GravebreakerLamia.java
@@ -21,7 +21,7 @@ import java.util.UUID;
  */
 public final class GravebreakerLamia extends CardImpl {
 
-    private static final FilterCard filter = new FilterCard();
+    private static final FilterCard filter = new FilterCard("spells you cast from your graveyard");
 
     static {
         filter.add(new CastFromZonePredicate(Zone.GRAVEYARD));
@@ -43,8 +43,7 @@ public final class GravebreakerLamia extends CardImpl {
         this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInGraveyardEffect(), false));
 
         // Spells you cast from your graveyard cost {1} less to cast.
-        this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1)
-                .setText("Spells you cast from your graveyard cost {1} less to cast.")));
+        this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1)));
     }
 
     private GravebreakerLamia(final GravebreakerLamia card) {
diff --git a/Mage.Sets/src/mage/cards/p/PatricianGeist.java b/Mage.Sets/src/mage/cards/p/PatricianGeist.java
new file mode 100644
index 00000000000..086b25a48e4
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/p/PatricianGeist.java
@@ -0,0 +1,60 @@
+package mage.cards.p;
+
+import mage.MageInt;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.common.continuous.BoostControlledEffect;
+import mage.abilities.effects.common.cost.SpellsCostReductionControllerEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.SubType;
+import mage.constants.Zone;
+import mage.filter.FilterCard;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.card.CastFromZonePredicate;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class PatricianGeist extends CardImpl {
+
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(SubType.SPIRIT, "Spirits");
+    private static final FilterCard filter2 = new FilterCard("spells you cast from your graveyard");
+
+    static {
+        filter2.add(new CastFromZonePredicate(Zone.GRAVEYARD));
+    }
+
+    public PatricianGeist(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}");
+
+        this.subtype.add(SubType.SPIRIT);
+        this.subtype.add(SubType.KNIGHT);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(2);
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+
+        // Other Spirits you control get +1/+1.
+        this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(
+                1, 1, Duration.WhileOnBattlefield, filter, true
+        )));
+
+        // Spells you cast from your graveyard cost {1} less to cast.
+        this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter2, 1)));
+    }
+
+    private PatricianGeist(final PatricianGeist card) {
+        super(card);
+    }
+
+    @Override
+    public PatricianGeist copy() {
+        return new PatricianGeist(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/InnistradMidnightHunt.java b/Mage.Sets/src/mage/sets/InnistradMidnightHunt.java
index b02a9f524ef..d1bd198c561 100644
--- a/Mage.Sets/src/mage/sets/InnistradMidnightHunt.java
+++ b/Mage.Sets/src/mage/sets/InnistradMidnightHunt.java
@@ -84,6 +84,7 @@ public final class InnistradMidnightHunt extends ExpansionSet {
         cards.add(new SetCardInfo("Mountain", 274, Rarity.LAND, mage.cards.basiclands.Mountain.class, FULL_ART_BFZ_VARIOUS));
         cards.add(new SetCardInfo("Neblegast Intruder", 64, Rarity.UNCOMMON, mage.cards.n.NeblegastIntruder.class));
         cards.add(new SetCardInfo("Overgrown Farmland", 265, Rarity.RARE, mage.cards.o.OvergrownFarmland.class));
+        cards.add(new SetCardInfo("Patrician Geist", 69, Rarity.RARE, mage.cards.p.PatricianGeist.class));
         cards.add(new SetCardInfo("Pestilent Wolf", 192, Rarity.COMMON, mage.cards.p.PestilentWolf.class));
         cards.add(new SetCardInfo("Pithing Needle", 257, Rarity.RARE, mage.cards.p.PithingNeedle.class));
         cards.add(new SetCardInfo("Plains", 268, Rarity.LAND, mage.cards.basiclands.Plains.class, FULL_ART_BFZ_VARIOUS));