emik/Roland
1
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix merge ability

Browse source
This commit is contained in:
Emik 2025-04-05 03:09:42 +02:00
parent 3e1317ec08
commit db5ced1704
Signed by untrusted user who does not match committer: emik
GPG key ID: 09CDFF9E5703688D
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manifest.json
View file

@ -6,7 +6,7 @@
"author": [ "author": [
"Emik" "Emik"
], ],
"version": "1.2.7", "version": "1.2.8",
"badge_colour": "8BE9FD", "badge_colour": "8BE9FD",
"main_file": "src/main.lua", "main_file": "src/main.lua",
"badge_text_colour": "44475A", "badge_text_colour": "44475A",

4
src/joker.lua
View file

@ -26,7 +26,7 @@ end
local function is_mergeable_with(it) local function is_mergeable_with(it)
return function(card) return function(card)
return it.rank ~= card.rank and return it.rank ~= card.rank and
card.key == "j_Roland_Escapey" and not card.label == "j_Roland_escapey" and not
(card.ability or {}).eternal (card.ability or {}).eternal
end end
end end
@ -55,7 +55,7 @@ SMODS.Joker {
local quotes = loc_self.quotes local quotes = loc_self.quotes
local merge = G.jokers 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 {} and loc_self.merge or {}
local normal = (merge[1] or (Jen or Jane or {}).sinister) and {} or local normal = (merge[1] or (Jen or Jane or {}).sinister) and {} or