From cc8c514fa013fcd36ac97aacda41b8391b1564f5 Mon Sep 17 00:00:00 2001 From: paulkent-coder Date: Sun, 10 May 2026 20:08:50 -0400 Subject: [PATCH] Block merging playing cards with non-playing cards --- items/misc.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/items/misc.lua b/items/misc.lua index e78758351..5eb97ca98 100644 --- a/items/misc.lua +++ b/items/misc.lua @@ -2435,6 +2435,7 @@ G.FUNCS.can_merge_ds = function(e) and not other.merged and card.area and card.area.config.type ~= "shop" + and (not not card.playing_card) == (not not other.playing_card) then e.config.colour = G.C.PURPLE e.config.button = "merge_ds"