Skip to content

Fix crash when copying Alberto #7

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

Closed
wingedcatgirl wants to merge 1 commit into from
Closed

Fix crash when copying Alberto #7

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
27 changes: 13 additions & 14 deletions other_j/feli.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,32 +271,31 @@ SMODS.Joker {
loc_vars = function(self, info_queue, card)
return {
vars = {
card.ability.extra.xmult, card.ability.imm.rank.key,
card.ability.extra.xmult, localize(card.ability.imm.rank.key, "ranks"),
}
}
end,
load = function(self, card, card_table, other_card)
G.E_MANAGER:add_event(Event({
func = function()
card.ability.imm.rank = pseudorandom_element(SMODS.Ranks, pseudoseed('j_bd_alberto'))
return true
end
}))

end,
set_ability = function(self, card, initial, info_queue)
card.ability.imm.rank = pseudorandom_element(SMODS.Ranks, pseudoseed('j_bd_alberto'))
local rank = pseudorandom_element(SMODS.Ranks, pseudoseed('j_bd_alberto'))
card.ability.imm.rank = {
id = rank.id,
key = rank.key
}
end,
calculate = function(self, card, context)
if context.individual and context.cardarea == G.hand and not context.end_of_round then
if context.other_card:get_id() == card.ability.imm.rank.nominal then
if context.other_card:get_id() == card.ability.imm.rank.id then
return {
xmult = card.ability.extra.xmult
}
end
end
if context.end_of_round and context.main_eval and not context.game_over then
card.ability.imm.rank = pseudorandom_element(SMODS.Ranks, pseudoseed('j_bd_alberto'))
local rank = pseudorandom_element(SMODS.Ranks, pseudoseed('j_bd_alberto'))
card.ability.imm.rank = {
id = rank.id,
key = rank.key
}
return {
message = "Changed!",
colour = G.C.FILTER,
Expand All @@ -317,7 +316,7 @@ SMODS.Joker {
local xmult = 1
for _, playing_card in ipairs(G.hand.cards) do
if playing_hand or not playing_card.highlighted then
if playing_card.facing and not (playing_card.facing == 'back') and not playing_card.debuff and playing_card:get_id() == card.ability.imm.rank.nominal then
if playing_card.facing and not (playing_card.facing == 'back') and not playing_card.debuff and playing_card:get_id() == card.ability.imm.rank.id then
xmult = xmult * (card.ability.extra.xmult ^ JokerDisplay.calculate_card_triggers(playing_card, nil, true))
end
end
Expand Down