Skip to content

SMODS.scale_card scalar_factor #1329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vitellaryjr wants to merge 3 commits into
base: main
Choose a base branch
from
Open

SMODS.scale_card scalar_factor #1329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e2966d
implement 'scalar_factor' and auto scalar_value
vitellaryjr Apr 10, 2026
3485d2d
lsp def
vitellaryjr Apr 10, 2026
eef2898
add returns to scale_card
vitellaryjr May 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 7 additions & 17 deletions lovely/scaling.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ SMODS.scale_card(self, {
ref_value = "mult",
scalar_table = sliced_card,
scalar_value = "sell_cost",
operation = function(ref_table, ref_value, initial, scaling)
ref_table[ref_value] = initial + 2*scaling
end,
scalar_factor = 2,
scaling_message = {
message = localize{type = 'variable', key = 'a_mult', vars = {self.ability.mult+2*sliced_card.sell_cost}},
colour = G.C.RED,
Expand Down Expand Up @@ -492,11 +490,9 @@ SMODS.scale_card(self, {
ref_table = self.ability,
ref_value = "x_mult",
scalar_value = "extra",
scalar_factor = #enhanced,
message_key = 'a_xmult',
message_colour = G.C.MULT,
operation = function(ref_table, ref_value, initial, scaling)
ref_table[ref_value] = initial + scaling*#enhanced
end
message_colour = G.C.MULT
})
return nil, true
'''
Expand All @@ -516,10 +512,8 @@ SMODS.scale_card(self, {
ref_table = self.ability,
ref_value = "x_mult",
scalar_value = "extra",
message_key = 'a_xmult',
operation = function(ref_table, ref_value, initial, scaling)
ref_table[ref_value] = initial + scaling*#context.cards
end
scalar_factor = #context.cards,
message_key = 'a_xmult'
})
'''

Expand Down Expand Up @@ -672,9 +666,7 @@ SMODS.scale_card(self, {
ref_table = self.ability,
ref_value = 'caino_xmult',
scalar_value = 'extra',
operation = function(ref_table, ref_value, initial, change)
ref_table[ref_value] = initial + face_cards*change
end,
scalar_factor = face_cards,
message_key = 'a_xmult'
})
return nil, true
Expand All @@ -700,9 +692,7 @@ SMODS.scale_card(self, {
ref_table = self.ability,
ref_value = 'x_mult',
scalar_value = 'extra',
operation = function(ref_table, ref_value, initial, change)
ref_table[ref_value] = initial + glass_cards*change
end,
scalar_factor = glass_cards,
message_key = 'a_xmult'
})
'''
9 changes: 6 additions & 3 deletions lsp_def/utils.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,9 +718,12 @@ function SMODS.is_poker_hand_visible(handname) end
function SMODS.is_eternal(card, trigger) end

---@param card Card|table
---@param args? table|{ref_table: table, ref_value: string, scalar_value: string, scalar_table: table?, operation: '+'|'X'|'-'|string|fun(ref_table: table, ref_value: string, initial: number, change: number)?, block_overrides: {value: boolean?, scalar: boolean?, message: boolean?}?, scaling_message: table?, message_key: string?, message_colour: table?, message_delay: number?, no_message: boolean?}
--- Tells Jokers that this card is scaling allowing for scaling detection
--- Args must contain `ref_table`, `ref_value`, and `scalar_value`. It may optionally contain `scalar_table`, used in place of `ref_table` for the `scalar_value`, and `operation` to designate the scaling operation, which defaults to `"+"`
---@param args? table|{ref_table: table, ref_value: string, scalar_value: string?, scalar_table: table?, scalar_factor:number?, operation: '+'|'X'|'-'|string|fun(ref_table: table, ref_value: string, initial: number, change: number)?, block_overrides: {value: boolean?, scalar: boolean?, message: boolean?}?, scaling_message: table?, message_key: string?, message_colour: table?, message_delay: number?, no_message: boolean?}
---@return number, number
--- Tells Jokers that this card is scaling allowing for scaling detection.
--- Args must contain `ref_table` and `ref_value`. If `scalar_value` is not defined, it is automatically created.
--- It may also optionally contain `scalar_table`, used in place of `ref_table` for the `scalar_value`, and `operation` to designate the scaling operation, which defaults to `"+"`
--- Returns the final scaled value, and what it had been scaled by
function SMODS.scale_card(card, args) end

---@param prototype_obj SMODS.GameObject|table
Expand Down
16 changes: 11 additions & 5 deletions src/utils.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3076,7 +3076,12 @@ function SMODS.scale_card(card, args)
args.ref_table = args.ref_table or card.ability.extra
args.scalar_table = args.scalar_table or args.ref_table
local initial = args.ref_table[args.ref_value]
if not args.scalar_value then
args.scalar_value = "SMODS_scalar_"..args.ref_value
args.scalar_table[args.scalar_value] = 1
end
local scalar_value = args.scalar_table[args.scalar_value]
local scalar_factor = args.scalar_factor or 1
if args.operation == '-' and scalar_value < 0 then scalar_value = scalar_value * -1 end
local scaling_message = args.scaling_message
local scaling_responses = {}
Expand Down Expand Up @@ -3110,17 +3115,17 @@ function SMODS.scale_card(card, args)
end

if type(args.operation) == 'function' then
args.operation(args.ref_table, args.ref_value, initial, scalar_value)
args.operation(args.ref_table, args.ref_value, initial, scalar_value * scalar_factor)
elseif args.operation == 'X' then
SMODS.multiplicative_scaling(args.ref_table, args.ref_value, initial, scalar_value)
SMODS.multiplicative_scaling(args.ref_table, args.ref_value, initial, scalar_value * scalar_factor)
elseif args.operation == '-' then
SMODS.additive_scaling(args.ref_table, args.ref_value, initial, -1 * scalar_value)
SMODS.additive_scaling(args.ref_table, args.ref_value, initial, -1 * scalar_value * scalar_factor)
else
SMODS.additive_scaling(args.ref_table, args.ref_value, initial, scalar_value)
SMODS.additive_scaling(args.ref_table, args.ref_value, initial, scalar_value * scalar_factor)
end

scaling_message = scaling_message or {
message = localize(args.message_key and {type='variable',key=args.message_key,vars={args.message_key =='a_xmult' and args.ref_table[args.ref_value] or scalar_value}} or 'k_upgrade_ex'),
message = localize(args.message_key and {type='variable',key=args.message_key,vars={args.message_key =='a_xmult' and args.ref_table[args.ref_value] or scalar_value * scalar_factor}} or 'k_upgrade_ex'),
colour = args.message_colour or G.C.FILTER,
delay = args.message_delay,
}
Expand All @@ -3130,6 +3135,7 @@ function SMODS.scale_card(card, args)
for _, ret in ipairs(scaling_responses) do
SMODS.calculate_effect(ret, ret.source)
end
return args.ref_table[args.ref_value], scalar_value * scalar_factor
end

function SMODS.additive_scaling(ref_table, ref_value, initial, modifier)
Expand Down