Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 691c3adb37 | |||
| ae97703bb4 | |||
| e8ca768e87 | |||
| 9a908e89ae | |||
| 3109844765 |
+11
@@ -0,0 +1,11 @@
|
||||
{
|
||||
"$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json",
|
||||
"runtime.version": "LuaJIT",
|
||||
"diagnostics.globals": [
|
||||
"love"
|
||||
],
|
||||
"workspace.library": [
|
||||
"${3rd}/love2d/library"
|
||||
],
|
||||
"workspace.checkThirdParty": false
|
||||
}
|
||||
Vendored
+5
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"recommendations":
|
||||
["tomblind.local-lua-debugger-vscode",
|
||||
"sumneko.lua",]
|
||||
}
|
||||
Vendored
+28
@@ -0,0 +1,28 @@
|
||||
{
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"type": "lua-local",
|
||||
"request": "launch",
|
||||
"name": "Debug",
|
||||
"program": {
|
||||
"command": "love"
|
||||
},
|
||||
"args": [
|
||||
".",
|
||||
"debug"
|
||||
],
|
||||
},
|
||||
{
|
||||
"type": "lua-local",
|
||||
"request": "launch",
|
||||
"name": "Release",
|
||||
"program": {
|
||||
"command": "love"
|
||||
},
|
||||
"args": [
|
||||
".",
|
||||
],
|
||||
},
|
||||
]
|
||||
}
|
||||
Vendored
+12
@@ -0,0 +1,12 @@
|
||||
{
|
||||
"version": "2.0.0",
|
||||
"tasks": [
|
||||
{
|
||||
"label": "Build with LÖVE-Build",
|
||||
"type": "shell",
|
||||
"command": "love-build", // Path to Love-build
|
||||
"args": [".main.lua"],
|
||||
"group": "build",
|
||||
}
|
||||
]
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 57 KiB |
@@ -0,0 +1,17 @@
|
||||
return {
|
||||
-- basic settings:
|
||||
name = 'Jeopardy', -- name of the game for your executable
|
||||
developer = 'Ryan Ward', -- dev name used in metadata of the file
|
||||
output = 'bin', -- output location for your game, defaults to $SAVE_DIRECTORY
|
||||
version = '1.0.4', -- 'version' of your game, used to name the folder in output
|
||||
love = '11.5', -- version of LÖVE to use, must match github releases
|
||||
ignore = {'bin', 'love', 'server_test', '.gitignore', '.gitmodules', 'build.lua', 'login_dialog.yaml', 'package.bat', 'README.md'}, -- folders/files to ignore in your project
|
||||
icon = 'assets/icon.png', -- 256x256px PNG icon for game, will be converted for you
|
||||
|
||||
-- optional settings:
|
||||
use32bit = false, -- set true to build windows 32-bit as well as 64-bit
|
||||
identifier = 'net.ddns.epicknex.jeopardy', -- macos team identifier, defaults to game.developer.name
|
||||
libs = {},
|
||||
hooks = {},
|
||||
platforms = {'windows', --[['macos', 'linux', 'steamdeck']]} -- set if you only want to build for a specific platform
|
||||
}
|
||||
+1
-1
Submodule gui updated: fa06733747...27995af07f
@@ -1,59 +0,0 @@
|
||||
# login_dialog.yaml
|
||||
type: frame
|
||||
x: 0
|
||||
y: 0
|
||||
scale-size: [0.4, 0.25]
|
||||
scale-pos: [0.3, 0.2]
|
||||
color: "#1e1e2e"
|
||||
border-color: "#4a4a6a"
|
||||
roundness: 12
|
||||
|
||||
children:
|
||||
- type: label
|
||||
text: "Sign In"
|
||||
x: 0
|
||||
y: 20
|
||||
scale-size: [1.0, 0.0]
|
||||
h: 48
|
||||
align: center
|
||||
font: 28
|
||||
text-color: "#cdd6f4"
|
||||
|
||||
- type: textbox
|
||||
x: 30
|
||||
y: 90
|
||||
scale-size: [0.85, 0.0]
|
||||
h: 36
|
||||
text: ""
|
||||
color: "#313244"
|
||||
border-color: "#6c7086"
|
||||
text-color: "#cdd6f4"
|
||||
font: 14
|
||||
on-return: "focusPassword"
|
||||
|
||||
- type: textbox
|
||||
x: 30
|
||||
y: 140
|
||||
scale-size: [0.85, 0.0]
|
||||
h: 36
|
||||
text: ""
|
||||
color: "#313244"
|
||||
border-color: "#6c7086"
|
||||
text-color: "#cdd6f4"
|
||||
font: 14
|
||||
on-return: "submitLogin"
|
||||
|
||||
- type: button
|
||||
text: "Log In"
|
||||
align: "center"
|
||||
fit-font: true
|
||||
x: 30
|
||||
y: 200
|
||||
scale-size: [0.2, 0.0]
|
||||
h: 40
|
||||
color: "#89b4fa"
|
||||
text-color: "#1e1e2e"
|
||||
roundness: 8
|
||||
on-pressed: "submitLogin"
|
||||
on-enter: "highlightButton"
|
||||
on-exit: "unhighlightButton"
|
||||
@@ -1,11 +1,10 @@
|
||||
local logger = require("utils/logger")
|
||||
local lovehandler = require("utils/love_file_handler")
|
||||
local zip = require("utils/zip")
|
||||
|
||||
multi, thread = require("multi"):init({priority=true})
|
||||
local multi, thread = require("multi"):init({priority=true})
|
||||
multi.setClock(require("socket").gettime) -- When on linux os.clock doesn't reture actual seconds the program has elapsed for
|
||||
GLOBAL, THREAD = require("multi.integration.loveManager"):init()
|
||||
|
||||
|
||||
local GLOBAL, THREAD = require("multi.integration.loveManager"):init()
|
||||
|
||||
local fileHandler, logCtrl = lovehandler.new("logs/jeopardy.log", {
|
||||
max_size = 512 * 1024, -- rotate at 512 KB
|
||||
@@ -16,7 +15,7 @@ local fileHandler, logCtrl = lovehandler.new("logs/jeopardy.log", {
|
||||
lovehandler.auto_flush_on_quit(logCtrl)
|
||||
|
||||
log = logger.new("jeopardy", {
|
||||
level = logger.LEVELS.DEBUG,
|
||||
level = logger.LEVELS.INFO,
|
||||
handlers = {
|
||||
logger.handlers.ConsoleHandler({ colours = true }),
|
||||
fileHandler,
|
||||
@@ -36,6 +35,12 @@ color.indexColor("title_font","#b16d24")
|
||||
color.indexColor("question_bg","#363ac8")
|
||||
color.indexColor("tile_font","#ffffff")
|
||||
color.indexColor("header_font","#fef6eeda")
|
||||
color.indexColor("correct", "#52b11b")
|
||||
color.indexColor("skip", "#5d5d5d")
|
||||
color.indexColor("wrong", "#bd2626")
|
||||
color.indexColor("shaderColA","rgb01(0.10, 0.12, 0.38)")
|
||||
color.indexColor("shaderColB","rgb01(0.20, 0.22, 0.58)")
|
||||
color.indexColor("shaderColC","rgb01(0.55, 0.58, 0.78)")
|
||||
|
||||
require("gui.addons")
|
||||
|
||||
@@ -49,12 +54,28 @@ local old = multi.error
|
||||
|
||||
multi.error = function(self, err)
|
||||
loadLog:error("Error: %s", err)
|
||||
loadLog:error(debug.traceback())
|
||||
love.quit()
|
||||
end
|
||||
|
||||
function readFileData(path)
|
||||
return io.open(path,"r"):read("*a")
|
||||
end
|
||||
|
||||
function love.load()
|
||||
-- local z = zip.new()
|
||||
-- z:add("main.lua",readFileData("main.lua"))
|
||||
-- z:add("package.bat",readFileData("package.bat"))
|
||||
-- local data = z:build()
|
||||
-- local file = io.open("test.zip","wb")
|
||||
-- file:write(data)
|
||||
-- file:close()
|
||||
|
||||
loadLog:info("Starting Jeopardy Game")
|
||||
loadLog:debug("Setting game identity to jeopardy")
|
||||
for i,v in ipairs(color.listColors(showAllColors)) do
|
||||
loadLog:debug("Indexed color %s",v)
|
||||
end
|
||||
love.filesystem.setIdentity("jeopardy")
|
||||
loadLog:trace("Creating save directory")
|
||||
success = love.filesystem.createDirectory("")
|
||||
@@ -85,3 +106,75 @@ function love.draw()
|
||||
gui.draw()
|
||||
end
|
||||
|
||||
-- custom shaders
|
||||
|
||||
gui.NewShader("background", [[
|
||||
extern float time;
|
||||
extern vec2 size;
|
||||
extern vec3 colA;
|
||||
extern vec3 colB;
|
||||
extern vec3 colC;
|
||||
|
||||
// Hash function (pseudo-random from 2D input)
|
||||
float hash(vec2 p) {
|
||||
p = fract(p * vec2(127.1, 311.7));
|
||||
p += dot(p, p + 19.19);
|
||||
return fract(p.x * p.y);
|
||||
}
|
||||
|
||||
// Smooth value noise
|
||||
float noise(vec2 p) {
|
||||
vec2 i = floor(p);
|
||||
vec2 f = fract(p);
|
||||
// Quintic smoothstep
|
||||
vec2 u = f * f * f * (f * (f * 6.0 - 15.0) + 10.0);
|
||||
|
||||
float a = hash(i);
|
||||
float b = hash(i + vec2(1.0, 0.0));
|
||||
float c = hash(i + vec2(0.0, 1.0));
|
||||
float d = hash(i + vec2(1.0, 1.0));
|
||||
|
||||
return mix(mix(a, b, u.x), mix(c, d, u.x), u.y);
|
||||
}
|
||||
|
||||
// Fractional Brownian Motion – layers of noise at different scales
|
||||
float fbm(vec2 p) {
|
||||
float value = 0.0;
|
||||
float amplitude = 0.5;
|
||||
float frequency = 1.0;
|
||||
for (int i = 0; i < 6; i++) {
|
||||
value += amplitude * noise(p * frequency);
|
||||
frequency *= 2.0;
|
||||
amplitude *= 0.5;
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
vec4 effect(vec4 color, Image tex, vec2 texCoord, vec2 screenCoord) {
|
||||
// Normalized UV with aspect ratio correction
|
||||
vec2 uv = screenCoord / size;
|
||||
|
||||
// Slow, asymmetric time offsets per axis for lava-lamp feel
|
||||
float t1 = time * 0.008;
|
||||
float t2 = time * 0.005;
|
||||
|
||||
// Domain-warped FBM: feed FBM output back into itself
|
||||
// This creates the bulging, self-folding blob shapes.
|
||||
vec2 q = vec2(
|
||||
fbm(uv + vec2(0.0, 0.0) + t1),
|
||||
fbm(uv + vec2(5.2, 1.3) + t2)
|
||||
);
|
||||
|
||||
vec2 r = vec2(
|
||||
fbm(uv + 4.0 * q + vec2(1.7, 9.2) + t1 * 0.7),
|
||||
fbm(uv + 4.0 * q + vec2(8.3, 2.8) + t2 * 0.9)
|
||||
);
|
||||
|
||||
float n = fbm(uv + 4.0 * r + t1 * 0.4);
|
||||
|
||||
vec3 col = mix(colA, colB, clamp(n * 2.0, 0.0, 1.0));
|
||||
col = mix(col, colC, clamp(n * 2.0 - 0.6, 0.0, 1.0));
|
||||
|
||||
return vec4(col, 1.0);
|
||||
}
|
||||
]])
|
||||
+249
-115
@@ -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,35 +20,17 @@ local activePlayer
|
||||
local playerList = {}
|
||||
local playerStaticList = {}
|
||||
local scoreboard = {}
|
||||
local handler
|
||||
local handler_conn = boardUpdater:newConnection()
|
||||
local reference
|
||||
local multiply
|
||||
|
||||
-- Create a table to manage GUI elements
|
||||
local manage = {}
|
||||
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 function resizeFonts()
|
||||
-- Use multi-threading to improve performance
|
||||
multi:newThread(function()
|
||||
-- Introduce a small delay to avoid too many iterations at once
|
||||
thread.skip(2)
|
||||
-- Iterate over each element in the 'manage' table
|
||||
for i = 1, #manage do
|
||||
local elem = manage[i]
|
||||
|
||||
-- Check if the current element has a centerFont property
|
||||
if elem.centerFont then
|
||||
-- Adjust font size and re-center the text
|
||||
elem:fitFont(nil, nil, {scale = 2/3})
|
||||
elem:centerFont()
|
||||
end
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
gui.Events.OnResized(resizeFonts)
|
||||
|
||||
local completed_questions = 0
|
||||
local min_questions = 0
|
||||
local dd_count = 0
|
||||
@@ -54,6 +38,28 @@ local dd_enabled = false
|
||||
local applied_dd = false
|
||||
local board, question
|
||||
|
||||
local function cleanUp(frameRef)
|
||||
boardLog:debug("Cleaning up state and returning to title screen")
|
||||
scoreboard:removeAllPlayers()
|
||||
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
|
||||
frameRef:destroy()
|
||||
end
|
||||
|
||||
local function pickUniqueIndices(t, count)
|
||||
assert(#t >= count, "Not enough elements to pick " .. count .. " unique items")
|
||||
|
||||
@@ -101,6 +107,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)
|
||||
@@ -162,9 +177,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
|
||||
@@ -175,16 +192,23 @@ end
|
||||
|
||||
local function manageCosmetics(frame, cosmetics)
|
||||
boardLog:debug("Managing cosmetics")
|
||||
if cosmetics["bg-img"] then
|
||||
frame:setImage(cosmetics["bg-img"])
|
||||
else
|
||||
frame:setImage("assets/images/background.png")
|
||||
end
|
||||
if type(cosmetics.colors) == "table" then
|
||||
for i,v in pairs(cosmetics.colors) do
|
||||
color.reindexColor((i:gsub("-","_")),v)
|
||||
end
|
||||
end
|
||||
if cosmetics["bg-img"] then
|
||||
frame:setImage(cosmetics["bg-img"])
|
||||
frame:setShader()
|
||||
else
|
||||
-- frame:setImage("assets/images/background.png")
|
||||
frame:setImage(nil)
|
||||
frame:setShader(gui.SHADERS.background,{
|
||||
colA = color.shaderColA,
|
||||
colB = color.shaderColB,
|
||||
colC = color.shaderColC
|
||||
})
|
||||
end
|
||||
end
|
||||
|
||||
function gui:cleanup()
|
||||
@@ -195,14 +219,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:newImageLabel():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({
|
||||
@@ -222,41 +243,152 @@ 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()
|
||||
cleanUp(frameRef)
|
||||
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.textColor = color.white
|
||||
|
||||
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,
|
||||
shaderTime = {true},
|
||||
OnReleased=function(self)
|
||||
if self.text == "Skip" then
|
||||
handler_conn:Fire()
|
||||
reference:Unconnect()
|
||||
handler.visible = false
|
||||
return
|
||||
end
|
||||
local val = self.text == "Correct"
|
||||
handler_conn:Fire(val, multiply)
|
||||
if val then
|
||||
if reference then
|
||||
reference:Unconnect()
|
||||
end
|
||||
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)
|
||||
|
||||
boardUpdater:newThread(function()
|
||||
local test = function()
|
||||
return label.text ~= ""
|
||||
end
|
||||
while true do
|
||||
thread.hold(test)
|
||||
handler:setRoundness(20,20,60)
|
||||
handler.visibility = .9
|
||||
handler.color = color.bg
|
||||
label:scaleFont(2/3)
|
||||
label:centerFont()
|
||||
label:fitFont(nil, nil, {scale = 2/3})
|
||||
end
|
||||
end)
|
||||
|
||||
local data = loader:new(path)
|
||||
board, question, dailydouble = qframe:newFrame(), qframe:newFrame(), qframe:newImageLabel("assets/images/double.jpg")
|
||||
index = data.index
|
||||
|
||||
local cosmetics = index.cosmetics or {}
|
||||
manageCosmetics(frame, cosmetics)
|
||||
cosmetics.colors = cosmetics.colors or {}
|
||||
|
||||
for i,v in pairs(color.listColors()) do
|
||||
if not cosmetics.colors[v] then
|
||||
cosmetics.colors[v] = color.rgbToHex(color[v])
|
||||
end
|
||||
end
|
||||
|
||||
frameRef:shaderTime()
|
||||
manageCosmetics(frameRef, cosmetics)
|
||||
|
||||
board:fullFrame()
|
||||
question:fullFrame()
|
||||
@@ -293,10 +425,13 @@ function Menu(frame, path)
|
||||
end
|
||||
end
|
||||
|
||||
reset(function()
|
||||
reset(function(q)
|
||||
question:cleanup()
|
||||
manageCosmetics(frame, cosmetics, true)
|
||||
manageCosmetics(frameRef, cosmetics)
|
||||
label.text = default_text
|
||||
if q["display-answer"] then
|
||||
displayAnswer(q)
|
||||
end
|
||||
end)
|
||||
|
||||
for cat,v in pairs(index.categories) do
|
||||
@@ -323,7 +458,8 @@ function Menu(frame, path)
|
||||
img:fullFrame()
|
||||
end
|
||||
|
||||
table.insert(manage,c)
|
||||
c:scaleFont(.25)
|
||||
c:centerFont()
|
||||
|
||||
for tier = 1,tiers do
|
||||
local t = board:newTextButton("$" .. start + inc*(tier-1),0,0,0,0,(1/#index.categories)*(cat-1),1/(tiers+1)*tier,(1/#index.categories),1/(tiers+1))
|
||||
@@ -333,12 +469,19 @@ function Menu(frame, path)
|
||||
t.category = v.name
|
||||
t.index = tier
|
||||
t.price = start + inc*(tier-1)
|
||||
t:OnEnter(function(self)
|
||||
self:setShader(gui.SHADERS.glow)
|
||||
end)
|
||||
t:OnExit(function(self)
|
||||
self:setShader()
|
||||
end)
|
||||
t:shaderTime(true)
|
||||
t:OnReleased(boardUpdater:newFunction(function(self)
|
||||
if self.text == "" or GetActivePlayer() == nil then return end
|
||||
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 = {}
|
||||
@@ -352,9 +495,9 @@ 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)
|
||||
manageCosmetics(frameRef, q.cosmetics)
|
||||
end
|
||||
self.textVisibility = 0
|
||||
local template = LoadTemplate(q.template, path)
|
||||
@@ -395,33 +538,30 @@ 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)
|
||||
boardUpdater:newThread("QuestionUpdater",function()
|
||||
while true do
|
||||
template.update(dt)
|
||||
thread.yield()
|
||||
thread.sleep(.1)
|
||||
if self.text == "" then return end
|
||||
end
|
||||
end)
|
||||
end)
|
||||
end))
|
||||
table.insert(manage,t)
|
||||
t:centerFont()
|
||||
t:scaleFont(.5)
|
||||
end
|
||||
end
|
||||
|
||||
resizeFonts()
|
||||
resizeFonts()
|
||||
|
||||
return background
|
||||
end
|
||||
|
||||
@@ -460,19 +600,33 @@ end
|
||||
|
||||
function ScoreBoard(frame, x, y, w, h, sx, sy, sw, sh)
|
||||
-- Colors
|
||||
local C_BG_PANEL = color.new("#1a1a2e")
|
||||
local C_BG_HEADER = color.new("#16213e")
|
||||
local C_ACCENT = color.new("#e94560")
|
||||
local C_ROW_TOP = color.new("#1c2641")
|
||||
local C_ROW_NORM = color.new("#121226")
|
||||
local C_BORDER_TOP = color.new("#323c6e")
|
||||
local C_BORDER_NRM = color.new("#1c1c37")
|
||||
local C_BAR_EMPTY = color.new("#232341")
|
||||
local C_TEXT_MUTED = color.new("#786e96")
|
||||
local C_WHITE = color.new("#ffffff")
|
||||
local C_GOLD = color.new("#ffd700")
|
||||
local C_SILVER = color.new("#C0C0C0")
|
||||
local C_BRONZE = color.new("#cd7f32")
|
||||
color.indexColor("scoreboard_panel_bg", "#1a1a2e")
|
||||
color.indexColor("scoreboard_header_bg", "#16213e")
|
||||
color.indexColor("scoreboard_accent_color", "#e94560")
|
||||
color.indexColor("scoreboard_row_top_bg", "#1c2641")
|
||||
color.indexColor("scoreboard_row_norm_bg", "#121226")
|
||||
color.indexColor("scoreboard_border_top_color", "#323c6e")
|
||||
color.indexColor("scoreboard_border_nrm_color", "#1c1c37")
|
||||
color.indexColor("scoreboard_bar_empty_color", "#232341")
|
||||
color.indexColor("scoreboard_text_muted_color", "#786e96")
|
||||
color.indexColor("scoreboard_pure_white", "#ffffff")
|
||||
color.indexColor("scoreboard_precious_gold", "#ffd700")
|
||||
color.indexColor("scoreboard_precious_silver", "#C0C0C0")
|
||||
color.indexColor("scoreboard_precious_bronze", "#cd7f32")
|
||||
|
||||
local C_BG_PANEL = color.scoreboard_panel_bg
|
||||
local C_BG_HEADER = color.scoreboard_header_bg
|
||||
local C_ACCENT = color.scoreboard_accent_color
|
||||
local C_ROW_TOP = color.scoreboard_row_top_bg
|
||||
local C_ROW_NORM = color.scoreboard_row_norm_bg
|
||||
local C_BORDER_TOP = color.scoreboard_border_top_color
|
||||
local C_BORDER_NRM = color.scoreboard_border_nrm_color
|
||||
local C_BAR_EMPTY = color.scoreboard_bar_empty_color
|
||||
local C_TEXT_MUTED = color.scoreboard_text_muted_color
|
||||
local C_WHITE = color.scoreboard_pure_white
|
||||
local C_GOLD = color.scoreboard_precious_gold
|
||||
local C_SILVER = color.scoreboard_precious_silver
|
||||
local C_BRONZE = color.scoreboard_precious_bronze
|
||||
|
||||
-- Config stuff
|
||||
local LEADER_HEIGHT_SCALE = .06
|
||||
@@ -508,30 +662,13 @@ function ScoreBoard(frame, x, y, w, h, sx, sy, sw, sh)
|
||||
textColor = C_TEXT_MUTED,
|
||||
}, headernum, headerplayer, headerscore)
|
||||
|
||||
local updateList = {header, headernum, headerplayer, headerscore}
|
||||
|
||||
local function ScoreResize()
|
||||
scoreUpdater:newThread(function()
|
||||
thread.skip(2)
|
||||
local updateList = {headernum, headerplayer, headerscore, header}
|
||||
|
||||
for _,object in pairs(updateList) do
|
||||
object:fitFont(nil, nil, {scale = 5/6})
|
||||
object:scaleFont(2/3)
|
||||
object:centerFont()
|
||||
end
|
||||
|
||||
for _,object in pairs(playerList) do
|
||||
if type(object) == "table" and object.Ref then
|
||||
for i, player in pairs(object.Ref) do
|
||||
if player:hasType(gui.TYPE_TEXT) then
|
||||
player:fitFont(nil, nil, {scale = 5/6})
|
||||
player:centerFont()
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
function scoreboard:AddPlayer(name, score, icon)
|
||||
local player = {
|
||||
Name = name,
|
||||
@@ -547,13 +684,11 @@ function ScoreBoard(frame, x, y, w, h, sx, sy, sw, sh)
|
||||
return tonumber(a.Score) > tonumber(b.Score)
|
||||
end)
|
||||
scoreboard:RenderPlayer(playerList)
|
||||
ScoreResize()
|
||||
end,
|
||||
}
|
||||
table.insert(playerList, player)
|
||||
table.insert(playerStaticList, player)
|
||||
scoreboard:RenderPlayer(playerList)
|
||||
ScoreResize()
|
||||
return player
|
||||
end
|
||||
|
||||
@@ -569,17 +704,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}
|
||||
scoreUpdater:newThread(function()
|
||||
while true do
|
||||
thread.sleep(.01)
|
||||
for i,v in pairs(embededWatch) do
|
||||
v:centerFont()
|
||||
end
|
||||
end
|
||||
end)
|
||||
gui.apply({
|
||||
centerFont = {},
|
||||
scaleFont = {.5}
|
||||
},add_player,edit_player,remove_player)
|
||||
|
||||
local function embedTextEdit(reference, default, but_text, callback)
|
||||
reference.color = C_BORDER_NRM
|
||||
@@ -598,11 +728,10 @@ function ScoreBoard(frame, x, y, w, h, sx, sy, sw, sh)
|
||||
callback(textbox)
|
||||
end)
|
||||
gui.apply({
|
||||
setFont = {20},
|
||||
align = gui.ALIGN_CENTER
|
||||
scaleFont = {.5},
|
||||
align = gui.ALIGN_CENTER,
|
||||
centerFont = {},
|
||||
},textbox,button,reference)
|
||||
table.insert(embededWatch,textbox)
|
||||
table.insert(embededWatch,button)
|
||||
end
|
||||
|
||||
remove_player.color = color.new("#a13a3a")
|
||||
@@ -637,6 +766,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
|
||||
@@ -704,7 +838,9 @@ function ScoreBoard(frame, x, y, w, h, sx, sy, sw, sh)
|
||||
gui.apply({
|
||||
visibility = 0,
|
||||
drawBorder = false,
|
||||
textColor = MapColor(index)
|
||||
textColor = MapColor(index),
|
||||
scaleFont = {5/6},
|
||||
centerFont = {}
|
||||
},playernum, playerName, playerScore, playerIcon, playerLine)
|
||||
|
||||
player.Ref = {playerName, playerScore, playernum, playerIcon, playerLine, Frame = playerFrame}
|
||||
@@ -712,8 +848,6 @@ function ScoreBoard(frame, x, y, w, h, sx, sy, sw, sh)
|
||||
end
|
||||
end
|
||||
|
||||
gui.Events.OnResized(ScoreResize)
|
||||
ScoreResize()
|
||||
return scoreboard
|
||||
end
|
||||
|
||||
|
||||
+9
-2
@@ -4,6 +4,13 @@ local menu = require("gui.core.menus")
|
||||
-- local proc = gui:getProcessor():newProcessor("settings")
|
||||
|
||||
function Menu(frame)
|
||||
local background = frame:newImageLabel("assets/images/background.jpg")
|
||||
background:fullFrame()
|
||||
local background = frame:newFrame():fullFrame()
|
||||
background:setShader(gui.SHADERS.background,{
|
||||
colA = color.shaderColA,
|
||||
colB = color.shaderColB,
|
||||
colC = color.shaderColC
|
||||
})
|
||||
background:shaderTime()
|
||||
end
|
||||
|
||||
return menu.registerMenu("settings", Menu)
|
||||
+13
-17
@@ -5,7 +5,8 @@ local proc = gui:getProcessor():newProcessor("main-title")
|
||||
|
||||
local APP_VERSION = love.filesystem.read("version.txt")
|
||||
|
||||
local board = require("menus.board")
|
||||
local boardMenu = require("menus.board")
|
||||
local settingsMenu = require("menus.settings")
|
||||
|
||||
local titleLog = log:child("title")
|
||||
|
||||
@@ -25,17 +26,9 @@ function Menu(frame)
|
||||
title.visibility = 0
|
||||
title.textColor = color.title_font
|
||||
title.drawBorder = false
|
||||
title:centerFont()
|
||||
|
||||
titleLog:debug("Creating font thread")
|
||||
proc:newThread(function()
|
||||
local function enabled()
|
||||
return background.visible
|
||||
end
|
||||
while true do
|
||||
thread.hold(enabled)
|
||||
title:centerFont()
|
||||
end
|
||||
end)
|
||||
|
||||
local items = 0
|
||||
local MenuOption = function(str)
|
||||
@@ -43,13 +36,10 @@ function Menu(frame)
|
||||
local text = item:newTextLabel(str)
|
||||
text:fullFrame()
|
||||
text.align = gui.ALIGN_CENTER
|
||||
thread:newThread(function()
|
||||
thread.skip(2)
|
||||
text:fitFont(nil,nil,{scale = 1/2})
|
||||
text:scaleFont(.4)
|
||||
text:centerFont()
|
||||
text.visibility = 0
|
||||
text.textColor = color.new("#24269a")
|
||||
end)
|
||||
items = items + 1
|
||||
return item, text
|
||||
end
|
||||
@@ -70,17 +60,23 @@ function Menu(frame)
|
||||
play:OnReleased(function()
|
||||
titleLog:debug("Play button pressed")
|
||||
if love.filesystem.getInfo("quiz") then
|
||||
menu.getMenu("board"):visible(true, "quiz")
|
||||
boardMenu:visible(true, "quiz", true)
|
||||
return
|
||||
else
|
||||
gui:newFilePicker("File picker test",nil, {".zip"}, function(file)
|
||||
titleLog:info("File picked: %s", file)
|
||||
menu.getMenu("board"):visible(true, file:gsub("\\","/"):gsub(love.filesystem.getSaveDirectory(),""):sub(2,-1))
|
||||
boardMenu:visible(true, file:gsub("\\","/"):gsub(love.filesystem.getSaveDirectory(),""):sub(2,-1))
|
||||
end)
|
||||
end
|
||||
end)
|
||||
|
||||
quit:OnReleased(function()
|
||||
settings:OnReleased(function()
|
||||
titleLog:debug("Settings button pressed")
|
||||
settingsMenu:visible(true)
|
||||
end)
|
||||
|
||||
quit:OnReleased(function(self, x, y)
|
||||
print("Quit Pressed",x,y,self:getAbsolutes())
|
||||
titleLog:debug("Quit button pressed")
|
||||
local f = frame:newFrame()
|
||||
f:fullFrame()
|
||||
|
||||
+1
-1
Submodule multi updated: 0796788fcb...8b5d10cbb6
+5
-20
@@ -10,7 +10,9 @@ local function index(window, q, callback)
|
||||
label.align = ALIGN_CENTER
|
||||
label.textColor = color.white
|
||||
label.color = color.new("#363ac8")
|
||||
label.borderColor = color.new("#363ac8")
|
||||
label.drawBorder = false
|
||||
label:scaleFont(.4)
|
||||
label:centerFont()
|
||||
|
||||
if not q.imageA or q.imageA == "" then
|
||||
error("Missing 'imageA' field for question!")
|
||||
@@ -37,32 +39,15 @@ local function index(window, q, callback)
|
||||
imageHolder2:setAspectSize(imageHolder2.imageWidth, imageHolder2.imageHeight)
|
||||
imageHolder2:setDualDim(0, 0, 0, 0, .6, 0, .4, 1)
|
||||
|
||||
local correct = window:newTextButton("Correct",0,-200,0,100,0,1,.5)
|
||||
correct.color = color.new("#52b11b")
|
||||
local wrong = window:newTextButton("Wrong",0,-200,0,100,.5,1,.5)
|
||||
wrong.color = color.new("#bd2626")
|
||||
local skip = window:newTextButton("Skip",0,-100,0,100,.25,1,.5)
|
||||
skip.color = color.new("#5d5d5d")
|
||||
|
||||
window.apply({
|
||||
centerY = {true},
|
||||
}, imageHolder, plusLabel, imageHolder2)
|
||||
|
||||
window.apply({
|
||||
fitFont={},
|
||||
align=window.ALIGN_CENTER,
|
||||
OnReleased=function(self)
|
||||
if self.text == "Skip" then
|
||||
callback()
|
||||
return
|
||||
end
|
||||
callback(self.text == "Correct")
|
||||
end,
|
||||
}, correct, wrong, skip)
|
||||
useDefaultHandler(callback)
|
||||
end
|
||||
|
||||
local function update(dt)
|
||||
label:fitFont()
|
||||
|
||||
end
|
||||
|
||||
return {
|
||||
|
||||
@@ -23,7 +23,11 @@ local function index(window, q, callback)
|
||||
label.textColor = color.white
|
||||
label.color = color.new("#363ac8")
|
||||
label:setFont(50)
|
||||
choices = window:newFrame(noOf(0,.3,1,.7))
|
||||
label:centerFont()
|
||||
label:scaleFont(2/3)
|
||||
label.drawBorder = false
|
||||
|
||||
local choices = window:newFrame(noOf(0,.3,1,.7))
|
||||
choices.color = color.new("#363ac8")
|
||||
|
||||
function choices:newChoice(choice, i)
|
||||
@@ -52,9 +56,8 @@ local function index(window, q, callback)
|
||||
choiceText.textColor = color.white
|
||||
-- choiceText.align = window.ALIGN_CENTER
|
||||
choiceText:setFont(40)
|
||||
table.insert(choiceList,choiceText)
|
||||
choiceText:centerFont()
|
||||
table.insert(allBoxes,box)
|
||||
|
||||
end
|
||||
|
||||
for i,choice in pairs(q.choices) do
|
||||
@@ -84,16 +87,7 @@ local function index(window, q, callback)
|
||||
end
|
||||
|
||||
local function update(dt) -- time in seconds that has passed since
|
||||
-- label:fitFont()
|
||||
label:centerFont()
|
||||
for _, obj in pairs(choiceList) do
|
||||
obj:centerFont()
|
||||
-- obj:fitFont(nil, nil, {scale = 2/3})
|
||||
end
|
||||
confirm:fitFont(nil, nil, {scale = 2/3})
|
||||
confirm:centerFont()
|
||||
-- print(box.parent:getAbsolutes())
|
||||
-- print(box:getAbsolutes())
|
||||
|
||||
end
|
||||
|
||||
return {
|
||||
|
||||
+6
-19
@@ -10,12 +10,15 @@ local label
|
||||
local imageHolder
|
||||
|
||||
local function index(window, q, callback)
|
||||
frame = window:newFrame(0,0,0,-200,0,.2,1,.8)
|
||||
frame = window:newFrame(0,0,0,0,0,.2,1,.8)
|
||||
frame.visibility = 0
|
||||
label = window:newTextLabel(" " ..q.title.. " ",0,0,0,0,0,0,1,.2)
|
||||
label.align = ALIGN_CENTER
|
||||
label.textColor = color.white
|
||||
label.color = color.new("#363ac8")
|
||||
label:scaleFont(.4)
|
||||
label:centerFont()
|
||||
label.drawBorder = false
|
||||
if not q.image or q.image == "" then
|
||||
error("Missing 'image' field for question!")
|
||||
end
|
||||
@@ -24,30 +27,14 @@ local function index(window, q, callback)
|
||||
imageHolder:centerX(true)
|
||||
imageHolder:centerY(true)
|
||||
imageHolder:setDualDim(0,0,imageHolder.imageWidth,imageHolder.imageHeight)
|
||||
local correct = window:newTextButton("Correct",0,-200,0,100,0,1,.5)
|
||||
correct.color = color.new("#52b11b")
|
||||
local wrong = window:newTextButton("Wrong",0,-200,0,100,.5,1,.5)
|
||||
wrong.color = color.new("#bd2626")
|
||||
local skip = window:newTextButton("Skip",0,-100,0,100,.25,1,.5)
|
||||
skip.color = color.new("#5d5d5d")
|
||||
window.apply({
|
||||
fitFont={},
|
||||
align=window.ALIGN_CENTER,
|
||||
OnReleased=function(self)
|
||||
if self.text == "Skip" then
|
||||
callback()
|
||||
return
|
||||
end
|
||||
callback(self.text == "Correct")
|
||||
end,
|
||||
},correct,wrong,skip)
|
||||
|
||||
useDefaultHandler(callback)
|
||||
end
|
||||
|
||||
local function update(dt) -- time in seconds that has passed since
|
||||
_,_,w,h = imageHolder.parent:getAbsolutes()
|
||||
local x,y,w,h = imageHolder:GetSizeAdjustedToAspectRatio(w,h)
|
||||
imageHolder:setDualDim(w,h,x,y)
|
||||
label:fitFont()
|
||||
end
|
||||
|
||||
return {
|
||||
|
||||
+6
-19
@@ -14,28 +14,15 @@ local function index(window, q, callback)
|
||||
label:fullFrame()
|
||||
label.textColor = color.white
|
||||
label.color = color.new("#363ac8")
|
||||
local correct = window:newTextButton("Correct",0,-200,0,100,0,1,.5)
|
||||
correct.color = color.new("#52b11b")
|
||||
local wrong = window:newTextButton("Wrong",0,-200,0,100,.5,1,.5)
|
||||
wrong.color = color.new("#bd2626")
|
||||
local skip = window:newTextButton("Skip",0,-100,0,100,.25,1,.5)
|
||||
skip.color = color.new("#5d5d5d")
|
||||
gui.apply({
|
||||
fitFont={},
|
||||
align=gui.ALIGN_CENTER,
|
||||
OnReleased=function(self)
|
||||
if self.text == "Skip" then
|
||||
callback()
|
||||
return
|
||||
end
|
||||
callback(self.text == "Correct")
|
||||
end,
|
||||
},correct,wrong,skip)
|
||||
label:setFont(60)
|
||||
label:centerFont()
|
||||
label:scaleFont(.075)
|
||||
label.drawBorder = false
|
||||
|
||||
useDefaultHandler(callback)
|
||||
end
|
||||
|
||||
local function update(dt) -- time in seconds that has passed since
|
||||
label:centerFont()
|
||||
|
||||
end
|
||||
|
||||
return {
|
||||
|
||||
+9
-22
@@ -15,13 +15,17 @@ local function index(window, q, callback)
|
||||
callback()
|
||||
return
|
||||
end
|
||||
frame = window:newFrame(0,0,0,-200,0,.2,1,.8)
|
||||
frame = window:newFrame(0,0,0,0,0,.2,1,.8)
|
||||
frame.visibility = 0
|
||||
label = window:newTextLabel(" " ..q.title.. " ",0,0,0,0,0,0,1,.2)
|
||||
label.align = ALIGN_CENTER
|
||||
label.textColor = color.white
|
||||
label.color = color.new("#363ac8")
|
||||
imageHolder = frame:newImageButton("assets/images/speaker.png",0,0,0,0,0,0,.3,.4)
|
||||
label:scaleFont(.4)
|
||||
label:centerFont()
|
||||
label.drawBorder = false
|
||||
imageHolder = frame:newImageButton("assets/images/speaker.png",0,0,0,0,0,0,.3,.3)
|
||||
imageHolder.scale = "h"
|
||||
imageHolder:setAspectSize(imageHolder.imageWidth,imageHolder.imageHeight)
|
||||
imageHolder:centerX(true)
|
||||
imageHolder:centerY(true)
|
||||
@@ -38,29 +42,12 @@ local function index(window, q, callback)
|
||||
sound:seek(0)
|
||||
end)
|
||||
end)
|
||||
local correct = window:newTextButton("Correct",0,-200,0,100,0,1,.5)
|
||||
correct.color = color.new("#52b11b")
|
||||
local wrong = window:newTextButton("Wrong",0,-200,0,100,.5,1,.5)
|
||||
wrong.color = color.new("#bd2626")
|
||||
local skip = window:newTextButton("Skip",0,-100,0,100,.25,1,.5)
|
||||
skip.color = color.new("#5d5d5d")
|
||||
window.apply({
|
||||
fitFont={},
|
||||
align=window.ALIGN_CENTER,
|
||||
OnReleased=function(self)
|
||||
sound:stop()
|
||||
if self.text == "Skip" then
|
||||
callback()
|
||||
return
|
||||
end
|
||||
callback(self.text == "Correct")
|
||||
end,
|
||||
},correct,wrong,skip)
|
||||
|
||||
useDefaultHandler(callback)
|
||||
end
|
||||
|
||||
local function update(dt) -- time in seconds that has passed since
|
||||
label:fitFont()
|
||||
label:centerFont()
|
||||
|
||||
end
|
||||
|
||||
return {
|
||||
|
||||
+6
-20
@@ -21,6 +21,9 @@ local function index(window, q, callback)
|
||||
label.align = ALIGN_CENTER
|
||||
label.textColor = color.white
|
||||
label.color = color.new("#363ac8")
|
||||
label:centerFont()
|
||||
label:scaleFont(.4)
|
||||
label.drawBorder = false
|
||||
local holder = frame:newFrame(-300, -200, 600, 400, .5, .5)
|
||||
holder:centerX(true)
|
||||
holder:centerY(true)
|
||||
@@ -31,29 +34,12 @@ local function index(window, q, callback)
|
||||
video:play()
|
||||
end)
|
||||
video.XButton.visible = false
|
||||
local correct = window:newTextButton("Correct",0,-200,0,100,0,1,.5)
|
||||
correct.color = color.new("#52b11b")
|
||||
local wrong = window:newTextButton("Wrong",0,-200,0,100,.5,1,.5)
|
||||
wrong.color = color.new("#bd2626")
|
||||
local skip = window:newTextButton("Skip",0,-100,0,100,.25,1,.5)
|
||||
skip.color = color.new("#5d5d5d")
|
||||
window.apply({
|
||||
fitFont={},
|
||||
align=window.ALIGN_CENTER,
|
||||
OnReleased=function(self)
|
||||
video:stop()
|
||||
if self.text == "Skip" then
|
||||
callback()
|
||||
return
|
||||
end
|
||||
callback(self.text == "Correct")
|
||||
end,
|
||||
},correct,wrong,skip)
|
||||
|
||||
useDefaultHandler(callback)
|
||||
end
|
||||
|
||||
local function update(dt) -- time in seconds that has passed since
|
||||
label:fitFont()
|
||||
label:centerFont()
|
||||
|
||||
end
|
||||
|
||||
return {
|
||||
|
||||
@@ -0,0 +1,87 @@
|
||||
--[[ Constants
|
||||
* (all lua builtins that don't allow io/executing code)
|
||||
color (interface)
|
||||
gui (interface)
|
||||
multi (interface bound to a processor) no thread module
|
||||
|
||||
callback true/false correct/wrong
|
||||
]]
|
||||
local label
|
||||
local imageHolder
|
||||
|
||||
local function index(window, q, callback)
|
||||
frame = window:newFrame(0,0,0,0,0,.2,1,.8)
|
||||
frame.visibility = 0
|
||||
label = window:newTextLabel(" " ..q.title.. " ",0,0,0,0,0,0,1,.2)
|
||||
label.align = ALIGN_CENTER
|
||||
label.textColor = color.white
|
||||
label.color = color.new("#363ac8")
|
||||
label:scaleFont(.4)
|
||||
label:centerFont()
|
||||
label.drawBorder = false
|
||||
|
||||
local errors = {}
|
||||
|
||||
if type(q.zoom) ~= "string" and q.zoom ~= "" then
|
||||
table.insert(errors, "Missing 'zoom' fiels for queston! Should be a path to an image.")
|
||||
end
|
||||
|
||||
if type(q.minzoom) ~= "string" and q.minzoom ~= "" then
|
||||
table.insert(errors, "Missing 'minzoom' field for question! Should be a path to an image.")
|
||||
end
|
||||
|
||||
if type(q.fullimage) ~= "string" and q.fullimage ~= "" then
|
||||
table.insert(errors, "Missing 'fullimage' field for question! Should be a path to an image.")
|
||||
end
|
||||
|
||||
local zooms = {q.zoom, q.minzoom, q.fullimage}
|
||||
|
||||
local index = 1
|
||||
local mul = 1
|
||||
|
||||
imageHolder = frame:newImageLabel(q.zoom)
|
||||
imageHolder:setAspectSize(imageHolder.imageWidth,imageHolder.imageHeight)
|
||||
imageHolder:centerX(true)
|
||||
imageHolder:centerY(true)
|
||||
imageHolder:setDualDim(0,0,imageHolder.imageWidth,imageHolder.imageHeight)
|
||||
|
||||
imageHolder:OnEnter(function(self)
|
||||
self:setShader(gui.SHADERS.glow)
|
||||
end)
|
||||
|
||||
imageHolder:OnExit(function(self)
|
||||
self:setShader()
|
||||
end)
|
||||
|
||||
imageHolder:shaderTime(true)
|
||||
|
||||
imageHolder:OnReleased(function()
|
||||
index = index + 1
|
||||
if index == 2 then
|
||||
if q["zoom-deduct"] then
|
||||
mul = .5
|
||||
end
|
||||
elseif index == 3 then
|
||||
if q["zoom-deduct"] then
|
||||
mul = .25
|
||||
end
|
||||
else
|
||||
index = 3
|
||||
end
|
||||
imageHolder:setImage(zooms[index])
|
||||
setMultiplier(mul)
|
||||
end)
|
||||
|
||||
useDefaultHandler(callback)
|
||||
end
|
||||
|
||||
local function update(dt) -- time in seconds that has passed since
|
||||
_,_,w,h = imageHolder.parent:getAbsolutes()
|
||||
local x,y,w,h = imageHolder:GetSizeAdjustedToAspectRatio(w,h)
|
||||
imageHolder:setDualDim(w,h,x,y)
|
||||
end
|
||||
|
||||
return {
|
||||
index = index,
|
||||
update = update
|
||||
}
|
||||
-197
@@ -1,197 +0,0 @@
|
||||
--- test_logger.lua — Demonstrates and tests all logger.lua features
|
||||
|
||||
-- Adjust path if needed
|
||||
package.path = "./?.lua;" .. package.path
|
||||
local Logger = require("utils/logger")
|
||||
|
||||
local PASS = 0
|
||||
local FAIL = 0
|
||||
|
||||
local function test(label, cond)
|
||||
if cond then
|
||||
print(string.format(" [PASS] %s", label))
|
||||
PASS = PASS + 1
|
||||
else
|
||||
io.stderr:write(string.format(" [FAIL] %s\n", label))
|
||||
FAIL = FAIL + 1
|
||||
end
|
||||
end
|
||||
|
||||
print("━━━ logger.lua test suite ━━━\n")
|
||||
|
||||
-- ── 1. Basic levels ────────────────────────────────────────────────────────
|
||||
print("▶ 1. Basic level output (INFO+)")
|
||||
do
|
||||
local handler, get, clear = Logger.handlers.MemoryHandler()
|
||||
local log = Logger.new("basic", { level = Logger.LEVELS.INFO, handlers = { handler } })
|
||||
|
||||
log:trace("should be filtered")
|
||||
log:debug("should be filtered")
|
||||
log:info("hello %s", "world")
|
||||
log:warn("disk %d%%", 90)
|
||||
log:error("boom")
|
||||
log:fatal("catastrophe")
|
||||
|
||||
local records = get()
|
||||
test("TRACE filtered", records[1].level == Logger.LEVELS.INFO)
|
||||
test("INFO captured", records[1].message == "hello world")
|
||||
test("WARN captured", records[2].message == "disk 90%")
|
||||
test("ERROR captured", records[3].level == Logger.LEVELS.ERROR)
|
||||
test("FATAL captured", records[4].level == Logger.LEVELS.FATAL)
|
||||
test("exactly 4 records", #records == 4)
|
||||
end
|
||||
|
||||
-- ── 2. Level filtering ─────────────────────────────────────────────────────
|
||||
print("\n▶ 2. Dynamic level changes")
|
||||
do
|
||||
local handler, get = Logger.handlers.MemoryHandler()
|
||||
local log = Logger.new("dyn", { handlers = { handler } })
|
||||
|
||||
log:set_level(Logger.LEVELS.DEBUG)
|
||||
log:debug("visible")
|
||||
log:set_level(Logger.LEVELS.ERROR)
|
||||
log:info("invisible")
|
||||
log:error("visible again")
|
||||
|
||||
local records = get()
|
||||
test("DEBUG visible at DEBUG level", records[1].message == "visible")
|
||||
test("INFO invisible at ERROR level", records[2].message == "visible again")
|
||||
test("total 2 records", #records == 2)
|
||||
end
|
||||
|
||||
-- ── 3. is_enabled ──────────────────────────────────────────────────────────
|
||||
print("\n▶ 3. is_enabled()")
|
||||
do
|
||||
local log = Logger.new("enabled", { level = Logger.LEVELS.WARN })
|
||||
test("WARN enabled", log:is_enabled(Logger.LEVELS.WARN))
|
||||
test("INFO disabled", not log:is_enabled(Logger.LEVELS.INFO))
|
||||
test("ERROR enabled", log:is_enabled(Logger.LEVELS.ERROR))
|
||||
end
|
||||
|
||||
-- ── 4. Custom format ───────────────────────────────────────────────────────
|
||||
print("\n▶ 4. Custom format string")
|
||||
do
|
||||
local handler, get = Logger.handlers.MemoryHandler()
|
||||
local log = Logger.new("fmt", {
|
||||
format = "{level}|{name}|{message}",
|
||||
handlers = { handler },
|
||||
})
|
||||
log:info("hi")
|
||||
local f = get()[1].formatted
|
||||
test("contains level", f:find("INFO") ~= nil)
|
||||
test("contains name", f:find("fmt") ~= nil)
|
||||
test("contains message", f:find("hi") ~= nil)
|
||||
test("pipe separator", f:find("|") ~= nil)
|
||||
end
|
||||
|
||||
-- ── 5. Filters ─────────────────────────────────────────────────────────────
|
||||
print("\n▶ 5. Custom filter")
|
||||
do
|
||||
local handler, get = Logger.handlers.MemoryHandler()
|
||||
local log = Logger.new("filter", { level = Logger.LEVELS.DEBUG, handlers = { handler } })
|
||||
|
||||
-- only pass records whose message contains "keep"
|
||||
log:add_filter(function(rec) return rec.message:find("keep") ~= nil end)
|
||||
|
||||
log:info("drop this")
|
||||
log:info("keep this")
|
||||
log:warn("also drop")
|
||||
log:debug("keep me too")
|
||||
|
||||
local records = get()
|
||||
test("only 'keep' records pass", #records == 2)
|
||||
test("first kept record", records[1].message == "keep this")
|
||||
test("second kept record", records[2].message == "keep me too")
|
||||
end
|
||||
|
||||
-- ── 6. Multiple handlers ───────────────────────────────────────────────────
|
||||
print("\n▶ 6. Multiple handlers")
|
||||
do
|
||||
local h1, get1 = Logger.handlers.MemoryHandler()
|
||||
local h2, get2 = Logger.handlers.MemoryHandler()
|
||||
local log = Logger.new("multi", { handlers = { h1 } })
|
||||
log:add_handler(h2)
|
||||
|
||||
log:info("broadcast")
|
||||
|
||||
test("handler1 received", #get1() == 1)
|
||||
test("handler2 received", #get2() == 1)
|
||||
test("same message", get1()[1].message == get2()[1].message)
|
||||
end
|
||||
|
||||
-- ── 7. Child loggers ───────────────────────────────────────────────────────
|
||||
print("\n▶ 7. Child loggers")
|
||||
do
|
||||
local handler, get = Logger.handlers.MemoryHandler()
|
||||
local parent = Logger.new("app", { handlers = { handler } })
|
||||
local child = parent:child("db")
|
||||
|
||||
parent:info("parent message")
|
||||
child:info("child message")
|
||||
|
||||
local records = get()
|
||||
test("parent name", records[1].name == "app")
|
||||
test("child name", records[2].name == "app.db")
|
||||
test("child shares handler", #records == 2)
|
||||
end
|
||||
|
||||
-- ── 8. Logger.get() registry ──────────────────────────────────────────────
|
||||
print("\n▶ 8. Logger.get() registry")
|
||||
do
|
||||
local a = Logger.get("svc.auth")
|
||||
local b = Logger.get("svc.auth")
|
||||
test("same instance returned", a == b)
|
||||
|
||||
local c = Logger.get("svc.payments")
|
||||
test("different names differ", a ~= c)
|
||||
end
|
||||
|
||||
-- ── 9. Format with no args ────────────────────────────────────────────────
|
||||
print("\n▶ 9. Message with no format args")
|
||||
do
|
||||
local handler, get = Logger.handlers.MemoryHandler()
|
||||
local log = Logger.new("noargs", { handlers = { handler } })
|
||||
log:info("plain string, no args")
|
||||
test("plain string works", get()[1].message == "plain string, no args")
|
||||
end
|
||||
|
||||
-- ── 10. FileHandler ───────────────────────────────────────────────────────
|
||||
print("\n▶ 10. FileHandler")
|
||||
do
|
||||
local path = "test_logger_output.log"
|
||||
os.remove(path)
|
||||
|
||||
local fh = Logger.handlers.FileHandler({ path = path })
|
||||
local log = Logger.new("file", { handlers = { fh } })
|
||||
log:info("written to file")
|
||||
log:warn("second line")
|
||||
|
||||
local f = io.open(path)
|
||||
local content = f and f:read("*a") or ""
|
||||
if f then f:close() end
|
||||
|
||||
test("file created", content ~= "")
|
||||
test("INFO line present", content:find("written to file") ~= nil)
|
||||
test("WARN line present", content:find("second line") ~= nil)
|
||||
test("two newlines", select(2, content:gsub("\n","")) == 2)
|
||||
end
|
||||
|
||||
-- ── 11. Console handler (visual) ──────────────────────────────────────────
|
||||
print("\n▶ 11. ConsoleHandler — visual check (colours enabled)")
|
||||
do
|
||||
local log = Logger.new("visual", {
|
||||
level = Logger.LEVELS.TRACE,
|
||||
handlers = { Logger.handlers.ConsoleHandler({ colours = true }) },
|
||||
})
|
||||
log:trace("trace message")
|
||||
log:debug("debug message")
|
||||
log:info ("info message")
|
||||
log:warn ("warn message")
|
||||
log:error("error message")
|
||||
log:fatal("fatal message")
|
||||
test("no crash", true)
|
||||
end
|
||||
|
||||
-- ── Summary ────────────────────────────────────────────────────────────────
|
||||
print(string.format("\n━━━ Results: %d passed, %d failed ━━━", PASS, FAIL))
|
||||
if FAIL > 0 then os.exit(1) end
|
||||
@@ -1,2 +0,0 @@
|
||||
[2026-06-08 19:40:49] [INFO ] [file] written to file
|
||||
[2026-06-08 19:40:49] [WARN ] [file] second line
|
||||
+2
-2
@@ -37,6 +37,8 @@ local function startTimer(opt)
|
||||
tlabel.align = gui.ALIGN_CENTER
|
||||
tlabel:fullFrame()
|
||||
tlabel.visibility = 0
|
||||
tlabel:centerFont()
|
||||
tlabel:scaleFont(.5)
|
||||
tpie.color = opt.startColor
|
||||
tpie.visibility = opt.visibility
|
||||
|
||||
@@ -82,8 +84,6 @@ local function startTimer(opt)
|
||||
|
||||
if opt.autoText then
|
||||
tlabel.text = num
|
||||
tlabel:fitFont(nil, nil, {scale=1/2})
|
||||
tlabel:centerFont()
|
||||
end
|
||||
|
||||
if opt.finegrained then
|
||||
|
||||
+217
@@ -0,0 +1,217 @@
|
||||
--[[
|
||||
zip.lua — A zip writer module for LÖVE 2D
|
||||
==========================================
|
||||
Uses love.math.compress (zlib/DEFLATE) and a pure-Lua CRC-32 table.
|
||||
No external dependencies required.
|
||||
|
||||
Requires: LÖVE 11.0+
|
||||
|
||||
Usage:
|
||||
local Zip = require("zip")
|
||||
|
||||
local z = Zip.new()
|
||||
z:add("level1.lua", love.filesystem.read("level1.lua"))
|
||||
z:add("tiles/grass.png", love.filesystem.read("tiles/grass.png"))
|
||||
local data = z:build()
|
||||
love.filesystem.write("levels.zip", data)
|
||||
|
||||
API:
|
||||
Zip.new() → creates a new Zip writer
|
||||
zip:add(path, data) → adds a file entry (path uses forward slashes)
|
||||
zip:build() → returns the zip file as a string
|
||||
]]
|
||||
|
||||
local Zip = {}
|
||||
Zip.__index = Zip
|
||||
|
||||
-- ── helpers ──────────────────────────────────────────────────────────────────
|
||||
|
||||
--- Pack bytes into a little-endian binary string.
|
||||
local function pack_u16(n)
|
||||
return string.char(n % 256, math.floor(n / 256) % 256)
|
||||
end
|
||||
|
||||
local function pack_u32(n)
|
||||
return string.char(
|
||||
n % 256,
|
||||
math.floor(n / 256) % 256,
|
||||
math.floor(n / 65536) % 256,
|
||||
math.floor(n / 16777216) % 256
|
||||
)
|
||||
end
|
||||
|
||||
-- LuaJIT (used by LOVE) provides the 'bit' library for bitwise operations.
|
||||
local bxor = bit.bxor
|
||||
local band = bit.band
|
||||
local rshift = bit.rshift
|
||||
|
||||
--- CRC-32 lookup table (standard IEEE 802.3 polynomial 0xEDB88320, reflected).
|
||||
local _crc_table = (function()
|
||||
local t = {}
|
||||
for i = 0, 255 do
|
||||
local c = i
|
||||
for _ = 1, 8 do
|
||||
if band(c, 1) == 1 then
|
||||
c = bxor(rshift(c, 1), 0xEDB88320)
|
||||
else
|
||||
c = rshift(c, 1)
|
||||
end
|
||||
end
|
||||
t[i] = c
|
||||
end
|
||||
return t
|
||||
end)()
|
||||
|
||||
--- Compute CRC-32 of a string (LuaJIT / LOVE compatible).
|
||||
local function crc32(data)
|
||||
local crc = 0xFFFFFFFF
|
||||
for i = 1, #data do
|
||||
local idx = band(bxor(crc, data:byte(i)), 0xFF)
|
||||
crc = bxor(rshift(crc, 8), _crc_table[idx])
|
||||
end
|
||||
return band(bxor(crc, 0xFFFFFFFF), 0xFFFFFFFF)
|
||||
end
|
||||
|
||||
--- Deflate-compress data using love.math.compress.
|
||||
--- Returns compressed_string, or nil if compression made it larger.
|
||||
local function deflate(data)
|
||||
-- "zlib" wraps DEFLATE with a 2-byte header and 4-byte Adler-32 checksum.
|
||||
-- For ZIP we need raw DEFLATE, which we get by stripping the zlib envelope.
|
||||
-- love.math.compress( rawstring, format, level )
|
||||
-- love.data.compress( container, format, rawstring, level )
|
||||
local zlib_data = love.data.compress("string", "zlib", data, 6) -- level 6 = default
|
||||
|
||||
-- Strip the 2-byte zlib header and 4-byte Adler-32 trailer
|
||||
local raw_deflate = zlib_data:sub(3, -5)
|
||||
|
||||
if #raw_deflate >= #data then
|
||||
return nil -- not worth compressing
|
||||
end
|
||||
return raw_deflate
|
||||
end
|
||||
|
||||
--- MS-DOS date/time encoding for the current time.
|
||||
local function dos_datetime()
|
||||
local t = os.date("*t")
|
||||
local date = ((t.year - 1980) * 512) + (t.month * 32) + t.day
|
||||
local time = (t.hour * 2048) + (t.min * 32) + math.floor(t.sec / 2)
|
||||
return pack_u16(time), pack_u16(date)
|
||||
end
|
||||
|
||||
-- ── Zip writer ────────────────────────────────────────────────────────────────
|
||||
|
||||
--- Create a new Zip writer instance.
|
||||
function Zip.new()
|
||||
return setmetatable({ _entries = {}, _offset = 0 }, Zip)
|
||||
end
|
||||
|
||||
--- Add a file to the zip.
|
||||
-- @param path string Archive path, e.g. "maps/level1.lua". Use '/' separators.
|
||||
-- @param data string Raw file contents.
|
||||
function Zip:add(path, data)
|
||||
assert(type(path) == "string", "path must be a string")
|
||||
assert(type(data) == "string", "data must be a string")
|
||||
assert(not path:match("^/"), "path must not start with '/'")
|
||||
|
||||
local crc = crc32(data)
|
||||
local original = #data
|
||||
local compressed, method
|
||||
|
||||
local deflated = deflate(data)
|
||||
if deflated then
|
||||
compressed = deflated
|
||||
method = 8 -- DEFLATE
|
||||
else
|
||||
compressed = data
|
||||
method = 0 -- Stored
|
||||
end
|
||||
|
||||
table.insert(self._entries, {
|
||||
path = path,
|
||||
data = data, -- uncompressed (kept for the central dir)
|
||||
compressed = compressed,
|
||||
method = method,
|
||||
crc = crc,
|
||||
size_orig = original,
|
||||
size_comp = #compressed,
|
||||
offset = self._offset,
|
||||
})
|
||||
|
||||
-- Local file header = 30 bytes + filename length + compressed data length
|
||||
self._offset = self._offset + 30 + #path + #compressed
|
||||
end
|
||||
|
||||
--- Build and return the full zip file as a binary string.
|
||||
function Zip:build()
|
||||
local parts = {}
|
||||
|
||||
-- ── Local file headers + data ────────────────────────────────────────────
|
||||
for _, e in ipairs(self._entries) do
|
||||
local dos_time, dos_date = dos_datetime()
|
||||
|
||||
-- Local file header signature
|
||||
parts[#parts+1] = "\x50\x4B\x03\x04" -- PK\3\4
|
||||
parts[#parts+1] = "\x14\x00" -- version needed: 2.0
|
||||
parts[#parts+1] = "\x00\x00" -- general purpose bit flag
|
||||
parts[#parts+1] = pack_u16(e.method)
|
||||
parts[#parts+1] = dos_time
|
||||
parts[#parts+1] = dos_date
|
||||
parts[#parts+1] = pack_u32(e.crc)
|
||||
parts[#parts+1] = pack_u32(e.size_comp)
|
||||
parts[#parts+1] = pack_u32(e.size_orig)
|
||||
parts[#parts+1] = pack_u16(#e.path) -- filename length
|
||||
parts[#parts+1] = "\x00\x00" -- extra field length
|
||||
parts[#parts+1] = e.path
|
||||
parts[#parts+1] = e.compressed
|
||||
end
|
||||
|
||||
local central_dir_offset = 0
|
||||
for _, p in ipairs(parts) do central_dir_offset = central_dir_offset + #p end
|
||||
|
||||
-- ── Central directory ────────────────────────────────────────────────────
|
||||
local central_parts = {}
|
||||
for _, e in ipairs(self._entries) do
|
||||
local dos_time, dos_date = dos_datetime()
|
||||
|
||||
central_parts[#central_parts+1] = "\x50\x4B\x01\x02" -- PK\1\2
|
||||
central_parts[#central_parts+1] = "\x14\x00" -- version made by: 2.0
|
||||
central_parts[#central_parts+1] = "\x14\x00" -- version needed: 2.0
|
||||
central_parts[#central_parts+1] = "\x00\x00" -- general purpose bit flag
|
||||
central_parts[#central_parts+1] = pack_u16(e.method)
|
||||
central_parts[#central_parts+1] = dos_time
|
||||
central_parts[#central_parts+1] = dos_date
|
||||
central_parts[#central_parts+1] = pack_u32(e.crc)
|
||||
central_parts[#central_parts+1] = pack_u32(e.size_comp)
|
||||
central_parts[#central_parts+1] = pack_u32(e.size_orig)
|
||||
central_parts[#central_parts+1] = pack_u16(#e.path) -- filename length
|
||||
central_parts[#central_parts+1] = "\x00\x00" -- extra field length
|
||||
central_parts[#central_parts+1] = "\x00\x00" -- file comment length
|
||||
central_parts[#central_parts+1] = "\x00\x00" -- disk number start
|
||||
central_parts[#central_parts+1] = "\x00\x00" -- internal attributes
|
||||
central_parts[#central_parts+1] = "\x00\x00\x00\x00" -- external attributes
|
||||
central_parts[#central_parts+1] = pack_u32(e.offset) -- offset of local header
|
||||
central_parts[#central_parts+1] = e.path
|
||||
end
|
||||
|
||||
local central_dir_size = 0
|
||||
for _, p in ipairs(central_parts) do central_dir_size = central_dir_size + #p end
|
||||
|
||||
-- ── End of central directory record ─────────────────────────────────────
|
||||
local num_entries = #self._entries
|
||||
local eocd = table.concat({
|
||||
"\x50\x4B\x05\x06", -- PK\5\6 (EOCD signature)
|
||||
"\x00\x00", -- disk number
|
||||
"\x00\x00", -- disk with central dir start
|
||||
pack_u16(num_entries), -- entries on this disk
|
||||
pack_u16(num_entries), -- total entries
|
||||
pack_u32(central_dir_size), -- central dir size
|
||||
pack_u32(central_dir_offset), -- central dir offset
|
||||
"\x00\x00", -- comment length
|
||||
})
|
||||
|
||||
return table.concat(parts)
|
||||
.. table.concat(central_parts)
|
||||
.. eocd
|
||||
end
|
||||
|
||||
return Zip
|
||||
+1
-1
@@ -1 +1 @@
|
||||
1.0.2
|
||||
1.0.4
|
||||
Reference in New Issue
Block a user