README.md

@@ -1,2 +0,0 @@
-# Leaderboard plugin for srb2kart
-https://mb.srb2.org/addons/time-attack-leaderboard.3742/

leaderboard.lua

@@ -11,36 +11,15 @@ 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 UNCLAIMED = "Unclaimed Record"
-local HELP_MESSAGE = "\x89Leaderboard Commands:\nretry exit findmap changelevel spba_clearcheats lb_gui rival scroll encore records"
+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,15 +27,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_BALANCE = TICRATE * 60
-local AFK_BALANCE_WARN = AFK_BALANCE - TICRATE * 10
 local PREVENT_JOIN_TIME = START_TIME + TICRATE * 5
 
 local GUI_OFF    = 0x0
@@ -86,14 +61,8 @@ local clamp
 local scroll_to
 
 local ticsToTime
-
-local allowJoin
 ---------------
 
--- cvars
-local cv_teamchange
-local cv_spbatk
-
 local cv_gui = CV_RegisterVar({
 	name = "lb_gui",
 	defaultvalue = GUI_ON,
@@ -101,24 +70,11 @@ local cv_gui = CV_RegisterVar({
 	PossibleValue = {Off = GUI_OFF, Splits = GUI_SPLITS, On = GUI_ON}
 })
 
-local AntiAFK = true
+local cv_afk = CV_RegisterVar({
-CV_RegisterVar({
 	name = "lb_afk",
 	defaultvalue = 1,
-	flags = CV_NETVAR | CV_CALL,
+	flags = CV_NETVAR,
-	PossibleValue = CV_OnOff,
+	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({
@@ -128,9 +84,6 @@ local cv_enable = CV_RegisterVar({
 	PossibleValue = CV_OnOff,
 	func = function(v)
 		disable = $ or not v.value
-		if disable then
-			allowJoin(true)
-		end
 	end
 })
 
@@ -153,79 +106,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 score_t(map, name, skin, color, time, splits, flags, restat)
-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,
-	PossibleValue = CV_YesNo,
-	func = function(v)
-		if v.value then
-			ST_SEP = F_SPBATK
-		else
-			ST_SEP = F_SPBATK | F_SPBBIG | F_SPBEXP
-		end
-
-		reinit_lb()
-	end
-})
-
-local function score_t(map, name, skin, color, time, splits, flags, stat)
 	return {
 		["map"]    = map,
 		["name"]   = name,
@@ -234,11 +133,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,
@@ -248,9 +147,9 @@ local function stat_t(speed, weight)
 	return nil
 end
 
-local function stat_str(stat)
+local function restat_str(restat)
-	if stat then
+	if restat then
-		return string.format("%d%d", stat["speed"], stat["weight"])
+		return string.format("%d%d", restat["speed"], restat["weight"])
 	end
 
 	return "0"
@@ -261,7 +160,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)
@@ -272,7 +171,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
@@ -284,9 +183,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 speed = string.sub(t[8], 1, 1)
-				local weight = tonumber(string.sub(t[8], 2, 2))
+				local weight = string.sub(t[8], 2, 2)
-				stats = stat_t(speed, weight)
+				stats = restat_t(speed, weight)
 			end
 		end
 
@@ -303,17 +202,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
@@ -328,40 +225,29 @@ function allowJoin(v)
 	end
 end
 
--- Returns true if there is a single player ingame
+local function 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
 	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))
+	disable = $ or not cv_enable.value
-
-	-- Restore encore mode to initial value
-	if disable and EncoreInitial != nil then
-		COM_BufInsertText(server, string.format("kartencore %d", EncoreInitial))
-		EncoreInitial = nil
-	end
-
 	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
@@ -386,58 +272,26 @@ local function exitlevel(player, ...)
 end
 COM_AddCommand("exit", exitlevel)
 
-local function zoneAct(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
-
 local function findMap(player, ...)
 	local search = ...
+	if search == nil then 
 
-	local hell = "\x85HELL"
+		return
-	local tol = {
+	end
-		[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
-		map = mapheaderinfo[i]
+		local map = mapheaderinfo[i]
 		if map == nil then
 			continue
 		end
 
-		lvlttl = map.lvlttl + zoneAct(map)
+		if map.lvlttl:lower():find(search:lower()) then
-
-		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 %-9s %-30s - %s\t%s",
+					"%s - %s",
 					G_BuildMapName(i),
-					lvltype,
+					map.lvlttl
-					lvlttl,
-					map.subttl,
-					(map.menuflags & LF2_HIDEINMENU and hell) or ""
 				)
 			)
 		end
@@ -445,128 +299,11 @@ local function findMap(player, ...)
 end
 COM_AddCommand("findmap", findMap)
 
-local function mapnumFromExtended(map)
+local function mapNotExists(player, map)
-	local p, q = map:upper():match("MAP(%w)(%w)$", 1)
+	CONS_Printf(player, string.format("Map doesn't exist: %s", map:upper()))
-	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 = {
+local ALPH = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-	[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
@@ -582,19 +319,32 @@ local function changelevel(player, ...)
 		return
 	end
 
-	local mapnum = mapnumFromExtended(map)
+	local p, q = map:upper():match("MAP(%w)(%w)$", 1)
-	if not mapnum then
+	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
+	local mapnum = 0
-	if not (mapheaderinfo[mapnum].typeoflevel & (TOL_SP | TOL_RACE)) then
+	if tonumber(p) != nil then
-		CONS_Printf(player, "Battle maps are not supported")
+		-- 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
 
@@ -602,24 +352,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
@@ -653,7 +385,7 @@ local function findRival(player, ...)
 		[0] = "\x89",
 		[-1] = "\x88"
 	}
-
+	
 	local sym = {
 		[true] = "-",
 		[false] = "",
@@ -716,6 +448,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
@@ -724,8 +458,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)]
@@ -738,7 +470,7 @@ local function findRival(player, ...)
 						ticsToTime(score["rival"]["time"]),
 						color,
 						sym[diff<0] + ticsToTime(abs(diff)),
-						modestr
+						spb
 					)
 				)
 			else
@@ -749,7 +481,7 @@ local function findRival(player, ...)
 						G_BuildMapName(score["rival"]["map"]),
 						ticsToTime(score["rival"]["time"]),
 						ticsToTime(0, true),
-						modestr
+						spb
 					)
 				)
 			end
@@ -793,7 +525,7 @@ COM_AddCommand("rival", findRival)
 --			--		v[i]["flags"],
 --			--		","
 --			--	)
---			--
+--			--		
 --			--end
 --		end
 --	end
@@ -806,7 +538,6 @@ addHook("MapLoad", function()
 		drawState = DS_DEFAULT
 		scrollY = 50 * FRACUNIT
 		scrollAcc = 0
-		FlashTics = 0
 
 		allowJoin(true)
 		--printTable(lb)
@@ -820,7 +551,7 @@ function ticsToTime(tics, pure)
 
 	return string.format(
 		"%d:%02d:%02d",
-		G_TicsToMinutes(tics, true),
+		G_TicsToMinutes(tics),
 		G_TicsToSeconds(tics),
 		G_TicsToCentiseconds(tics)
 	)
@@ -839,20 +570,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] = " ."
@@ -861,7 +578,7 @@ local function marquee(text, maxwidth)
 	if #text <= maxwidth then
 		return text
 	end
-
+	
 	local shift = 16
 
 	-- Creates an index range ranging from -shift to #text + shift
@@ -899,26 +616,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
@@ -927,7 +630,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
@@ -936,7 +639,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
@@ -946,7 +649,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
@@ -956,7 +659,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
@@ -967,18 +670,15 @@ local function drawScore(v, player, pos, x, y, gui, faceRank, score, drawPos, te
 		v.drawNum(x, y + 3, pos, textVFlags | VFLAGS)
 	end
 
-	-- Stats
+	-- Restats
-	local stat = score["stat"]
+	local restat = score["restat"]
-	local pskin = score["skin"] and skins[score["skin"]]
+	if restat then
-	if stat and not (
+		v.drawString(x + FACERANK_DIM - 2, y + 4, restat["speed"], V_HUDTRANS | VFLAGS, "small")
-			pskin
+		v.drawString(x + FACERANK_DIM - 2, y + 8, restat["weight"], V_HUDTRANS | VFLAGS, "small")
-			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")
 	end
 
+	
+	
 	if gui == GUI_ON or (gui == GUI_SPLITS and showSplit) then
 		local name = score["name"]
 
@@ -999,16 +699,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
 		)
 
@@ -1026,7 +721,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
@@ -1071,11 +766,11 @@ local function drawScroll(v, player, scoreTable, gui)
 		end
 
 		local x = 10
-		if #scoreTable >= 10 then
+		if #scoreTable > 10 then
+			x = x + 8
+		end
+		if #scoreTable > 100 then
 			x = x + 8
-			if #scoreTable >= 100 then
-				x = x + 8
-			end
 		end
 
 		local y = FixedInt(scrollY)
@@ -1113,19 +808,13 @@ local stateFunctions = {
 	[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)
+	
+	local scoreTable = getScoreTable(gamemap, Flags)
 
 	local gui = cv_gui.value
 	if leveltime < START_TIME or player.exiting or player.lives == 0 then
@@ -1135,12 +824,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")
 
@@ -1167,13 +850,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
@@ -1186,26 +878,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,
@@ -1214,7 +889,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
@@ -1223,16 +898,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
@@ -1254,11 +923,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)
@@ -1276,7 +940,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
@@ -1309,39 +973,29 @@ 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 nextMap then
+		COM_BufInsertText(server, "map " + nextMap)
+		nextMap = nil
+	end
 
 	if disable then
-		if AntiAFK then
+		if cv_afk.value and ingame() > 1 then
-			if not singleplayer() then
+			for p in players.iterate do
-				for p in players.iterate do
+				if p.valid and not p.spectator and not p.exiting and p.lives > 0 then
-					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 then
-							p.afkTime = leveltime
-						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)
-						end
-						if p.afkTime + AFK_BALANCE < leveltime then
-							p.spectator = true
-							chatprint("\x89" + p.name + " was moved to the other team for game balance", true)
-						end
-					end
-				end
-			else
-				for p in players.iterate do
-					if p.valid and not p.spectator then
 						p.afkTime = leveltime
 					end
+					if p.afkTime + AFK_BALANCE < leveltime then
+						p.spectator = true
+						chatprint("\x89" + p.name + " was moved to the other team for game balance", true)
+					end
+				end
+			end
+		else
+			for p in players.iterate do
+				if p.valid and not p.spectator then
+					p.afkTime = leveltime
 				end
 			end
 		end
@@ -1356,7 +1010,7 @@ local function think()
 	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)
@@ -1367,13 +1021,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
@@ -1382,57 +1030,39 @@ 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
+		if leveltime > START_TIME - (3 * TICRATE) / 2 and server.SPBArunning then
-		   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 q in players.iterate do
+				for p in players.iterate do
-					q.SPBAKARTBIG = false
+					p.SPBAKARTBIG = false
-					q.SPBAjustice = false
+					p.SPBAjustice = false
-					q.SPBAshutup = false
+					p.SPBAshutup = false
 				end
 			end
-
+			for p in players.iterate do
-			if p then
+				if not p.spectator then
-				if p.SPBAKARTBIG then
+					if p.SPBAKARTBIG then
-					Flags = $ | F_SPBBIG
+						Flags = $ | F_SPBBIG
-				end
+					end
-				if p.SPBAjustice then
+					if p.SPBAjustice then
-					Flags = $ | F_SPBJUS
+						Flags = $ | F_SPBJUS
+					end
 				end
 			end
-
+		end
-			-- make sure the spb actually spawned
+		if not (Flags & F_SPBATK) then
-			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
 			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
@@ -1457,15 +1087,13 @@ local function think()
 			p.afkTime = leveltime
 		end
 
-		if not replayplayback then
+		if leveltime > PREVENT_JOIN_TIME and p.afkTime + AFK_TIMEOUT > leveltime then
-			if leveltime > PREVENT_JOIN_TIME and p.afkTime + AFK_TIMEOUT > leveltime then
+			if cv_teamchange.value then
-				if cv_teamchange.value then
+				allowJoin(false)
-					allowJoin(false)
+			end
-				end
+		elseif p.afkTime + AFK_TIMEOUT < leveltime then
-			elseif p.afkTime + AFK_TIMEOUT < leveltime then
+			if not cv_teamchange.value then
-				if not cv_teamchange.value then
+				allowJoin(true)
-					allowJoin(true)
-				end
 			end
 		end
 
@@ -1481,18 +1109,15 @@ end
 addHook("ThinkFrame", think)
 
 local function interThink()
-	if nextMap then changeMap() end
+	if nextMap then
-
+		COM_BufInsertText(server, "map " + nextMap)
-	if not cv_teamchange then
+		nextMap = nil
-		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)
@@ -1500,12 +1125,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)