Skip to content

add winning hand info to context.end_of_round #1180

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
lord-ruby wants to merge 7 commits into
base: main
Choose a base branch
from
+17 −3
Open

add winning hand info to context.end_of_round #1180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
df5b657
pass winning hand info into context.end_of_round
lord-ruby Jan 27, 2026
20585a6
Update better_calc.toml
lord-ruby Jan 27, 2026
aa5c028
fix crash when winning without playing a hand
lord-ruby Jan 27, 2026
ce00c19
cull destroyed cards from last_hand
lord-ruby Jan 27, 2026
1dce167
move setting last_hand earlier
lord-ruby Jan 27, 2026
18a6981
Update utils.lua
lord-ruby Jan 27, 2026
dfc88c0
Update utils.lua
lord-ruby Jan 28, 2026
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
9 changes: 7 additions & 2 deletions lovely/better_calc.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,7 @@ match_indent = true
position = "at"
payload = '''
-- context.before calculations
SMODS.last_hand = {scoring_hand = scoring_hand, scoring_name = text, full_hand = cards}
SMODS.calculate_context({full_hand = G.play.cards, scoring_hand = scoring_hand, scoring_name = text, poker_hands = poker_hands, before = true})

-- TARGET: effects before scoring starts
Expand Down Expand Up @@ -738,6 +739,8 @@ match_indent = true
position = "at"
payload = '''
-- context.after calculations
local cards = {}
for i, v in pairs(G.play.cards) do cards[#cards+1] = v end
SMODS.calculate_context({full_hand = G.play.cards, scoring_hand = scoring_hand, scoring_name = text, poker_hands = poker_hands, after = true})

-- TARGET: effects after hand evaluation'''
Expand Down Expand Up @@ -828,7 +831,9 @@ payload = '''
-- context.end_of_round calculations
SMODS.saved = false
G.GAME.saved_text = nil
SMODS.calculate_context({end_of_round = true, game_over = game_over, beat_boss = G.GAME.blind.boss })
SMODS.last_hand = SMODS.last_hand or {scoring_hand = {}, full_hand = {}}
SMODS.calculate_context({end_of_round = true, game_over = game_over, beat_boss = G.GAME.blind.boss, scoring_hand = SMODS.last_hand.scoring_hand, scoring_name = SMODS.last_hand.scoring_name, full_hand = SMODS.last_hand.full_hand })
SMODS.last_hand = nil
if SMODS.saved then game_over = false end
-- TARGET: main end_of_round evaluation
'''
Expand Down Expand Up @@ -2000,4 +2005,4 @@ if ret then
ret.colour = G.C.RED
return ret
end
'''
'''
11 changes: 10 additions & 1 deletion src/utils.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2089,6 +2089,15 @@ function SMODS.calculate_destroying_cards(context, cards_destroyed, scoring_hand
cards_destroyed[#cards_destroyed+1] = card
end
end
--cull destroyed cards from last_hand
if SMODS.last_hand then
local scoring = {}
local full = {}
for i, v in pairs(SMODS.last_hand.scoring_hand or {}) do if not v.getting_sliced then scoring[#scoring+1] = v end end
for i, v in pairs(SMODS.last_hand.full_hand or {}) do if not v.getting_sliced then full[#full+1] = v end end
SMODS.last_hand.scoring_hand = scoring
SMODS.last_hand.full_hand = full
end
end

function SMODS.blueprint_effect(copier, copied_card, context)
Expand Down Expand Up @@ -3428,4 +3437,4 @@ function SMODS.get_clean_pool(_type, _rarity, _legendary, _append)
end
end
return clean_pool
end
end