From c855b90f9d3a687f3cd18a86d46d758052a913ff Mon Sep 17 00:00:00 2001 From: Emik Date: Sun, 28 Jun 2026 21:13:56 +0200 Subject: [PATCH] Avoid polluting centers and improve debugging experience --- lovely.toml | 2 +- manifest.json | 2 +- src/edition.lua | 2 +- src/lib/shared.lua | 12 +++++++++++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lovely.toml b/lovely.toml index 7f9a966..aa54ab3 100644 --- a/lovely.toml +++ b/lovely.toml @@ -129,5 +129,5 @@ match_indent = true target = "card.lua" pattern = "math\\.floor\\(\\(G\\.GAME\\.dollars \\+ \\(G\\.GAME\\.dollar_buffer or 0\\)\\)/self\\.ability\\.extra\\.dollars\\)" position = "at" -payload = "G.P_CENTERS.j_bootstraps:mult(self)" +payload = "SMODS.Mods.Roland.bootstraps_mult(self)" match_indent = true diff --git a/manifest.json b/manifest.json index 850729c..c6d0cf9 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "id": "Roland", "name": "Roland", "prefix": "Roland", - "version": "2.9.28", + "version": "2.9.29", "badge_colour": "8BE9FD", "display_name": "Roland", "main_file": "src/main.lua", diff --git a/src/edition.lua b/src/edition.lua index 8f81150..8e54dd6 100644 --- a/src/edition.lua +++ b/src/edition.lua @@ -287,7 +287,7 @@ end local orig_get_probability_vars = SMODS.get_probability_vars -function G.P_CENTERS.j_bootstraps:mult(card) +function SMODS.current_mod.bootstraps_mult(card) local ability = card.Roland_frozen_ability local ret = math.floor((G.GAME.dollars + (G.GAME.dollar_buffer or 0)) / card.ability.extra.dollars) diff --git a/src/lib/shared.lua b/src/lib/shared.lua index 058da7d..678e444 100644 --- a/src/lib/shared.lua +++ b/src/lib/shared.lua @@ -3,6 +3,16 @@ 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 v == "op" then + local op = SMODS.add_card {no_edition = true, key = "j_joker"} + op.ability.mult = 1e100 + return op + elseif v == "xop" then + local xop = SMODS.add_card {no_edition = true, key = "j_Roland_jokersr"} + xop.ability.extra.xmult = 1e100 + return xop + end + if not G.P_TAGS[v] then return SMODS.add_card {no_edition = true, key = v} end @@ -28,7 +38,7 @@ end ---@param it string local function find(it) - if (G.P_CENTERS[it] or {}).config then + if ({op = true, xop = true})[it] or (G.P_CENTERS[it] or {}).config then return it end