Compare commits
1 Commits
2f5db0f3c7
...
apfd
| Author | SHA1 | Date | |
|---|---|---|---|
| aabc4bdaee |
448
browser.lua
448
browser.lua
@ -1,448 +0,0 @@
|
||||
local leaderboard = nil
|
||||
local maps
|
||||
local mapIndex = 1
|
||||
local scrollPos = 1
|
||||
local modes = nil
|
||||
local mode = 1
|
||||
local prefMode = nil
|
||||
|
||||
-- Imported functions -------
|
||||
-- lb_common.lua
|
||||
local ZoneAct = lb_ZoneAct
|
||||
local TicsToTime = lb_TicsToTime
|
||||
-----------------------------
|
||||
|
||||
local function mapIndexOffset(n)
|
||||
return (mapIndex + n + #maps - 1) % #maps + 1
|
||||
end
|
||||
|
||||
local function getMap(offset)
|
||||
return maps[mapIndexOffset(offset or 0)]
|
||||
end
|
||||
|
||||
local function updateModes()
|
||||
-- set available modes for this map
|
||||
modes = {}
|
||||
for mode, scoreTable in pairs(leaderboard) do
|
||||
if scoreTable[getMap()] then
|
||||
table.insert(modes, mode)
|
||||
end
|
||||
end
|
||||
table.sort(modes)
|
||||
|
||||
mode = 1
|
||||
-- select pref mode
|
||||
for i, m in ipairs(modes) do
|
||||
if m == prefMode then
|
||||
mode = i
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local function updateMapIndex(n)
|
||||
mapIndex = mapIndexOffset(n)
|
||||
scrollPos = 1
|
||||
|
||||
updateModes()
|
||||
end
|
||||
|
||||
local scalar = 2
|
||||
local hlfScrnWdth = 320 / 2
|
||||
local mappY = 26
|
||||
local ttlY = mappY + FixedMul(30, FRACUNIT / scalar)
|
||||
local scoresY = ttlY + 16
|
||||
|
||||
local function drawMapPatch(v, offset)
|
||||
local scale = FRACUNIT / (abs(offset) + scalar)
|
||||
local mapName = G_BuildMapName(getMap(offset))
|
||||
local patchName = mapName.."P"
|
||||
local mapp = v.patchExists(patchName) and v.cachePatch(patchName) or v.cachePatch("BLANKLVL")
|
||||
|
||||
local scaledWidth = FixedMul(mapp.width, scale)
|
||||
local scaledHeight = FixedMul(mapp.height, scale)
|
||||
|
||||
v.drawScaled(
|
||||
(hlfScrnWdth + offset * scaledWidth - scaledWidth / 2) * FRACUNIT,
|
||||
(mappY - scaledHeight / 2) * FRACUNIT,
|
||||
scale,
|
||||
mapp
|
||||
)
|
||||
end
|
||||
|
||||
local colors = {
|
||||
[0] = 0,
|
||||
[1] = 215
|
||||
}
|
||||
local function drawMapBorder(v)
|
||||
local mapWidth = FixedMul(160, FRACUNIT / scalar)
|
||||
local mapHeight = FixedMul(100, FRACUNIT / scalar)
|
||||
v.drawFill(
|
||||
hlfScrnWdth - mapWidth / 2 - 1,
|
||||
mappY - mapHeight / 2 -1,
|
||||
mapWidth + 2,
|
||||
mapHeight + 2,
|
||||
colors[leveltime / 4 % 2]
|
||||
)
|
||||
end
|
||||
|
||||
local function drawMapStrings(v)
|
||||
local map = mapheaderinfo[getMap()]
|
||||
local titleWidth = v.stringWidth(map.lvlttl)
|
||||
|
||||
-- title
|
||||
v.drawString(
|
||||
hlfScrnWdth,
|
||||
ttlY,
|
||||
map.lvlttl,
|
||||
V_SKYMAP,
|
||||
"center"
|
||||
)
|
||||
|
||||
-- zone/act
|
||||
local zone = ZoneAct(map)
|
||||
local zoneWidth = v.stringWidth(zone)
|
||||
v.drawString(
|
||||
hlfScrnWdth + titleWidth / 2,
|
||||
ttlY + 8,
|
||||
zone,
|
||||
V_SKYMAP,
|
||||
"right"
|
||||
)
|
||||
|
||||
-- subtitle
|
||||
v.drawString(
|
||||
hlfScrnWdth + titleWidth / 2 - zoneWidth,
|
||||
ttlY + 8,
|
||||
map.subttl,
|
||||
V_MAGENTAMAP,
|
||||
"small-right"
|
||||
)
|
||||
|
||||
-- hell
|
||||
if map.menuflags & LF2_HIDEINMENU then
|
||||
v.drawString(
|
||||
300,
|
||||
ttlY + 16,
|
||||
"HELL",
|
||||
V_REDMAP,
|
||||
"right"
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
local F_SPBATK = 0x1
|
||||
local F_SPBJUS = 0x2
|
||||
local F_SPBBIG = 0x4
|
||||
local F_SPBEXP = 0x8
|
||||
local F_ENCORE = 0x80
|
||||
|
||||
local function drawGamemode(v)
|
||||
local m = modes[mode] or 0
|
||||
|
||||
local modeX = 20
|
||||
local modeY = scoresY
|
||||
local scale = FRACUNIT / 2
|
||||
|
||||
if m == 0 then
|
||||
local clockp = v.cachePatch("K_LAPE02")
|
||||
v.drawScaled(
|
||||
modeX * FRACUNIT,
|
||||
modeY * FRACUNIT,
|
||||
scale,
|
||||
clockp
|
||||
)
|
||||
|
||||
v.drawString(
|
||||
modeX,
|
||||
modeY,
|
||||
"Time Attack!"
|
||||
)
|
||||
elseif m & F_SPBATK then
|
||||
local scaledHalf = FixedMul(50 * FRACUNIT, scale) / 2
|
||||
local xoff = 0
|
||||
if m & F_SPBBIG then
|
||||
xoff = $ + scaledHalf
|
||||
end
|
||||
if m & F_SPBEXP then
|
||||
xoff = $ + scaledHalf
|
||||
end
|
||||
|
||||
if m & F_SPBBIG then
|
||||
local growp = v.cachePatch("K_ITGROW")
|
||||
v.drawScaled(
|
||||
modeX * FRACUNIT - scaledHalf + xoff,
|
||||
modeY * FRACUNIT - scaledHalf,
|
||||
scale,
|
||||
growp
|
||||
)
|
||||
|
||||
xoff = $ - scaledHalf
|
||||
end
|
||||
|
||||
if m & F_SPBEXP then
|
||||
local invp = v.cachePatch("K_ITINV"..(leveltime / 6 % 7 + 1))
|
||||
v.drawScaled(
|
||||
modeX * FRACUNIT - scaledHalf + xoff,
|
||||
modeY * FRACUNIT - scaledHalf,
|
||||
scale,
|
||||
invp
|
||||
)
|
||||
end
|
||||
|
||||
local spbp = v.cachePatch("K_ITSPB")
|
||||
v.drawScaled(
|
||||
modeX * FRACUNIT - scaledHalf,
|
||||
modeY * FRACUNIT - scaledHalf,
|
||||
scale,
|
||||
spbp
|
||||
)
|
||||
|
||||
v.drawString(
|
||||
modeX,
|
||||
modeY,
|
||||
"SPB Attack!"
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
local function drawFlags(v, x, y, flags)
|
||||
local nx = x * FRACUNIT
|
||||
local ny = y * FRACUNIT + 2 * FRACUNIT
|
||||
local margin = 4 * FRACUNIT
|
||||
if flags & F_ENCORE then
|
||||
local encp = v.cachePatch("RUBYICON")
|
||||
v.drawScaled(
|
||||
nx,
|
||||
ny + 2 * FRACUNIT,
|
||||
FRACUNIT / 5,
|
||||
encp
|
||||
)
|
||||
nx = $ + margin
|
||||
end
|
||||
if flags & F_SPBATK then
|
||||
local scale = FRACUNIT / 3
|
||||
local shift = 6 * FRACUNIT
|
||||
nx = $ - shift
|
||||
ny = $ - shift
|
||||
if flags & F_SPBJUS then
|
||||
local hyup = v.cachePatch("K_ISHYUD")
|
||||
v.drawScaled(nx, ny, scale, hyup)
|
||||
nx = $ + margin
|
||||
end
|
||||
if flags & F_SPBBIG then
|
||||
local growp = v.cachePatch("K_ISGROW")
|
||||
v.drawScaled(nx - FRACUNIT / 2, ny, scale, growp)
|
||||
nx = $ + margin
|
||||
end
|
||||
if flags & F_SPBEXP then
|
||||
local invp = v.cachePatch("K_ISINV"..(leveltime / 6 % 6 + 1))
|
||||
v.drawScaled(nx, ny, scale, invp)
|
||||
nx = $ + margin
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local function drawStats(v, x, y, skin, stats)
|
||||
local s = skins[skin]
|
||||
if not (s
|
||||
and s.kartspeed == stats["speed"]
|
||||
and s.kartweight == stats["weight"]
|
||||
)
|
||||
and stats then
|
||||
v.drawString(x-2, y-2, stats["speed"], V_ALLOWLOWERCASE, "thin")
|
||||
v.drawString(x + 13, y + 9, stats["weight"], V_ALLOWLOWERCASE, "thin")
|
||||
end
|
||||
end
|
||||
|
||||
-- draw in columns
|
||||
-- pos, facerank, name, time, flags
|
||||
-- ______________________________________________
|
||||
-- | 3|[O]|InsertNameHere | 01:02:03 | EXB |
|
||||
-- ----------------------------------------------
|
||||
-- defined are widths of each column, x value is calculated below
|
||||
local column = {
|
||||
[1] = 18, -- facerank, pos, drawNum is right aligned
|
||||
[2] = 170, -- name
|
||||
[3] = 60, -- time
|
||||
[4] = 0 -- flags
|
||||
}
|
||||
do
|
||||
local w = 32 -- starting offset
|
||||
local t
|
||||
for i = 1, #column do
|
||||
t = column[i]
|
||||
column[i] = w
|
||||
w = $ + t
|
||||
end
|
||||
end
|
||||
|
||||
local colorFlags = {
|
||||
[0] = V_SKYMAP,
|
||||
[1] = 0
|
||||
}
|
||||
local function drawScore(v, i, pos, score)
|
||||
local y = scoresY + i * 18
|
||||
local textFlag = colorFlags[pos%2]
|
||||
|
||||
-- position
|
||||
v.drawNum(column[1], y, pos)
|
||||
|
||||
-- facerank
|
||||
local skin = skins[score["skin"]]
|
||||
local facerank = skin and v.cachePatch(skin.facerank) or v.cachePatch("M_NORANK")
|
||||
v.draw(column[1], y, facerank, 0, v.getColormap("sonic", score["color"]))
|
||||
|
||||
-- stats
|
||||
drawStats(v, column[1], y, score["skin"], score["stat"])
|
||||
-- name
|
||||
v.drawString(column[2], y, score["name"], V_ALLOWLOWERCASE | textFlag)
|
||||
-- time
|
||||
v.drawString(column[3], y, TicsToTime(score["time"]), textFlag)
|
||||
-- flags
|
||||
drawFlags(v, column[4], y, score["flags"])
|
||||
end
|
||||
|
||||
local function drawBrowser(v)
|
||||
if not leaderboard then return end
|
||||
|
||||
v.fadeScreen(0xFF00, 16)
|
||||
|
||||
-- previous, next maps
|
||||
for i = 5, 1, -1 do
|
||||
drawMapPatch(v, -i)
|
||||
drawMapPatch(v, i)
|
||||
end
|
||||
|
||||
-- draw map border
|
||||
drawMapBorder(v)
|
||||
|
||||
-- current map
|
||||
drawMapPatch(v, 0)
|
||||
drawMapStrings(v)
|
||||
drawGamemode(v)
|
||||
|
||||
if not modes then return end
|
||||
|
||||
local gamemode = leaderboard[modes[mode]]
|
||||
if not gamemode then return end
|
||||
|
||||
local scoreTable = gamemode[getMap()]
|
||||
if not scoreTable then return end
|
||||
|
||||
local scores = #scoreTable
|
||||
scrollPos = max(min(scrollPos, scores - 3), 1)
|
||||
local endi = min(scrollPos + 7, scores)
|
||||
for i = scrollPos, endi do
|
||||
drawScore(v, i - scrollPos + 1, i, scoreTable[i])
|
||||
end
|
||||
end
|
||||
rawset(_G, "DrawBrowser", drawBrowser)
|
||||
|
||||
local function initBrowser(lb)
|
||||
leaderboard = lb
|
||||
|
||||
-- set mapIndex to current map
|
||||
for i, m in ipairs(maps) do
|
||||
if m == gamemap then
|
||||
mapIndex = i
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
scrollPos = 1
|
||||
updateModes()
|
||||
end
|
||||
rawset(_G, "InitBrowser", initBrowser)
|
||||
|
||||
-- initialize maps with racemaps only
|
||||
local function loadMaps()
|
||||
maps = {}
|
||||
local hell = {}
|
||||
for i = 0, #mapheaderinfo do
|
||||
local map = mapheaderinfo[i]
|
||||
if map and map.typeoflevel & TOL_RACE then
|
||||
if map.menuflags & LF2_HIDEINMENU then
|
||||
table.insert(hell, i)
|
||||
else
|
||||
table.insert(maps, i)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- append hell maps
|
||||
for _, map in ipairs(hell) do
|
||||
table.insert(maps, map)
|
||||
end
|
||||
end
|
||||
addHook("MapLoad", loadMaps)
|
||||
|
||||
local repeatCount = 0
|
||||
local keyRepeat = 0
|
||||
|
||||
local function updateKeyRepeat()
|
||||
S_StartSound(nil, 143)
|
||||
if repeatCount < 1 then
|
||||
keyRepeat = TICRATE / 4
|
||||
else
|
||||
keyRepeat = TICRATE / 15
|
||||
end
|
||||
repeatCount = $ + 1
|
||||
end
|
||||
|
||||
local function resetKeyRepeat()
|
||||
keyRepeat = 0
|
||||
repeatCount = 0
|
||||
end
|
||||
|
||||
-- return value indicates we want to exit the browser
|
||||
local function controller(player)
|
||||
keyRepeat = max(0, $ - 1)
|
||||
|
||||
if not (player.cmd.driftturn or player.cmd.buttons) then
|
||||
resetKeyRepeat()
|
||||
end
|
||||
|
||||
local cmd = player.cmd
|
||||
if not keyRepeat then
|
||||
if cmd.driftturn > 0 then
|
||||
updateMapIndex(-1)
|
||||
updateKeyRepeat()
|
||||
elseif cmd.driftturn < 0 then
|
||||
updateMapIndex(1)
|
||||
updateKeyRepeat()
|
||||
elseif cmd.buttons & BT_FORWARD then
|
||||
scrollPos = $ - 1
|
||||
updateKeyRepeat()
|
||||
elseif cmd.buttons & BT_BACKWARD then
|
||||
scrollPos = $ + 1
|
||||
updateKeyRepeat()
|
||||
elseif cmd.buttons & BT_DRIFT then
|
||||
scrollPos = 1
|
||||
if modes and #modes then
|
||||
mode = $ % #modes + 1
|
||||
prefMode = modes[mode]
|
||||
end
|
||||
updateKeyRepeat()
|
||||
elseif cmd.buttons & BT_BRAKE then
|
||||
S_StartSound(nil, 115)
|
||||
return true
|
||||
elseif cmd.buttons & BT_ACCELERATE then
|
||||
S_StartSound(nil, 143)
|
||||
COM_BufInsertText(player, "changelevel "..G_BuildMapName(maps[mapIndex]))
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
rawset(_G, "BrowserController", controller)
|
||||
|
||||
local function netvars(net)
|
||||
maps = net($)
|
||||
mapIndex = net($)
|
||||
modes = net($)
|
||||
mode = net($)
|
||||
prefMode = net($)
|
||||
scrollPos = net($)
|
||||
leaderboard = net($)
|
||||
end
|
||||
addHook("NetVars", netvars)
|
||||
@ -1,26 +0,0 @@
|
||||
rawset(_G, "lb_TicsToTime", function(tics, pure)
|
||||
if tics == 0 and pure then
|
||||
return "-:--:--"
|
||||
end
|
||||
|
||||
return string.format(
|
||||
"%d:%02d:%02d",
|
||||
G_TicsToMinutes(tics, true),
|
||||
G_TicsToSeconds(tics),
|
||||
G_TicsToCentiseconds(tics)
|
||||
)
|
||||
end)
|
||||
|
||||
rawset(_G, "lb_ZoneAct", function(map)
|
||||
local z = ""
|
||||
if map.zonttl != "" then
|
||||
z = " " + map.zonttl
|
||||
elseif not(map.levelflags & LF_NOZONE) then
|
||||
z = " Zone"
|
||||
end
|
||||
if map.actnum != "" then
|
||||
z = $ + " " + map.actnum
|
||||
end
|
||||
|
||||
return z
|
||||
end)
|
||||
851
leaderboard.lua
851
leaderboard.lua
@ -11,36 +11,19 @@ local prevLap = 0
|
||||
local splits = {}
|
||||
local PATCH = nil
|
||||
local help = true
|
||||
local EncoreInitial = nil
|
||||
local scoreTable
|
||||
|
||||
|
||||
-- Text flash on finish
|
||||
local FlashTics = 0
|
||||
local FlashRate
|
||||
local FlashVFlags
|
||||
local YellowFlash = {
|
||||
[0] = V_YELLOWMAP,
|
||||
[1] = V_ORANGEMAP,
|
||||
[2] = 0
|
||||
}
|
||||
local RedFlash = {
|
||||
[0] = V_REDMAP,
|
||||
[1] = 0
|
||||
}
|
||||
|
||||
-- Tracks if stats have been written or not
|
||||
local StatTrack = false
|
||||
local LIFE = {}
|
||||
local faceranks = {}
|
||||
local dvd = {}
|
||||
|
||||
local UNCLAIMED = "Unclaimed Record"
|
||||
local HELP_MESSAGE = "\x89Leaderboard Commands:\nretry exit findmap changelevel spba_clearcheats lb_gui rival scroll encore records levelselect"
|
||||
local HELP_MESSAGE = "\x89Leaderboard Commands:\nretry exit findmap changelevel spba_clearcheats lb_gui rival scroll"
|
||||
local FILENAME = "leaderboard.txt"
|
||||
|
||||
-- Retry / changelevel map
|
||||
local nextMap = nil
|
||||
|
||||
local Flags = 0
|
||||
local F_ENCORE = 0x80
|
||||
|
||||
-- SPB flags with the least significance first
|
||||
local F_SPBATK = 0x1
|
||||
@ -48,16 +31,11 @@ local F_SPBJUS = 0x2
|
||||
local F_SPBBIG = 0x4
|
||||
local F_SPBEXP = 0x8
|
||||
|
||||
-- Score table separator
|
||||
local ST_SEP = F_SPBATK
|
||||
|
||||
local clearcheats = false
|
||||
|
||||
local START_TIME = 6 * TICRATE + (3 * TICRATE / 4) + 1
|
||||
local START_TIME = 6 * TICRATE + (3 * TICRATE / 4)
|
||||
local AFK_TIMEOUT = TICRATE * 5
|
||||
local AFK_BROWSER = TICRATE * 15
|
||||
local AFK_BALANCE = TICRATE * 60
|
||||
local AFK_BALANCE_WARN = AFK_BALANCE - TICRATE * 10
|
||||
local PREVENT_JOIN_TIME = START_TIME + TICRATE * 5
|
||||
|
||||
local GUI_OFF = 0x0
|
||||
@ -69,7 +47,6 @@ local DS_DEFAULT = 0x0
|
||||
local DS_SCROLL = 0x1
|
||||
local DS_AUTO = 0x2
|
||||
local DS_SCRLTO = 0x4
|
||||
local DS_BROWSER = 0x8
|
||||
|
||||
local drawState = DS_DEFAULT
|
||||
|
||||
@ -87,24 +64,9 @@ local clamp
|
||||
|
||||
local scroll_to
|
||||
|
||||
local allowJoin
|
||||
|
||||
-- Imported functions --
|
||||
|
||||
-- lb_common.lua
|
||||
local ticsToTime = lb_TicsToTime
|
||||
local zoneAct = lb_ZoneAct
|
||||
|
||||
-- browser.lua
|
||||
local InitBrowser = InitBrowser
|
||||
local DrawBrowser = DrawBrowser
|
||||
local BrowserController = BrowserController
|
||||
local ticsToTime
|
||||
---------------
|
||||
|
||||
-- cvars
|
||||
local cv_teamchange
|
||||
local cv_spbatk
|
||||
|
||||
local cv_gui = CV_RegisterVar({
|
||||
name = "lb_gui",
|
||||
defaultvalue = GUI_ON,
|
||||
@ -112,24 +74,11 @@ local cv_gui = CV_RegisterVar({
|
||||
PossibleValue = {Off = GUI_OFF, Splits = GUI_SPLITS, On = GUI_ON}
|
||||
})
|
||||
|
||||
local AntiAFK = true
|
||||
CV_RegisterVar({
|
||||
local cv_afk = CV_RegisterVar({
|
||||
name = "lb_afk",
|
||||
defaultvalue = 1,
|
||||
flags = CV_NETVAR | CV_CALL,
|
||||
PossibleValue = CV_OnOff,
|
||||
func = function(v)
|
||||
-- Set players afkTime and toggle AntiAFK
|
||||
if v.value then
|
||||
for p in players.iterate do
|
||||
p.afkTime = leveltime
|
||||
end
|
||||
|
||||
AntiAFK = true
|
||||
else
|
||||
AntiAFK = false
|
||||
end
|
||||
end
|
||||
flags = CV_NETVAR,
|
||||
PossibleValue = CV_OnOff
|
||||
})
|
||||
|
||||
local cv_enable = CV_RegisterVar({
|
||||
@ -139,9 +88,6 @@ local cv_enable = CV_RegisterVar({
|
||||
PossibleValue = CV_OnOff,
|
||||
func = function(v)
|
||||
disable = $ or not v.value
|
||||
if disable then
|
||||
allowJoin(true)
|
||||
end
|
||||
end
|
||||
})
|
||||
|
||||
@ -164,83 +110,25 @@ local cv_interrupt = CV_RegisterVar({
|
||||
end
|
||||
})
|
||||
|
||||
local function setST(t, map, flags, scoreTable)
|
||||
local mode = flags & ST_SEP
|
||||
t[mode] = t[mode] or {}
|
||||
t[mode][map] = scoreTable
|
||||
end
|
||||
|
||||
local function getST(t, map, flags)
|
||||
local mode = flags & ST_SEP
|
||||
return t[mode] and t[mode][map] or nil
|
||||
end
|
||||
|
||||
local function setScoreTable(map, flags, scoreTable)
|
||||
setST(lb, map, flags, scoreTable)
|
||||
local mode = flags & F_SPBATK
|
||||
lb[mode] = lb[mode] or {}
|
||||
lb[mode][map] = scoreTable
|
||||
end
|
||||
|
||||
local function getScoreTable(map, flags)
|
||||
return getST(lb, map, flags)
|
||||
--local id = tostring(map)
|
||||
--if flags & F_SPBATK then
|
||||
-- id = id + "S"
|
||||
--end
|
||||
|
||||
--return id
|
||||
|
||||
local mode = flags & F_SPBATK
|
||||
return lb[mode] and lb[mode][map] or nil
|
||||
end
|
||||
|
||||
-- True if a is better than b
|
||||
local function lbComp(a, b)
|
||||
-- Calculates the difficulty, harder has higher priority
|
||||
-- if s is positive then a is harder
|
||||
-- if s is negative then b is harder
|
||||
-- if s is 0 then compare time
|
||||
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 sortScores()
|
||||
for mode, t in pairs(lb) do
|
||||
for map, scoreTable in pairs(t) do
|
||||
table.sort(scoreTable, lbComp)
|
||||
setScoreTable(map, mode, scoreTable)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Reinitialize lb based on new ST_SEP value
|
||||
local function reinit_lb()
|
||||
local nlb = {}
|
||||
|
||||
for mode, t in pairs(lb) do
|
||||
for map, scoreTable in pairs(t) do
|
||||
for i, score in ipairs(scoreTable) do
|
||||
local st = getST(nlb, map, score["flags"]) or {}
|
||||
table.insert(st, score)
|
||||
setST(nlb, map, score["flags"], st)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
lb = nlb
|
||||
sortScores()
|
||||
end
|
||||
|
||||
local cv_spb_separate = CV_RegisterVar({
|
||||
name = "lb_spb_combined",
|
||||
defaultvalue = 1,
|
||||
flags = CV_NETVAR | CV_CALL | CV_NOINIT,
|
||||
PossibleValue = CV_YesNo,
|
||||
func = function(v)
|
||||
local curSep = ST_SEP
|
||||
|
||||
if v.value then
|
||||
ST_SEP = F_SPBATK
|
||||
else
|
||||
ST_SEP = F_SPBATK | F_SPBBIG | F_SPBEXP
|
||||
end
|
||||
|
||||
if curSep != ST_SEP then
|
||||
reinit_lb()
|
||||
end
|
||||
end
|
||||
})
|
||||
|
||||
local function score_t(map, name, skin, color, time, splits, flags, stat)
|
||||
local function score_t(map, name, skin, color, time, splits, flags, restat)
|
||||
return {
|
||||
["map"] = map,
|
||||
["name"] = name,
|
||||
@ -249,11 +137,11 @@ local function score_t(map, name, skin, color, time, splits, flags, stat)
|
||||
["time"] = time,
|
||||
["splits"] = splits,
|
||||
["flags"] = flags,
|
||||
["stat"] = stat
|
||||
["restat"] = restat
|
||||
}
|
||||
end
|
||||
|
||||
local function stat_t(speed, weight)
|
||||
local function restat_t(speed, weight)
|
||||
if speed and weight then
|
||||
return {
|
||||
["speed"] = speed,
|
||||
@ -263,9 +151,9 @@ local function stat_t(speed, weight)
|
||||
return nil
|
||||
end
|
||||
|
||||
local function stat_str(stat)
|
||||
if stat then
|
||||
return string.format("%d%d", stat["speed"], stat["weight"])
|
||||
local function restat_str(restat)
|
||||
if restat then
|
||||
return string.format("%d%d", restat["speed"], restat["weight"])
|
||||
end
|
||||
|
||||
return "0"
|
||||
@ -276,7 +164,7 @@ local f = io.open(FILENAME, "r")
|
||||
if f then
|
||||
for l in f:lines() do
|
||||
-- Leaderboard is stored in the following tab separated format
|
||||
-- mapnum, name, skin, color, time, splits, flags, stat
|
||||
-- mapnum, name, skin, color, time, splits, flags, restat
|
||||
local t = {}
|
||||
for word in (l+"\t"):gmatch("(.-)\t") do
|
||||
table.insert(t, word)
|
||||
@ -287,7 +175,7 @@ if f then
|
||||
flags = tonumber(t[7])
|
||||
end
|
||||
|
||||
scoreTable = getScoreTable(tonumber(t[1]), flags) or {}
|
||||
local scoreTable = getScoreTable(tonumber(t[1]), flags) or {}
|
||||
|
||||
local spl = {}
|
||||
if t[6] != nil then
|
||||
@ -299,9 +187,9 @@ if f then
|
||||
local stats = nil
|
||||
if t[8] != nil then
|
||||
if #t[8] >= 2 then
|
||||
local speed = tonumber(string.sub(t[8], 1, 1))
|
||||
local weight = tonumber(string.sub(t[8], 2, 2))
|
||||
stats = stat_t(speed, weight)
|
||||
local speed = string.sub(t[8], 1, 1)
|
||||
local weight = string.sub(t[8], 2, 2)
|
||||
stats = restat_t(speed, weight)
|
||||
end
|
||||
end
|
||||
|
||||
@ -318,17 +206,15 @@ if f then
|
||||
stats
|
||||
)
|
||||
)
|
||||
|
||||
setScoreTable(tonumber(t[1]), flags, scoreTable)
|
||||
end
|
||||
|
||||
sortScores()
|
||||
f:close()
|
||||
else
|
||||
print("Failed to open file: ", FILENAME)
|
||||
end
|
||||
|
||||
function allowJoin(v)
|
||||
local function allowJoin(v)
|
||||
if not cv_interrupt.value then
|
||||
local y
|
||||
if v then
|
||||
@ -343,40 +229,29 @@ function allowJoin(v)
|
||||
end
|
||||
end
|
||||
|
||||
-- Returns true if there is a single player ingame
|
||||
local function singleplayer()
|
||||
local function ingame()
|
||||
local n = 0
|
||||
for p in players.iterate do
|
||||
if p.valid and not p.spectator then
|
||||
n = $ + 1
|
||||
if n > 1 then
|
||||
return false
|
||||
end
|
||||
end
|
||||
end
|
||||
return true
|
||||
return n
|
||||
end
|
||||
|
||||
local function initLeaderboard(player)
|
||||
if disable and leveltime < START_TIME then
|
||||
disable = not singleplayer()
|
||||
disable = ingame() > 1
|
||||
else
|
||||
disable = disable or not singleplayer()
|
||||
disable = disable or ingame() > 1
|
||||
end
|
||||
disable = $ or not cv_enable.value or not (maptol & (TOL_SP | TOL_RACE))
|
||||
|
||||
-- Restore encore mode to initial value
|
||||
if disable and EncoreInitial != nil then
|
||||
COM_BufInsertText(server, string.format("kartencore %d", EncoreInitial))
|
||||
EncoreInitial = nil
|
||||
end
|
||||
|
||||
disable = $ or not cv_enable.value
|
||||
player.afkTime = leveltime
|
||||
end
|
||||
addHook("PlayerSpawn", initLeaderboard)
|
||||
|
||||
local function doyoudare(player)
|
||||
if not singleplayer() or player.spectator then
|
||||
if ingame() > 1 or player.spectator then
|
||||
CONS_Printf(player, "How dare you")
|
||||
return false
|
||||
end
|
||||
@ -385,12 +260,6 @@ end
|
||||
|
||||
local function retry(player, ...)
|
||||
if doyoudare(player) then
|
||||
-- Verify valid race level
|
||||
if not (mapheaderinfo[gamemap].typeoflevel & (TOL_SP | TOL_RACE)) then
|
||||
CONS_Printf(player, "Battle maps are not supported")
|
||||
return
|
||||
end
|
||||
|
||||
-- Prevents bind crash
|
||||
if leveltime < 20 then
|
||||
return
|
||||
@ -407,65 +276,26 @@ local function exitlevel(player, ...)
|
||||
end
|
||||
COM_AddCommand("exit", exitlevel)
|
||||
|
||||
local function initBrowser(player)
|
||||
if not doyoudare(player) then return end
|
||||
|
||||
-- TODO: allow in battle
|
||||
if mapheaderinfo[gamemap].typeoflevel & TOL_MATCH then
|
||||
CONS_Printf(player, "Please exit battle first")
|
||||
return
|
||||
end
|
||||
|
||||
if not InitBrowser then
|
||||
print("Browser is not loaded")
|
||||
return
|
||||
end
|
||||
|
||||
InitBrowser(lb)
|
||||
drawState = DS_BROWSER
|
||||
|
||||
player.afkTime = leveltime
|
||||
end
|
||||
COM_AddCommand("levelselect", initBrowser)
|
||||
|
||||
local function findMap(player, ...)
|
||||
local search = ...
|
||||
if search == nil then
|
||||
|
||||
local hell = "\x85HELL"
|
||||
local tol = {
|
||||
[TOL_SP] = "\x81Race\x80", -- Nuked race maps
|
||||
[TOL_COOP] = "\x8D\Battle\x80", -- Nuked battle maps
|
||||
[TOL_RACE] = "\x88Race\x80",
|
||||
[TOL_MATCH] = "\x87\Battle\x80"
|
||||
}
|
||||
local lvltype, map, lvlttl
|
||||
return
|
||||
end
|
||||
|
||||
for i = 1, #mapheaderinfo do
|
||||
map = mapheaderinfo[i]
|
||||
local map = mapheaderinfo[i]
|
||||
if map == nil then
|
||||
continue
|
||||
end
|
||||
|
||||
lvlttl = map.lvlttl + zoneAct(map)
|
||||
|
||||
if not search or lvlttl:lower():find(search:lower()) then
|
||||
-- Only care for up to TOL_MATCH (0x10)
|
||||
lvltype = tol[map.typeoflevel & 0x1F] or map.typeoflevel
|
||||
|
||||
-- If not battle print numlaps
|
||||
lvltype = (map.typeoflevel & (TOL_MATCH | TOL_COOP) and lvltype)
|
||||
or string.format("%s \x82%-2d\x80", lvltype, map.numlaps)
|
||||
|
||||
|
||||
if map.lvlttl:lower():find(search:lower()) then
|
||||
CONS_Printf(
|
||||
player,
|
||||
string.format(
|
||||
"%s %-9s %-30s - %s\t%s",
|
||||
"%s - %s",
|
||||
G_BuildMapName(i),
|
||||
lvltype,
|
||||
lvlttl,
|
||||
map.subttl,
|
||||
(map.menuflags & LF2_HIDEINMENU and hell) or ""
|
||||
map.lvlttl
|
||||
)
|
||||
)
|
||||
end
|
||||
@ -473,128 +303,11 @@ 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
|
||||
local function mapNotExists(player, map)
|
||||
CONS_Printf(player, string.format("Map doesn't exist: %s", map:upper()))
|
||||
end
|
||||
|
||||
local SPBModeSym = {
|
||||
[F_SPBEXP] = "X",
|
||||
[F_SPBBIG] = "B",
|
||||
[F_SPBJUS] = "J",
|
||||
}
|
||||
|
||||
local function modeToString(mode)
|
||||
local modestr = "Time Attack"
|
||||
if mode & F_SPBATK then
|
||||
modestr = "SPB"
|
||||
for k, v in pairs(SPBModeSym) do
|
||||
if mode & k then
|
||||
modestr = $ + v
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return modestr
|
||||
end
|
||||
|
||||
local function records(player, ...)
|
||||
local mapid = ...
|
||||
local mapnum = gamemap
|
||||
|
||||
if mapid then
|
||||
mapnum = mapnumFromExtended(mapid)
|
||||
if not mapnum then
|
||||
CONS_Printf(player, string.format("Invalid map name: %s", mapid))
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
local map = mapheaderinfo[mapnum]
|
||||
if map then
|
||||
CONS_Printf(player,
|
||||
string.format(
|
||||
"\x83%s%8s",
|
||||
map.lvlttl,
|
||||
(map.menuflags & LF2_HIDEINMENU and "\x85HELL") or ""
|
||||
)
|
||||
)
|
||||
|
||||
local zoneact = zoneAct(map)
|
||||
-- print the zone/act on the right hand size under the title
|
||||
CONS_Printf(
|
||||
player,
|
||||
string.format(
|
||||
string.format("\x83%%%ds%%s\x80 - \x88%%s", #map.lvlttl - #zoneact / 2 - 1),
|
||||
" ",
|
||||
zoneAct(map),
|
||||
map.subttl
|
||||
)
|
||||
)
|
||||
else
|
||||
CONS_Printf(player, "\x85UNKNOWN MAP")
|
||||
end
|
||||
|
||||
for mode, maps in pairs(lb) do
|
||||
local maptbl = maps[mapnum]
|
||||
if not maptbl then continue end
|
||||
CONS_Printf(player, "")
|
||||
CONS_Printf(player, modeToString(mode))
|
||||
|
||||
-- don't print flags for time attack
|
||||
if mode then
|
||||
for i, tbl in ipairs(maptbl) do
|
||||
CONS_Printf(
|
||||
player,
|
||||
string.format(
|
||||
"%2d %-21s \x89%8s \x80%s",
|
||||
i,
|
||||
tbl["name"],
|
||||
ticsToTime(tbl["time"]),
|
||||
modeToString(tbl["flags"])
|
||||
)
|
||||
)
|
||||
end
|
||||
else
|
||||
for i, tbl in ipairs(maptbl) do
|
||||
CONS_Printf(
|
||||
player,
|
||||
string.format(
|
||||
"%2d %-21s \x89%8s",
|
||||
i,
|
||||
tbl["name"],
|
||||
ticsToTime(tbl["time"])
|
||||
)
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
COM_AddCommand("records", records)
|
||||
local ALPH = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||
|
||||
local function changelevel(player, ...)
|
||||
if not doyoudare(player) then
|
||||
@ -610,19 +323,32 @@ local function changelevel(player, ...)
|
||||
return
|
||||
end
|
||||
|
||||
local mapnum = mapnumFromExtended(map)
|
||||
if not mapnum then
|
||||
local p, q = map:upper():match("MAP(%w)(%w)$", 1)
|
||||
if not (p and q) then
|
||||
CONS_Printf(player, string.format("Invalid map name: %s", map))
|
||||
end
|
||||
|
||||
if mapheaderinfo[mapnum] == nil then
|
||||
CONS_Printf(player, string.format("Map doesn't exist: %s", map:upper()))
|
||||
return
|
||||
end
|
||||
|
||||
-- Verify valid race level
|
||||
if not (mapheaderinfo[mapnum].typeoflevel & (TOL_SP | TOL_RACE)) then
|
||||
CONS_Printf(player, "Battle maps are not supported")
|
||||
local mapnum = 0
|
||||
if tonumber(p) != nil then
|
||||
-- Non extended map numbers
|
||||
if tonumber(q) == nil then
|
||||
mapNotExists(player, map)
|
||||
return
|
||||
end
|
||||
mapnum = tonumber(p) * 10 + tonumber(q)
|
||||
else
|
||||
--Extended map numbers
|
||||
p = ALPH:find(p) - 1
|
||||
local qn = tonumber(q)
|
||||
if qn == nil then
|
||||
qn = ALPH:find(q) + 9
|
||||
end
|
||||
mapnum = 36 * p + qn + 100
|
||||
end
|
||||
|
||||
if mapheaderinfo[mapnum] == nil then
|
||||
mapNotExists(player, map)
|
||||
return
|
||||
end
|
||||
|
||||
@ -630,24 +356,6 @@ local function changelevel(player, ...)
|
||||
end
|
||||
COM_AddCommand("changelevel", changelevel)
|
||||
|
||||
local function toggleEncore(player)
|
||||
if not doyoudare(player) then
|
||||
return
|
||||
end
|
||||
|
||||
local enc = CV_FindVar("kartencore")
|
||||
if EncoreInitial == nil then
|
||||
EncoreInitial = enc.value
|
||||
end
|
||||
|
||||
if enc.value then
|
||||
COM_BufInsertText(server, "kartencore off")
|
||||
else
|
||||
COM_BufInsertText(server, "kartencore on")
|
||||
end
|
||||
end
|
||||
COM_AddCommand("encore", toggleEncore)
|
||||
|
||||
local function clearcheats(player)
|
||||
if not player.spectator then
|
||||
clearcheats = true
|
||||
@ -744,6 +452,8 @@ local function findRival(player, ...)
|
||||
|
||||
table.sort(tbl, sortf)
|
||||
|
||||
local spb = mode & F_SPBATK and "SPB" or "TA"
|
||||
|
||||
for _, score in ipairs(tbl) do
|
||||
if o then
|
||||
o = o - 1
|
||||
@ -752,8 +462,6 @@ local function findRival(player, ...)
|
||||
if i >= stop then break end
|
||||
i = i + 1
|
||||
|
||||
local modestr = modeToString(score["rival"]["flags"])
|
||||
|
||||
if score["your"] then
|
||||
local diff = score["your"]["time"] - score["rival"]["time"]
|
||||
local color = colors[clamp(-1, diff, 1)]
|
||||
@ -766,7 +474,7 @@ local function findRival(player, ...)
|
||||
ticsToTime(score["rival"]["time"]),
|
||||
color,
|
||||
sym[diff<0] + ticsToTime(abs(diff)),
|
||||
modestr
|
||||
spb
|
||||
)
|
||||
)
|
||||
else
|
||||
@ -777,7 +485,7 @@ local function findRival(player, ...)
|
||||
G_BuildMapName(score["rival"]["map"]),
|
||||
ticsToTime(score["rival"]["time"]),
|
||||
ticsToTime(0, true),
|
||||
modestr
|
||||
spb
|
||||
)
|
||||
)
|
||||
end
|
||||
@ -827,6 +535,23 @@ COM_AddCommand("rival", findRival)
|
||||
-- end
|
||||
--end
|
||||
|
||||
|
||||
local cellSize = 16
|
||||
local function spawnCells(n)
|
||||
local p = leveltime
|
||||
for i = 0,n do
|
||||
local x = (i * p) % (320/cellSize)
|
||||
p = p + 7
|
||||
local y = (i * p) % (200/cellSize)
|
||||
p = p % 42 + 1
|
||||
|
||||
if not(LIFE[x] and LIFE[y]) then
|
||||
LIFE[x] = $ or {}
|
||||
LIFE[x][y] = true
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
addHook("MapLoad", function()
|
||||
timeFinished = 0
|
||||
splits = {}
|
||||
@ -834,13 +559,139 @@ addHook("MapLoad", function()
|
||||
drawState = DS_DEFAULT
|
||||
scrollY = 50 * FRACUNIT
|
||||
scrollAcc = 0
|
||||
FlashTics = 0
|
||||
|
||||
allowJoin(true)
|
||||
--printTable(lb)
|
||||
|
||||
LIFE = {}
|
||||
dvd = {}
|
||||
end
|
||||
)
|
||||
|
||||
local function life(player, ...)
|
||||
local n = ...
|
||||
spawnCells(n)
|
||||
end
|
||||
COM_AddCommand("life", life)
|
||||
|
||||
function ticsToTime(tics, pure)
|
||||
if tics == 0 and pure then
|
||||
return "-:--:--"
|
||||
end
|
||||
|
||||
return string.format(
|
||||
"%d:%02d:%02d",
|
||||
G_TicsToMinutes(tics),
|
||||
G_TicsToSeconds(tics),
|
||||
G_TicsToCentiseconds(tics)
|
||||
)
|
||||
end
|
||||
|
||||
local function ticLife()
|
||||
local neigh = {}
|
||||
local new = {}
|
||||
|
||||
for x, t in pairs(LIFE) do
|
||||
for y, v in pairs(t) do
|
||||
neigh[x-1] = $ or {}
|
||||
neigh[x] = $ or {}
|
||||
neigh[x+1] = $ or {}
|
||||
|
||||
neigh[x-1][y-1] = $ and $ + 1 or 1
|
||||
neigh[x-1][y] = $ and $ + 1 or 1
|
||||
neigh[x-1][y+1] = $ and $ + 1 or 1
|
||||
|
||||
neigh[x][y-1] = $ and $ + 1 or 1
|
||||
neigh[x][y+1] = $ and $ + 1 or 1
|
||||
|
||||
neigh[x+1][y-1] = $ and $ + 1 or 1
|
||||
neigh[x+1][y] = $ and $ + 1 or 1
|
||||
neigh[x+1][y+1] = $ and $ + 1 or 1
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
for x, t in pairs(neigh) do
|
||||
if x >= 0 and x * cellSize < 320 then
|
||||
for y, v in pairs(t) do
|
||||
if y >= 0 and y * cellSize < 200 then
|
||||
-- 3 neighbours dead cell
|
||||
if v == 3 and (LIFE[x] == nil or LIFE[x][y] == nil) then
|
||||
new[x] = $ or {}
|
||||
new[x][y] = true
|
||||
elseif v >= 2 and v <= 3 and (LIFE[x] and LIFE[x][y] != nil) then
|
||||
new[x] = $ or {}
|
||||
new[x][y] = true
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
LIFE = new
|
||||
end
|
||||
|
||||
local function drawLife(v, player)
|
||||
for x, t in pairs(LIFE) do
|
||||
for y, _ in pairs(t) do
|
||||
v.drawScaled(
|
||||
x * cellSize * FRACUNIT,
|
||||
y * cellSize * FRACUNIT,
|
||||
FixedDiv(cellSize * FRACUNIT, 16 * FRACUNIT),
|
||||
PATCH["FACERANK"][faceranks[((x + y) % #faceranks) + 1]],
|
||||
0,
|
||||
v.getColormap("sonic", player.skincolor)
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local function spawnDvd(p)
|
||||
local size = (((p + leveltime) % 3) + 1) * 16
|
||||
local rank = (#faceranks and faceranks[((p + leveltime) % #faceranks) + 1]) or "sonic"
|
||||
local d = {
|
||||
["x"] = max(((p + leveltime % 320) - size), 0) * FRACUNIT,
|
||||
["y"] = max(((p + leveltime % 200) - size), 0) * FRACUNIT,
|
||||
["xvel"] = (((p + leveltime) % 7) + 1) * FRACUNIT / 2,
|
||||
["yvel"] = (((p + leveltime) % 5) + 1) * FRACUNIT / 2,
|
||||
["rank"] = rank,
|
||||
["color"] = ((p + leveltime) % MAXSKINCOLORS - 1) + 1,
|
||||
["size"] = size,
|
||||
}
|
||||
|
||||
table.insert(dvd, d)
|
||||
end
|
||||
|
||||
local function ticDvd()
|
||||
for i, d in ipairs(dvd) do
|
||||
d.x = $ + d.xvel
|
||||
d.y = $ + d.yvel
|
||||
|
||||
if d.x < 0 or d.x + d.size * FRACUNIT > 320 * FRACUNIT then
|
||||
d.xvel = -$
|
||||
clamp(0, d.x, 320 * FRACUNIT)
|
||||
end
|
||||
|
||||
if d.y < 0 or d.y + d.size * FRACUNIT > 200 * FRACUNIT then
|
||||
d.yvel = -$
|
||||
clamp(0, d.y, 200 * FRACUNIT)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local function drawDvd(v, player)
|
||||
for i, d in ipairs(dvd) do
|
||||
v.drawScaled(
|
||||
d.x,
|
||||
d.y,
|
||||
FixedDiv(d.size * FRACUNIT, 16 * FRACUNIT),
|
||||
PATCH["FACERANK"][d.rank],
|
||||
0,
|
||||
v.getColormap("sonic", d.color)
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
-- Item patches have the amazing property of being displaced 12x 13y pixels
|
||||
local iXoffset = 13 * FRACUNIT
|
||||
local iYoffset = 12 * FRACUNIT
|
||||
@ -854,20 +705,6 @@ local function drawitem(v, x, y, scale, itempatch, vflags)
|
||||
)
|
||||
end
|
||||
|
||||
local modePatches = {
|
||||
[F_SPBATK] = "SPB",
|
||||
[F_SPBJUS] = "HYUD",
|
||||
[F_SPBBIG] = "BIG",
|
||||
[F_SPBEXP] = "INV"
|
||||
}
|
||||
|
||||
local function modePatch(flag)
|
||||
if flag == F_SPBEXP then
|
||||
return PATCH[modePatches[flag]][(leveltime / 4) % 6]
|
||||
end
|
||||
return PATCH[modePatches[flag]]
|
||||
end
|
||||
|
||||
local cursors = {
|
||||
[1] = ". ",
|
||||
[2] = " ."
|
||||
@ -914,26 +751,12 @@ local FACERANK_DIM = 16
|
||||
local FACERANK_SPC = FACERANK_DIM + 4
|
||||
local function drawScore(v, player, pos, x, y, gui, faceRank, score, drawPos, textVFlags)
|
||||
textVFlags = textVFlags or V_HUDTRANSHALF
|
||||
local me = player.name == score["name"]
|
||||
|
||||
--draw Patch/chili
|
||||
v.draw(x, y, faceRank, V_HUDTRANS | VFLAGS, v.getColormap("sonic", score["color"]))
|
||||
if me then
|
||||
if player.name == score["name"] then
|
||||
v.draw(x, y, PATCH["CHILI"][(leveltime / 4) % 8], V_HUDTRANS | VFLAGS)
|
||||
end
|
||||
|
||||
-- Encore
|
||||
if score["flags"] & F_ENCORE then
|
||||
local bob = sin((leveltime + i * 5) * (ANG10))
|
||||
v.drawScaled(
|
||||
x * FRACUNIT,
|
||||
bob + (y + FACERANK_DIM / 2) * FRACUNIT,
|
||||
FRACUNIT / 6,
|
||||
PATCH["RUBY"],
|
||||
V_HUDTRANS | VFLAGS
|
||||
)
|
||||
end
|
||||
|
||||
-- SPB
|
||||
if score["flags"] & F_SPBATK then
|
||||
local scale = FRACUNIT / 4
|
||||
@ -942,7 +765,7 @@ local function drawScore(v, player, pos, x, y, gui, faceRank, score, drawPos, te
|
||||
x - 2,
|
||||
y - 2,
|
||||
scale,
|
||||
modePatch(F_SPBATK),
|
||||
PATCH["SPB"],
|
||||
V_HUDTRANS | VFLAGS
|
||||
)
|
||||
if score["flags"] & F_SPBEXP then
|
||||
@ -951,7 +774,7 @@ local function drawScore(v, player, pos, x, y, gui, faceRank, score, drawPos, te
|
||||
x + FACERANK_DIM - 4,
|
||||
y - 2,
|
||||
scale,
|
||||
modePatch(F_SPBEXP),
|
||||
PATCH["INV"][(leveltime / 4) % 6],
|
||||
V_HUDTRANS | VFLAGS
|
||||
)
|
||||
end
|
||||
@ -961,7 +784,7 @@ local function drawScore(v, player, pos, x, y, gui, faceRank, score, drawPos, te
|
||||
x - 2,
|
||||
y + FACERANK_DIM - 4,
|
||||
scale,
|
||||
modePatch(F_SPBBIG),
|
||||
PATCH["BIG"],
|
||||
V_HUDTRANS | VFLAGS
|
||||
)
|
||||
end
|
||||
@ -971,7 +794,7 @@ local function drawScore(v, player, pos, x, y, gui, faceRank, score, drawPos, te
|
||||
x + FACERANK_DIM - 4,
|
||||
y + FACERANK_DIM - 4,
|
||||
scale,
|
||||
modePatch(F_SPBJUS),
|
||||
PATCH["HYUD"],
|
||||
V_HUDTRANS | VFLAGS
|
||||
)
|
||||
end
|
||||
@ -982,18 +805,15 @@ local function drawScore(v, player, pos, x, y, gui, faceRank, score, drawPos, te
|
||||
v.drawNum(x, y + 3, pos, textVFlags | VFLAGS)
|
||||
end
|
||||
|
||||
-- Stats
|
||||
local stat = score["stat"]
|
||||
local pskin = score["skin"] and skins[score["skin"]]
|
||||
if stat and not (
|
||||
pskin
|
||||
and pskin.kartweight == stat["weight"]
|
||||
and pskin.kartspeed == stat["speed"]
|
||||
) then
|
||||
v.drawString(x + FACERANK_DIM - 2, y + 4, stat["speed"], V_HUDTRANS | VFLAGS, "small")
|
||||
v.drawString(x + FACERANK_DIM - 2, y + 8, stat["weight"], V_HUDTRANS | VFLAGS, "small")
|
||||
-- Restats
|
||||
local restat = score["restat"]
|
||||
if restat then
|
||||
v.drawString(x + FACERANK_DIM - 2, y + 4, restat["speed"], V_HUDTRANS | VFLAGS, "small")
|
||||
v.drawString(x + FACERANK_DIM - 2, y + 8, restat["weight"], V_HUDTRANS | VFLAGS, "small")
|
||||
end
|
||||
|
||||
|
||||
|
||||
if gui == GUI_ON or (gui == GUI_SPLITS and showSplit) then
|
||||
local name = score["name"]
|
||||
|
||||
@ -1014,16 +834,11 @@ local function drawScore(v, player, pos, x, y, gui, faceRank, score, drawPos, te
|
||||
end
|
||||
end
|
||||
|
||||
local flashV = 0
|
||||
if me and FlashTics > leveltime then
|
||||
flashV = FlashVFlags[leveltime / FlashRate % (#FlashVFlags + 1)]
|
||||
end
|
||||
|
||||
v.drawString(
|
||||
x + FACERANK_DIM + px,
|
||||
y + py,
|
||||
name,
|
||||
textVFlags | V_ALLOWLOWERCASE | VFLAGS | flashV,
|
||||
textVFlags | V_ALLOWLOWERCASE | VFLAGS,
|
||||
stralign
|
||||
)
|
||||
|
||||
@ -1041,7 +856,7 @@ local function drawScore(v, player, pos, x, y, gui, faceRank, score, drawPos, te
|
||||
x + px + FACERANK_DIM,
|
||||
y + 8,
|
||||
ticsToTime(score["time"], true),
|
||||
textVFlags | bodium[min(pos, 4)] | VFLAGS | flashV
|
||||
textVFlags | bodium[min(pos, 4)] | VFLAGS
|
||||
)
|
||||
end
|
||||
end
|
||||
@ -1088,10 +903,10 @@ local function drawScroll(v, player, scoreTable, gui)
|
||||
local x = 10
|
||||
if #scoreTable >= 10 then
|
||||
x = x + 8
|
||||
end
|
||||
if #scoreTable >= 100 then
|
||||
x = x + 8
|
||||
end
|
||||
end
|
||||
|
||||
local y = FixedInt(scrollY)
|
||||
|
||||
@ -1121,32 +936,24 @@ local function drawScrollTo(v, player, scoreTable, gui)
|
||||
drawScroll(v, player, scoreTable, gui)
|
||||
end
|
||||
|
||||
local function drawBrowser(v, player)
|
||||
DrawBrowser(v, lb)
|
||||
end
|
||||
|
||||
local stateFunctions = {
|
||||
[DS_DEFAULT] = drawDefault,
|
||||
[DS_SCROLL] = drawScroll,
|
||||
[DS_AUTO] = drawAuto,
|
||||
[DS_SCRLTO] = drawScrollTo,
|
||||
[DS_BROWSER] = drawBrowser
|
||||
[DS_SCRLTO] = drawScrollTo
|
||||
}
|
||||
|
||||
-- Draw mode and return pos + 1 if success
|
||||
local function drawMode(v, pos, flag)
|
||||
if not (Flags & flag) then return pos end
|
||||
|
||||
drawitem(v, pos * 6 + 1, 194, FRACUNIT / 4, modePatch(flag), V_SNAPTOBOTTOM | V_SNAPTOLEFT)
|
||||
return pos + 1
|
||||
end
|
||||
|
||||
local function drawScoreboard(v, player)
|
||||
if disable then return end
|
||||
if player != displayplayers[0] then return end
|
||||
|
||||
cachePatches(v)
|
||||
|
||||
drawLife(v, player)
|
||||
drawDvd(v, player)
|
||||
|
||||
local scoreTable = getScoreTable(gamemap, Flags)
|
||||
|
||||
local gui = cv_gui.value
|
||||
if leveltime < START_TIME or player.exiting or player.lives == 0 then
|
||||
gui = GUI_ON
|
||||
@ -1155,12 +962,6 @@ 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)
|
||||
end
|
||||
hud.add(drawScoreboard, "game")
|
||||
|
||||
@ -1178,6 +979,7 @@ function cachePatches(v)
|
||||
PATCH["FACERANK"] = {}
|
||||
for skin in skins.iterate do
|
||||
PATCH["FACERANK"][skin.name] = v.cachePatch(skin.facerank)
|
||||
table.insert(faceranks, skin.name)
|
||||
end
|
||||
|
||||
PATCH["SPB"] = v.cachePatch("K_ISSPB")
|
||||
@ -1187,13 +989,22 @@ function cachePatches(v)
|
||||
end
|
||||
PATCH["BIG"] = v.cachePatch("K_ISGROW")
|
||||
PATCH["HYUD"] = v.cachePatch("K_ISHYUD")
|
||||
PATCH["RUBY"] = v.cachePatch("RUBYICON")
|
||||
end
|
||||
end
|
||||
|
||||
-- True if a is better than b
|
||||
local function lbComp(a, b)
|
||||
-- Calculates the difficulty, harder has higher priority
|
||||
-- if s is positive then a is harder
|
||||
-- if s is negative then b is harder
|
||||
-- if s is 0 then compare time
|
||||
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
|
||||
|
||||
-- Find location of player and scroll to it
|
||||
function scroll_to(player)
|
||||
local m = scoreTable or {}
|
||||
local m = getScoreTable(gamemap, Flags) or {}
|
||||
|
||||
scrollToPos = 2
|
||||
for pos, score in ipairs(m) do
|
||||
@ -1206,26 +1017,9 @@ function scroll_to(player)
|
||||
drawState = DS_SCRLTO
|
||||
end
|
||||
|
||||
-- Write skin stats to each score where there are none
|
||||
local function writeStats()
|
||||
for _, t in pairs(lb) do
|
||||
for _, scoreTable in pairs(t) do
|
||||
for _, score in ipairs(scoreTable) do
|
||||
local skin = skins[score["skin"]]
|
||||
if skin and not score["stat"] then
|
||||
local stats = stat_t(skin.kartspeed, skin.kartweight)
|
||||
score["stat"] = stats
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local function saveTime(player)
|
||||
local scoreTable = getScoreTable(gamemap, Flags) or {}
|
||||
|
||||
scoreTable = $ or {}
|
||||
|
||||
local pskin = skins[player.mo.skin]
|
||||
local newscore = score_t(
|
||||
gamemap,
|
||||
player.name,
|
||||
@ -1234,7 +1028,7 @@ local function saveTime(player)
|
||||
timeFinished,
|
||||
splits,
|
||||
Flags,
|
||||
stat_t(player.HMRs or pskin.kartspeed, player.HMRw or pskin.kartweight)
|
||||
restat_t(player.HMRs, player.HMRw)
|
||||
)
|
||||
|
||||
-- Check if you beat your previous best
|
||||
@ -1243,16 +1037,10 @@ local function saveTime(player)
|
||||
if lbComp(newscore, scoreTable[i]) then
|
||||
table.remove(scoreTable, i)
|
||||
S_StartSound(nil, 130)
|
||||
FlashTics = leveltime + TICRATE * 3
|
||||
FlashRate = 1
|
||||
FlashVFlags = YellowFlash
|
||||
break
|
||||
else
|
||||
-- You suck lol
|
||||
S_StartSound(nil, 201)
|
||||
FlashTics = leveltime + TICRATE * 3
|
||||
FlashRate = 3
|
||||
FlashVFlags = RedFlash
|
||||
scroll_to(player)
|
||||
return
|
||||
end
|
||||
@ -1274,11 +1062,6 @@ local function saveTime(player)
|
||||
|
||||
setScoreTable(gamemap, Flags, scoreTable)
|
||||
|
||||
if not StatTrack then
|
||||
writeStats()
|
||||
StatTrack = true
|
||||
end
|
||||
|
||||
local f = assert(io.open(FILENAME, "w"))
|
||||
if f == nil then
|
||||
print("Failed to open file for writing: " + FILENAME)
|
||||
@ -1296,7 +1079,7 @@ local function saveTime(player)
|
||||
score["time"], "\t",
|
||||
table.concat(score["splits"], " "), "\t",
|
||||
score["flags"], "\t",
|
||||
stat_str(score["stat"]), "\n"
|
||||
restat_str(score["restat"]), "\n"
|
||||
)
|
||||
end
|
||||
end
|
||||
@ -1315,6 +1098,10 @@ end
|
||||
|
||||
local function regLap(player)
|
||||
if player.laps > prevLap and timeFinished == 0 then
|
||||
spawnCells(1000)
|
||||
for i = 0,player.laps * 3 do
|
||||
spawnDvd((i + 1) + 7)
|
||||
end
|
||||
prevLap = player.laps
|
||||
table.insert(splits, player.realtime)
|
||||
showSplit = 5 * TICRATE
|
||||
@ -1329,27 +1116,18 @@ local function getGamer()
|
||||
end
|
||||
end
|
||||
|
||||
local function changeMap()
|
||||
COM_BufInsertText(server, "map " + nextMap + " -force -gametype race")
|
||||
nextMap = nil
|
||||
end
|
||||
|
||||
local function think()
|
||||
if nextMap then changeMap() end
|
||||
|
||||
if disable then
|
||||
if AntiAFK then
|
||||
if not singleplayer() then
|
||||
for p in players.iterate do
|
||||
if p.valid and not p.spectator and not p.exiting and p.lives > 0 then
|
||||
if p.cmd.buttons or p.cmd.driftturn then
|
||||
p.afkTime = leveltime
|
||||
if nextMap then
|
||||
COM_BufInsertText(server, "map " + nextMap)
|
||||
nextMap = nil
|
||||
end
|
||||
|
||||
--Away from kart
|
||||
if p.afkTime + AFK_BALANCE_WARN == leveltime then
|
||||
chatprintf(p, "[AFK] \x89You will be moved to spectator in 10 seconds!", false)
|
||||
S_StartSound(nil, 26, p)
|
||||
if disable then
|
||||
if cv_afk.value and ingame() > 1 then
|
||||
for p in players.iterate do
|
||||
if p.valid and not p.spectator and not p.exiting and p.lives > 0 then
|
||||
if p.cmd.buttons then
|
||||
p.afkTime = leveltime
|
||||
end
|
||||
if p.afkTime + AFK_BALANCE < leveltime then
|
||||
p.spectator = true
|
||||
@ -1364,7 +1142,6 @@ local function think()
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
help = true
|
||||
return
|
||||
@ -1372,11 +1149,17 @@ local function think()
|
||||
|
||||
showSplit = max(0, showSplit - 1)
|
||||
|
||||
if leveltime % 10 == 0 then
|
||||
ticLife()
|
||||
end
|
||||
|
||||
ticDvd()
|
||||
|
||||
local p = getGamer()
|
||||
if leveltime < START_TIME then
|
||||
-- Help message
|
||||
if leveltime == START_TIME - TICRATE * 3 then
|
||||
if singleplayer() then
|
||||
if ingame() == 1 then
|
||||
if help then
|
||||
help = false
|
||||
chatprint(HELP_MESSAGE, true)
|
||||
@ -1387,13 +1170,7 @@ local function think()
|
||||
end
|
||||
|
||||
-- Autospec
|
||||
-- Encore
|
||||
if leveltime == 1 then
|
||||
Flags = $ & !F_ENCORE
|
||||
if encoremode then
|
||||
Flags = $ | F_ENCORE
|
||||
end
|
||||
|
||||
if p then
|
||||
for s in players.iterate do
|
||||
if s.valid and s.spectator then
|
||||
@ -1402,29 +1179,24 @@ local function think()
|
||||
end
|
||||
end
|
||||
end
|
||||
if not cv_spbatk then
|
||||
cv_spbatk = CV_FindVar("spbatk")
|
||||
end
|
||||
|
||||
-- Gamemode flags
|
||||
Flags = $ & !(F_SPBATK | F_SPBEXP | F_SPBBIG | F_SPBJUS)
|
||||
if server.SPBArunning
|
||||
and cv_spbatk.value
|
||||
and leveltime > START_TIME - (3 * TICRATE) / 2 then
|
||||
if leveltime > START_TIME - (3 * TICRATE) / 2 and server.SPBArunning then
|
||||
Flags = $ | F_SPBATK
|
||||
if server.SPBAexpert then
|
||||
Flags = $ | F_SPBEXP
|
||||
end
|
||||
if clearcheats then
|
||||
clearcheats = false
|
||||
for q in players.iterate do
|
||||
q.SPBAKARTBIG = false
|
||||
q.SPBAjustice = false
|
||||
q.SPBAshutup = false
|
||||
for p in players.iterate do
|
||||
p.SPBAKARTBIG = false
|
||||
p.SPBAjustice = false
|
||||
p.SPBAshutup = false
|
||||
end
|
||||
end
|
||||
|
||||
if p then
|
||||
for p in players.iterate do
|
||||
if not p.spectator then
|
||||
if p.SPBAKARTBIG then
|
||||
Flags = $ | F_SPBBIG
|
||||
end
|
||||
@ -1432,27 +1204,14 @@ local function think()
|
||||
Flags = $ | F_SPBJUS
|
||||
end
|
||||
end
|
||||
|
||||
-- make sure the spb actually spawned
|
||||
if leveltime == START_TIME - 1 then
|
||||
if not (server.SPBAbomb and server.SPBAbomb.valid) then
|
||||
-- it didn't spawn, clear spb flags
|
||||
Flags = $ & !(F_SPBATK | F_SPBEXP | F_SPBBIG | F_SPBJUS)
|
||||
end
|
||||
end
|
||||
|
||||
else
|
||||
if not (Flags & F_SPBATK) then
|
||||
hud.enable("freeplay")
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
scoreTable = getScoreTable(gamemap, Flags)
|
||||
|
||||
if not cv_teamchange then
|
||||
cv_teamchange = CV_FindVar("allowteamchange")
|
||||
end
|
||||
|
||||
local cv_teamchange = CV_FindVar("allowteamchange")
|
||||
if p then
|
||||
-- Scroll controller
|
||||
-- Spectators can't input buttons so let the gamer do it
|
||||
@ -1467,37 +1226,16 @@ local function think()
|
||||
scrollAcc = 0
|
||||
end
|
||||
end
|
||||
elseif drawState == DS_BROWSER then
|
||||
if BrowserController(p) then
|
||||
drawState = DS_DEFAULT
|
||||
end
|
||||
|
||||
-- prevent intermission while browsing
|
||||
if p.exiting then
|
||||
p.exiting = $ + 1
|
||||
end
|
||||
|
||||
-- disable spba hud
|
||||
if server.SPBAdone then
|
||||
server.SPBArunning = false
|
||||
p.pflags = $ & !(PF_TIMEOVER)
|
||||
p.exiting = 100
|
||||
end
|
||||
|
||||
-- prevent softlocking the server
|
||||
if p.afkTime + AFK_BROWSER < leveltime then
|
||||
drawState = DS_DEFAULT
|
||||
S_StartSound(nil, 100)
|
||||
end
|
||||
elseif p.lives == 0 then
|
||||
if p.lives == 0 then
|
||||
drawState = DS_SCROLL
|
||||
end
|
||||
|
||||
if p.cmd.buttons or p.cmd.driftturn then
|
||||
if p.cmd.buttons then
|
||||
p.afkTime = leveltime
|
||||
end
|
||||
|
||||
if not replayplayback then
|
||||
if leveltime > PREVENT_JOIN_TIME and p.afkTime + AFK_TIMEOUT > leveltime then
|
||||
if cv_teamchange.value then
|
||||
allowJoin(false)
|
||||
@ -1507,7 +1245,6 @@ local function think()
|
||||
allowJoin(true)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if p.laps >= mapheaderinfo[gamemap].numlaps and timeFinished == 0 then
|
||||
timeFinished = p.realtime
|
||||
@ -1521,18 +1258,15 @@ end
|
||||
addHook("ThinkFrame", think)
|
||||
|
||||
local function interThink()
|
||||
if nextMap then changeMap() end
|
||||
|
||||
if not cv_teamchange then
|
||||
cv_teamchange = CV_FindVar("allowteamchange")
|
||||
if nextMap then
|
||||
COM_BufInsertText(server, "map " + nextMap)
|
||||
nextMap = nil
|
||||
end
|
||||
|
||||
if not cv_teamchange.value then
|
||||
if not CV_FindVar("allowteamchange").value then
|
||||
allowJoin(true)
|
||||
end
|
||||
end
|
||||
addHook("IntermissionThinker", interThink)
|
||||
addHook("VoteThinker", interThink)
|
||||
|
||||
-- Returns the values clamed between min, max
|
||||
function clamp(min_v, v, max_v)
|
||||
@ -1540,12 +1274,9 @@ function clamp(min_v, v, max_v)
|
||||
end
|
||||
|
||||
local function netvars(net)
|
||||
Flags = net($)
|
||||
lb = net($)
|
||||
splits = net($)
|
||||
prevLap = net($)
|
||||
drawState = net($)
|
||||
StatTrack = net($)
|
||||
EncoreInitial = net($)
|
||||
lb = net($)
|
||||
end
|
||||
addHook("NetVars", netvars)
|
||||
|
||||
Reference in New Issue
Block a user