epicknex/jeopardy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

added refresh when working with quiz folder, debug logs enabled in folder mode, added new zoom content

Browse Source
This commit is contained in:
Ryan Ward
2026-06-12 00:10:06 -07:00
parent e8ca768e87
commit ae97703bb4
13 changed files with 225 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
menus/board.lua
+178 -27
View File
@@ -6,6 +6,8 @@ local fmt = require("utils/fmt")
local timer = require("utils/utils")
local multi, thread = require("multi"):init()
local menu = require("gui.core.menus")
local transition = require("gui.core.transitions")
local logger = require("utils/logger")
local timesup = love.audio.newSource("assets/sounds/timesup.mp3", "static")
local double = love.audio.newSource("assets/sounds/double.mp3", "static")
@@ -18,12 +20,17 @@ local activePlayer
local playerList = {}
local playerStaticList = {}
local scoreboard = {}
local handler
local handler_conn = boardUpdater:newConnection()
local reference
local multiply
local reset = boardUpdater:newConnection()
local default_text = "Pick a Category"
local boardLog = log:child("board")
-- Function to resize fonts for all managed elements
boardLog:debug("Creating resize fonts handler")
local completed_questions = 0
local min_questions = 0
local dd_count = 0
@@ -31,6 +38,25 @@ local dd_enabled = false
local applied_dd = false
local board, question
local function cleanUp()
activePlayer = nil
handler_conn:Remove()
playerList = {}
playerStaticList = {}
scoreboard = {}
handler = nil
reference = nil
multiply = nil
reset:Remove()
default_text = "Pick a Category"
completed_questions = 0
min_questions = 0
dd_enabled = false
applied_dd = false
board = nil
question = nil
end
local function pickUniqueIndices(t, count)
assert(#t >= count, "Not enough elements to pick " .. count .. " unique items")
@@ -78,6 +104,15 @@ function applyDD()
end
end
local function setMultiplier(m)
multiply = m
end
local function useDefaultHandler(callback)
handler.visible = true
reference = handler_conn(callback)
end
local templateLog = log:child("template")
function LoadTemplate(name, path)
boardLog:debug("Loading Template: %s", name)
@@ -139,9 +174,11 @@ function LoadTemplate(name, path)
theme = theme,
gui = gui,
timer = timer,
useDefaultHandler = useDefaultHandler,
setMultiplier = setMultiplier,
-- love stuff
newSource = love.audio.newSource,
log = templateLog
log = templateLog,
}
env._G = env
@@ -172,14 +209,11 @@ function gui:cleanup()
completed_questions = completed_questions + 1
end
local reset = boardUpdater:newConnection()
local default_text = "Pick a Category"
function Menu(frame, path)
function Menu(frame, path, deb)
local frameRef = frame:newFrame():fullFrame()
frameRef.visibility = 0
boardLog:info("Building board")
if path:match(".zip") then
-- local basename = path:match("([^/\\]+)$")
local success = love.filesystem.mount(path, "quiz", true)
if not success then
gui:newMessageBox({
@@ -199,23 +233,133 @@ function Menu(frame, path)
path = "quiz"
end
local scoreboard = ScoreBoard(frameRef, 0, 0, 0, 0, .06, .1, .170, .8)
local qframe = frameRef:newFrame(0, 0, 0, 0, .24, .1, .70, .8)
local dframe = frameRef:newTextLabel("",0, 0, 0, 0, .24, .1, .7, .8)
dframe:scaleFont(.075)
dframe:centerFont()
dframe.align = gui.ALIGN_CENTER
dframe.color = color.bg
dframe.visible = false
dframe:OnReleased(function(self)
if self.click then
boardUpdater:newThread(function()
thread.skip(1)
dframe.visible = false
end)
end
end)
if deb then
boardLog.level = logger.LEVELS.DEBUG
templateLog.level = logger.LEVELS.DEBUG
boardLog:debug("Debug mode is activated when quiz directory is in the save directory")
local refresh = frameRef:newTextButton("Refresh", 0, -30, 140, 30, 0, 1)
refresh:centerFont()
refresh:scaleFont(.9)
refresh.align = gui.ALIGN_CENTER
refresh.color = color.green
refresh:OnReleased(function()
boardLog:debug("Cleaning up state and returning to title screen")
scoreboard:removeAllPlayers()
cleanUp()
frameRef:destroy()
menu.getMenu("title"):visible(true)
menu.getMenu("board"):visible(frame, path, deb)
end)
end
-- Start the processors now
boardLog:debug("Starting processors")
boardUpdater.Start()
boardLog:debug("Starting board-updater Started")
qUpdater.Start()
boardLog:debug("Starting question-updater Started")
scoreUpdater.Start()
boardLog:debug("Starting score-updater Started")
local scoreboard = ScoreBoard(frame, 0, 0, 0, 0, .06, .1, .170, .8)
local glide = transition.glide()
local qframe = frame:newFrame(0, 0, 0, 0, .24, .1, .70, .8)
local function displayAnswer(q)
dframe.text = q.answer
dframe.visible = true
dframe.click = q["display-mode"] == "click"
local sleep = 5
local fade = 1
if type(q["display-mode"]) == "number" then
sleep = q["display-mode"]
end
if type(q["display-fade"]) == "number" and q["display-fade"] > 0 then
fade = q["display-fade"]
end
if not dframe.click then
boardUpdater:newThread(function()
thread.sleep(sleep)
local handle = glide(1,0,fade)
handle:OnStep(function(p)
dframe.textVisibility = p
dframe.visibility = p
end)
handle:OnStop(function()
dframe.visible = false
dframe.textVisibility = 1
dframe.visibility = 1
handle.OnStep:Remove()
handle.OnStop:Remove()
end)
end)
end
end
local label = frameRef:newTextLabel(default_text, 0, 10, 0, -20, .29, 0, .6, .1)
handler = frameRef:newFrame(0, 10, 0, -20, .29, .9, .6, .1)
handler.visible = false
local correct = handler:newTextButton("Correct", 5,0,-10,0,0,.1,1/3,.8)
correct.color = color.correct
local skip = handler:newTextButton("Skip", 8,0,-15,0,1/3,.1,1/3,.8)
skip.color = color.skip
local wrong = handler:newTextButton("Wrong", 5,0,-10,0,2/3,.1,1/3,.8)
wrong.color = color.wrong
gui.apply({
setRoundness = {15,15,60},
centerFont = {},
scaleFont = {1/2},
align = gui.ALIGN_CENTER,
OnEnter = function(self)
self:setShader(gui.SHADERS.glow)
end,
OnExit = function(self)
self:setShader()
end,
OnReleased=function(self)
if self.text == "Skip" then
handler_conn:Fire()
reference:Unconnect()
handler.visible = false
return
end
local val = self.text == "Correct"
print(multiply)
handler_conn:Fire(val, multiply)
if val then
reference:Unconnect()
handler.visible = false
end
end,
},correct,skip,wrong)
local label = frame:newTextLabel(default_text, 0, 10, 0, -20, .29, 0, .6, .1)
label.visibility = .85
label.drawBorder = false
label.align = gui.ALIGN_CENTER
label.color = color.bg
label.textColor = color.status_font
label:setRoundness(20,20,60)
handler:setRoundness(20,20,60)
handler.visibility = .9
handler.color = color.bg
label:scaleFont(2/3)
label:centerFont()
@@ -261,10 +405,13 @@ function Menu(frame, path)
end
end
reset(function()
reset(function(q)
question:cleanup()
manageCosmetics(frame, cosmetics, true)
manageCosmetics(frame, cosmetics)
label.text = default_text
if q["display-answer"] then
displayAnswer(q)
end
end)
for cat,v in pairs(index.categories) do
@@ -307,7 +454,7 @@ function Menu(frame, path)
if dd_enabled then
applyDD() -- check and run DD if conditions meet
end
if index.categories[cat].questions == nil then boardLog:info("Question not defined: File: %s Category: %s - %s\n",path,index.categories[cat].name,start + inc*(tier-1)) return end
if index.categories[cat].questions == nil then boardLog:debug("Question not defined: File: %s Category: %s - %s",path,index.categories[cat].name,start + inc*(tier-1)) return end
local globals = index.categories[cat].global
if not globals then
globals = {}
@@ -321,7 +468,7 @@ function Menu(frame, path)
mt.__metatable = nil
end
setmetatable(q, {__index = globals})
if q == nil then boardLog:info("Question contains no data: File: %s Category: %s Tier: %s\n",path,index.categories[cat].name,start + inc*(tier-1)) return end
if q == nil then boardLog:debug("Question contains no data: File: %s Category: %s Tier: %s",path,index.categories[cat].name,start + inc*(tier-1)) return end
if q.cosmetics then
manageCosmetics(frame, q.cosmetics)
end
@@ -364,14 +511,14 @@ function Menu(frame, path)
player:Add((self.price*mul)*m)
finished = true
question.visible = false
reset:Fire()
reset:Fire(q)
elseif ans == false then
player:Add(-self.price*mul)
player = GetNextPlayer()
else
finished = true
question.visible = false
reset:Fire()
reset:Fire(q)
end -- nil is a valid option where you weren't right or wrong, you just skipped
self.text = ""
end)
@@ -488,13 +635,10 @@ function ScoreBoard(frame, x, y, w, h, sx, sy, sw, sh)
textColor = C_TEXT_MUTED,
}, headernum, headerplayer, headerscore)
local updateList = {headernum, headerplayer, headerscore}
local updateList = {headernum, headerplayer, headerscore, header}
header:centerFont()
header:scaleFont(2/3)
for _,object in pairs(updateList) do
object:fitFont(nil, nil, {scale = 5/6})
object:scaleFont(2/3)
object:centerFont()
end
@@ -533,10 +677,12 @@ function ScoreBoard(frame, x, y, w, h, sx, sy, sw, sh)
local add_player = leaderboard:newFrame(5,-5,-10,0,0,1-PLAYER_HEIGHT,1,PLAYER_HEIGHT)
local edit_player = leaderboard:newFrame(5,-10,-10,0,0,1-2*PLAYER_HEIGHT,1,PLAYER_HEIGHT)
local remove_player = leaderboard:newTextButton("Remove Selected",5,-15,-10,0,0,1-3*PLAYER_HEIGHT,1,PLAYER_HEIGHT)
remove_player:setFont(20)
remove_player.align = gui.ALIGN_CENTER
local embededWatch = {remove_player}
remove_player:centerFont()
gui.apply({
centerFont = {},
scaleFont = {.5}
},add_player,edit_player,remove_player)
local function embedTextEdit(reference, default, but_text, callback)
reference.color = C_BORDER_NRM
@@ -555,7 +701,7 @@ function ScoreBoard(frame, x, y, w, h, sx, sy, sw, sh)
callback(textbox)
end)
gui.apply({
setFont = {20},
scaleFont = {.5},
align = gui.ALIGN_CENTER,
centerFont = {},
},textbox,button,reference)
@@ -593,6 +739,11 @@ function ScoreBoard(frame, x, y, w, h, sx, sy, sw, sh)
end
end)
function scoreboard:removeAllPlayers()
playerList = {}
playerStaticList = {}
end
function scoreboard:RenderPlayer(list)
for index, player in ipairs(list) do
if player.Ref then