diff --git a/manifest.json b/manifest.json index 8b68f7e..a8e2e9c 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "author": [ "Emik" ], - "version": "1.2.7", + "version": "1.2.8", "badge_colour": "8BE9FD", "main_file": "src/main.lua", "badge_text_colour": "44475A", diff --git a/src/joker.lua b/src/joker.lua index 16c2f36..bd7c90f 100644 --- a/src/joker.lua +++ b/src/joker.lua @@ -26,7 +26,7 @@ end local function is_mergeable_with(it) return function(card) return it.rank ~= card.rank and - card.key == "j_Roland_Escapey" and not + card.label == "j_Roland_escapey" and not (card.ability or {}).eternal end end @@ -55,7 +55,7 @@ SMODS.Joker { local quotes = loc_self.quotes local merge = G.jokers - and F.count(F.filter(G.jokers.cards, is_mergeable_with(card))) > 1 + and F.count(F.filter(G.jokers.cards, is_mergeable_with(card))) > 0 and loc_self.merge or {} local normal = (merge[1] or (Jen or Jane or {}).sinister) and {} or