Skip to content

Block merging playing cards with non-playing cards #856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
paulkent-coder wants to merge 1 commit into
base: main
Choose a base branch
from
+1 −0
Open

Block merging playing cards with non-playing cards #856

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions items/misc.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down