Skip to content

Commit 241e013

Browse files
Fix incorrect Maximized + High Five interaction
1 parent 3be098e commit 241e013

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

items/misc_joker.lua

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7916,21 +7916,25 @@ local highfive = {
79167916
discovered = true,
79177917
calculate = function(self, card, context)
79187918
if context.final_scoring_step then
7919-
local maximum = -math.huge
7919+
local maximum = -1
7920+
local fives = 0
79207921
for k, v in ipairs(context.scoring_hand) do
79217922
if not SMODS.has_no_rank(v) then
7922-
local thunk = v.base.value == "Ace" and 1 or v.base.nominal
7923+
local thunk = v:get_id() == 14 and 1 or v:get_id()
7924+
if thunk == 5 then
7925+
fives = fives + 1
7926+
end
79237927
if thunk > maximum then
79247928
maximum = thunk
79257929
end
79267930
end
79277931
end
79287932

79297933
local whapoosh = false
7930-
if maximum == 5 then
7934+
if maximum == 5 and fives ~= #context.scoring_hand then
79317935
for index = 1, #context.scoring_hand do
79327936
local v = context.scoring_hand[index]
7933-
if v.base.value ~= "5" and not SMODS.has_no_rank(v) then
7937+
if v:get_id() ~= "5" and not SMODS.has_no_rank(v) then
79347938
whapoosh = true
79357939
G.E_MANAGER:add_event(Event({
79367940
func = function()

0 commit comments

Comments
 (0)