diff --git a/manifest.json b/manifest.json index 90f836d..90799a1 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "id": "Roland", "name": "Roland", "prefix": "Roland", - "version": "2.9.76", + "version": "2.9.77", "badge_colour": "8BE9FD", "display_name": "Roland", "main_file": "src/main.lua", diff --git a/src/spectral.lua b/src/spectral.lua index 89d0f87..8bc458d 100644 --- a/src/spectral.lua +++ b/src/spectral.lua @@ -38,7 +38,7 @@ spectral { return {vars = {card.ability.extra.amount}} end, can_use = function() - return u() and #G.hand.cards > 0 + return next(G.hand.cards) and u() end, use = function(_, card, _) local cards = f(G.hand.cards):table() @@ -132,7 +132,8 @@ spectral { return {vars = {card.ability.extra.amount}} end, can_use = function(_, card) - return u() and #Bakery_API.get_highlighted() <= card.ability.extra.amount + local count = #Bakery_API.get_highlighted() + return u() and count > 0 and count <= card.ability.extra.amount end, use = function(_, _, _) f(Bakery_API.get_highlighted()):each(function(v) diff --git a/src/tarot.lua b/src/tarot.lua index 2d4d24e..7b3b5de 100644 --- a/src/tarot.lua +++ b/src/tarot.lua @@ -26,8 +26,9 @@ q(SMODS.Consumable { end local highlighted = Bakery_API.get_highlighted() + local count = #G.jokers.highlighted + #highlighted - return #G.jokers.highlighted + #highlighted <= card.ability.extra.amount and + return count > 0 and count <= card.ability.extra.amount and f(G.jokers.highlighted):concat(highlighted):all(function(v) return not v.edition end)