emik/Roland
1
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve Frozen compatibility, Nerf Arctic Circle

Browse source
This commit is contained in:
Emik 2026-06-03 22:01:52 +02:00
parent 2ab4f8a4be
commit a827dfd3c1
Signed by: emik
GPG key ID: 6B0CD72A5E503BDF
6 changed files with 78 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
localization/en-us.lua
View file

@ -125,7 +125,7 @@ return {
},
j_Roland_arctic = {
name = "Arctic Circle",
text = {"Retrigger {C:dark_edition}Frozen {}cards", "Retrigger playing cards"},
text = {"Retrigger {C:attention}all", "{C:dark_edition}Frozen {}cards"},
},
j_Roland_artemis = {
name = "Artemis X",
@ -261,7 +261,7 @@ return {
},
j_Roland_phytoestrogens = {
name = "Phytoestrogens",
text = {"{C:mult}+Chips{} Mult", "{X:mult,C:white}X#1#{} Mult"},
text = {"{C:mult}+Chips{} Mult, {X:mult,C:white}X#1#{} Mult"},
},
j_Roland_sapling = {
name = "Sapling",

16
lovely.toml
View file

@ -12,12 +12,12 @@ priority = -2
target = "game.lua"
pattern = "self.GAME.round_resets.blind_choices.Boss = get_new_boss()"
position = "before"
payload = '''
payload = """
if G.GAME.modifiers.Roland_blossom_deck then
self.GAME.round_resets.blind_choices.Small = get_new_boss()
self.GAME.round_resets.blind_choices.Big = get_new_boss()
end
'''
"""
match_indent = true
[[patches]]
@ -25,12 +25,12 @@ match_indent = true
target = "functions/common_events.lua"
pattern = "G.GAME.round_resets.blind_choices.Boss = get_new_boss()"
position = "before"
payload = '''
payload = """
if G.GAME.modifiers.Roland_blossom_deck then
G.GAME.round_resets.blind_choices.Small = get_new_boss()
G.GAME.round_resets.blind_choices.Big = get_new_boss()
end
'''
"""
match_indent = true
[[patches]]
@ -85,3 +85,11 @@ payload = """if next(SMODS.find_card "j_Roland_misfortune") then
card:set_edition "e_negative"
end"""
match_indent = true
[[patches]]
[patches.regex]
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_erosion:mult(self)"
match_indent = true

2
manifest.json
View file

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

71
src/edition.lua
View file

@ -17,7 +17,6 @@ local frozen_sounds = f(4):map(frozen_sound):map("key"):table()
local needs_chip_mult_override = {
Bull = true,
Erosion = true,
Misprint = true,
TierList = true,
Bootstraps = true,
@ -48,7 +47,7 @@ local function freeze(card)
---@return T
local function copy(x)
return type(x) == "table" and f(x):map(copy):where(function(v, k)
return k ~= "Roland_frozen_proxy" and (k ~= "nine_tally" or v ~= 0)
return k ~= "nine_tally" or v ~= 0
end):table() or x
end
@ -58,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_probability = card.Roland_frozen_probability or SMODS.get_probability_vars(card, 1, 1)
card.Roland_frozen = card.Roland_frozen and {probability = SMODS.get_probability_vars(card, 1, 1)}
local ability, ret = card.ability, card.Roland_frozen_ability
if type(ability) ~= "table" then
@ -93,15 +92,10 @@ SMODS.Edition {
in_shop = true,
apply_to_float = false,
calculate = function(_, card, context)
if not context.fix_probability and not context.mod_probability then
freeze(card)
end
local _ = not context.fix_probability and not context.mod_probability and freeze(card)
end,
on_remove = function(card)
card.Roland_frozen_proxy = nil
card.Roland_frozen_estate = nil
card.Roland_frozen_ability = nil
card.Roland_frozen_probability = nil
card.Roland_frozen, card.Roland_frozen_ability, card.Roland_frozen_current_round = nil, nil, nil
end,
get_weight = function(self)
return G.GAME.edition_rate * self.weight
@ -153,7 +147,7 @@ function Card:calculate_joker(context, ...)
local ret = {orig_calculate_joker(self, context, ...)}
if not is_frozen or not ret[1] then
if not is_frozen or type(ret[1]) ~= "table" then
return unpack(ret)
end
@ -163,24 +157,11 @@ function Card:calculate_joker(context, ...)
return unpack(ret)
end
ability.Roland_frozen_mult_mod = ability.Roland_frozen_mult_mod or ret[1].mult_mod
ability.Roland_frozen_chip_mod = ability.Roland_frozen_chip_mod or ret[1].chip_mod
ability.Roland_frozen_xmult = ability.Roland_frozen_xmult or ret[1].xmult
return {
chip_mod = ability.Roland_frozen_chip_mod,
mult_mod = ability.Roland_frozen_mult_mod,
xmult = ability.Roland_frozen_xmult,
message = localize {
type = "variable",
key = "a_mult",
vars = {
ability.Roland_frozen_mult_mod or
ability.Roland_frozen_chip_mod or
ability.Roland_frozen_xmult,
},
},
}
return f {mult = "mult_mod", chips = "chip_mod", xmult = "xmult", x_mult = "x_mult"}:map(function(v)
local key = "Roland_frozen_" .. v
ability[key] = ability[key] or ret[1][v]
return ability[key]
end):where(f().id):table()
end
local orig_calculate_dollar_bonus = Card.calculate_dollar_bonus
@ -205,9 +186,21 @@ end
local orig_get_probability_vars = SMODS.get_probability_vars
function G.P_CENTERS.j_erosion: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)
if not ability then
return ret
end
ability.Roland_erosion_mult = ability.Roland_erosion_mult or ret
return ability.Roland_erosion_mult
end
function SMODS.get_probability_vars(trigger_obj, ...)
local numerator, denominator = orig_get_probability_vars(trigger_obj, ...)
return trigger_obj and trigger_obj.Roland_frozen_probability or numerator, denominator
return trigger_obj and (trigger_obj.Roland_frozen or {}).probability or numerator, denominator
end
q(function()
@ -217,19 +210,19 @@ q(function()
return
end
---@param card Card|{ Roland_frozen_estate: integer }
---@param card Card|{ Roland_frozen: {estate: integer} }
local function estate_pos(card)
if card.area ~= G.jokers and card.area.config.type ~= "title" then
return 1
end
card.Roland_frozen_estate = card.Roland_frozen_estate and
card.Roland_frozen_estate or
card.Roland_frozen.estate = card.Roland_frozen.estate and
card.Roland_frozen.estate or
(f(card.area.cards):swap():any(function(_, k)
return k == card
end) or 1)
return card.Roland_frozen_estate
return card.Roland_frozen.estate
end
local orig_calculate = estate.calculate
@ -268,18 +261,18 @@ q(function()
return
end
---@param card Card|{ Roland_frozen_proxy: number }
---@param card Card|{ Roland_frozen: {proxy: string} }
local function get_proxied_joker(card)
if not G.jokers or not G.jokers.cards then
return
end
card.Roland_frozen_proxy = card.Roland_frozen_proxy or
card.Roland_frozen.proxy = card.Roland_frozen.proxy or
(Bakery_API.get_proxied_joker() or card).config.center.key
---@param v Card
local function eq(v)
return v.config.center.key == card.Roland_frozen_proxy
return v.config.center.key == card.Roland_frozen.proxy
end
return f(G.jokers.cards):any(eq) ---@type Card?
@ -290,10 +283,10 @@ q(function()
function proxy:calculate(card, context, ...)
if not card or not card.edition or not card.edition.Roland_frozen then
return orig_calculate(self, card, context, ...)
end
else
return SMODS.blueprint_effect(card, get_proxied_joker(card), context)
end
end
local orig_loc_vars = proxy.loc_vars

11
src/joker.lua
View file

@ -438,7 +438,7 @@ joker {
pronouns = "they_them",
cost = 10,
rarity = 3,
config = {extra = {frozen = 2, non_frozen = 1}},
config = {extra = {frozen = 1}},
attributes = {"retrigger", "editions"},
eternal_compat = true,
blueprint_compat = true,
@ -449,9 +449,12 @@ joker {
calculate = function(_, card, context)
local extra = card.ability.extra
return (context.repetition and context.other_card) and
{card = card, repetitions = is_frozen(context.other_card) and extra.frozen or extra.non_frozen} or
SMODS.merge_effects(
if context.repetition and context.other_card then
local repetitions = is_frozen(context.other_card) and extra.frozen or extra.non_frozen
return repetitions ~= 0 and {card = card, repetitions = repetitions} or nil
end
return SMODS.merge_effects(
f(G.jokers.cards):where(is_frozen):map(function(v)
return SMODS.blueprint_effect(card, v, context) or true
end):where(function(v)

22
src/lib/funky.lua
View file

@ -18,6 +18,14 @@ end
---@type F
local none
---@generic T: F|function|string|nil
---@param func T
---@return T
---@nodiscard
local function autofunc(func)
return type(func) == "string" and f.index(func) or func or f.id
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)
@ -236,7 +244,7 @@ end
---@nodiscard
---@overload fun(self: F|{ [K]: V }, func: string): F|{ [K]: U }
function f:map(func)
func = type(func) == "string" and f.index(func) or func
func = autofunc(func)
return f.new(function()
local k, v = self:next()
@ -257,7 +265,7 @@ end
function f:flatmap(func, fpairs)
-- local i = 0
local vt, vk, vv, vp
func = type(func) == "string" and f.index(func) or func
func = autofunc(func)
return f.new(function()
if vk then
@ -307,7 +315,7 @@ end
function f:flatmap(func, fpairs)
-- local i = 0
local vt, vk, vv, vp
func = type(func) == "string" and f.index(func) or func
func = autofunc(func)
return f.new(function()
if vk then
@ -355,7 +363,7 @@ end
---@nodiscard
---@overload fun(self: F|{ [K]: V }, func: string, is?: any): F|{ [K]: V }
function f:where(func, is)
func = type(func) == "string" and f.index(func) or func
func = autofunc(func)
return f.new(function()
local k, v
@ -517,7 +525,7 @@ end
---@nodiscard
---@overload fun(self: F|{ [K]: V }, func: string?): boolean|V
function f:any(func)
func = type(func) == "string" and f.index(func) or func
func = autofunc(func)
for k, v in self.next do
if not func or func(v, k) then
@ -535,7 +543,7 @@ end
---@nodiscard
---@overload fun(self: F|{ [K]: V }, func: string?): boolean|V
function f:all(func)
func = type(func) == "string" and f.index(func) or func
func = autofunc(func)
for k, v in self.next do
if not func or not func(v, k) then
@ -554,7 +562,7 @@ end
---@overload fun(self: F|{ [K]: V }, func: string): integer
function f:count(func)
local ret = 0
func = type(func) == "string" and f.index(func) or func
func = autofunc(func)
for k, v in self.next do
if not func or func(v, k) then