nevermind

No need to constantly look up the cvar when it can be saved

browser.lua

@@ -0,0 +1,448 @@
+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)

lb_common.lua

@@ -0,0 +1,26 @@
+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)

leaderboard.lua

@@ -12,12 +12,28 @@ 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 UNCLAIMED = "Unclaimed Record"
-local HELP_MESSAGE = "\x89Leaderboard Commands:\nretry exit findmap changelevel spba_clearcheats lb_gui rival scroll encore"
+local HELP_MESSAGE = "\x89Leaderboard Commands:\nretry exit findmap changelevel spba_clearcheats lb_gui rival scroll encore records levelselect"
 local FILENAME = "leaderboard.txt"
 
 -- Retry / changelevel map
@@ -39,6 +55,7 @@ local clearcheats = false
 
 local START_TIME = 6 * TICRATE + (3 * TICRATE / 4) + 1
 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
@@ -52,6 +69,7 @@ local DS_DEFAULT = 0x0
 local DS_SCROLL  = 0x1
 local DS_AUTO    = 0x2
 local DS_SCRLTO  = 0x4
+local DS_BROWSER = 0x8
 
 local drawState = DS_DEFAULT
 
@@ -69,11 +87,24 @@ local clamp
 
 local scroll_to
 
-local ticsToTime
-
 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
 ---------------
 
+-- cvars
+local cv_teamchange
+local cv_spbatk
+
 local cv_gui = CV_RegisterVar({
 	name = "lb_gui",
 	defaultvalue = GUI_ON,
@@ -81,11 +112,24 @@ local cv_gui = CV_RegisterVar({
 	PossibleValue = {Off = GUI_OFF, Splits = GUI_SPLITS, On = GUI_ON}
 })
 
-local cv_afk = CV_RegisterVar({
+local AntiAFK = true
+CV_RegisterVar({
 	name = "lb_afk",
 	defaultvalue = 1,
-	flags = CV_NETVAR,
-	PossibleValue = CV_OnOff
+	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
 })
 
 local cv_enable = CV_RegisterVar({
@@ -179,17 +223,21 @@ end
 local cv_spb_separate = CV_RegisterVar({
 	name = "lb_spb_combined",
 	defaultvalue = 1,
-	flags = CV_NETVAR | CV_CALL,
+	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)
@@ -239,7 +287,7 @@ if f then
 			flags = tonumber(t[7])
 		end
 
-		local scoreTable = getScoreTable(tonumber(t[1]), flags) or {}
+		scoreTable = getScoreTable(tonumber(t[1]), flags) or {}
 
 		local spl = {}
 		if t[6] != nil then
@@ -295,23 +343,27 @@ function allowJoin(v)
 	end
 end
 
-local function ingame()
+-- Returns true if there is a single player ingame
+local function singleplayer()
 	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
-	return n
+	end
+	return true
 end
 
 local function initLeaderboard(player)
 	if disable and leveltime < START_TIME then
-		disable = ingame() > 1
+		disable = not singleplayer()
 	else
-		disable = disable or ingame() > 1
+		disable = disable or not singleplayer()
 	end
-	disable = $ or not cv_enable.value
+	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
@@ -324,7 +376,7 @@ end
 addHook("PlayerSpawn", initLeaderboard)
 
 local function doyoudare(player)
-	if ingame() > 1 or player.spectator then
+	if not singleplayer() or player.spectator then
 		CONS_Printf(player, "How dare you")
 		return false
 	end
@@ -333,6 +385,12 @@ 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
@@ -349,26 +407,65 @@ local function exitlevel(player, ...)
 end
 COM_AddCommand("exit", exitlevel)
 
-local function findMap(player, ...)
-	local search = ...
-	if search == nil then 
+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 = ...
+
+	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
+
 	for i = 1, #mapheaderinfo do
-		local map = mapheaderinfo[i]
+		map = mapheaderinfo[i]
 		if map == nil then
 			continue
 		end
 
-		if map.lvlttl:lower():find(search:lower()) then
+		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)
+
+
 			CONS_Printf(
 				player,
 				string.format(
-					"%s - %s",
+					"%s %-9s %-30s - %s\t%s",
 					G_BuildMapName(i),
-					map.lvlttl
+					lvltype,
+					lvlttl,
+					map.subttl,
+					(map.menuflags & LF2_HIDEINMENU and hell) or ""
 				)
 			)
 		end
@@ -376,11 +473,128 @@ local function findMap(player, ...)
 end
 COM_AddCommand("findmap", findMap)
 
-local function mapNotExists(player, map)
-	CONS_Printf(player, string.format("Map doesn't exist: %s", map:upper()))
+local function mapnumFromExtended(map)
+	local p, q = map:upper():match("MAP(%w)(%w)$", 1)
+	if not (p and q) then
+		return nil
 	end
 
-local ALPH = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+	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",
+	[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 function changelevel(player, ...)
 	if not doyoudare(player) then
@@ -396,32 +610,19 @@ local function changelevel(player, ...)
 		return
 	end
 
-	local p, q = map:upper():match("MAP(%w)(%w)$", 1)
-	if not (p and q) then
+	local mapnum = mapnumFromExtended(map)
+	if not mapnum then
 		CONS_Printf(player, string.format("Invalid map name: %s", map))
-		return
-	end
-
-	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)
+		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")
 		return
 	end
 
@@ -538,12 +739,6 @@ local function findRival(player, ...)
 		return a["rival"]["map"] < b["rival"]["map"]
 	end
 
-	local modestrings = {
-		[F_SPBEXP] = "X",
-		[F_SPBBIG] = "B",
-		[F_SPBJUS] = "J",
-	}
-
 	for mode, tbl in pairs(scores) do
 		if i >= stop then break end
 
@@ -557,15 +752,7 @@ local function findRival(player, ...)
 			if i >= stop then break end
 			i = i + 1
 
-			local modestr = "TA"
-			if score["rival"]["flags"] & F_SPBATK then
-				modestr = "SPB"
-				for k, v in pairs(modestrings) do
-					if score["rival"]["flags"] & k then
-						modestr = $ + v
-					end
-				end
-			end
+			local modestr = modeToString(score["rival"]["flags"])
 
 			if score["your"] then
 				local diff = score["your"]["time"] - score["rival"]["time"]
@@ -647,25 +834,13 @@ addHook("MapLoad", function()
 		drawState = DS_DEFAULT
 		scrollY = 50 * FRACUNIT
 		scrollAcc = 0
+		FlashTics = 0
 
 		allowJoin(true)
 		--printTable(lb)
 	end
 )
 
-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
-
 -- Item patches have the amazing property of being displaced 12x 13y pixels
 local iXoffset = 13 * FRACUNIT
 local iYoffset = 12 * FRACUNIT
@@ -739,10 +914,11 @@ 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 player.name == score["name"] then
+	if me then
 		v.draw(x, y, PATCH["CHILI"][(leveltime / 4) % 8], V_HUDTRANS | VFLAGS)
 	end
 
@@ -754,7 +930,7 @@ local function drawScore(v, player, pos, x, y, gui, faceRank, score, drawPos, te
 			bob + (y + FACERANK_DIM / 2) * FRACUNIT,
 			FRACUNIT / 6,
 			PATCH["RUBY"],
-			V_HUDTRANS
+			V_HUDTRANS | VFLAGS
 		)
 	end
 
@@ -838,11 +1014,16 @@ 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,
+			textVFlags | V_ALLOWLOWERCASE | VFLAGS | flashV,
 			stralign
 		)
 
@@ -860,7 +1041,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
+				textVFlags | bodium[min(pos, 4)] | VFLAGS | flashV
 			)
 		end
 	end
@@ -907,10 +1088,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)
 
@@ -940,11 +1121,16 @@ 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_SCRLTO] = drawScrollTo,
+	[DS_BROWSER] = drawBrowser
 }
 
 -- Draw mode and return pos + 1 if success
@@ -961,8 +1147,6 @@ local function drawScoreboard(v, player)
 
 	cachePatches(v)
 
-	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
@@ -1009,7 +1193,7 @@ end
 
 -- Find location of player and scroll to it
 function scroll_to(player)
-	local m = getScoreTable(gamemap, Flags) or {}
+	local m = scoreTable or {}
 
 	scrollToPos = 2
 	for pos, score in ipairs(m) do
@@ -1038,7 +1222,8 @@ local function writeStats()
 end
 
 local function saveTime(player)
-	local scoreTable = getScoreTable(gamemap, Flags) or {}
+
+	scoreTable =  $ or {}
 
 	local pskin = skins[player.mo.skin]
 	local newscore = score_t(
@@ -1058,10 +1243,16 @@ 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
@@ -1138,17 +1329,20 @@ local function getGamer()
 	end
 end
 
-local function think()
-	if nextMap then
-		COM_BufInsertText(server, "map " + nextMap)
+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 cv_afk.value and ingame() > 1 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 then
+						if p.cmd.buttons or p.cmd.driftturn then
 							p.afkTime = leveltime
 						end
 
@@ -1170,6 +1364,7 @@ local function think()
 					end
 				end
 			end
+		end
 
 		help = true
 		return
@@ -1181,7 +1376,7 @@ local function think()
 	if leveltime < START_TIME then
 		-- Help message
 		if leveltime == START_TIME - TICRATE * 3 then
-			if ingame() == 1  then
+			if singleplayer()  then
 				if help then
 					help = false
 					chatprint(HELP_MESSAGE, true)
@@ -1207,24 +1402,29 @@ 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 leveltime > START_TIME - (3 * TICRATE) / 2 and server.SPBArunning then
+		if server.SPBArunning
+		   and cv_spbatk.value
+		   and leveltime > START_TIME - (3 * TICRATE) / 2 then
 			Flags = $ | F_SPBATK
 			if server.SPBAexpert then
 				Flags = $ | F_SPBEXP
 			end
 			if clearcheats then
 				clearcheats = false
-				for p in players.iterate do
-					p.SPBAKARTBIG = false
-					p.SPBAjustice = false
-					p.SPBAshutup = false
+				for q in players.iterate do
+					q.SPBAKARTBIG = false
+					q.SPBAjustice = false
+					q.SPBAshutup = false
 				end
 			end
-			for p in players.iterate do
-				if not p.spectator then
+
+			if p then
 				if p.SPBAKARTBIG then
 					Flags = $ | F_SPBBIG
 				end
@@ -1232,14 +1432,27 @@ local function think()
 					Flags = $ | F_SPBJUS
 				end
 			end
-			end
-		end
-		if not (Flags & F_SPBATK) then
-			hud.enable("freeplay")
+
+			-- 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
 
-	local cv_teamchange = CV_FindVar("allowteamchange")
+		else
+			hud.enable("freeplay")
+		end
+
+	end
+
+	scoreTable = getScoreTable(gamemap, Flags)
+
+	if not cv_teamchange then
+		cv_teamchange = CV_FindVar("allowteamchange")
+	end
+
 	if p then
 		-- Scroll controller
 		-- Spectators can't input buttons so let the gamer do it
@@ -1254,13 +1467,33 @@ local function think()
 					scrollAcc = 0
 				end
 			end
+		elseif drawState == DS_BROWSER then
+			if BrowserController(p) then
+				drawState = DS_DEFAULT
 			end
 
-		if p.lives == 0 then
+			-- 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
 			drawState = DS_SCROLL
 		end
 
-		if p.cmd.buttons then
+		if p.cmd.buttons or p.cmd.driftturn then
 			p.afkTime = leveltime
 		end
 
@@ -1288,15 +1521,18 @@ end
 addHook("ThinkFrame", think)
 
 local function interThink()
-	if nextMap then
-		COM_BufInsertText(server, "map " + nextMap)
-		nextMap = nil
+	if nextMap then changeMap() end
+
+	if not cv_teamchange then
+		cv_teamchange = CV_FindVar("allowteamchange")
 	end
-	if not CV_FindVar("allowteamchange").value then
+
+	if not cv_teamchange.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)