diff --git a/manifest.json b/manifest.json index f887ce5..debf2a1 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "id": "Roland", "name": "Roland", "prefix": "Roland", - "version": "2.8.18", + "version": "2.8.19", "badge_colour": "8BE9FD", "display_name": "Roland", "main_file": "src/main.lua", diff --git a/src/joker.lua b/src/joker.lua index 7d7141b..3201971 100644 --- a/src/joker.lua +++ b/src/joker.lua @@ -242,10 +242,8 @@ joker { table.insert(info_queue, negative) end, calculate = function(_, _, context) - return (context.selling_self or context.forcetrigger) and f(G.consumeables.cards):where(function(v) - return v.config.center.set ~= "Joker" - end):each(function(v) - q { + return (context.selling_self or context.forcetrigger) and f(G.consumeables.cards):each(function(v) --@type Card + return v.ability.consumeable and q { delay = 1, func = function() play_sound "timpani" diff --git a/src/lib/funky.lua b/src/lib/funky.lua index 9d1241b..dd37382 100644 --- a/src/lib/funky.lua +++ b/src/lib/funky.lua @@ -640,7 +640,7 @@ end ---@generic K, V ---@param self F|{ [K]: V } ----@param func? fun(v: V, k: K) +---@param func? fun(v: V, k: K): nil function f:each(func) for k, v in self.next do if func then