Skip to content

fix Eclipse joker to not crash with other mods (talisman) #43

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
Saydyrya90 wants to merge 3 commits into
base: main
Choose a base branch
from
+12 −5
Open

fix Eclipse joker to not crash with other mods (talisman) #43

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a586bd5
ExtraCredit Cryptid compatibility for ease dollars
Saydyrya90 Mar 13, 2025
cab8781
Merge branch 'GuilloryCraft:main' into main
Saydyrya90 Mar 24, 2025
cfca085
fix Eclipse joker to not crash with other mods (talisman)
Saydyrya90 Mar 24, 2025
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
17 changes: 12 additions & 5 deletions src/essay.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,16 @@ local function sum_levels()
end
local ed = ease_dollars
function ease_dollars(mod, x)
ed(mod, x)
-- Use Talisman's to_number if available
local safe_mod = type(mod) == "table" and (to_number and to_number(mod) or tonumber(mod)) or mod
local safe_x = type(x) == "table" and (to_number and to_number(x) or tonumber(x)) or x
-- If conversion fails, default to 0
safe_mod = safe_mod or 0
safe_x = safe_x or 0
-- Call original ease_dollars with converted values
ed(safe_mod, safe_x)
for i = 1, #G.jokers.cards do
local effects = G.jokers.cards[i]:calculate_joker({ EC_ease_dollars = mod })
local effects = G.jokers.cards[i]:calculate_joker({ EC_ease_dollars = safe_x })
end
end

Expand Down Expand Up @@ -402,10 +409,10 @@ SMODS.Joker{ --Eclipse
end,

calculate = function(self, card, context)
if context.cardarea == G.jokers and (sum_levels() - 12) > 0 and context.joker_main then
if context.cardarea == G.jokers and (sum_levels() - to_big(12)) > to_big(0) and context.joker_main then
return {
message = localize{type='variable',key='a_chips',vars={(sum_levels()-12)*card.ability.extra.chip_mod}},
chip_mod = (sum_levels()-12)*card.ability.extra.chip_mod,
message = localize{type='variable',key='a_chips',vars={(sum_levels() - to_big(12))*card.ability.extra.chip_mod}},
chip_mod = (sum_levels() - to_big(12))*card.ability.extra.chip_mod,
colour = G.C.CHIPS
}
end
Expand Down