From 18a05acd81a82a6c7ff81c8914f1780f1e29b5a0 Mon Sep 17 00:00:00 2001
From: Susucre <34709007+Susucre@users.noreply.github.com>
Date: Sat, 30 Mar 2024 15:17:10 +0100
Subject: [PATCH] [OTJ] Implement Ornery Tumblewagg

---
 .../src/mage/cards/o/OrneryTumblewagg.java    | 62 +++++++++++++++++++
 .../mage/sets/OutlawsOfThunderJunction.java   |  1 +
 2 files changed, 63 insertions(+)
 create mode 100644 Mage.Sets/src/mage/cards/o/OrneryTumblewagg.java

diff --git a/Mage.Sets/src/mage/cards/o/OrneryTumblewagg.java b/Mage.Sets/src/mage/cards/o/OrneryTumblewagg.java
new file mode 100644
index 00000000000..7545d05d313
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/o/OrneryTumblewagg.java
@@ -0,0 +1,62 @@
+package mage.cards.o;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.AttacksWhileSaddledTriggeredAbility;
+import mage.abilities.common.BeginningOfCombatTriggeredAbility;
+import mage.abilities.effects.common.DoubleCountersTargetEffect;
+import mage.abilities.effects.common.counter.AddCountersTargetEffect;
+import mage.abilities.keyword.SaddleAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.constants.TargetController;
+import mage.counters.CounterType;
+import mage.target.common.TargetCreaturePermanent;
+
+import java.util.UUID;
+
+/**
+ * @author Susucr
+ */
+public final class OrneryTumblewagg extends CardImpl {
+
+    public OrneryTumblewagg(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}");
+
+        this.subtype.add(SubType.BRUSHWAGG);
+        this.subtype.add(SubType.MOUNT);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(2);
+
+        // At the beginning of combat on your turn, put a +1/+1 counter on target creature.
+        Ability ability = new BeginningOfCombatTriggeredAbility(
+                new AddCountersTargetEffect(CounterType.P1P1.createInstance()),
+                TargetController.YOU, false
+        );
+        ability.addTarget(new TargetCreaturePermanent());
+        this.addAbility(ability);
+
+        // Whenever Ornery Tumblewagg attacks while saddled, double the number of +1/+1 counters on target creature.
+        ability = new AttacksWhileSaddledTriggeredAbility(
+                new DoubleCountersTargetEffect(CounterType.P1P1)
+                        .setText("double the number of +1/+1 counters on target creature")
+        );
+        ability.addTarget(new TargetCreaturePermanent());
+        this.addAbility(ability);
+
+        // Saddle 2
+        this.addAbility(new SaddleAbility(2));
+
+    }
+
+    private OrneryTumblewagg(final OrneryTumblewagg card) {
+        super(card);
+    }
+
+    @Override
+    public OrneryTumblewagg copy() {
+        return new OrneryTumblewagg(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/OutlawsOfThunderJunction.java b/Mage.Sets/src/mage/sets/OutlawsOfThunderJunction.java
index 755644f5e17..7824f154e36 100644
--- a/Mage.Sets/src/mage/sets/OutlawsOfThunderJunction.java
+++ b/Mage.Sets/src/mage/sets/OutlawsOfThunderJunction.java
@@ -109,6 +109,7 @@ public final class OutlawsOfThunderJunction extends ExpansionSet {
         cards.add(new SetCardInfo("Oasis Gardener", 246, Rarity.COMMON, mage.cards.o.OasisGardener.class));
         cards.add(new SetCardInfo("Oko, the Ringleader", 223, Rarity.MYTHIC, mage.cards.o.OkoTheRingleader.class));
         cards.add(new SetCardInfo("Omenport Vigilante", 21, Rarity.UNCOMMON, mage.cards.o.OmenportVigilante.class));
+        cards.add(new SetCardInfo("Ornery Tumblewagg", 171, Rarity.RARE, mage.cards.o.OrneryTumblewagg.class));
         cards.add(new SetCardInfo("Outcaster Trailblazer", 173, Rarity.RARE, mage.cards.o.OutcasterTrailblazer.class));
         cards.add(new SetCardInfo("Outlaw Stitcher", 59, Rarity.UNCOMMON, mage.cards.o.OutlawStitcher.class));
         cards.add(new SetCardInfo("Peerless Ropemaster", 60, Rarity.COMMON, mage.cards.p.PeerlessRopemaster.class));