Compare commits
27 Commits
34da7e2929
...
ghost
Author | SHA1 | Date | |
---|---|---|---|
adbdbb8c03 | |||
e833227b64 | |||
ef620772d9 | |||
46f787f543 | |||
d0e3698ee4 | |||
12ca9aca54 | |||
85e49ecd73 | |||
d9df5d6940 | |||
418f9b01f7 | |||
a663d685f2 | |||
ea01c4db77 | |||
ef4c43161d | |||
9b1ef1a655 | |||
f9716f9e9f | |||
051b0adb4e | |||
beb19c81a3 | |||
00de269bb3 | |||
3c5234f7b2 | |||
d4bbf62945 | |||
36204b579f | |||
9d50705d9a | |||
935d119e4d | |||
172b9d3633 | |||
57120e257a | |||
cf74af8945 | |||
68e44e534b | |||
0a21799e60 |
@ -12,6 +12,7 @@ local ModeSep
|
||||
-- lb_common.lua
|
||||
local ZoneAct = lb_ZoneAct
|
||||
local TicsToTime = lb_TicsToTime
|
||||
local mapChecksum = lb_map_checksum
|
||||
|
||||
-- lb_store.lua
|
||||
local GetMapRecords = lb_get_map_records
|
||||
@ -50,7 +51,7 @@ local function updateMapIndex(n)
|
||||
mapIndex = mapIndexOffset(n)
|
||||
scrollPos = 1
|
||||
|
||||
MapRecords = GetMapRecords(maps[mapIndex], ModeSep)
|
||||
MapRecords = GetMapRecords(maps[mapIndex], mapChecksum(maps[mapIndex]), ModeSep)
|
||||
|
||||
updateModes()
|
||||
end
|
||||
@ -388,7 +389,7 @@ local function initBrowser(modeSep)
|
||||
end
|
||||
|
||||
-- initialize MapRecords
|
||||
MapRecords = GetMapRecords(gamemap, ModeSep)
|
||||
MapRecords = GetMapRecords(gamemap, mapChecksum(gamemap), ModeSep)
|
||||
|
||||
scrollPos = 1
|
||||
updateModes()
|
||||
|
808
ghost.lua
Normal file
808
ghost.lua
Normal file
@ -0,0 +1,808 @@
|
||||
local DEBUG = false
|
||||
|
||||
freeslot("MT_PLAYER_GHOST")
|
||||
|
||||
mobjinfo[MT_PLAYER_GHOST] = {
|
||||
-1, -- doomednum
|
||||
S_KART_STND1, -- spawnstate
|
||||
1, -- spawnhealth
|
||||
S_KART_WALK1, -- seestate
|
||||
sfx_None, -- seesound
|
||||
0, -- reactiontime
|
||||
sfx_thok, -- attacksound
|
||||
S_KART_PAIN, -- painstate
|
||||
MT_THOK, -- painchance
|
||||
sfx_None, -- painsound
|
||||
S_NULL, -- meleestate
|
||||
S_NULL, -- missilestate
|
||||
S_KART_PAIN, -- deathstate
|
||||
S_NULL, -- xdeathstate
|
||||
sfx_None, -- deathsound
|
||||
1, -- speed
|
||||
16*FRACUNIT, -- radius
|
||||
48*FRACUNIT, -- height
|
||||
0, -- display offset
|
||||
1000, -- mass
|
||||
MT_THOK, -- damage
|
||||
sfx_None, -- activesound
|
||||
MF_NOCLIP, -- flags
|
||||
MT_THOK -- raisestate
|
||||
}
|
||||
|
||||
local nenc = lb_base62_encode
|
||||
local ndec = lb_base62_decode
|
||||
local mapChecksum = lb_map_checksum
|
||||
local Transmitter = lb_transmitter
|
||||
local Reciever = lb_reciever
|
||||
|
||||
local Player
|
||||
|
||||
local Client
|
||||
local Server
|
||||
|
||||
local Index
|
||||
local Ghost
|
||||
local Ghosts
|
||||
local Recording
|
||||
|
||||
local PREFIX -- Dir
|
||||
local INDEX = "ghosts" -- Filename
|
||||
|
||||
local cv_disable = CV_RegisterVar({
|
||||
name = "lb_ghost_disable",
|
||||
defaultvalue = "No",
|
||||
flags = CV_NETVAR | CV_CALL,
|
||||
PossibleValue = CV_YesNo,
|
||||
func = function(v)
|
||||
Recording = nil
|
||||
end
|
||||
})
|
||||
|
||||
|
||||
local function Columns(line, sep)
|
||||
local t = {}
|
||||
sep = sep or " "
|
||||
for str in (line..sep):gmatch("(.-)"..sep) do
|
||||
table.insert(t, str)
|
||||
end
|
||||
return {
|
||||
index = 0,
|
||||
items = t,
|
||||
next = function(this)
|
||||
this.index = $ + 1
|
||||
return this.items[this.index]
|
||||
end
|
||||
}
|
||||
end
|
||||
|
||||
local function compareTables(a, b, ...)
|
||||
for _, key in ipairs({...}) do
|
||||
if a[key] != b[key] then
|
||||
return false
|
||||
end
|
||||
end
|
||||
return true
|
||||
end
|
||||
|
||||
Ghosts = {
|
||||
map,
|
||||
players = {},
|
||||
headers = {},
|
||||
data = {},
|
||||
|
||||
dirty = true,
|
||||
|
||||
getData = function(this, player)
|
||||
return this.data[player]
|
||||
end,
|
||||
|
||||
set = function(this, header, data)
|
||||
if not this.headers[header.player] then
|
||||
table.insert(this.players, header.player)
|
||||
end
|
||||
|
||||
this.data[header.player] = data
|
||||
this.headers[header.player] = header
|
||||
end,
|
||||
|
||||
iterate = function(this)
|
||||
local i = 0
|
||||
local m = #this.players
|
||||
local player
|
||||
return function()
|
||||
i = i + 1
|
||||
if i <= m then
|
||||
player = this.players[i]
|
||||
return i, this.headers[player], this.data[player]
|
||||
end
|
||||
end
|
||||
end,
|
||||
|
||||
init = function(this)
|
||||
if this.map == gamemap and not this.dirty then return end
|
||||
this:reset()
|
||||
|
||||
local headers = Index:getMap(gamemap, mapChecksum(gamemap))
|
||||
local ok, data
|
||||
for _, header in ipairs(headers) do
|
||||
ok, data = pcall(Ghost.read, header, Ghost.tableReader)
|
||||
if not ok then
|
||||
print(data)
|
||||
print("\x85\ERROR:\x80 invalid ghost data, removing entry")
|
||||
Index:remove(header)
|
||||
Index:write()
|
||||
continue
|
||||
end
|
||||
this:set(header, data)
|
||||
end
|
||||
end,
|
||||
|
||||
reset = function(this)
|
||||
this.players = {}
|
||||
this.headers = {}
|
||||
this.data = {}
|
||||
this.map = gamemap
|
||||
this.dirty = false
|
||||
end,
|
||||
|
||||
play = function(this)
|
||||
for _, header in pairs(this.headers) do
|
||||
local ghost = P_SpawnMobj(0, 0, 0, MT_PLAYER_GHOST)
|
||||
ghost.playerName = header.player
|
||||
ghost.skin = header.skin
|
||||
ghost.color = header.color
|
||||
end
|
||||
end
|
||||
}
|
||||
|
||||
local function GhostTable(header)
|
||||
local function frame(this, frameNum)
|
||||
return this.frames[frameNum]
|
||||
end
|
||||
|
||||
local function append(this, frame)
|
||||
table.insert(this.frames, frame)
|
||||
end
|
||||
|
||||
-- Calculate the momentum of the last frame
|
||||
local function thrust(this, frameNum)
|
||||
local a = this:frame(frameNum-1)
|
||||
local b = this:frame(frameNum)
|
||||
local angle = R_PointToAngle2(a.x, a.y, b.x, b.y)
|
||||
local momentum = R_PointToDist2(a.x, a.y, b.x, b.y) / FRACUNIT
|
||||
|
||||
local x = momentum * cos(angle)
|
||||
local y = momentum * sin(angle)
|
||||
return x, y
|
||||
end
|
||||
|
||||
local t = {
|
||||
frames = {},
|
||||
frame = frame,
|
||||
append = append,
|
||||
thrust = thrust,
|
||||
}
|
||||
|
||||
if header then
|
||||
for key, value in pairs(header) do
|
||||
t[key] = value
|
||||
end
|
||||
end
|
||||
|
||||
return t
|
||||
end
|
||||
|
||||
local transProximity = 150
|
||||
local function calcTrans(mobj)
|
||||
local dist = R_PointToDist2(mobj.x, mobj.y, Player.mo.x, Player.mo.y)
|
||||
local i = dist / transProximity
|
||||
local tr = 9 - min(9, FixedInt(i * 9))
|
||||
return tr << FF_TRANSSHIFT
|
||||
end
|
||||
|
||||
CV_RegisterVar({
|
||||
name = "lb_ghost_trans_prox",
|
||||
defaultvalue = 150,
|
||||
flags = CV_CALL,
|
||||
PossibleValue = CV_Natural,
|
||||
func = function(cv)
|
||||
transProximity = cv.value
|
||||
end
|
||||
})
|
||||
|
||||
local function ghost_think(mobj)
|
||||
if mobj.done then return end
|
||||
if leveltime < 1 then return end
|
||||
|
||||
if not Recording then
|
||||
P_RemoveMobj(mobj)
|
||||
return
|
||||
end
|
||||
|
||||
local ghost = Ghosts:getData(mobj.playerName)
|
||||
local frame = ghost:frame(leveltime)
|
||||
if frame == nil then
|
||||
mobj.done = true
|
||||
mobj.state = S_KART_STND1
|
||||
mobj.momx, mobj.momy = ghost:thrust(leveltime-1)
|
||||
return
|
||||
end
|
||||
|
||||
P_MoveOrigin(mobj, frame.x, frame.y, frame.z)
|
||||
mobj.angle = frame.angle
|
||||
mobj.state = frame.state
|
||||
mobj.frame
|
||||
= mobj.frame
|
||||
& (~FF_TRANSMASK)
|
||||
| calcTrans(mobj)
|
||||
|
||||
return true
|
||||
end
|
||||
addHook("MobjThinker", ghost_think, MT_PLAYER_GHOST)
|
||||
|
||||
local function drawGhostProgress(v)
|
||||
local x, y = 0, 0
|
||||
local flags = V_SNAPTOTOP | V_SNAPTOLEFT
|
||||
|
||||
local function fmt(rec)
|
||||
local stale = rec.tics > (TICRATE * 10) and "(STALE) " or ""
|
||||
if not rec.len then return stale.."0%" end
|
||||
local n = #rec.packets
|
||||
local p = ((n * 100) / rec.len).."%"
|
||||
return stale.."["..n.."/"..rec.len.."] "..p
|
||||
end
|
||||
|
||||
for _, rec in pairs(Client.data.recievers) do
|
||||
v.drawString(x, y, fmt(rec), flags, "small")
|
||||
y = y + 5
|
||||
end
|
||||
end
|
||||
|
||||
hud.add(function(v)
|
||||
if not Recording then return end
|
||||
|
||||
drawGhostProgress(v)
|
||||
|
||||
local leveltime = leveltime
|
||||
local frame, patch, skin, color
|
||||
for i, header, data in Ghosts:iterate() do
|
||||
frame = data:frame(leveltime)
|
||||
if not frame then continue end
|
||||
|
||||
skin = skins[header.skin] or skins["sonic"]
|
||||
patch = v.cachePatch(skin.facemmap)
|
||||
color = v.getColormap(header.skin, header.color)
|
||||
|
||||
v.drawOnMinimap(frame.x, frame.y, FRACUNIT, patch, color)
|
||||
end
|
||||
end)
|
||||
|
||||
if lb_hook then
|
||||
lb_hook("Finish", function(data)
|
||||
if not data.position then
|
||||
return
|
||||
end
|
||||
|
||||
if data.score.flags & 0x1 then
|
||||
Recording = nil
|
||||
return
|
||||
end
|
||||
|
||||
local score = data.score
|
||||
|
||||
local header = {
|
||||
version = 1,
|
||||
encoding = "b62",
|
||||
player = score.name,
|
||||
skin = score.skin,
|
||||
color = score.color,
|
||||
map = score.map,
|
||||
checksum = score.checksum,
|
||||
time = score.time,
|
||||
flags = score.flags,
|
||||
}
|
||||
|
||||
Ghost.write(header, Ghost.tableWriter(Recording))
|
||||
Index:insert(header)
|
||||
Index:write()
|
||||
Ghosts.dirty = true
|
||||
Recording = nil
|
||||
end)
|
||||
end
|
||||
|
||||
--COM_AddCommand("save_ghost", function(player)
|
||||
-- if not Recording then return end
|
||||
--
|
||||
-- print("Saving Ghost")
|
||||
--
|
||||
-- local header = {
|
||||
-- version = 1,
|
||||
-- encoding = "b62",
|
||||
-- player = player.name,
|
||||
-- skin = player.mo.skin,
|
||||
-- color = player.skincolor,
|
||||
-- map = gamemap,
|
||||
-- checksum = mapChecksum(gamemap),
|
||||
-- time = leveltime,
|
||||
-- flags = 0,
|
||||
-- }
|
||||
--
|
||||
-- Ghost.write(header, Ghost.tableWriter(Recording))
|
||||
-- Index:insert(header)
|
||||
-- Index:write()
|
||||
--
|
||||
-- Recording = nil
|
||||
--end)
|
||||
|
||||
local function singlePlayer()
|
||||
local player
|
||||
for p in players.iterate do
|
||||
if p.valid and not p.spectator then
|
||||
if player then
|
||||
return nil
|
||||
end
|
||||
player = p
|
||||
end
|
||||
end
|
||||
|
||||
return player
|
||||
end
|
||||
|
||||
addHook("ThinkFrame", function()
|
||||
if not Recording then return end
|
||||
|
||||
Player = singlePlayer()
|
||||
local p = Player
|
||||
if not p then
|
||||
Server:stop()
|
||||
Client:stop()
|
||||
Recording = nil
|
||||
return
|
||||
end
|
||||
|
||||
local frame = {
|
||||
x = p.mo.x,
|
||||
y = p.mo.y,
|
||||
z = p.mo.z,
|
||||
angle = p.frameangle,
|
||||
state = p.mo.state
|
||||
}
|
||||
|
||||
Recording:append(frame)
|
||||
end)
|
||||
|
||||
Server = {
|
||||
header = {
|
||||
transmitter,
|
||||
send = function(this)
|
||||
if this.transmitter
|
||||
or #Server.command.transmitters
|
||||
then
|
||||
return
|
||||
end
|
||||
|
||||
this.transmitter = Transmitter("GM", {free = this.free, handle = this})
|
||||
local mapindex = Index:getMap(gamemap, mapChecksum(gamemap))
|
||||
|
||||
local s = ""
|
||||
for _, header in ipairs(mapindex) do
|
||||
s = s..Index.headerFmt(header)
|
||||
end
|
||||
|
||||
this.transmitter:transmit(s)
|
||||
end,
|
||||
|
||||
free = function(tr, this)
|
||||
this.transmitter = nil
|
||||
end,
|
||||
|
||||
stop = function(this)
|
||||
if this.transmitter then
|
||||
this.transmitter:close()
|
||||
end
|
||||
end
|
||||
},
|
||||
|
||||
command = {
|
||||
reciever,
|
||||
listen = function(this)
|
||||
if this.reciever then return end
|
||||
this.reciever = Reciever("GC", this.callback, {stream = true, handle = this})
|
||||
this.reciever:listen()
|
||||
end,
|
||||
|
||||
transmitters = {},
|
||||
callback = function(cmd, handle)
|
||||
if handle.transmitters[cmd] then
|
||||
return
|
||||
end
|
||||
|
||||
local mapindex = Index:getMap(gamemap, mapChecksum(gamemap))
|
||||
local header = assert(mapindex[tonumber(cmd)])
|
||||
local data = Ghost.read(header, Ghost.stringReader)
|
||||
|
||||
local tr = Transmitter(
|
||||
"GC"..cmd,
|
||||
{
|
||||
free = handle.free,
|
||||
handle = {
|
||||
this = handle,
|
||||
cmd = cmd
|
||||
}
|
||||
}
|
||||
)
|
||||
handle.transmitters[cmd] = tr
|
||||
tr:transmit(data)
|
||||
end,
|
||||
|
||||
free = function(tr, handle)
|
||||
handle.this.transmitters[handle.cmd] = nil
|
||||
end,
|
||||
|
||||
stop = function(this)
|
||||
for _, tr in pairs(this.transmitters) do
|
||||
tr:close()
|
||||
end
|
||||
end
|
||||
},
|
||||
|
||||
stop = function(this)
|
||||
this.header:stop()
|
||||
this.command:stop()
|
||||
end
|
||||
}
|
||||
|
||||
Client = {
|
||||
header = {
|
||||
reciever,
|
||||
listen = function(this)
|
||||
if this.reciever then return end
|
||||
this.reciever = Reciever(
|
||||
"GM",
|
||||
this.callback,
|
||||
{
|
||||
free = this.free,
|
||||
handle = this
|
||||
}
|
||||
)
|
||||
this.reciever:listen()
|
||||
end,
|
||||
|
||||
callback = function(data, this)
|
||||
local header, storedHeader
|
||||
local cmd = 1
|
||||
for str in data:gmatch("(.-)\n") do
|
||||
if Client.data:busy(cmd) then
|
||||
continue
|
||||
end
|
||||
|
||||
header = Index.parseHeader(str)
|
||||
storedHeader = Index:find(header)
|
||||
if not (
|
||||
storedHeader
|
||||
and compareTables(
|
||||
header,
|
||||
storedHeader,
|
||||
"time",
|
||||
"flags",
|
||||
"skin",
|
||||
"color"
|
||||
)
|
||||
) then
|
||||
local tr = Transmitter("GC", {stream = true})
|
||||
tr:transmit(cmd)
|
||||
Client.data:listen(header, cmd)
|
||||
end
|
||||
cmd = $ + 1
|
||||
end
|
||||
end,
|
||||
|
||||
free = function(rc, handle)
|
||||
handle.reciever = nil
|
||||
end,
|
||||
|
||||
stop = function(this)
|
||||
if this.reciever then
|
||||
this.reciever:close()
|
||||
end
|
||||
end
|
||||
},
|
||||
|
||||
data = {
|
||||
recievers = {},
|
||||
listen = function(this, header, cmd)
|
||||
local rc = Reciever(
|
||||
"GC"..cmd,
|
||||
this.callback,
|
||||
{
|
||||
free = this.free,
|
||||
handle = {
|
||||
this = this,
|
||||
header = header,
|
||||
cmd = cmd
|
||||
},
|
||||
}
|
||||
)
|
||||
|
||||
this.recievers[cmd] = rc
|
||||
rc:listen()
|
||||
end,
|
||||
|
||||
callback = function(data, handle)
|
||||
Ghost.write(handle.header, Ghost.stringWriter(data))
|
||||
Index:insert(handle.header)
|
||||
Index:write()
|
||||
|
||||
Ghosts.dirty = true
|
||||
end,
|
||||
|
||||
free = function(rc, handle)
|
||||
handle.this.recievers[handle.cmd] = nil
|
||||
end,
|
||||
|
||||
busy = function(this, cmd)
|
||||
for com in pairs(this.recievers) do
|
||||
if com == cmd then return true end
|
||||
end
|
||||
end,
|
||||
|
||||
stop = function(this)
|
||||
for _, rec in pairs(this.recievers) do
|
||||
rec:close()
|
||||
end
|
||||
end
|
||||
},
|
||||
|
||||
stop = function(this)
|
||||
this.header:stop()
|
||||
this.data:stop()
|
||||
end
|
||||
}
|
||||
|
||||
addHook("MapLoad", function(num)
|
||||
if cv_disable.value
|
||||
or not singlePlayer()
|
||||
then
|
||||
Recording = nil
|
||||
return
|
||||
end
|
||||
|
||||
Recording = GhostTable()
|
||||
|
||||
if isserver then
|
||||
Server.header:send()
|
||||
Server.command:listen()
|
||||
return
|
||||
end
|
||||
|
||||
Ghosts:init()
|
||||
Client.header:listen()
|
||||
Ghosts:play()
|
||||
end)
|
||||
|
||||
local function open(filename, mode, fn)
|
||||
local f, err = io.open(filename, mode)
|
||||
if err then
|
||||
return nil, err
|
||||
end
|
||||
|
||||
local ok, err = pcall(fn, f)
|
||||
f:close()
|
||||
|
||||
if not ok then
|
||||
err = string.format("%s\n(\x82%s\x80 (%s))", err, filename, mode)
|
||||
end
|
||||
|
||||
return ok, err
|
||||
end
|
||||
|
||||
Index = {
|
||||
headers,
|
||||
|
||||
insert = function(this, header)
|
||||
local map = this:getMap(header.map, header.checksum)
|
||||
for i, h in ipairs(map) do
|
||||
if h.player == header.player then
|
||||
map[i] = header
|
||||
this:setMap(header.map, header.checksum, map)
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
table.insert(map, header)
|
||||
this:setMap(header.map, header.checksum, map)
|
||||
end,
|
||||
|
||||
remove = function(this, header)
|
||||
local map = this:getMap(header.map, header.checksum)
|
||||
for i, h in ipairs(map) do
|
||||
if h.player == header.player then
|
||||
map[i] = nil
|
||||
this:setMap(header.map, header.checksum, map)
|
||||
return
|
||||
end
|
||||
end
|
||||
end,
|
||||
|
||||
find = function(this, header)
|
||||
local index = this:getMap(header.map, header.checksum)
|
||||
for i, h in ipairs(index) do
|
||||
if h.player == header.player then
|
||||
return h
|
||||
end
|
||||
end
|
||||
end,
|
||||
|
||||
join = function(sep, ...)
|
||||
local t = {...}
|
||||
local ret = ""..t[1]
|
||||
local v
|
||||
for i = 2, #t do
|
||||
v = t[i]
|
||||
ret = $..sep..(v ~= nil and v or "")
|
||||
end
|
||||
return ret
|
||||
end,
|
||||
|
||||
headerFmt = function(h)
|
||||
return Index.join(
|
||||
"\t",
|
||||
h.version,
|
||||
h.encoding,
|
||||
h.map,
|
||||
h.checksum,
|
||||
h.player,
|
||||
h.time,
|
||||
h.flags or "0",
|
||||
h.skin,
|
||||
h.color or "0"
|
||||
).."\n"
|
||||
end,
|
||||
|
||||
parseHeader = function(line)
|
||||
local c = Columns(line, "\t")
|
||||
return {
|
||||
version = c:next(),
|
||||
encoding = c:next(),
|
||||
map = c:next(),
|
||||
checksum = c:next(),
|
||||
player = c:next(),
|
||||
time = tonumber(c:next()),
|
||||
flags = tonumber(c:next()),
|
||||
skin = c:next(),
|
||||
color = tonumber(c:next())
|
||||
}
|
||||
end,
|
||||
|
||||
filename = function(prefix, filename)
|
||||
return string.format(
|
||||
"%s/%s.txt",
|
||||
prefix,
|
||||
filename
|
||||
)
|
||||
end,
|
||||
|
||||
write = function(this)
|
||||
local filename = this.filename(PREFIX, INDEX)
|
||||
assert(open(filename, "w", function(f)
|
||||
for _, map in pairs(this.headers) do
|
||||
for _, header in ipairs(map) do
|
||||
f:write(this.headerFmt(header))
|
||||
end
|
||||
end
|
||||
end))
|
||||
end,
|
||||
|
||||
read = function(this)
|
||||
local filename = this.filename(PREFIX, INDEX)
|
||||
this.headers = {}
|
||||
assert(open(filename, "r", function(f)
|
||||
for line in f:lines() do
|
||||
this:insert(
|
||||
this.parseHeader(line)
|
||||
)
|
||||
end
|
||||
end))
|
||||
end,
|
||||
|
||||
getMap = function(this, map, checksum)
|
||||
if not this.headers then
|
||||
this:read()
|
||||
end
|
||||
|
||||
return this.headers[map..checksum] or {}
|
||||
end,
|
||||
|
||||
setMap = function(this, map, checksum, entry)
|
||||
assert(this.headers, "Index: header unread")
|
||||
this.headers[map..checksum] = entry
|
||||
end
|
||||
}
|
||||
|
||||
Ghost = {
|
||||
stringReader = function(f)
|
||||
return f:read("*a")
|
||||
end,
|
||||
|
||||
tableReader = function(f)
|
||||
local data = GhostTable(header)
|
||||
local c
|
||||
f:read() -- skip first frame
|
||||
for line in f:lines() do
|
||||
c = Columns(line)
|
||||
data:append({
|
||||
state = ndec(c:next()),
|
||||
angle = ndec(c:next()),
|
||||
x = ndec(c:next()),
|
||||
y = ndec(c:next()),
|
||||
z = ndec(c:next()),
|
||||
})
|
||||
end
|
||||
return data
|
||||
end,
|
||||
|
||||
filename = function(prefix, header)
|
||||
return string.format(
|
||||
"%s/%d_%s_%s.txt",
|
||||
prefix,
|
||||
header.map,
|
||||
header.checksum,
|
||||
header.player
|
||||
)
|
||||
end,
|
||||
|
||||
read = function(header, reader)
|
||||
local filename = Ghost.filename(PREFIX, header)
|
||||
local data
|
||||
assert(open(filename, "r", function(f)
|
||||
data = reader(f)
|
||||
end))
|
||||
|
||||
return data
|
||||
end,
|
||||
|
||||
stringWriter = function(dataStr)
|
||||
return function(f)
|
||||
f:setvbuf("full")
|
||||
f:write(dataStr)
|
||||
end
|
||||
end,
|
||||
|
||||
frameFmt = function(frame)
|
||||
return string.format(
|
||||
"%s %s %s %s %s\n",
|
||||
nenc(frame.state),
|
||||
nenc(frame.angle),
|
||||
nenc(frame.x),
|
||||
nenc(frame.y),
|
||||
nenc(frame.z)
|
||||
)
|
||||
end,
|
||||
|
||||
tableWriter = function(data)
|
||||
return function(f)
|
||||
f:setvbuf("line")
|
||||
for _, frame in ipairs(data.frames) do
|
||||
f:write(Ghost.frameFmt(frame))
|
||||
end
|
||||
end
|
||||
end,
|
||||
|
||||
write = function(header, writer)
|
||||
local filename = Ghost.filename(PREFIX, header)
|
||||
assert(open(filename, "w", writer))
|
||||
end,
|
||||
}
|
||||
|
||||
local cv_prefix = CV_RegisterVar({
|
||||
name = "lb_ghost_dir",
|
||||
defaultvalue = "ghosts",
|
||||
flags = CV_CALL | CV_NETVAR,
|
||||
func = function(cv)
|
||||
PREFIX = cv.string
|
||||
if DEBUG and not isserver then
|
||||
PREFIX = $.."_client"
|
||||
end
|
||||
Index.headers = nil
|
||||
end
|
||||
})
|
121
lb_common.lua
121
lb_common.lua
@ -1,3 +1,17 @@
|
||||
rawset(_G, "lb_score_t", function(map, name, skin, color, time, splits, flags, stat, checksum)
|
||||
return {
|
||||
["map"] = map,
|
||||
["name"] = name,
|
||||
["skin"] = skin,
|
||||
["color"] = color,
|
||||
["time"] = time,
|
||||
["splits"] = splits,
|
||||
["flags"] = flags,
|
||||
["stat"] = stat,
|
||||
["checksum"] = checksum
|
||||
}
|
||||
end)
|
||||
|
||||
rawset(_G, "lb_TicsToTime", function(tics, pure)
|
||||
if tics == 0 and pure then
|
||||
return "-:--:--"
|
||||
@ -44,3 +58,110 @@ rawset(_G, "lb_comp", function(a, b)
|
||||
local s = (a.flags & (F_SPBEXP | F_SPBBIG)) - (b.flags & (F_SPBEXP | F_SPBBIG))
|
||||
return s > 0 or not(s < 0 or a.time >= b.time)
|
||||
end)
|
||||
|
||||
local function djb2(message)
|
||||
local digest = 5381
|
||||
for c in message:gmatch(".") do
|
||||
digest = (($ << 5) + $) + string.byte(c)
|
||||
end
|
||||
|
||||
return digest
|
||||
end
|
||||
|
||||
-- Produce a checksum by using the maps title, subtitle and zone
|
||||
rawset(_G, "lb_map_checksum", function(mapnum)
|
||||
local mh = mapheaderinfo[mapnum]
|
||||
if not mh then
|
||||
return nil
|
||||
end
|
||||
|
||||
local digest = string.format("%04x", djb2(mh.lvlttl..mh.subttl..mh.zonttl))
|
||||
return string.sub(digest, #digest - 3)
|
||||
end)
|
||||
|
||||
rawset(_G, "lb_mapnum_from_extended", function(map)
|
||||
local p, q = map:upper():match("MAP(%w)(%w)$", 1)
|
||||
if not (p and q) then
|
||||
return nil
|
||||
end
|
||||
|
||||
local mapnum = 0
|
||||
local A = string.byte("A")
|
||||
|
||||
if tonumber(p) != nil then
|
||||
-- Non extended map numbers
|
||||
if tonumber(q) == nil then
|
||||
return nil
|
||||
end
|
||||
mapnum = tonumber(p) * 10 + tonumber(q)
|
||||
else
|
||||
--Extended map numbers
|
||||
p = string.byte(p) - A
|
||||
local qn = tonumber(q)
|
||||
if qn == nil then
|
||||
qn = string.byte(q) - A + 10
|
||||
end
|
||||
|
||||
mapnum = 36 * p + qn + 100
|
||||
end
|
||||
|
||||
return mapnum
|
||||
end)
|
||||
|
||||
local eventHandler = {}
|
||||
|
||||
rawset(_G, "lb_hook", function(event, callback)
|
||||
local handle = eventHandler[event] or {}
|
||||
table.insert(handle, callback)
|
||||
eventHandler[event] = handle
|
||||
end)
|
||||
|
||||
rawset(_G, "lb_fire_event", function(event, ...)
|
||||
local handle = eventHandler[event]
|
||||
if not handle then return end
|
||||
|
||||
for _, callback in ipairs(handle) do
|
||||
pcall(callback, ...)
|
||||
end
|
||||
end)
|
||||
|
||||
local b62 = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||
local function base62_encode(n)
|
||||
if n <= 0 then return "0" end
|
||||
local b62 = b62
|
||||
local q = n
|
||||
local r = ""
|
||||
local t
|
||||
while q > 0 do
|
||||
t = q % 62 + 1
|
||||
r = b62:sub(t, t)..r
|
||||
q = q / 62
|
||||
end
|
||||
return r
|
||||
end
|
||||
|
||||
local function base62_decode(s)
|
||||
local n = b62:find(s:sub(1,1)) - 1
|
||||
for i = 2, #s do
|
||||
n = n * 62 + b62:find(s:sub(i, i)) - 1
|
||||
end
|
||||
|
||||
return n
|
||||
end
|
||||
|
||||
local function neg_base62_encode(n)
|
||||
if n == INT32_MIN then
|
||||
return "-2lkCB2"
|
||||
end
|
||||
|
||||
if n < 0 then return "-"..base62_encode(abs(n)) end
|
||||
return base62_encode(n)
|
||||
end
|
||||
|
||||
local function neg_base62_decode(s)
|
||||
if s:sub(1, 1) == "-" then return -base62_decode(s:sub(2)) end
|
||||
return base62_decode(s)
|
||||
end
|
||||
|
||||
rawset(_G, "lb_base62_encode", neg_base62_encode)
|
||||
rawset(_G, "lb_base62_decode", neg_base62_decode)
|
||||
|
362
lb_store.lua
362
lb_store.lua
@ -5,10 +5,14 @@
|
||||
-- lb_common.lua
|
||||
local stat_t = lb_stat_t
|
||||
local lbComp = lb_comp
|
||||
local score_t = lb_score_t
|
||||
local mapChecksum = lb_map_checksum
|
||||
local mapnumFromExtended = lb_mapnum_from_extended
|
||||
|
||||
----------------------------
|
||||
|
||||
local LEADERBOARD_FILE = "leaderboard.txt"
|
||||
local COLDSTORE_FILE = "leaderboard.coldstore.txt"
|
||||
|
||||
-- ColdStore are records loaded from lua addons
|
||||
-- this table should never be modified outside of the AddColdStore function
|
||||
@ -17,43 +21,123 @@ local ColdStore = {}
|
||||
-- Livestore are new records nad records loaded from leaderboard.txt file
|
||||
local LiveStore = {}
|
||||
|
||||
-- parse score function
|
||||
local parseScore
|
||||
|
||||
local MSK_SPEED = 0xF0
|
||||
local MSK_WEIGHT = 0xF
|
||||
local function stat_str(stat)
|
||||
if stat then
|
||||
return string.format("%d%d", (stat & MSK_SPEED) >> 4, stat & MSK_WEIGHT)
|
||||
end
|
||||
|
||||
return "0"
|
||||
end
|
||||
|
||||
local function isSameRecord(a, b, modeSep)
|
||||
return a.name == b.name and (a.flags & modeSep) == (b.flags & modeSep)
|
||||
end
|
||||
|
||||
-- insert or replace the score in dest
|
||||
local function insertOrReplace(dest, score, modeSep)
|
||||
for i, record in ipairs(dest) do
|
||||
if isSameRecord(record, score, modeSep) then
|
||||
if lbComp(score, record) then
|
||||
dest[i] = score
|
||||
end
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
table.insert(dest, score)
|
||||
end
|
||||
|
||||
local function dumpStoreToFile(filename, store)
|
||||
local f = assert(
|
||||
io.open(filename, "w"),
|
||||
"Failed to open file for writing: "..filename
|
||||
)
|
||||
|
||||
f:setvbuf("line")
|
||||
|
||||
for mapid, checksums in pairs(store) do
|
||||
for checksum, records in pairs(checksums) do
|
||||
for _, record in ipairs(records) do
|
||||
if not record.checksum or record.checksum == "" then
|
||||
record.checksum = mapChecksum(record.map) or ""
|
||||
end
|
||||
|
||||
f:write(
|
||||
mapid, "\t",
|
||||
record.name, "\t",
|
||||
record.skin, "\t",
|
||||
record.color, "\t",
|
||||
record.time, "\t",
|
||||
table.concat(record.splits, " "), "\t",
|
||||
record.flags, "\t",
|
||||
stat_str(record.stat), "\t",
|
||||
record.checksum, "\n"
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
f:close()
|
||||
end
|
||||
|
||||
-- GLOBAL
|
||||
-- Returns a list of all maps with records
|
||||
local function MapList()
|
||||
local maps = {}
|
||||
for map in pairs(ColdStore) do
|
||||
maps[map] = true
|
||||
for mapid, checksums in pairs(ColdStore) do
|
||||
maps[mapid] = $ or {}
|
||||
for checksum in pairs(checksums) do
|
||||
maps[mapid][checksum] = true
|
||||
end
|
||||
end
|
||||
for map in pairs(LiveStore) do
|
||||
maps[map] = true
|
||||
for mapid, checksums in pairs(LiveStore) do
|
||||
maps[mapid] = $ or {}
|
||||
for checksum in pairs(checksums) do
|
||||
maps[mapid][checksum] = true
|
||||
end
|
||||
end
|
||||
|
||||
local maplist = {}
|
||||
for map in pairs(maps) do
|
||||
table.insert(maplist, map)
|
||||
for mapid, checksums in pairs(maps) do
|
||||
for checksum in pairs(checksums) do
|
||||
table.insert(maplist, {["id"] = mapid, ["checksum"] = checksum})
|
||||
end
|
||||
end
|
||||
table.sort(maplist)
|
||||
table.sort(maplist, function(a, b) return a.id < b.id end)
|
||||
|
||||
return maplist
|
||||
end
|
||||
rawset(_G, "lb_map_list", MapList)
|
||||
|
||||
-- GLOBAL
|
||||
-- Function for adding records from lua
|
||||
-- Function for adding a single record from lua
|
||||
local function AddColdStore(record)
|
||||
ColdStore[record.map] = $ or {}
|
||||
table.insert(ColdStore[record.map], record)
|
||||
ColdStore[record.map][record.checksum] = $ or {}
|
||||
|
||||
table.insert(ColdStore[record.map][record.checksum], record)
|
||||
end
|
||||
rawset(_G, "lb_add_coldstore_record", AddColdStore)
|
||||
|
||||
-- GLOBAL
|
||||
-- Function for adding a single record in string form from lua
|
||||
local function AddColdStoreString(record)
|
||||
AddColdStore(parseScore(record))
|
||||
end
|
||||
rawset(_G, "lb_add_coldstore_record_string", AddColdStoreString)
|
||||
|
||||
-- Insert mode separated records from the flat sourceTable into dest
|
||||
local function insertRecords(dest, sourceTable, modeSep)
|
||||
local function insertRecords(dest, sourceTable, checksum, modeSep)
|
||||
if not sourceTable then return end
|
||||
if not sourceTable[checksum] then return end
|
||||
|
||||
local mode = nil
|
||||
for _, record in ipairs(sourceTable) do
|
||||
for _, record in ipairs(sourceTable[checksum]) do
|
||||
mode = record.flags & modeSep
|
||||
dest[mode] = $ or {}
|
||||
table.insert(dest[mode], record)
|
||||
@ -63,14 +147,14 @@ end
|
||||
-- GLOBAL
|
||||
-- Construct the leaderboard table of the supplied mapid
|
||||
-- combines the ColdStore and LiveStore records
|
||||
local function GetMapRecords(map, modeSep)
|
||||
local function GetMapRecords(map, checksum, modeSep)
|
||||
local mapRecords = {}
|
||||
|
||||
-- Insert ColdStore records
|
||||
insertRecords(mapRecords, ColdStore[map], modeSep)
|
||||
insertRecords(mapRecords, ColdStore[map], checksum, modeSep)
|
||||
|
||||
-- Insert LiveStore records
|
||||
insertRecords(mapRecords, LiveStore[map], modeSep)
|
||||
insertRecords(mapRecords, LiveStore[map], checksum, modeSep)
|
||||
|
||||
-- Sort records
|
||||
for _, records in pairs(mapRecords) do
|
||||
@ -95,92 +179,19 @@ local function GetMapRecords(map, modeSep)
|
||||
end
|
||||
rawset(_G, "lb_get_map_records", GetMapRecords)
|
||||
|
||||
local function insertOrReplaceRecord(map, score, modeSep)
|
||||
LiveStore[map] = $ or {}
|
||||
|
||||
for i, record in ipairs(LiveStore[map]) do
|
||||
-- Replace the record
|
||||
if record.name == score.name
|
||||
and (record.flags & modeSep) == (score.flags & modeSep) then
|
||||
LiveStore[map][i] = score
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
table.insert(LiveStore[map], score)
|
||||
|
||||
-- TODO: remove excess records
|
||||
end
|
||||
|
||||
local MSK_SPEED = 0xF0
|
||||
local MSK_WEIGHT = 0xF
|
||||
local function stat_str(stat)
|
||||
if stat then
|
||||
return string.format("%d%d", (stat & MSK_SPEED) >> 4, stat & MSK_WEIGHT)
|
||||
end
|
||||
|
||||
return "0"
|
||||
end
|
||||
|
||||
local function djb2(message)
|
||||
local digest = 5381
|
||||
for c in message:gmatch(".") do
|
||||
digest = (($ << 5) + $) + string.byte(c)
|
||||
end
|
||||
|
||||
return digest
|
||||
end
|
||||
|
||||
-- Produce a checksum by using the maps title, subtitle and zone
|
||||
local function mapChecksum(mapnum)
|
||||
local mh = mapheaderinfo[mapnum]
|
||||
if not mh then
|
||||
return nil
|
||||
end
|
||||
|
||||
local digest = string.format("%04x", djb2(mh.lvlttl..mh.subttl..mh.zonttl))
|
||||
return string.sub(digest, #digest - 3)
|
||||
end
|
||||
|
||||
-- GLOBAL
|
||||
-- Save a record to the LiveStore and write to disk
|
||||
-- SaveRecord will replace the record holders previous record but it will not compare any record times
|
||||
-- SaveRecord will replace the record holders previous record
|
||||
local function SaveRecord(score, map, modeSep)
|
||||
insertOrReplaceRecord(map, score, modeSep)
|
||||
local checksum = mapChecksum(map)
|
||||
LiveStore[map] = $ or {}
|
||||
LiveStore[map][checksum] = $ or {}
|
||||
insertOrReplace(LiveStore[map][checksum], score, modeSep)
|
||||
|
||||
print("Saving score")
|
||||
|
||||
if not isserver then return end
|
||||
|
||||
local f = assert(
|
||||
io.open(LEADERBOARD_FILE, "w"),
|
||||
"Failed to open file for writing: "..LEADERBOARD_FILE
|
||||
)
|
||||
|
||||
f:setvbuf("line")
|
||||
|
||||
for mapid, records in pairs(LiveStore) do
|
||||
for _, record in ipairs(records) do
|
||||
-- Insert checksum if missing
|
||||
if (not record.checksum) or record.checksum == "" then
|
||||
record.checksum = mapChecksum(mapid)
|
||||
end
|
||||
|
||||
f:write(
|
||||
mapid, "\t",
|
||||
record.name, "\t",
|
||||
record.skin, "\t",
|
||||
record.color, "\t",
|
||||
record.time, "\t",
|
||||
table.concat(record.splits, " "), "\t",
|
||||
record.flags, "\t",
|
||||
stat_str(record.stat), "\t",
|
||||
record.checksum or "", "\n"
|
||||
)
|
||||
end
|
||||
if isserver then
|
||||
dumpStoreToFile(LEADERBOARD_FILE, LiveStore)
|
||||
end
|
||||
|
||||
f:close()
|
||||
end
|
||||
rawset(_G, "lb_save_record", SaveRecord)
|
||||
|
||||
@ -190,21 +201,7 @@ end
|
||||
|
||||
addHook("NetVars", netvars)
|
||||
|
||||
local function score_t(map, name, skin, color, time, splits, flags, stat, checksum)
|
||||
return {
|
||||
["map"] = map,
|
||||
["name"] = name,
|
||||
["skin"] = skin,
|
||||
["color"] = color,
|
||||
["time"] = time,
|
||||
["splits"] = splits,
|
||||
["flags"] = flags,
|
||||
["stat"] = stat,
|
||||
["checksum"] = checksum
|
||||
}
|
||||
end
|
||||
|
||||
local function parseScore(str)
|
||||
function parseScore(str)
|
||||
-- Leaderboard is stored in the following tab separated format
|
||||
-- mapnum, name, skin, color, time, splits, flags, stat
|
||||
local t = {}
|
||||
@ -233,7 +230,7 @@ local function parseScore(str)
|
||||
end
|
||||
end
|
||||
|
||||
local checksum = t[9]
|
||||
local checksum = t[9] or ""
|
||||
|
||||
return score_t(
|
||||
tonumber(t[1]), -- Map
|
||||
@ -244,23 +241,154 @@ local function parseScore(str)
|
||||
splits,
|
||||
flags,
|
||||
stats,
|
||||
checksum
|
||||
checksum:lower()
|
||||
)
|
||||
end
|
||||
rawset(_G, "lb_parse_score", parseScore)
|
||||
|
||||
-- Load the livestore
|
||||
if isserver then
|
||||
-- Read and parse a store file
|
||||
local function loadStoreFile(filename)
|
||||
local f = assert(
|
||||
io.open(LEADERBOARD_FILE, "r"),
|
||||
"Failed to open file: "..LEADERBOARD_FILE
|
||||
io.open(filename, "r"),
|
||||
"Failed to open file for reading: "..filename
|
||||
)
|
||||
|
||||
local store = {}
|
||||
|
||||
for l in f:lines() do
|
||||
local score = parseScore(l)
|
||||
LiveStore[score.map] = $ or {}
|
||||
table.insert(LiveStore[score.map], score)
|
||||
store[score.map] = $ or {}
|
||||
store[score.map][score.checksum] = $ or {}
|
||||
table.insert(store[score.map][score.checksum], score)
|
||||
end
|
||||
|
||||
f:close()
|
||||
|
||||
return store
|
||||
end
|
||||
|
||||
-- GLOBAL
|
||||
-- Command for moving records from one map to another
|
||||
local function moveRecords(from, to, modeSep)
|
||||
local function moveRecordsInStore(store)
|
||||
if not (store[from.id] and store[from.id][from.checksum]) then
|
||||
return 0
|
||||
end
|
||||
|
||||
store[to.id] = $ or {}
|
||||
store[to.id][to.checksum] = $ or {}
|
||||
for i, score in ipairs(store[from.id][from.checksum]) do
|
||||
score.map = to.id
|
||||
score.checksum = to.checksum
|
||||
insertOrReplace(store[to.id][to.checksum], score, modeSep)
|
||||
end
|
||||
|
||||
-- Destroy the original table
|
||||
store[from.id][from.checksum] = nil
|
||||
end
|
||||
|
||||
-- move livestore records and write to disk
|
||||
moveRecordsInStore(LiveStore)
|
||||
|
||||
if isserver then
|
||||
dumpStoreToFile(LEADERBOARD_FILE, LiveStore)
|
||||
|
||||
-- move coldstore records
|
||||
local ok, coldstore = pcall(loadStoreFile, COLDSTORE_FILE)
|
||||
if ok and coldstore then
|
||||
moveRecordsInStore(coldstore)
|
||||
dumpStoreToFile(COLDSTORE_FILE, coldstore)
|
||||
end
|
||||
end
|
||||
end
|
||||
rawset(_G, "lb_move_records", moveRecords)
|
||||
|
||||
-- Helper function for those upgrading from 1.2 to 1.3
|
||||
COM_AddCommand("lb_write_checksums", function(player)
|
||||
local count = 0
|
||||
local moved = {}
|
||||
|
||||
-- Gather movable records (no checksum, map loaded)
|
||||
for map, checksums in pairs(LiveStore) do
|
||||
for checksum, records in pairs(checksums) do
|
||||
if checksum == "" then
|
||||
local sum = mapChecksum(map)
|
||||
|
||||
if not sum then continue end
|
||||
|
||||
moved[map] = {}
|
||||
moved[map][sum] = {}
|
||||
|
||||
for i, record in ipairs(records) do
|
||||
record.checksum = sum
|
||||
table.insert(moved[map][sum], record)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Write moved to livestore
|
||||
for map, checksums in pairs(moved) do
|
||||
LiveStore[map] = $ or {}
|
||||
for checksum, records in pairs(checksums) do
|
||||
LiveStore[map][checksum] = $ or {}
|
||||
for i, score in ipairs(records) do
|
||||
table.insert(LiveStore[map][checksum], score)
|
||||
end
|
||||
count = $ + #records
|
||||
end
|
||||
LiveStore[map][""] = nil
|
||||
end
|
||||
|
||||
if isserver then
|
||||
dumpStoreToFile(LEADERBOARD_FILE, LiveStore)
|
||||
end
|
||||
|
||||
CONS_Printf(player, string.format("Successful operation on %d records", count))
|
||||
end, COM_ADMIN)
|
||||
|
||||
COM_AddCommand("lb_known_maps", function(player, map)
|
||||
local mapnum = gamemap
|
||||
if map then
|
||||
mapnum = mapnumFromExtended(map)
|
||||
if not mapnum then
|
||||
CONS_Printf(player, string.format("invalid map '%s'", map))
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
local known = {}
|
||||
|
||||
if LiveStore[mapnum] then
|
||||
for checksum, records in pairs(LiveStore[mapnum]) do
|
||||
known[checksum] = #records
|
||||
end
|
||||
end
|
||||
if ColdStore[mapnum] then
|
||||
for checksum, records in pairs(ColdStore[mapnum]) do
|
||||
known[checksum] = $ or 0 + #records
|
||||
end
|
||||
end
|
||||
|
||||
CONS_Printf(player, "Map Chck Records")
|
||||
for checksum, count in pairs(known) do
|
||||
CONS_Printf(player, string.format("%s %s %d", G_BuildMapName(mapnum), checksum, count))
|
||||
end
|
||||
end)
|
||||
|
||||
COM_AddCommand("lb_download_live_records", function(player, filename)
|
||||
if not filename then
|
||||
CONS_Printf(player, "Usage: lb_download_live_records <filename>")
|
||||
return
|
||||
end
|
||||
|
||||
if filename:sub(#filename-3) != ".txt" then
|
||||
filename = $..".txt"
|
||||
end
|
||||
dumpStoreToFile(filename, LiveStore)
|
||||
end, COM_LOCAL)
|
||||
|
||||
-- Load the livestore
|
||||
if isserver then
|
||||
LiveStore = loadStoreFile(LEADERBOARD_FILE)
|
||||
end
|
||||
|
195
leaderboard.lua
195
leaderboard.lua
@ -1,6 +1,29 @@
|
||||
-- Leaderboards written by Not
|
||||
-- Reusable
|
||||
|
||||
---------- Imported functions -------------
|
||||
-- lb_common.lua
|
||||
local ticsToTime = lb_TicsToTime
|
||||
local zoneAct = lb_ZoneAct
|
||||
local stat_t = lb_stat_t
|
||||
local lbComp = lb_comp
|
||||
local mapChecksum = lb_map_checksum
|
||||
local score_t = lb_score_t
|
||||
local mapnumFromExtended = lb_mapnum_from_extended
|
||||
local fireEvent = lb_fire_event
|
||||
|
||||
-- browser.lua
|
||||
local InitBrowser = InitBrowser
|
||||
local DrawBrowser = DrawBrowser
|
||||
local BrowserController = BrowserController
|
||||
|
||||
-- lb_store.lua
|
||||
local GetMapRecords = lb_get_map_records
|
||||
local SaveRecord = lb_save_record
|
||||
local MapList = lb_map_list
|
||||
local MoveRecords = lb_move_records
|
||||
--------------------------------------------
|
||||
|
||||
-- Holds the current maps records table including all modes
|
||||
local MapRecords = {}
|
||||
|
||||
@ -85,24 +108,9 @@ local scroll_to
|
||||
|
||||
local allowJoin
|
||||
|
||||
-- Imported functions --
|
||||
-- Events
|
||||
local EVENT_FINISH = "Finish"
|
||||
|
||||
-- lb_common.lua
|
||||
local ticsToTime = lb_TicsToTime
|
||||
local zoneAct = lb_ZoneAct
|
||||
local stat_t = lb_stat_t
|
||||
local lbComp = lb_comp
|
||||
|
||||
-- browser.lua
|
||||
local InitBrowser = InitBrowser
|
||||
local DrawBrowser = DrawBrowser
|
||||
local BrowserController = BrowserController
|
||||
|
||||
-- lb_store.lua
|
||||
local GetMapRecords = lb_get_map_records
|
||||
local SaveRecord = lb_save_record
|
||||
local MapList = lb_map_list
|
||||
---------------
|
||||
|
||||
-- cvars
|
||||
local cv_teamchange
|
||||
@ -181,19 +189,6 @@ local cv_spb_separate = CV_RegisterVar({
|
||||
end
|
||||
})
|
||||
|
||||
local function score_t(map, name, skin, color, time, splits, flags, stat)
|
||||
return {
|
||||
["map"] = map,
|
||||
["name"] = name,
|
||||
["skin"] = skin,
|
||||
["color"] = color,
|
||||
["time"] = time,
|
||||
["splits"] = splits,
|
||||
["flags"] = flags,
|
||||
["stat"] = stat
|
||||
}
|
||||
end
|
||||
|
||||
local MSK_SPEED = 0xF0
|
||||
local MSK_WEIGHT = 0xF
|
||||
|
||||
@ -342,35 +337,6 @@ local function findMap(player, ...)
|
||||
end
|
||||
COM_AddCommand("findmap", findMap)
|
||||
|
||||
local function mapnumFromExtended(map)
|
||||
local p, q = map:upper():match("MAP(%w)(%w)$", 1)
|
||||
if not (p and q) then
|
||||
return nil
|
||||
end
|
||||
|
||||
local mapnum = 0
|
||||
local A = string.byte("A")
|
||||
|
||||
if tonumber(p) != nil then
|
||||
-- Non extended map numbers
|
||||
if tonumber(q) == nil then
|
||||
return nil
|
||||
end
|
||||
mapnum = tonumber(p) * 10 + tonumber(q)
|
||||
else
|
||||
--Extended map numbers
|
||||
p = string.byte(p) - A
|
||||
local qn = tonumber(q)
|
||||
if qn == nil then
|
||||
qn = string.byte(q) - A + 10
|
||||
end
|
||||
|
||||
mapnum = 36 * p + qn + 100
|
||||
end
|
||||
|
||||
return mapnum
|
||||
end
|
||||
|
||||
local SPBModeSym = {
|
||||
[F_SPBEXP] = "X",
|
||||
[F_SPBBIG] = "B",
|
||||
@ -403,7 +369,7 @@ local function records(player, ...)
|
||||
return
|
||||
end
|
||||
|
||||
mapRecords = GetMapRecords(mapnum, ST_SEP)
|
||||
mapRecords = GetMapRecords(mapnum, mapChecksum(mapnum), ST_SEP)
|
||||
end
|
||||
|
||||
local map = mapheaderinfo[mapnum]
|
||||
@ -562,14 +528,14 @@ local function findRival(player, ...)
|
||||
local totalDiff = 0
|
||||
|
||||
CONS_Printf(player, string.format("\x89%s's times:", rival))
|
||||
CONS_Printf(player, "MAP Time Diff Mode")
|
||||
CONS_Printf(player, "MAP CHCK Time Diff Mode")
|
||||
|
||||
local maplist = MapList()
|
||||
local mapRecords
|
||||
local rivalScore
|
||||
local yourScore
|
||||
for i = 1, #maplist do
|
||||
mapRecords = GetMapRecords(maplist[i], ST_SEP)
|
||||
mapRecords = GetMapRecords(maplist[i].id, maplist[i].checksum, ST_SEP)
|
||||
|
||||
for mode, records in pairs(mapRecords) do
|
||||
scores[mode] = $ or {}
|
||||
@ -636,9 +602,10 @@ local function findRival(player, ...)
|
||||
CONS_Printf(
|
||||
player,
|
||||
string.format(
|
||||
"%s %8s %s%9s \x80%s",
|
||||
G_BuildMapName(score["rival"]["map"]),
|
||||
ticsToTime(score["rival"]["time"]),
|
||||
"%s %4s %8s %s%9s \x80%s",
|
||||
G_BuildMapName(score.rival.map),
|
||||
score.rival.checksum,
|
||||
ticsToTime(score.rival.time),
|
||||
color,
|
||||
sym[diff<0] + ticsToTime(abs(diff)),
|
||||
modestr
|
||||
@ -648,9 +615,10 @@ local function findRival(player, ...)
|
||||
CONS_Printf(
|
||||
player,
|
||||
string.format(
|
||||
"%s %8s %9s %s",
|
||||
G_BuildMapName(score["rival"]["map"]),
|
||||
ticsToTime(score["rival"]["time"]),
|
||||
"%s %4s %8s %9s %s",
|
||||
G_BuildMapName(score.rival.map),
|
||||
score.rival.checksum,
|
||||
ticsToTime(score.rival.time),
|
||||
ticsToTime(0, true),
|
||||
modestr
|
||||
)
|
||||
@ -680,6 +648,64 @@ local function findRival(player, ...)
|
||||
end
|
||||
COM_AddCommand("rival", findRival)
|
||||
|
||||
local function moveRecords(player, from_map, from_checksum, to_map, to_checksum)
|
||||
if not(from_map and from_checksum and to_map) then
|
||||
CONS_Printf(player, "Usage: lb_move_records <from_map> <from_checksum> <to_map> [<to_checksum>]")
|
||||
CONS_Printf(
|
||||
player,
|
||||
string.format(
|
||||
"Summary: Move records from one map to another.\n"..
|
||||
"If no <to_checksum> is supplied then the checksum of the current loaded map %s is used.\n"..
|
||||
"Hint: Use lb_known_maps to find checksums",
|
||||
to_map or "<to_map>"
|
||||
)
|
||||
)
|
||||
return
|
||||
end
|
||||
|
||||
local from = {
|
||||
["id"] = mapnumFromExtended(from_map),
|
||||
["checksum"] = from_checksum:lower()
|
||||
}
|
||||
|
||||
local to = {
|
||||
["id"] = mapnumFromExtended(to_map),
|
||||
}
|
||||
to.checksum = to_checksum or mapChecksum(to.id)
|
||||
|
||||
if not to.checksum then
|
||||
CONS_Printf(player, string.format("error: %s is not loaded; provide to_checksum to continue", to_map:upper()))
|
||||
return
|
||||
end
|
||||
if #to.checksum != 4 or to.checksum:match("[^a-f0-9]") then
|
||||
CONS_Printf(player, string.format("error: %s is an invalid checksum; checksums are of length 4 and can contain only 0-9a-f", to.checksum))
|
||||
return
|
||||
end
|
||||
|
||||
to.checksum = $:lower()
|
||||
|
||||
local mapRecords = GetMapRecords(from.id, from.checksum, F_SPBATK | F_SPBBIG | F_SPBEXP)
|
||||
local recordCount = 0
|
||||
for mode, records in pairs(mapRecords) do
|
||||
recordCount = $ + #records
|
||||
end
|
||||
|
||||
MoveRecords(from, to, ST_SEP)
|
||||
|
||||
CONS_Printf(
|
||||
player,
|
||||
string.format(
|
||||
"%d records have been moved from\x82 %s %s\x80 to\x88 %s %s",
|
||||
recordCount,
|
||||
from_map, from.checksum,
|
||||
to_map, to.checksum
|
||||
)
|
||||
)
|
||||
|
||||
CONS_Printf(player, "Please repack coldstore and restart the server for changes to take effect.")
|
||||
end
|
||||
COM_AddCommand("lb_move_records", moveRecords, COM_ADMIN)
|
||||
|
||||
--DEBUGGING
|
||||
--local function printTable(tb)
|
||||
-- for mode, tbl in pairs(tb) do
|
||||
@ -714,7 +740,7 @@ addHook("MapLoad", function()
|
||||
allowJoin(true)
|
||||
--printTable(lb)
|
||||
|
||||
MapRecords = GetMapRecords(gamemap, ST_SEP)
|
||||
MapRecords = GetMapRecords(gamemap, mapChecksum(gamemap), ST_SEP)
|
||||
end
|
||||
)
|
||||
|
||||
@ -1024,7 +1050,7 @@ local function drawScoreboard(v, player)
|
||||
|
||||
cachePatches(v)
|
||||
|
||||
local gui = cv_gui.value
|
||||
local gui = cv_gui.value or drawState == DS_BROWSER
|
||||
|
||||
-- Force enable gui at start and end of the race
|
||||
if leveltime < START_TIME or player.exiting or player.lives == 0 then
|
||||
@ -1033,13 +1059,13 @@ local function drawScoreboard(v, player)
|
||||
|
||||
if gui then
|
||||
stateFunctions[drawState](v, player, ScoreTable, gui)
|
||||
end
|
||||
|
||||
local pos = 0
|
||||
-- Draw current active modes bottom left
|
||||
pos = drawMode(v, pos, F_SPBJUS)
|
||||
pos = drawMode(v, pos, F_SPBBIG)
|
||||
pos = drawMode(v, pos, F_SPBEXP)
|
||||
local pos = 0
|
||||
-- Draw current active modes bottom left
|
||||
pos = drawMode(v, pos, F_SPBJUS)
|
||||
pos = drawMode(v, pos, F_SPBBIG)
|
||||
pos = drawMode(v, pos, F_SPBEXP)
|
||||
end
|
||||
end
|
||||
hud.add(drawScoreboard, "game")
|
||||
|
||||
@ -1135,6 +1161,9 @@ local function saveTime(player)
|
||||
if checkFlags(player) != Flags then
|
||||
print("Game mode change detected! Time has been disqualified.")
|
||||
S_StartSound(nil, 110)
|
||||
fireEvent(EVENT_FINISH, {
|
||||
disqualified = true,
|
||||
})
|
||||
return
|
||||
end
|
||||
|
||||
@ -1149,7 +1178,8 @@ local function saveTime(player)
|
||||
TimeFinished,
|
||||
splits,
|
||||
Flags,
|
||||
stat_t(player.HMRs or pskin.kartspeed, player.HMRw or pskin.kartweight)
|
||||
stat_t(player.HMRs or pskin.kartspeed, player.HMRw or pskin.kartweight),
|
||||
mapChecksum(gamemap)
|
||||
)
|
||||
|
||||
-- Check if you beat your previous best
|
||||
@ -1162,6 +1192,7 @@ local function saveTime(player)
|
||||
FlashRate = 3
|
||||
FlashVFlags = RedFlash
|
||||
scroll_to(player)
|
||||
fireEvent(EVENT_FINISH, {score = newscore})
|
||||
return
|
||||
end
|
||||
end
|
||||
@ -1178,10 +1209,16 @@ local function saveTime(player)
|
||||
FlashVFlags = YellowFlash
|
||||
|
||||
-- Reload the MapRecords
|
||||
MapRecords = GetMapRecords(gamemap, ST_SEP)
|
||||
MapRecords = GetMapRecords(gamemap, mapChecksum(gamemap), ST_SEP)
|
||||
|
||||
-- Set the updated ScoreTable
|
||||
ScoreTable = MapRecords[Flags]
|
||||
ScoreTable = MapRecords[ST_SEP & Flags]
|
||||
|
||||
for i, score in ipairs(ScoreTable) do
|
||||
if score.name != player.name then continue end
|
||||
fireEvent(EVENT_FINISH, {position = i, score = newscore})
|
||||
break
|
||||
end
|
||||
|
||||
-- Scroll the gui to the player entry
|
||||
scroll_to(player)
|
||||
|
@ -1,14 +1,22 @@
|
||||
#!/bin/python
|
||||
#!/usr/bin/env python3
|
||||
import sys
|
||||
from os import linesep
|
||||
from os import path
|
||||
linesep = "\n"
|
||||
|
||||
if len(sys.argv) != 4 or not sys.argv[1] or not sys.argv[2] or not sys.argv[3]:
|
||||
print("Usage: coldstore.py <leaderboard.txt> <coldstore.txt> <leaderboard_records.lua>")
|
||||
if len(sys.argv) != 3 or not sys.argv[1] or not sys.argv[2]:
|
||||
print("Usage: coldstore.py <game_directory> <leaderboard_records.lua>")
|
||||
print("\t<game_directory>\t\tthe game directory where wads and luafiles reside. Usually at '$HOME/.srb2kart'.")
|
||||
print("\t<leaderboard_records.lua>\tthe output name for the records packed lua file. It will be saved within <game_directory>.")
|
||||
quit()
|
||||
|
||||
leaderboard_txt = sys.argv[1]
|
||||
coldstore_txt = sys.argv[2]
|
||||
records_lua = sys.argv[3]
|
||||
if not sys.argv[2].endswith(".lua"):
|
||||
print("{} must end with .lua".format(sys.argv[2]))
|
||||
quit()
|
||||
|
||||
game_dir = sys.argv[1]
|
||||
leaderboard_txt = path.join(game_dir, "luafiles", "leaderboard.txt")
|
||||
coldstore_txt = path.join(game_dir, "luafiles", "leaderboard.coldstore.txt")
|
||||
records_lua = path.join(game_dir, sys.argv[2])
|
||||
|
||||
def ParseScore(score):
|
||||
# Map Name Skin Color Time Splits Flags Stat
|
||||
@ -36,13 +44,19 @@ def CompareScore(a, b):
|
||||
|
||||
F_SEP = 0xF
|
||||
def SameScore(a, b):
|
||||
return a["name"] == b["name"] and (a["flags"] & F_SEP) == (b["flags"] & F_SEP)
|
||||
return a["name"] == b["name"] and a["checksum"] == b["checksum"] and (a["flags"] & F_SEP) == (b["flags"] & F_SEP)
|
||||
|
||||
def LoadRecordsFromFile(path):
|
||||
records = []
|
||||
with open(path, "r") as f:
|
||||
for line in f.readlines():
|
||||
records.append(ParseScore(line.strip()))
|
||||
try:
|
||||
with open(path, "r") as f:
|
||||
for line in f.readlines():
|
||||
line = line.strip()
|
||||
if line != "":
|
||||
records.append(ParseScore(line))
|
||||
except FileNotFoundError:
|
||||
pass
|
||||
|
||||
return records
|
||||
|
||||
def AddScore(records, score):
|
||||
@ -86,20 +100,23 @@ with open(coldstore_txt, "w") as f:
|
||||
for score in recordsList:
|
||||
f.write(score + linesep)
|
||||
|
||||
luaA = """local ParseScore = lb_parse_score
|
||||
local AddColdStore = lb_add_coldstore_record
|
||||
local records = {
|
||||
luaA = """do
|
||||
local AddColdStore = lb_add_coldstore_record_string
|
||||
local records = {
|
||||
"""
|
||||
luaB = """}
|
||||
for _, str in ipairs(records) do
|
||||
AddColdStore(ParseScore(str))
|
||||
luaB = """ }
|
||||
for _, str in ipairs(records) do
|
||||
AddColdStore(str)
|
||||
end
|
||||
end
|
||||
"""
|
||||
# pack the records.lua file
|
||||
with open(records_lua, "w") as f:
|
||||
f.write(luaA)
|
||||
for score in recordsList:
|
||||
f.write("\"{}\",{}".format(score, linesep))
|
||||
score = score.replace("\\", "\\\\")
|
||||
score = score.replace("\"", "\\\"")
|
||||
f.write("\t\t\"{}\",{}".format(score, linesep))
|
||||
f.write(luaB)
|
||||
|
||||
# truncate and rewrite rejected scores to leaderboard.txt
|
||||
|
249
transmission.lua
Normal file
249
transmission.lua
Normal file
@ -0,0 +1,249 @@
|
||||
local MSG = "<<~"
|
||||
local CHN = "~>>"
|
||||
|
||||
local PACKET_MAX_SIZE = 200
|
||||
local MAX_TICS = TICRATE * 2
|
||||
|
||||
local function encode(data)
|
||||
data = string.gsub(data, "\n", "\\n")
|
||||
data = string.gsub(data, "\t", "\\t")
|
||||
return data
|
||||
end
|
||||
|
||||
local function decode(data)
|
||||
data = string.gsub(data, "\\n", "\n")
|
||||
data = string.gsub(data, "\\t", "\t")
|
||||
return data
|
||||
end
|
||||
|
||||
local transmitters = {}
|
||||
|
||||
local function Transmitter(channel, opts)
|
||||
assert(channel, "Transmitter: channel is required")
|
||||
opts = $ or {}
|
||||
|
||||
return {
|
||||
packets = {},
|
||||
|
||||
push = function(this, packet)
|
||||
table.insert(this.packets, MSG..channel..CHN..packet)
|
||||
end,
|
||||
|
||||
pop = function(this)
|
||||
return table.remove(this.packets)
|
||||
end,
|
||||
|
||||
sendPacket = function(this)
|
||||
local sender = consoleplayer or server
|
||||
COM_BufInsertText(sender, "say \""..this:pop().."\"")
|
||||
return not #this.packets
|
||||
end,
|
||||
|
||||
writeHeader = function(this)
|
||||
this:push(#this.packets)
|
||||
end,
|
||||
|
||||
close = function(this)
|
||||
for i, tr in ipairs(transmitters) do
|
||||
if tr == this then
|
||||
table.remove(transmitters, i)
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
if opts.free then
|
||||
opts.free(this, opts.handle)
|
||||
end
|
||||
end,
|
||||
|
||||
enqueue = function(this)
|
||||
table.insert(transmitters, this)
|
||||
end,
|
||||
|
||||
transmit = function(this, data)
|
||||
assert(data, "Transmitter: nil data")
|
||||
|
||||
data = encode(data)
|
||||
|
||||
if opts.stream then
|
||||
assert(
|
||||
#data < PACKET_MAX_SIZE,
|
||||
"Transmitter: data packet too large for stream"
|
||||
)
|
||||
|
||||
this:push(data)
|
||||
this:enqueue()
|
||||
return
|
||||
end
|
||||
|
||||
local sub
|
||||
for i = 1, #data, PACKET_MAX_SIZE do
|
||||
sub = data:sub(i, min(#data, i + PACKET_MAX_SIZE-1))
|
||||
this:push(sub)
|
||||
end
|
||||
|
||||
this:writeHeader()
|
||||
this:enqueue()
|
||||
end
|
||||
}
|
||||
end
|
||||
rawset(_G, "lb_transmitter", Transmitter)
|
||||
|
||||
addHook("ThinkFrame", function()
|
||||
if not (#transmitters and leveltime) then return end
|
||||
|
||||
local index = (leveltime % #transmitters) + 1
|
||||
local transmitter = transmitters[index]
|
||||
|
||||
if transmitter:sendPacket() then
|
||||
transmitter:close()
|
||||
end
|
||||
end)
|
||||
|
||||
local Channels = {
|
||||
channel = {},
|
||||
|
||||
add = function(this, ch, reciever)
|
||||
this.channel[ch] = $ or {}
|
||||
table.insert(this.channel[ch], reciever)
|
||||
end,
|
||||
|
||||
chan = function(this, ch)
|
||||
local c = this.channel[ch]
|
||||
local i = c and #c + 1 or 0
|
||||
return function()
|
||||
if i > 1 then
|
||||
i = i - 1
|
||||
return i, c[i]
|
||||
end
|
||||
end
|
||||
end,
|
||||
|
||||
remove = function(this, ch, index)
|
||||
table.remove(this.channel[ch], index)
|
||||
end,
|
||||
|
||||
recieve = function(this)
|
||||
return function(packet, ch)
|
||||
for i, reciever in this:chan(ch) do
|
||||
if reciever:push(packet) then
|
||||
reciever:close()
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
}
|
||||
|
||||
addHook("ThinkFrame", function()
|
||||
for _, ch in pairs(Channels.channel) do
|
||||
for _, rec in pairs(ch) do
|
||||
if rec:tick() then
|
||||
rec:close()
|
||||
end
|
||||
end
|
||||
end
|
||||
end)
|
||||
|
||||
local function Reciever(channel, callback, opts)
|
||||
assert(callback, "Reciever: callback is required")
|
||||
opts = $ or {}
|
||||
|
||||
local ticker, pusher
|
||||
local MAX_TICS = MAX_TICS
|
||||
if opts.stream then
|
||||
ticker = function(this) end
|
||||
|
||||
pusher = function(this, packet)
|
||||
callback(decode(packet), opts.handle)
|
||||
end
|
||||
else
|
||||
ticker = function(this)
|
||||
this.tics = $ + 1
|
||||
return this.tics > MAX_TICS
|
||||
end
|
||||
|
||||
pusher = function(this, packet)
|
||||
if not this.len then
|
||||
this:recieveHeader(packet)
|
||||
return
|
||||
end
|
||||
|
||||
table.insert(this.packets, packet)
|
||||
|
||||
if opts.progress then
|
||||
opts.progress(#this.packets, this.len, opts.handle)
|
||||
end
|
||||
|
||||
if #this.packets >= this.len then
|
||||
this:finish()
|
||||
return true
|
||||
end
|
||||
|
||||
this.tics = 0
|
||||
end
|
||||
end
|
||||
|
||||
return {
|
||||
len,
|
||||
packets = {},
|
||||
tics = 0,
|
||||
tick = ticker,
|
||||
|
||||
close = function(this)
|
||||
for i, rec in Channels:chan(channel) do
|
||||
if rec == this then
|
||||
Channels:remove(channel, i)
|
||||
if opts.free then
|
||||
opts.free(this, opts.handle)
|
||||
end
|
||||
return
|
||||
end
|
||||
end
|
||||
end,
|
||||
|
||||
push = pusher,
|
||||
|
||||
recieveHeader = function(this, header)
|
||||
local len = tonumber(header)
|
||||
assert(len ~= nil,
|
||||
"Reciever: invalid header '"..(header or "nil").."'")
|
||||
this.len = len
|
||||
end,
|
||||
|
||||
listen = function(this)
|
||||
Channels:add(channel, this)
|
||||
end,
|
||||
|
||||
pop = function(this)
|
||||
return table.remove(this.packets)
|
||||
end,
|
||||
|
||||
finish = function(this)
|
||||
local data = ""
|
||||
|
||||
local s = this:pop()
|
||||
while s do
|
||||
data = $..s
|
||||
s = this:pop()
|
||||
end
|
||||
|
||||
callback(decode(data), opts.handle)
|
||||
end
|
||||
}
|
||||
end
|
||||
rawset(_G, "lb_reciever", Reciever)
|
||||
|
||||
local function scan(sym, msg, fn)
|
||||
if msg:find(sym) == 1 then
|
||||
msg = msg:sub(#sym+1)
|
||||
local chi = msg:find(CHN)
|
||||
local ch = msg:sub(1, chi-1)
|
||||
msg = msg:sub(chi+#CHN)
|
||||
fn(msg, ch)
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
||||
addHook("PlayerMsg", function(source, type, target, msg)
|
||||
return scan(MSG, msg, Channels:recieve())
|
||||
end)
|
Reference in New Issue
Block a user