Compare commits

..

No commits in common. "main" and "1.11.0" have entirely different histories.
main ... 1.11.0

View file

@ -622,7 +622,7 @@ SMODS.Joker {
end, end,
update = function(_, card, _) update = function(_, card, _)
if card.edition and card.edition.Roland_frozen then if card.edition and card.edition.Roland_frozen then
card:set_edition("e_base") card:set_edition("e_jane_moire")
elseif card.children.floating_sprite then elseif card.children.floating_sprite then
card.children.floating_sprite:set_sprite_pos({x = card.ability.extra.is_attuned and 2 or 1, y = 0}) card.children.floating_sprite:set_sprite_pos({x = card.ability.extra.is_attuned and 2 or 1, y = 0})
end end
@ -667,8 +667,7 @@ SMODS.Joker {
end end
if extra.karma >= max_karma then if extra.karma >= max_karma then
local karma = (extra.is_attuning or extra.is_attuned) and 0 or extra.karma G.jokers:change_size((extra.is_attuned and 0 or extra.karma) * extra.jokers)
G.jokers:change_size(karma * extra.jokers)
ascend() ascend()
end end