From 70895b77e81f5fb48e71dc141b5a9160798a8f91 Mon Sep 17 00:00:00 2001
From: Emik <emik.cuber@gmail.com>
Date: Wed, 17 Jun 2026 09:47:40 +0200
Subject: [PATCH] Fix Survivor edgecase, Improve Escapey

---
 lovely.toml   |  2 +-
 manifest.json |  2 +-
 src/joker.lua | 18 ++++++++++++++----
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/lovely.toml b/lovely.toml
index d28de5c..b079a91 100644
--- a/lovely.toml
+++ b/lovely.toml
@@ -89,7 +89,7 @@ target = "functions/state_events.lua"
 pattern = "for _, v in ipairs(SMODS.get_card_areas('playing_cards')) do"
 position = "after"
 payload = '''if v == G.hand and not (G.GAME.blind and G.GAME.blind.name == "The Card" and not G.GAME.blind.disabled) and next(SMODS.find_card("j_jane_survivor")) then
-    if Cryptid then
+    if Jane.cry then
         for _, v in ipairs(G.hand.cards) do
             local area = {cards = {v}}
             SMODS.calculate_main_scoring({cardarea = area, full_hand = area.cards, scoring_hand = area.cards, scoring_name = text, poker_hands = poker_hands}, area.cards)
diff --git a/manifest.json b/manifest.json
index 9c0f934..30e1c23 100644
--- a/manifest.json
+++ b/manifest.json
@@ -18,5 +18,5 @@
     "conflicts": [
         "Jen"
     ],
-    "version": "1.8.1"
+    "version": "1.8.2"
 }
\ No newline at end of file
diff --git a/src/joker.lua b/src/joker.lua
index 3a9b8a1..44559e0 100644
--- a/src/joker.lua
+++ b/src/joker.lua
@@ -193,7 +193,17 @@ local esc = SMODS.Joker {
         return false
     end,
     Bakery_use_button_text = function(_, card)
-        return card.debuff and "DEBUFFED" or "ESCAPE"
+        if card.debuff then
+            return "DEBUFFED"
+        end
+
+        for _, v in ipairs(G.consumeables.cards) do
+            if destructible(v) then
+                return "CONSUME"
+            end
+        end
+
+        return "ESCAPE"
     end,
     Bakery_use_joker = function(self, card)
         if card.debuff then
@@ -235,9 +245,9 @@ local esc = SMODS.Joker {
             end
         end
 
-        local scaling = Jane.cry and G.GAME.dollars or math.min(G.GAME.dollars, extra.max)
-        local tags = scaling * (math.pow(extra.xmoney, xtimes) - 1)
-        ease_dollars(math.ceil(times * extra.money + tags))
+        local tag_money = Jane.cry and G.GAME.dollars or math.min(G.GAME.dollars, extra.max)
+        local tag_times = Jane.cry and math.pow(extra.xmoney, xtimes) - 1 or xtimes + 1
+        ease_dollars(math.ceil(times * extra.money + tag_money * tag_times))
     end,
     tag_threshold = 30,
 }