Add support for pools and tags

manifest.json

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

src/blind.lua

@@ -52,7 +52,7 @@ end
 
 local function has_enhancement(card)
     local e = SMODS.get_enhancements(card)
-    return not not (e and next(e))
+    return e and next(e)
 end
 
 local function set_freeze(state)

src/charm.lua

@@ -261,7 +261,7 @@ local orig_apply_to_run = Tag.apply_to_run
 
 function Tag:apply_to_run(...)
     if G.GAME.Bakery_charm == "BakeryCharm_Roland_wii" and
-        G.Bakery_charm_area.cards[1].config.center.ability.extra.active then
+        G.Bakery_charm_area.cards[1].ability.extra.active then
         return
     end
 

src/edition.lua

@@ -13,7 +13,7 @@ end
 
 frozen_sound "_click"
 local frozen_blocklist = {CardSleeve = true}
-local frozen_sounds = f(4):map(frozen_sound):map("key"):table()
+local frozen_sounds = f(4):map(frozen_sound):map "key":table()
 
 local needs_chip_mult_override = {
     Bull = true,

src/joker.lua

@@ -488,11 +488,9 @@ joker {
             end
         end
 
-        local key = card.config.center.key
+        return SMODS.merge_effects(
-
-        local merged = SMODS.merge_effects(
             f(G.jokers.cards):where(is_frozen):where(function(v)
-                return v.config.center.key ~= key
+                return v.config.center.key ~= card.config.center.key
             end):map(function(v)
                 return SMODS.blueprint_effect(card, v, context)
             end):where(type, "table"):map(function(v)
@@ -500,8 +498,6 @@ joker {
                 return v
             end):values():table()
         )
-
-        return merged
     end,
 }
 
@@ -652,7 +648,7 @@ joker {
         local _ = card.area == G.jokers and self:cerulean(false)
     end,
     cerulean = function(_, value)
-        f(G.jokers.cards):each(function(v)
+        local _ = G.jokers and f(G.jokers.cards):each(function(v)
             f {"click", "drag", "focus", "hover"}:map(f.index_into(v.states)):each(function(s)
                 s.can = value or v.config.center.key == "j_Roland_cerulean"
             end)
@@ -679,7 +675,7 @@ joker {
             {card = card, xmult = card.ability.extra.xmult} or nil
     end,
     crimson = function()
-        f(G.jokers.cards, ipairs_reversed):where(is_frozen, false):each(function(v)
+        local _ = G.jokers and f(G.jokers.cards, ipairs_reversed):where(is_frozen, false):each(function(v)
             local right = G.jokers.cards[v.rank + 1]
 
             local debuffed_by_crimson = right and
@@ -761,7 +757,7 @@ joker {
     key = "violet",
     pronouns = "she_they",
     idea = "hamester",
-    config = {extra = {before = 0.1, xmult = 9}},
+    config = {extra = {before = 0.1, xmult = 6}},
     pixel_size = {w = 68, h = 68},
     attributes = {"xmult"},
     cost = 6,
@@ -1262,7 +1258,7 @@ joker {
             return {card = card, numerator = extra.probability}
         end
 
-        if context.end_of_round and extra.probability ~= extra.reset then
+        if context.end_of_round and not context.repetition and extra.probability ~= extra.reset then
             extra.probability = extra.reset
             return {message = localize "k_reset", colour = G.C.RED, message_card = card, repetitions = 0}
         end

src/lib/funky.lua

@@ -128,13 +128,6 @@ local function autopairs(tbl, fpairs)
     return (fpairs or (tbl[#tbl] and ipairs or pairs))(tbl)
 end
 
----@param any any
----@return boolean
----@nodiscard
-local function is_f(any)
-    return type(any) == "table" and any.from == f.from and any.new == f.new
-end
-
 --- Always returns nil.
 ---@return nil
 ---@nodiscard
@@ -202,6 +195,15 @@ function f.const(v)
     end
 end
 
+---@param i integer
+---@return fun(...: any): any
+---@nodiscard
+function f.arg(i)
+    return function(...)
+        return ({...})[i]
+    end
+end
+
 ---@generic K, V
 ---@param v K
 ---@return fun(x: { [K]: V }): V
@@ -240,21 +242,32 @@ function f.indices(v)
     end
 end
 
+---@param any any
+---@return boolean
+---@nodiscard
+function f.isf(any)
+    return type(any) == "table" and any.from == f.from and any.new == f.new
+end
+
 f[true and "chain"] = function(...)
-    for _, v in ipairs(...) do
+    local ret
+
+    for _, v in ipairs {...} do
         if type(v) == "table" then
             for _, vv in ipairs(v) do
+                local copy = ret
                 vv = autofunc(vv)
 
                 ret = ret and function(...)
-                    return vv(ret(...))
+                    return vv(copy(...))
                 end or vv
             end
         else
+            local copy = ret
             v = autofunc(v)
 
             ret = ret and function(...)
-                return v(ret(...))
+                return v(copy(...))
             end or v
         end
     end
@@ -271,6 +284,7 @@ function f.new(fnext)
     return {
         all = f.all,
         any = f.any,
+        arg = f.arg,
         chain = f.chain,
         concat = f.concat,
         const = f.const,
@@ -285,6 +299,7 @@ function f.new(fnext)
         index = f.index,
         index_into = f.index_into,
         indices = f.indices,
+        isf = f.isf,
         keys = f.keys,
         map = f.map,
         new = f.new,
@@ -371,7 +386,7 @@ function f:concat(...)
     local sum, last = 0, 0
 
     for i = 1, #fs do
-        fs[i] = is_f(fs[i]) and fs[i] or f.from(fs[i])
+        fs[i] = f.isf(fs[i]) and fs[i] or f.from(fs[i])
     end
 
     return f.new(function()

src/lib/intellisense.lua

@@ -19,15 +19,21 @@ Balatest = Balatest
 --- @type { constants?: { TEN: table }, new: (fun(self: self, arr?: number[], sign?: number, noNormalize?: boolean): table), pow: (fun(x: number, y: number): number) }
 Big = Big
 
---- @type table
+--- @type table?
 CardSleeves = CardSleeves
 
---- @type fun(obj: SMODS.Back): SMODS.Back
+--- @type table|fun(obj: SMODS.Back): SMODS.Back
 CardSleeves.Sleeve = CardSleeves.Sleeve
 
+--- @type {aliases: { [string]: [string] }}
+Cryptid = Cryptid
+
 --- @type fun(area: CardArea, ...: ...): Card
 create_card_for_shop = create_card_for_shop
 
+--- @type boolean|table
+G.Bakery_charm_area.cards[1].ability.extra = G.Bakery_charm_area.cards[1].ability.extra
+
 SMODS.Mods.Roland.config = require "config"
 
 ---@type userdata|{getWidth: fun(self: self): number}

src/lib/shared.lua

@@ -1,5 +1,59 @@
 local f = assert(SMODS.load_file "src/lib/funky.lua")() or require "lib.funky"
 
+---@param v string
+---@return Card|Tag
+local function add(v)
+    if not G.P_TAGS[v] then
+        return SMODS.add_card {no_edition = true, key = v}
+    end
+
+    local tag = Tag(v)
+
+    if tag.name == "Orbital Tag" then
+        local hands = f(G.GAME.hands):where "visible":keys():table()
+        tag.ability.orbital_hand = pseudorandom_element(hands, pseudoseed "Roland_c_orbital_tag")
+    end
+
+    add_tag(tag)
+    return tag
+end
+
+local function simplify(x)
+    return type(x) == "string" and x:lower():gsub("%s", ""):gsub("_", ""):gsub("^the", "") or x
+end
+
+local function flatten(v)
+    return type(v) ~= "table" and {v} or (f.isf(v) and v:table() or v)
+end
+
+---@param it string
+local function find(it)
+    if (G.P_CENTERS[it] or {}).config then
+        return it
+    end
+
+    local match = simplify(it)
+    local pool = f(G.P_CENTER_POOLS):any(f.chain(f.arg(2), simplify, f.eq(match)))
+
+    if type(pool) == "table" and next(pool) then
+        return pseudorandom_element(pool, pseudoseed "Roland_c").key
+    end
+
+    if Cryptid and Cryptid.aliases and Cryptid.aliases[it] then
+        return Cryptid.aliases[it]
+    end
+
+    return f(G.localization.descriptions)
+        :flatmap(flatten)
+        :where(type, "table")
+        :where(f.chain(f.arg(2), f.index_into(G.P_CENTERS), "config"))
+        :where(function(v, k)
+            return match == simplify(k) or match == simplify(v.name)
+        end)
+        :keys()
+        :any()
+end
+
 local function protect(fun)
     return function()
         local res, ret = pcall(fun)
@@ -56,4 +110,35 @@ local function u()
         G.STATE ~= G.STATES.PLAY_TAROT)
 end
 
-return {f, q, u}
+--- Creates one or more cards.
+---@param ... any
+---@return Card|Tag|(Card|Tag[])
+local function c(...)
+    local cards = f {...}
+        :flatmap(flatten)
+        :where(type, "string")
+        :map(string.lower)
+        :map(find)
+        :where(f.id)
+        :map(add)
+        :values()
+        :table()
+
+    return #cards > 1 and cards or cards[1]
+end
+
+return {f, q, u, setmetatable({}, {
+    __call = function(_, ...)
+        return c(...)
+    end,
+    __index = function(_, k)
+        return c(k)
+    end,
+    __newindex = function(_, k, v)
+        local n = tonumber(v)
+
+        for _ = 1, type(n) == "number" and n or 1 do
+            c(k)
+        end
+    end,
+})}

src/main.lua

@@ -52,9 +52,11 @@ q {
             -- G.ARGS.LOC_COLOURS["Bakery_credit_bg_Roland_" .. k] = v.bg
         end)
 
-        if SMODS.Mods.DebugPlus and SMODS.Mods.Roland.config.import_funky then
+        if not SMODS.Mods.DebugPlus or not SMODS.Mods.Roland.config.import_funky then
-            _G.f, _G.q, _G.u = unpack(qol)
+            return
         end
+
+        _G.f, _G.q, _G.u, _G.c = unpack(qol)
     end,
 }
 

src/spectral.lua

@@ -69,15 +69,15 @@ spectral {
         table.insert(info_queue, G.P_CENTERS.m_stone)
     end,
     can_use = function()
-        return u() and not not next(G.hand.cards)
+        return next(G.hand.cards) and u()
     end,
     use = function(_, card)
         q {
             trigger = "after",
             delay = 0.4,
             func = function()
-                play_sound("tarot1")
                 card:juice_up(0.3, 0.5)
+                play_sound("tarot1")
             end,
         }
 
@@ -89,8 +89,8 @@ spectral {
                 delay = 0.15,
                 func = function()
                     v:flip()
-                    play_sound("card1", percent)
                     v:juice_up(0.3, 0.3)
+                    play_sound("card1", percent)
                     return true
                 end,
             }
@@ -110,8 +110,8 @@ spectral {
                 delay = 0.15,
                 func = function()
                     v:flip()
-                    play_sound("tarot2", percent, 0.6)
                     v:juice_up(0.3, 0.3)
+                    play_sound("tarot2", percent, 0.6)
                     return true
                 end,
             }
@@ -155,7 +155,7 @@ spectral {
         return {vars = {card.ability.extra.amount}}
     end,
     can_use = function()
-        return #G.playing_cards > 1 and not not u()
+        return next(G.playing_cards) and u()
     end,
     use = function(_, card)
         local function destructible(v)

src/tests/blind.tests.lua

@@ -192,9 +192,9 @@ Balatest.TestPlay {
 }
 
 Balatest.TestPlay {
-    category = {"blind", "xerox"},
+    category = {"blind", "mitotic"},
-    name = "xerox",
+    name = "mitotic",
-    blind = "bl_Roland_xerox",
+    blind = "bl_Roland_mitotic",
     execute = function()
         Balatest.discard {"2S"}
     end,
@@ -204,9 +204,9 @@ Balatest.TestPlay {
 }
 
 Balatest.TestPlay {
-    category = {"blind", "xerox"},
+    category = {"blind", "mitotic"},
-    name = "xerox_disabled",
+    name = "mitotic_disabled",
-    blind = "bl_Roland_xerox",
+    blind = "bl_Roland_mitotic",
     jokers = {"j_chicot"},
     execute = function()
         Balatest.discard {"2S"}

src/tests/joker.tests.lua

@@ -2,330 +2,6 @@ if not Balatest then
     return
 end
 
-Balatest.TestPlay {
-    category = {"joker", "escapey", "escape"},
-    name = "escapey_none",
-    jokers = {"j_Roland_escapey"},
-    execute = function() end,
-    assert = function()
-        Balatest.assert(not G.jokers.cards[1].config.center:Bakery_can_use(G.jokers.cards[1]))
-    end,
-}
-
-Balatest.TestPlay {
-    category = {"joker", "escapey", "escape"},
-    name = "escapey_one_consumable",
-    jokers = {"j_Roland_escapey"},
-    consumeables = {"c_strength"},
-    execute = function()
-        Balatest.q(function()
-            G.FUNCS.Bakery_use_joker {config = {ref_table = G.jokers.cards[1]}}
-        end)
-
-        Balatest.wait()
-    end,
-    assert = function()
-        Balatest.assert_eq(G.GAME.hands["High Card"].level, 2)
-    end,
-}
-
-Balatest.TestPlay {
-    category = {"joker", "escapey", "escape"},
-    name = "escapey_two_consumables",
-    jokers = {"j_Roland_escapey"},
-    consumeables = {"c_strength", "c_strength"},
-    execute = function()
-        Balatest.q(function()
-            G.FUNCS.Bakery_use_joker {config = {ref_table = G.jokers.cards[1]}}
-        end)
-
-        Balatest.wait()
-    end,
-    assert = function()
-        Balatest.assert_eq(G.GAME.hands["High Card"].level, 3)
-    end,
-}
-
-Balatest.TestPlay {
-    category = {"joker", "escapey", "escape"},
-    name = "escapey_one_tag",
-    jokers = {"j_Roland_escapey"},
-    no_auto_start = true,
-    execute = function()
-        Balatest.skip_blind("tag_investment")
-
-        Balatest.q(function()
-            G.FUNCS.Bakery_use_joker {config = {ref_table = G.jokers.cards[1]}}
-        end)
-
-        Balatest.wait()
-    end,
-    assert = function()
-        Balatest.assert_eq(G.GAME.hands["High Card"].level, 2)
-    end,
-}
-
-Balatest.TestPlay {
-    category = {"joker", "escapey", "escape"},
-    name = "escapey_two_tags",
-    jokers = {"j_Roland_escapey"},
-    no_auto_start = true,
-    execute = function()
-        Balatest.skip_blind("tag_investment")
-        Balatest.skip_blind("tag_investment")
-
-        Balatest.q(function()
-            G.FUNCS.Bakery_use_joker {config = {ref_table = G.jokers.cards[1]}}
-        end)
-
-        Balatest.wait()
-    end,
-    assert = function()
-        Balatest.assert_eq(G.GAME.hands["High Card"].level, 3)
-    end,
-}
-
-Balatest.TestPlay {
-    category = {"joker", "escapey", "escape"},
-    name = "escapey_consumables_and_tags",
-    jokers = {"j_Roland_escapey"},
-    consumeables = {"c_strength"},
-    no_auto_start = true,
-    execute = function()
-        Balatest.skip_blind("tag_investment")
-        Balatest.skip_blind("tag_investment")
-
-        Balatest.q(function()
-            G.FUNCS.Bakery_use_joker {config = {ref_table = G.jokers.cards[1]}}
-        end)
-
-        Balatest.wait()
-    end,
-    assert = function()
-        Balatest.assert_eq(G.GAME.hands["High Card"].level, 2)
-    end,
-}
-
-Balatest.TestPlay {
-    category = {"joker", "escapey", "escape"},
-    name = "escapey_partial_selected_consumables_and_tags",
-    jokers = {"j_Roland_escapey"},
-    consumeables = {"c_strength", "c_strength"},
-    no_auto_start = true,
-    execute = function()
-        Balatest.skip_blind("tag_investment")
-        Balatest.skip_blind("tag_investment")
-
-        Balatest.q(function()
-            G.consumeables:add_to_highlighted(G.consumeables.cards[1])
-        end)
-
-        Balatest.wait()
-
-        Balatest.q(function()
-            G.FUNCS.Bakery_use_joker {config = {ref_table = G.jokers.cards[1]}}
-        end)
-
-        Balatest.wait()
-    end,
-    assert = function()
-        Balatest.assert_eq(G.GAME.hands["High Card"].level, 2)
-    end,
-}
-
-Balatest.TestPlay {
-    category = {"joker", "escapey", "escape"},
-    name = "escapey_full_selected_consumables_and_tags",
-    jokers = {"j_Roland_escapey"},
-    consumeables = {"c_strength"},
-    no_auto_start = true,
-    execute = function()
-        Balatest.skip_blind("tag_investment")
-        Balatest.skip_blind("tag_investment")
-
-        Balatest.q(function()
-            G.consumeables:add_to_highlighted(G.consumeables.cards[1])
-        end)
-
-        Balatest.wait()
-
-        Balatest.q(function()
-            G.FUNCS.Bakery_use_joker {config = {ref_table = G.jokers.cards[1]}}
-        end)
-
-        Balatest.wait()
-    end,
-    assert = function()
-        Balatest.assert_eq(G.GAME.hands["High Card"].level, 3)
-    end,
-}
-
-Balatest.TestPlay {
-    category = {"joker", "escapey", "fuse"},
-    name = "escapey_fusion",
-    jokers = {"j_Roland_escapey", "j_Roland_escapey"},
-    execute = function()
-        Balatest.q(function()
-            G.FUNCS.Bakery_use_joker {config = {ref_table = G.jokers.cards[1]}}
-        end)
-
-        Balatest.wait()
-    end,
-    assert = function()
-        Balatest.assert_eq(#G.jokers.cards, 1)
-        Balatest.assert_eq(G.jokers.cards[1].sell_cost, 8)
-        Balatest.assert_eq(G.jokers.cards[1].ability.extra.levels, 2)
-    end,
-}
-
-Balatest.TestPlay {
-    category = {"joker", "escapey", "fuse"},
-    name = "escapey_consumable_takes_precedence",
-    jokers = {"j_Roland_escapey", "j_Roland_escapey"},
-    consumeables = {"c_strength"},
-    execute = function()
-        Balatest.q(function()
-            G.FUNCS.Bakery_use_joker {config = {ref_table = G.jokers.cards[1]}}
-        end)
-
-        Balatest.wait()
-    end,
-    assert = function()
-        Balatest.assert_eq(#G.jokers.cards, 2)
-        Balatest.assert_eq(G.GAME.hands["High Card"].level, 2)
-    end,
-}
-
-Balatest.TestPlay {
-    category = {"joker", "escapey", "fuse"},
-    name = "escapey_tag_takes_precedence",
-    jokers = {"j_Roland_escapey", "j_Roland_escapey"},
-    no_auto_start = true,
-    execute = function()
-        Balatest.skip_blind("tag_investment")
-
-        Balatest.q(function()
-            G.FUNCS.Bakery_use_joker {config = {ref_table = G.jokers.cards[1]}}
-        end)
-
-        Balatest.wait()
-    end,
-    assert = function()
-        Balatest.assert_eq(#G.jokers.cards, 2)
-        Balatest.assert_eq(G.GAME.hands["High Card"].level, 2)
-    end,
-}
-
-Balatest.TestPlay {
-    category = {"joker", "escapey", "fuse"},
-    name = "escapey_fusion_takes_precedence",
-    jokers = {"j_Roland_escapey", "j_Roland_escapey"},
-    consumeables = {"c_strength"},
-    execute = function()
-        Balatest.q(function()
-            G.consumeables:add_to_highlighted(G.consumeables.cards[1])
-        end)
-
-        Balatest.wait()
-
-        Balatest.q(function()
-            G.FUNCS.Bakery_use_joker {config = {ref_table = G.jokers.cards[1]}}
-        end)
-
-        Balatest.wait()
-    end,
-    assert = function()
-        Balatest.assert_eq(#G.jokers.cards, 1)
-        Balatest.assert_eq(G.jokers.cards[1].sell_cost, 8)
-        Balatest.assert_eq(G.jokers.cards[1].ability.extra.levels, 2)
-    end,
-}
-
-Balatest.TestPlay {
-    category = {"joker", "escapey", "fuse"},
-    name = "escapey_scribe_fusion",
-    jokers = {"j_Roland_escapey"},
-    execute = function()
-        if not G.P_CENTERS.c_Bakery_Scribe then
-            sendWarnMessage("escapey_scribe_fusion cannot run without c_Bakery_Scribe, skipping test.")
-            return
-        end
-
-        Balatest.q(function()
-            local scribe = create_card(nil, G.consumeables, nil, nil, nil, nil, "c_Bakery_Scribe", "balatest")
-            scribe:add_to_deck()
-            G.consumeables:emplace(scribe)
-        end)
-
-        Balatest.wait()
-
-        Balatest.q(function()
-            G.jokers:add_to_highlighted(G.jokers.cards[1])
-        end)
-
-        Balatest.wait()
-        Balatest.use(function() return G.consumeables.cards[1] end)
-
-        Balatest.q(function()
-            G.FUNCS.Bakery_use_joker {config = {ref_table = G.jokers.cards[1]}}
-        end)
-
-        Balatest.wait()
-    end,
-    assert = function()
-        if not G.P_CENTERS.c_Bakery_Scribe then
-            return
-        end
-
-        Balatest.assert_eq(#G.jokers.cards, 1)
-        Balatest.assert_eq(G.jokers.cards[1].sell_cost, 8)
-        Balatest.assert_eq(G.jokers.cards[1].ability.extra.levels, 1)
-    end,
-}
-
-Balatest.TestPlay {
-    category = {"joker", "escapey", "fuse"},
-    name = "escapey_scribe_fusion_alt",
-    jokers = {"j_Roland_escapey"},
-    execute = function()
-        if not G.P_CENTERS.c_Bakery_Scribe then
-            sendWarnMessage("escapey_scribe_fusion_alt cannot run without c_Bakery_Scribe, skipping test.")
-            return
-        end
-
-        Balatest.q(function()
-            local scribe = create_card(nil, G.consumeables, nil, nil, nil, nil, "c_Bakery_Scribe", "balatest")
-            scribe:add_to_deck()
-            G.consumeables:emplace(scribe)
-        end)
-
-        Balatest.wait()
-
-        Balatest.q(function()
-            G.jokers:add_to_highlighted(G.jokers.cards[1])
-        end)
-
-        Balatest.wait()
-        Balatest.use(function() return G.consumeables.cards[1] end)
-
-        Balatest.q(function()
-            G.jokers:add_to_highlighted(G.jokers.cards[2])
-            G.FUNCS.Bakery_use_joker {config = {ref_table = G.jokers.cards[2]}}
-        end)
-
-        Balatest.wait()
-    end,
-    assert = function()
-        if not G.P_CENTERS.c_Bakery_Scribe then
-            return
-        end
-
-        Balatest.assert_eq(#G.jokers.cards, 1)
-        Balatest.assert_eq(G.jokers.cards[1].sell_cost, 8)
-        Balatest.assert_eq(G.jokers.cards[1].ability.extra.levels, 1)
-    end,
-}
-
 Balatest.TestPlay {
     category = {"joker", "martingale"},
     name = "martingale_oops",
@@ -334,7 +10,7 @@ Balatest.TestPlay {
         Balatest.play_hand {"2S"}
     end,
     assert = function()
-        Balatest.assert_chips(7 * 2)
+        Balatest.assert_chips(7)
     end,
 }
 
@@ -347,6 +23,6 @@ Balatest.TestPlay {
         Balatest.play_hand {"2S"}
     end,
     assert = function()
-        Balatest.assert_chips(7 * math.pow(2, 32))
+        Balatest.assert_chips(1 / 0)
     end,
 }

src/tests/spectral.tests.lua

@@ -2,22 +2,6 @@ if not Balatest then
     return
 end
 
-Balatest.TestPlay {
-    category = {"spectral", "afterimage"},
-    name = "afterimage",
-    consumeables = {"c_Roland_afterimage"},
-    deck = {cards = {{s = "S", r = "2"}}},
-    execute = function()
-        Balatest.highlight({"2S"})
-        Balatest.use(G.consumeables.cards[1])
-        Balatest.end_round()
-    end,
-    assert = function()
-        Balatest.assert_eq(G.hand.config.card_limit, 51)
-        Balatest.assert(G.deck.cards[1].edition.negative)
-    end,
-}
-
 Balatest.TestPlay {
     category = {"spectral", "void"},
     name = "spectral",