From e671f0ec31b4670a475360e96a43f2954b872e31 Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Sun, 2 Jul 2023 21:56:16 +0200
Subject: [PATCH] Rework Imminent Doom

---
 .../src/main/java/forge/game/ability/AbilityUtils.java      | 6 +++---
 forge-gui/res/cardsfolder/i/imminent_doom.txt               | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
index da0f0f27f87..617c5a27610 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
@@ -561,9 +561,9 @@ public class AbilityUtils {
             }
         } else if (calcX[0].equals("OriginalHost")) {
             val = xCount(ability.getOriginalHost(), calcX[1], ability);
-        } else if (calcX[0].equals("LastStateBattlefield") && ability instanceof SpellAbility) {
-            Card c = ((SpellAbility) ability).getLastStateBattlefield().get(card);
-            val = c == null ? 0 : xCount(c, calcX[1], ability);
+        } else if (calcX[0].equals("ThisTurnCast") && ability instanceof SpellAbility) {
+            String[] def = calcX[1].split("\\$", 2);
+            val = handlePaid(CardUtil.getThisTurnCast(def[0], card, ability, player), def[1], card, ability);
         } else if (calcX[0].startsWith("ExiledWith")) {
             val = handlePaid(card.getExiledCards(), calcX[1], card, ability);
 	    } else if (calcX[0].startsWith("Convoked")) {
diff --git a/forge-gui/res/cardsfolder/i/imminent_doom.txt b/forge-gui/res/cardsfolder/i/imminent_doom.txt
index 66524866ddf..8457380448c 100644
--- a/forge-gui/res/cardsfolder/i/imminent_doom.txt
+++ b/forge-gui/res/cardsfolder/i/imminent_doom.txt
@@ -6,5 +6,5 @@ T:Mode$ SpellCast | ValidCard$ Card.cmcEQX | ValidActivatingPlayer$ You | Trigge
 SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ Y | SubAbility$ DBPutCounter
 SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ DOOM | CounterNum$ 1
 SVar:X:Count$CardCounters.DOOM
-SVar:Y:LastStateBattlefield$CardCounters.DOOM
+SVar:Y:ThisTurnCast$Card.TriggeredCard$CardManaCost
 Oracle:Imminent Doom enters the battlefield with a doom counter on it.\nWhenever you cast a spell with mana value equal to the number of doom counters on Imminent Doom, Imminent Doom deals that much damage to any target. Then put a doom counter on Imminent Doom.