Skip to content

Commit 735463b

Browse files
Make Zooble ignore Stone Cards
1 parent 500cb27 commit 735463b

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

items/misc_joker.lua

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7617,14 +7617,16 @@ local zooble = {
76177617
if not (next(context.poker_hands["Straight"]) or next(context.poker_hands["Straight Flush"])) then
76187618
local unique_ranks = {}
76197619
for i, v in pairs(context.scoring_hand) do
7620-
local not_unique = false
7621-
for i = 1, #unique_ranks do
7622-
if unique_ranks[i] == v:get_id() then
7623-
not_unique = true
7620+
if not (SMODS.has_no_rank(v) and not v.vampired) then
7621+
local not_unique = false
7622+
for i = 1, #unique_ranks do
7623+
if unique_ranks[i] == v:get_id() then
7624+
not_unique = true
7625+
end
7626+
end
7627+
if not not_unique then
7628+
unique_ranks[#unique_ranks + 1] = v:get_id()
76247629
end
7625-
end
7626-
if not not_unique then
7627-
unique_ranks[#unique_ranks + 1] = v:get_id()
76287630
end
76297631
end
76307632
if #unique_ranks >= 1 then
@@ -7637,7 +7639,7 @@ local zooble = {
76377639
end
76387640
end
76397641
end
7640-
if context.joker_main and context.cardarea == G.jokers then
7642+
if context.joker_main and card.ability.extra.mult > 0 then
76417643
return {
76427644
message = localize({ type = "variable", key = "a_mult", vars = { card.ability.extra.mult } }),
76437645
mult_mod = card.ability.extra.mult,

0 commit comments

Comments
 (0)