From 288901be1d5306643be4a5b843bf4c83028a43fe Mon Sep 17 00:00:00 2001
From: theelk801 <theelk801@gmail.com>
Date: Thu, 24 Jul 2025 09:54:55 -0400
Subject: [PATCH] [SPM] Implement Scorpion, Seething Striker

---
 .../mage/cards/s/ScorpionSeethingStriker.java | 76 +++++++++++++++++++
 Mage.Sets/src/mage/sets/MarvelsSpiderMan.java |  1 +
 .../effects/keyword/ConniveSourceEffect.java  |  6 +-
 3 files changed, 78 insertions(+), 5 deletions(-)
 create mode 100644 Mage.Sets/src/mage/cards/s/ScorpionSeethingStriker.java

diff --git a/Mage.Sets/src/mage/cards/s/ScorpionSeethingStriker.java b/Mage.Sets/src/mage/cards/s/ScorpionSeethingStriker.java
new file mode 100644
index 00000000000..ae85ab0fa00
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/s/ScorpionSeethingStriker.java
@@ -0,0 +1,76 @@
+package mage.cards.s;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.keyword.ConniveSourceEffect;
+import mage.abilities.keyword.DeathtouchAbility;
+import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.SubType;
+import mage.constants.SuperType;
+import mage.game.Game;
+import mage.target.common.TargetControlledCreaturePermanent;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class ScorpionSeethingStriker extends CardImpl {
+
+    public ScorpionSeethingStriker(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}");
+
+        this.supertype.add(SuperType.LEGENDARY);
+        this.subtype.add(SubType.SCORPION);
+        this.subtype.add(SubType.HUMAN);
+        this.subtype.add(SubType.VILLAIN);
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(3);
+
+        // Deathtouch
+        this.addAbility(DeathtouchAbility.getInstance());
+
+        // At the beginning of your end step, if a creature died this turn, target creature you control connives.
+        Ability ability = new BeginningOfEndStepTriggeredAbility(new ScorpionSeethingStrikerEffect());
+        ability.addTarget(new TargetControlledCreaturePermanent());
+        this.addAbility(ability);
+    }
+
+    private ScorpionSeethingStriker(final ScorpionSeethingStriker card) {
+        super(card);
+    }
+
+    @Override
+    public ScorpionSeethingStriker copy() {
+        return new ScorpionSeethingStriker(this);
+    }
+}
+
+class ScorpionSeethingStrikerEffect extends OneShotEffect {
+
+    ScorpionSeethingStrikerEffect() {
+        super(Outcome.Benefit);
+        staticText = "target creature you control connives";
+    }
+
+    private ScorpionSeethingStrikerEffect(final ScorpionSeethingStrikerEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public ScorpionSeethingStrikerEffect copy() {
+        return new ScorpionSeethingStrikerEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        return ConniveSourceEffect.connive(
+                game.getPermanent(getTargetPointer().getFirst(game, source)), 1, source, game
+        );
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/MarvelsSpiderMan.java b/Mage.Sets/src/mage/sets/MarvelsSpiderMan.java
index 012c404fb60..89d12456a5a 100644
--- a/Mage.Sets/src/mage/sets/MarvelsSpiderMan.java
+++ b/Mage.Sets/src/mage/sets/MarvelsSpiderMan.java
@@ -32,6 +32,7 @@ public final class MarvelsSpiderMan extends ExpansionSet {
         cards.add(new SetCardInfo("Oscorp Research Team", 40, Rarity.COMMON, mage.cards.o.OscorpResearchTeam.class));
         cards.add(new SetCardInfo("Plains", 194, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Risky Research", 62, Rarity.COMMON, mage.cards.r.RiskyResearch.class));
+        cards.add(new SetCardInfo("Scorpion, Seething Striker", 64, Rarity.UNCOMMON, mage.cards.s.ScorpionSeethingStriker.class));
         cards.add(new SetCardInfo("Selfless Police Captain", 12, Rarity.COMMON, mage.cards.s.SelflessPoliceCaptain.class));
         cards.add(new SetCardInfo("Shock", 88, Rarity.COMMON, mage.cards.s.Shock.class));
         cards.add(new SetCardInfo("Spectacular Tactics", 15, Rarity.COMMON, mage.cards.s.SpectacularTactics.class));
diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/ConniveSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/ConniveSourceEffect.java
index f7641bf46ba..d435e102853 100644
--- a/Mage/src/main/java/mage/abilities/effects/keyword/ConniveSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/keyword/ConniveSourceEffect.java
@@ -85,13 +85,9 @@ public class ConniveSourceEffect extends OneShotEffect {
      * @return
      */
     public static boolean connive(Permanent permanent, int amount, Ability source, Game game) {
-        if (amount < 1) {
+        if (permanent == null || amount < 1) {
             return false;
         }
-        if (permanent == null) {
-            return false;
-        }
-
         boolean permanentStillOnBattlefield = game.getState().getZone(permanent.getId()) == Zone.BATTLEFIELD;
         Player player = game.getPlayer(permanent.getControllerId());
         if (player == null) {