Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
43 changes: 22 additions & 21 deletions lovely.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,33 +18,34 @@ assembled_string = assembled_string..(type(subpart) == 'string' and subpart or (
'''
match_indent = true

#i know its ugly but its to make sure it doesnt do stuff when talisman is installed
[[patches]]
[patches.pattern]
target = "functions/common_events.lua"
pattern = "elseif eval_type == 'dollars' then"
position = "before"
payload = '''
elseif eval_type == 'x_chips' then
sound = 'cry_xchip'
amt = amt
text = 'X' .. number_format(amt)
colour = G.C.CHIPS
config.type = 'fade'
config.scale = 0.7
elseif eval_type == 'e_chips' then
sound = 'cry_echips'
amt = amt
text = '^' .. number_format(amt) .. ' ' .. localize('k_chips')
colour = G.C.DARK_EDITION
config.type = 'fade'
config.scale = 0.7
elseif eval_type == 'e_mult' then
sound = 'cry_emult'
amt = amt
text = '^' .. number_format(amt) .. ' ' .. localize('k_mult')
colour = G.C.DARK_EDITION
config.type = 'fade'
config.scale = 0.7
elseif eval_type == 'x_chips' and not (SMODS.Mods["Talisman"] or {}).can_load then
sound = 'cryl_xchip'
amt = amt
text = 'X' .. number_format(amt)
colour = G.C.CHIPS
config.type = 'fade'
config.scale = 0.7
elseif eval_type == 'e_chips' and not (SMODS.Mods["Talisman"] or {}).can_load then
sound = 'cryl_echips'
amt = amt
text = '^' .. number_format(amt) .. ' ' .. localize('k_chips')
colour = G.C.DARK_EDITION
config.type = 'fade'
config.scale = 0.7
elseif eval_type == 'e_mult' and not (SMODS.Mods["Talisman"] or {}).can_load then
sound = 'cryl_emult'
amt = amt
text = '^' .. number_format(amt) .. ' ' .. localize('k_mult')
colour = G.C.DARK_EDITION
config.type = 'fade'
config.scale = 0.7
'''
match_indent = true

Expand Down
4 changes: 2 additions & 2 deletions talisman.lua
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ if SMODS and SMODS.Mods and (not SMODS.Mods.Talisman or not SMODS.Mods.Talisman.
end
end
for _, v in ipairs({
"e_mult",
"e_chips",
"e_mult", "emult", "Emult_mod",
"e_chips", "echips", "Echips_mod",
}) do
table.insert(SMODS.scoring_parameter_keys, v)
end
Expand Down