Skip to content

Commit 99bded1

Browse files
committed
fixed order and logic of safety net (and naming)
1 parent b16b70b commit 99bded1

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

items/misc_joker.lua

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,12 +239,15 @@ local potofjokes = {
239239
end,
240240
calculate = function(self, card, context)
241241
if context.end_of_round and not context.individual and not context.repetition and not context.blueprint then
242-
G.hand:change_size(math.min(math.max(0, 1000 - card.ability.extra.h_size), card.ability.extra.h_mod))
243-
card.ability.extra.h_size = card.ability.extra.h_size + card.ability.extra.h_mod
244-
if to_big(card.ability.extra.h_size) > 1000 then
242+
if to_big(card.ability.extra.h_size) + to_big(card.ability.extra.h_mod) >= to_big(1000) then
245243
card.ability.extra.h_size = 1000
246-
card.abiliyt.extra.h_mod = 0
244+
card.ability.extra.h_mod = 0
247245
end
246+
247+
G.hand:change_size(math.min(math.max(0, 1000 - card.ability.extra.h_size), card.ability.extra.h_mod))
248+
249+
card.ability.extra.h_size = card.ability.extra.h_size + card.ability.extra.h_mod
250+
248251
return {
249252
message = localize({ type = "variable", key = "a_handsize", vars = { card.ability.extra.h_mod } }),
250253
colour = G.C.FILTER,

0 commit comments

Comments
 (0)