From e8fcd6931aee856705046d351394bd563c3dcba8 Mon Sep 17 00:00:00 2001
From: Emik <emik.cuber@gmail.com>
Date: Thu, 4 Jun 2026 04:14:13 +0200
Subject: [PATCH] Fix Frozen regressions

---
 manifest.json   |  2 +-
 src/edition.lua | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/manifest.json b/manifest.json
index e666506..9fda55b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
     "id": "Roland",
     "name": "Roland",
     "prefix": "Roland",
-    "version": "2.8.5",
+    "version": "2.8.6",
     "badge_colour": "8BE9FD",
     "display_name": "Roland",
     "main_file": "src/main.lua",
diff --git a/src/edition.lua b/src/edition.lua
index ae26071..c28dedd 100644
--- a/src/edition.lua
+++ b/src/edition.lua
@@ -57,7 +57,7 @@ local function freeze(card)
 
     card.Roland_frozen_ability = card.Roland_frozen_ability or copy(card.ability)
     card.ability = card.Roland_frozen_ability and copy(card.Roland_frozen_ability) or card.ability
-    card.Roland_frozen = card.Roland_frozen and {probability = SMODS.get_probability_vars(card, 1, 1)}
+    card.Roland_frozen = card.Roland_frozen or {probability = SMODS.get_probability_vars(card, 1, 1)}
     local ability, ret = card.ability, card.Roland_frozen_ability
 
     if type(ability) ~= "table" then
@@ -216,11 +216,10 @@ q(function()
             return 1
         end
 
-        card.Roland_frozen.estate = card.Roland_frozen.estate and
-            card.Roland_frozen.estate or
-            (f(card.area.cards):swap():any(function(_, k)
+        card.Roland_frozen.estate = card.Roland_frozen.estate or
+            f(card.area.cards):swap():any(function(_, k)
                 return k == card
-            end) or 1)
+            end) or 1
 
         return card.Roland_frozen.estate
     end
@@ -237,7 +236,7 @@ q(function()
         end
 
         local joker_count = estate_pos(card)
-        local extra = card.ability.extra or {}
+        local extra = card.ability.extra
         return {chips = extra.chips * joker_count, mult = extra.mult * joker_count}
     end