Skip to content

prevent unintended behaviour and crash in protostar #11

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.

Sign up for GitHub

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

Open
justamirror wants to merge 1 commit into
base: main
Choose a base branch
from
Open

prevent unintended behaviour and crash in protostar #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions objects/jokers/protostar.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ SMODS.Joker({
chips = card.ability.extra.chips
}
end
if context.after and not context.blueprint then
local change = G.GAME.hands[card.ability.extra.poker_hand].played * card.ability.extra.change
if context.after and not context.blueprint and (card.ability.extra.poker_hand ~= '') then
local poker_hand = card.ability.extra.poker_hand;
card.ability.extra.poker_hand = '';
local change = G.GAME.hands[poker_hand].played * card.ability.extra.change
if change >= card.ability.extra.chips then
card_eval_status_text(card,'extra', nil, nil, nil, {message = localize('ortalab_protostar')})
card.getting_sliced = true
Expand Down Expand Up @@ -51,15 +53,15 @@ SMODS.Joker({
ref_value = "chips",
scalar_value = "change",
operation = function(ref_table, ref_value, initial, change)
ref_table[ref_value] = initial - change * G.GAME.hands[card.ability.extra.poker_hand].played
ref_table[ref_value] = initial - change * G.GAME.hands[poker_hand].played
end,
scaling_message = {
message = localize{type = 'variable', key = 'a_chips_minus', vars = {card.ability.extra.change * G.GAME.hands[card.ability.extra.poker_hand].played}},
message = localize{type = 'variable', key = 'a_chips_minus', vars = {card.ability.extra.change * G.GAME.hands[poker_hand].played}},
colour = G.C.BLUE,
no_juice = true
}
})
end
end
end
})
})