diff --git a/manifest.json b/manifest.json index e1e4dc1..ea1e4c8 100644 --- a/manifest.json +++ b/manifest.json @@ -18,5 +18,5 @@ "conflicts": [ "Jen" ], - "version": "1.11.23" + "version": "1.11.24" } \ No newline at end of file diff --git a/src/joker.lua b/src/joker.lua index 2366dce..1f6fef7 100644 --- a/src/joker.lua +++ b/src/joker.lua @@ -279,7 +279,7 @@ SMODS.Joker { end, } -function Jane.update_honey() +function Jane.check_honey() if not G.GAME then return true end @@ -351,6 +351,7 @@ SMODS.Joker { blueprint_compat = false, cost = 8, rarity = 3, + add_to_deck = Jane.check_honey, loc_vars = function(_, _, card) local level = tonumber(card.ability.extra.level) or 1 @@ -394,8 +395,7 @@ SMODS.Joker { } end, draw = function(_, card) - if not Jane.update_honey() and - card.added_to_deck and + if card.added_to_deck and card.children.center and card.children.floating_sprite then local extra = card.ability.extra or {} diff --git a/src/slugcat.lua b/src/slugcat.lua index db68ca3..818cd7a 100644 --- a/src/slugcat.lua +++ b/src/slugcat.lua @@ -630,13 +630,15 @@ SMODS.Joker { local rgb = G.C.jane_RGB rgb[1], rgb[2], rgb[3] = Jane.hsv(1 - (G.TIMERS.REAL / 3 % 1), math.sin(G.TIMERS.REAL) / 10 + 0.6, 1) - if card.edition and card.edition.Roland_frozen then - card:set_edition("e_base") - elseif card.config.center.key == "j_jane_saint" and card.children.floating_sprite then + local _ = card and + card.children.floating_sprite and card.children.floating_sprite:set_sprite_pos({x = card.ability.extra.is_attuned and 2 or 1, y = 0}) - end end, calculate = function(self, card, context) + if card.edition and card.edition.Roland_frozen then + card:set_edition("e_base", true) + end + local extra = card.ability.extra extra.is_attuned = extra.is_attuned and extra.karma >= 0