Skip to content
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.

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

Small fix for nice joker #378

Merged
merged 1 commit into from
Feb 4, 2025
Merged
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions items/misc_joker.lua
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@ local nice = {
return { vars = { center.ability.extra.chips } }
end,
calculate = function(self, card, context)
if context.cardarea == G.jokers and context.before and not context.after then
if context.cardarea == G.jokers and context.before then
card.ability.extra.sixcount = 0
card.ability.extra.ninecount = 0
for i, v in pairs(context.full_hand) do
Expand All @@ -973,7 +973,7 @@ local nice = {
card.ability.extra.ninecount = card.ability.extra.ninecount + 1
end
end
elseif context.cardarea == G.jokers and not context.before and not context.after then
elseif context.cardarea == G.jokers and context.joker_main then
if card.ability.extra.sixcount > 0 and card.ability.extra.ninecount > 0 then
return {
message = localize({ type = "variable", key = "a_chips", vars = { card.ability.extra.chips or 0 } }),
Expand Down