Improve performance of Arctic Circle

Signed-off-by: emik <emik.cuber@gmail.com>

lovely.toml

@@ -212,3 +212,13 @@ match_indent = true
 # position = "at"
 # payload = 'local cmdName = inputText'
 # match_indent = true
+
+# [[patches]]
+# [patches.pattern]
+# target = '=[SMODS DebugPlus "debugplus/util.lua"]'
+# pattern = "function global.stringifyTable(tab, depth, num, dec, indent)"
+# position = "after"
+# payload = """if type(tab) == "table" and type(tab.table) == "function" then
+#     tab = tab:table()
+# end"""
+# match_indent = true

manifest.json

@@ -3,7 +3,7 @@
     "id": "Roland",
     "name": "Roland",
     "prefix": "Roland",
-    "version": "3.0.3",
+    "version": "3.0.9",
     "badge_colour": "8BE9FD",
     "display_name": "Roland",
     "main_file": "src/main.lua",

src/blind.lua

@@ -232,24 +232,21 @@ blind {
     boss = {min = 3},
     boss_colour = HEX "102a41ff",
     pronouns = "it_its",
-    defeat = function(self)
-        self.cards():where "Roland_blizzard":each(set_freeze())
+    defeat = function()
+        f(G.I.CARD):where "Roland_blizzard":each(set_freeze())
         G.GAME.blind.disabled = true
     end,
     disable = function(self)
         self:defeat()
     end,
-    calculate = function(self, b, context)
+    calculate = function(_, b, context)
         return not b.disabled and
             context.hand_drawn and
-            self.cards()
+            f(G.I.CARD)
             :where("Roland_blizzard", false)
             :where("facing", "front")
             :each(set_freeze(true)) or nil
     end,
-    cards = function()
-        return f(G):where(getmetatable, CardArea):flatmap("cards", ipairs)
-    end,
 }
 
 blind {

src/challenge.lua

@@ -16,7 +16,8 @@ end
 ---@param v SMODS.GameObject
 ---@return boolean
 local function is_banned_from_pastry(v)
-    return not ({Bakery = true, Roland = true})[(v.mod or {}).id]
+    return not ({bl_small = true, bl_big = true})[v.key] and
+        not ({Bakery = true, Roland = true})[(v.mod or {}).id]
 end
 
 ---@param v SMODS.Center
@@ -33,7 +34,7 @@ local function is_center_banned_from_pastry(v)
         p_arcana_mega_2 = true,
     }
 
-    local pastries_targets = {Enhanced = true, Joker = true, Tarot = true, Spectral = true}
+    local pastries_targets = {Enhanced = true, Joker = true, Tarot = true, Spectral = true, Voucher = true}
     return arcana_boosters[v.key] or pastries_targets[v.set] and is_banned_from_pastry(v)
 end
 
@@ -47,7 +48,7 @@ end
 ---@return fun(v: SMODS.Blind, k: string): boolean?
 local function is_showdown_except(key)
     return function(v, k)
-        return v.boss and v.boss.showdown and key ~= k
+        return key ~= k and v.boss and (v.boss.hardcore or v.boss.no_orb or v.boss.showdown)
     end
 end
 
@@ -128,6 +129,7 @@ local spin_to_win = SMODS.Challenge {
     jokers = f(4):map(f.const {id = "j_joker", eternal = true}):table(),
     restrictions = {banned_cards = {{id = "c_Roland_coolheaded"}}},
     pronouns = "they_them",
+    rotation = 0,
     apply = function(self)
         self.rotation = 0
     end,
@@ -139,7 +141,6 @@ local spin_to_win = SMODS.Challenge {
         context.card.ability.extra.rotation = self.rotation
         self.rotation = self.rotation + 1
     end,
-    rotation = 0,
 }
 
 SMODS.Challenge {
@@ -156,7 +157,7 @@ SMODS.Challenge {
     restrictions = amber,
     pronouns = "they_them",
     unlocked = function()
-        return G.P_CENTERS.j_Roland_amber and G.P_CENTERS.j_Roland_amber.check_for_unlock()
+        return G.P_CENTERS.j_Roland_amber.discovered
     end,
     calculate = function(_, context)
         local function slide(pitch)
@@ -198,7 +199,7 @@ SMODS.Challenge {
     restrictions = cerulean,
     pronouns = "she_her",
     unlocked = function()
-        return G.P_CENTERS.j_Roland_cerulean and G.P_CENTERS.j_Roland_cerulean.check_for_unlock()
+        return G.P_CENTERS.j_Roland_cerulean.discovered
     end,
     calculate = function(_, context)
         if not context.hand_drawn then
@@ -228,7 +229,7 @@ SMODS.Challenge {
     restrictions = crimson,
     pronouns = "she_her",
     unlocked = function()
-        return G.P_CENTERS.j_Roland_crimson and G.P_CENTERS.j_Roland_crimson.check_for_unlock()
+        return G.P_CENTERS.j_Roland_crimson.discovered
     end,
     calculate = function(_, context)
         local _ = context.blind_defeated and f(G.jokers.cards):each(function(v)
@@ -291,7 +292,7 @@ SMODS.Challenge {
     restrictions = verdant,
     pronouns = "she_her",
     unlocked = function()
-        return G.P_CENTERS.j_Roland_verdant and G.P_CENTERS.j_Roland_verdant.check_for_unlock()
+        return G.P_CENTERS.j_Roland_verdant.discovered
     end,
     calculate = function(_, context)
         if context.setting_blind then
@@ -317,7 +318,7 @@ SMODS.Challenge {
     restrictions = violet,
     pronouns = "she_they",
     unlocked = function()
-        return G.P_CENTERS.j_Roland_violet and G.P_CENTERS.j_Roland_violet.check_for_unlock()
+        return G.P_CENTERS.j_Roland_violet.discovered
     end,
     calculate = function(_, context)
         if not context.setting_blind then

src/joker.lua

@@ -589,9 +589,7 @@ joker {
         end
 
         return SMODS.merge_effects(
-            f(G)
-            :where(getmetatable, CardArea)
-            :flatmap("cards", ipairs)
+            f(G.I.CARD)
             :where(is_frozen)
             :map(copy(card, context))
             :where(type, "table")
@@ -741,8 +739,13 @@ joker {
     crimson = function()
         local _ = G.jokers and f(G.jokers.cards, f.revpairs):where(is_frozen, false):each(function(v)
             local right = G.jokers.cards[v.rank + 1]
+            local orig_calculate_reroll_cost = v.config.center.key == "j_chaos" and calculate_reroll_cost or nil
             local debuffed_by_crimson = right and not right.debuff and right.config.center.key == "j_Roland_crimson"
 
+            if orig_calculate_reroll_cost then
+                calculate_reroll_cost = f.noop
+            end
+
             if debuffed_by_crimson and v.ability.Roland_crimson == nil then
                 local debuff = not not v.debuff
                 v:set_debuff(true)
@@ -752,6 +755,10 @@ joker {
                 v.ability.Roland_crimson = nil
                 v:set_debuff(debuff)
             end
+
+            if orig_calculate_reroll_cost then
+                calculate_reroll_cost = orig_calculate_reroll_cost
+            end
         end)
     end,
 }
@@ -1197,7 +1204,8 @@ end
 local orig_get_enhancements = SMODS.get_enhancements
 
 function SMODS.get_enhancements(card, ...)
-    if (G.GAME.modifiers.Roland_suitable or 0) <= 0 or
+    if not card.base or
+        (G.GAME.modifiers.Roland_suitable or 0) <= 0 or
         card.base.suit ~= G.GAME.current_round.Roland_suitable.suit or
         (card.area ~= G.hand and card.area ~= G.play) then
         return orig_get_enhancements(card, ...)

src/lib/funky.lua

@@ -3,7 +3,7 @@
 ---@license MPL-2.0
 ---@version 1.0.0
 ---
----@alias FFrom (fun<K, V>(iter: table<K, V>, fpairs?: fun(t: table<K, V>): (fun(table: table<K, V>, index?: K): K?, V?)): F | { [K]: V })|(fun(iter: number, fpairs?: number, step?: number): F | { [number]: number })|(fun<V>(iter: string): (fun(table: { [string]: V }): V))|(fun<V>(iter: string): (fun(table: { [string]: V }): V))|(fun<K, V>(iter: fun(): K, V): F | { [K]: V })|(fun(iter: false): fun(): false)|(fun(iter: true): fun(): true)|(fun(iter: nil): F)
+---@alias FFrom (fun<K, V>(iter: { [K]: V }, fpairs?: fun(t: { [K]: V }): (fun(table: { [K]: V }, index?: K): K?, V?)): F | { [K]: V })|(fun(iter: number, fpairs?: number, step?: number): F | { [number]: number })|(fun<V>(iter: string): (fun(table: { [string]: V }): V))|(fun<V>(iter: string): (fun(table: { [string]: V }): V))|(fun<K, V>(iter: fun(): K, V): F | { [K]: V })|(fun(iter: false): fun(): false)|(fun(iter: true): fun(): true)|(fun(iter: nil): F)
 ---@class F
 local f = {}
 
@@ -254,10 +254,10 @@ local function autofunc(func)
 end
 
 ---@generic K, V
----@param tbl table<K, V>
----@param fpairs? fun(t: table<K, V>): (fun(table: table<K, V>, index?: K): K, V)
----@return fun(tbl: table<K, V>, key: K): K, V
----@return table<K, V>
+---@param tbl { [K]: V }
+---@param fpairs? fun(t: { [K]: V }): (fun(table: { [K]: V }, index?: K): K, V)
+---@return fun(tbl: { [K]: V }, key: K): K, V
+---@return { [K]: V }
 ---@return V
 ---@nodiscard
 local function autopairs(tbl, fpairs)
@@ -393,19 +393,44 @@ function f.insert(v, k)
     end
 end
 
+local chairs = function(s, i)
+    local k = i and i + 1 or 1
+    local v = s:sub(k, k)
+
+    if v == nil then
+        return
+    end
+
+    local t = type(v)
+
+    if t ~= "string" and t ~= "table" or #v ~= 0 then
+        return k, v
+    end
+end
+
+---@generic T: string|{sub: fun(self: self, i: integer, j: integer)}
+---@param str T
+---@return fun(t: T, i?: integer): integer, T
+---@return T
+function f.chairs(str)
+    return chairs, str
+end
+
+local revpairs = function(t, i)
+    local k = i and i - 1 or #t
+    local v = t[k]
+
+    if v ~= nil then
+        return k, v
+    end
+end
+
 ---@generic T
 ---@param tbl T[]
 ---@return fun(t: T[], i?: integer): integer, T
 ---@return T[]
 function f.revpairs(tbl)
-    return function(t, i)
-        local k = i and i - 1 or #t
-        local v = t[k]
-
-        if v ~= nil then
-            return k, v
-        end
-    end, tbl
+    return revpairs, tbl
 end
 
 ---@param any any
@@ -471,6 +496,7 @@ function f.new(fnext)
         arg = f.arg,
         call = f.call,
         chain = f.chain,
+        chairs = f.chairs,
         compose = f.compose,
         concat = f.concat,
         const = f.const,
@@ -524,7 +550,16 @@ function f.from(iter, fpairs, step)
     local t = type(iter)
 
     if t == "string" then
-        return f.indices(iter)
+        if not fpairs then
+            return f.indices(iter)
+        end
+
+        local next, tbl, k, v = fpairs(iter --[[@as { sub: fun(self: self, i: integer, j?: integer) }]])
+
+        return f.new(function()
+            k, v = next(tbl, k)
+            return k, v
+        end)
     elseif t == "number" then
         local ik, is, start = 0, step or 1, fpairs and iter or 1
 
@@ -647,9 +682,9 @@ end
 ---@generic K, V, U
 ---@param self F|{ [K]: V }
 ---@param func fun(v: V, k: K): { [any]: U }
----@param fpairs? fun(t: table<K, V>): (fun(table: table<K, V>, index?: K): K, V)
+---@param fpairs? fun(t: { [K]: V }): (fun(table: { [K]: V }, index?: K): K, V)
 ---@return F|{ [K]: U }
----@overload fun(self: F|{ [K]: V }, func: string, fpairs?: fun(t: table<K, V>): (fun(table: table<K, V>, index?: K): K, V)): F|{ [K]: U }
+---@overload fun(self: F|{ [K]: V }, func: string, fpairs?: fun(t: { [K]: V }): (fun(table: { [K]: V }, index?: K): K, V)): F|{ [K]: U }
 ---@nodiscard
 function f:flatmap(func, fpairs)
     self = f.isf(self) and self or f.from(self)