From da9b01f6986647b2b67e0bb76b4ab576b75cc477 Mon Sep 17 00:00:00 2001
From: theelk801 <theelk801@gmail.com>
Date: Thu, 24 Jul 2025 09:46:21 -0400
Subject: [PATCH] [SPM] Implement Flying Octobot

---
 Mage.Sets/src/mage/cards/f/FlyingOctobot.java | 54 +++++++++++++++++++
 Mage.Sets/src/mage/sets/MarvelsSpiderMan.java |  1 +
 2 files changed, 55 insertions(+)
 create mode 100644 Mage.Sets/src/mage/cards/f/FlyingOctobot.java

diff --git a/Mage.Sets/src/mage/cards/f/FlyingOctobot.java b/Mage.Sets/src/mage/cards/f/FlyingOctobot.java
new file mode 100644
index 00000000000..a362fe29cf5
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/f/FlyingOctobot.java
@@ -0,0 +1,54 @@
+package mage.cards.f;
+
+import mage.MageInt;
+import mage.abilities.common.EntersBattlefieldAllTriggeredAbility;
+import mage.abilities.effects.common.counter.AddCountersSourceEffect;
+import mage.abilities.keyword.FlyingAbility;
+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.FilterControlledPermanent;
+import mage.filter.predicate.mageobject.AnotherPredicate;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class FlyingOctobot extends CardImpl {
+
+    private static final FilterPermanent filter = new FilterControlledPermanent(SubType.VILLAIN, "another Villain you control");
+
+    static {
+        filter.add(AnotherPredicate.instance);
+    }
+
+    public FlyingOctobot(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{1}{U}");
+
+        this.subtype.add(SubType.ROBOT);
+        this.subtype.add(SubType.VILLAIN);
+        this.power = new MageInt(1);
+        this.toughness = new MageInt(1);
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+
+        // Whenever another Villain you control enters, put a +1/+1 counter on this creature. This ability triggers only once each turn.
+        this.addAbility(new EntersBattlefieldAllTriggeredAbility(
+                new AddCountersSourceEffect(CounterType.P1P1.createInstance()), filter
+        ).setTriggersLimitEachTurn(1));
+    }
+
+    private FlyingOctobot(final FlyingOctobot card) {
+        super(card);
+    }
+
+    @Override
+    public FlyingOctobot copy() {
+        return new FlyingOctobot(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/MarvelsSpiderMan.java b/Mage.Sets/src/mage/sets/MarvelsSpiderMan.java
index af8007fc5a8..1c7abc93106 100644
--- a/Mage.Sets/src/mage/sets/MarvelsSpiderMan.java
+++ b/Mage.Sets/src/mage/sets/MarvelsSpiderMan.java
@@ -23,6 +23,7 @@ public final class MarvelsSpiderMan extends ExpansionSet {
         cards.add(new SetCardInfo("Aunt May", 3, Rarity.UNCOMMON, mage.cards.a.AuntMay.class));
         cards.add(new SetCardInfo("Daily Bugle Reporters", 6, Rarity.COMMON, mage.cards.d.DailyBugleReporters.class));
         cards.add(new SetCardInfo("Doc Ock's Henchmen", 30, Rarity.COMMON, mage.cards.d.DocOcksHenchmen.class));
+        cards.add(new SetCardInfo("Flying Octobot", 31, Rarity.UNCOMMON, mage.cards.f.FlyingOctobot.class));
         cards.add(new SetCardInfo("Forest", 198, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Island", 195, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Mountain", 197, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS));