diff --git a/manifest.json b/manifest.json index 6687bb6..73868ad 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "id": "Roland", "name": "Roland", "prefix": "Roland", - "version": "2.9.59", + "version": "2.9.60", "badge_colour": "8BE9FD", "display_name": "Roland", "main_file": "src/main.lua", diff --git a/src/joker.lua b/src/joker.lua index 294bc6c..f5d11ef 100644 --- a/src/joker.lua +++ b/src/joker.lua @@ -720,12 +720,8 @@ joker { end, crimson = function() local _ = G.jokers and f(G.jokers.cards, ipairs_reversed):where(is_frozen, false):each(function(v) - local right = G.jokers.cards[v.rank + 1] - - local debuffed_by_crimson = right and - not right.debuff and - right.config.center.key == "j_Roland_crimson" and - not ({j_mp_turtle_bean = true, j_turtle_bean = true})[v.config.center.key] + local r = G.jokers.cards[v.rank + 1] + local debuffed_by_crimson = r and not r.debuff and r.config.center.key == "j_Roland_crimson" if debuffed_by_crimson and v.ability.Roland_crimson == nil then local debuff = not not v.debuff diff --git a/src/main.lua b/src/main.lua index e31eb99..5b2a9f5 100644 --- a/src/main.lua +++ b/src/main.lua @@ -1,5 +1,7 @@ local qol = assert(SMODS.load_file "src/lib/shared.lua")() or require "lib.shared" local f, q = qol[1], qol[2] +SMODS.current_mod.qol = qol +local animated = SMODS.Mods.Roland.config.animated_icon q { front = true, @@ -53,9 +55,6 @@ local function toggle(id) }) end -SMODS.current_mod.qol = qol -local animated = SMODS.Mods.Roland.config.animated_icon - SMODS.Atlas { px = 256, py = 256,