From 47b7f627d9ad83ff7a592b03e44df5241a002ced Mon Sep 17 00:00:00 2001
From: theelk801 <theelk801@gmail.com>
Date: Mon, 1 Apr 2024 21:53:16 -0400
Subject: [PATCH] [OTJ] Implement Giant Beaver

---
 Mage.Sets/src/mage/cards/g/GiantBeaver.java   | 61 +++++++++++++++++++
 .../mage/sets/OutlawsOfThunderJunction.java   |  1 +
 .../src/main/java/mage/constants/SubType.java |  1 +
 3 files changed, 63 insertions(+)
 create mode 100644 Mage.Sets/src/mage/cards/g/GiantBeaver.java

diff --git a/Mage.Sets/src/mage/cards/g/GiantBeaver.java b/Mage.Sets/src/mage/cards/g/GiantBeaver.java
new file mode 100644
index 00000000000..eebcc316ae2
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/g/GiantBeaver.java
@@ -0,0 +1,61 @@
+package mage.cards.g;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.AttacksWhileSaddledTriggeredAbility;
+import mage.abilities.effects.common.counter.AddCountersTargetEffect;
+import mage.abilities.keyword.SaddleAbility;
+import mage.abilities.keyword.VigilanceAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.counters.CounterType;
+import mage.filter.FilterPermanent;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.permanent.SaddledSourceThisTurnPredicate;
+import mage.target.TargetPermanent;
+import mage.watchers.common.SaddledMountWatcher;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class GiantBeaver extends CardImpl {
+
+    private static final FilterPermanent filter = new FilterCreaturePermanent("creature that saddled it this turn");
+
+    static {
+        filter.add(SaddledSourceThisTurnPredicate.instance);
+    }
+
+    public GiantBeaver(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}");
+
+        this.subtype.add(SubType.BEAVER);
+        this.subtype.add(SubType.MOUNT);
+        this.power = new MageInt(4);
+        this.toughness = new MageInt(4);
+
+        // Vigilance
+        this.addAbility(VigilanceAbility.getInstance());
+
+        // Whenever Giant Beaver attacks while saddled, put a +1/+1 counter on target creature that saddled it this turn.
+        Ability ability = new AttacksWhileSaddledTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()));
+        ability.addTarget(new TargetPermanent(filter));
+        this.addAbility(ability, new SaddledMountWatcher());
+
+        // Saddle 3
+        this.addAbility(new SaddleAbility(3));
+    }
+
+    private GiantBeaver(final GiantBeaver card) {
+        super(card);
+    }
+
+    @Override
+    public GiantBeaver copy() {
+        return new GiantBeaver(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/OutlawsOfThunderJunction.java b/Mage.Sets/src/mage/sets/OutlawsOfThunderJunction.java
index 75453ec498a..46981008e26 100644
--- a/Mage.Sets/src/mage/sets/OutlawsOfThunderJunction.java
+++ b/Mage.Sets/src/mage/sets/OutlawsOfThunderJunction.java
@@ -105,6 +105,7 @@ public final class OutlawsOfThunderJunction extends ExpansionSet {
         cards.add(new SetCardInfo("Getaway Glamer", 14, Rarity.UNCOMMON, mage.cards.g.GetawayGlamer.class));
         cards.add(new SetCardInfo("Geyser Drake", 51, Rarity.COMMON, mage.cards.g.GeyserDrake.class));
         cards.add(new SetCardInfo("Ghired, Mirror of the Wilds", 205, Rarity.MYTHIC, mage.cards.g.GhiredMirrorOfTheWilds.class));
+        cards.add(new SetCardInfo("Giant Beaver", 165, Rarity.COMMON, mage.cards.g.GiantBeaver.class));
         cards.add(new SetCardInfo("Gila Courser", 124, Rarity.UNCOMMON, mage.cards.g.GilaCourser.class));
         cards.add(new SetCardInfo("Gisa, the Hellraiser", 89, Rarity.MYTHIC, mage.cards.g.GisaTheHellraiser.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Gisa, the Hellraiser", 288, Rarity.MYTHIC, mage.cards.g.GisaTheHellraiser.class, NON_FULL_USE_VARIOUS));
diff --git a/Mage/src/main/java/mage/constants/SubType.java b/Mage/src/main/java/mage/constants/SubType.java
index 74a5f0da246..551a4d608de 100644
--- a/Mage/src/main/java/mage/constants/SubType.java
+++ b/Mage/src/main/java/mage/constants/SubType.java
@@ -97,6 +97,7 @@ public enum SubType {
     BAT("Bat", SubTypeSet.CreatureType),
     BEAR("Bear", SubTypeSet.CreatureType),
     BEAST("Beast", SubTypeSet.CreatureType),
+    BEAVER("Beaver", SubTypeSet.CreatureType),
     BEEBLE("Beeble", SubTypeSet.CreatureType),
     BEHOLDER("Beholder", SubTypeSet.CreatureType),
     BERSERKER("Berserker", SubTypeSet.CreatureType),