This commit is contained in:
2024-03-09 13:30:29 +08:00
parent 9b88453b4e
commit 7f124132ed
29 changed files with 1831 additions and 1720 deletions

View File

@@ -4771,19 +4771,24 @@ function G.UIDEF.run_setup(from_game_over)
tab_definition_function = G.UIDEF.run_setup_option,
tab_definition_function_args = 'New Run'
},
{
G.STAGE == G.STAGES.MAIN_MENU and {
label = localize('b_continue'),
chosen = (not _challenge_chosen) and _can_continue,
tab_definition_function = G.UIDEF.run_setup_option,
tab_definition_function_args = 'Continue',
func = 'can_continue'
},
{
} or {
label = localize('b_challenges'),
tab_definition_function = G.UIDEF.challenges,
tab_definition_function_args = from_game_over,
chosen = _challenge_chosen
},
G.STAGE == G.STAGES.MAIN_MENU and {
label = localize('b_challenges'),
tab_definition_function = G.UIDEF.challenges,
tab_definition_function_args = from_game_over,
chosen = _challenge_chosen
} or nil,
},
snap_to_nav = true}),
}},
@@ -5021,7 +5026,7 @@ end
function G.UIDEF.challenge_description(_id, daily, is_row)
local challenge = G.CHALLENGES[_id]
if not challenge then return {n=G.UIT.ROOT, config={align = "cm", colour = G.C.BLACK, minh = 8.82, minw = 11.5, r = 0.1}, nodes={{n=G.UIT.T, config={text = "Select a Challenge", scale = 0.3, colour = G.C.UI.TEXT_LIGHT}}}} end
if not challenge then return {n=G.UIT.ROOT, config={align = "cm", colour = G.C.BLACK, minh = 8.82, minw = 11.5, r = 0.1}, nodes={{n=G.UIT.T, config={text = localize('ph_select_challenge'), scale = 0.3, colour = G.C.UI.TEXT_LIGHT}}}} end
local joker_size = 0.6
local jokers = CardArea(0,0,