Merge branch 'lonsfor-patch-1'

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

README.md

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

leaderboard.lua

@@ -1,19 +1,32 @@
 -- Leaderboards written by Not
 -- Reusable
 
-local FILENAME = "leaderboard.txt"
+-- Leaderboard Table
+-- [mode][mapnum][scoreTable]
 local lb = {}
+
 local timeFinished = 0
 local disable = false
 local prevLap = 0
 local splits = {}
 local PATCH = nil
 local help = true
+local EncoreInitial = nil
+local cv_teamchange
+local scoreTable
+
+-- 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 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
@@ -21,20 +34,48 @@ 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)
+local START_TIME = 6 * TICRATE + (3 * TICRATE / 4) + 1
 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
 local GUI_SPLITS = 0x1
 local GUI_ON     = 0x2
 
--- patch caching function
+-- Draw states
+local DS_DEFAULT = 0x0
+local DS_SCROLL  = 0x1
+local DS_AUTO    = 0x2
+local DS_SCRLTO  = 0x4
+
+local drawState = DS_DEFAULT
+
+-- fixed_t scroll position
+local scrollY = 50 * FRACUNIT
+local scrollAcc = 0
+
+-- functions --
+
+-- patch caching
 local cachePatches
 
+-- clamp(min, v, max)
+local clamp
+
+local scroll_to
+
+local ticsToTime
+
+local allowJoin
+---------------
+
 local cv_gui = CV_RegisterVar({
 	name = "lb_gui",
 	defaultvalue = GUI_ON,
@@ -42,11 +83,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,
+	flags = CV_NETVAR | CV_CALL,
-	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({
@@ -56,7 +110,17 @@ local cv_enable = CV_RegisterVar({
 	PossibleValue = CV_OnOff,
 	func = function(v)
 		disable = $ or not v.value
+		if disable then
+			allowJoin(true)
 		end
+	end
+})
+
+local cv_saves = CV_RegisterVar({
+	name = "lb_save_count",
+	defaultvalue = 20,
+	flags = CV_NETVAR,
+	PossibleValue = CV_Natural
 })
 
 local cv_interrupt = CV_RegisterVar({
@@ -71,17 +135,79 @@ local cv_interrupt = CV_RegisterVar({
 	end
 })
 
-
+local function setST(t, map, flags, scoreTable)
-local function lbID(map, flags)
+	local mode = flags & ST_SEP
-	local id = tostring(map)
+	t[mode] = t[mode] or {}
-	if flags & F_SPBATK then
+	t[mode][map] = scoreTable
-		id = id + "S"
 end
 
-	return id
+local function getST(t, map, flags)
+	local mode = flags & ST_SEP
+	return t[mode] and t[mode][map] or nil
 end
 
-local function score_t(map, name, skin, color, time, splits, flags)
+local function setScoreTable(map, flags, scoreTable)
+	setST(lb, map, flags, scoreTable)
+end
+
+local function getScoreTable(map, flags)
+	return getST(lb, map, flags)
+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,
+	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,
@@ -89,16 +215,35 @@ local function score_t(map, name, skin, color, time, splits, flags)
 		["color"]  = color,
 		["time"]   = time,
 		["splits"] = splits,
-		["flags"]  = flags
+		["flags"]  = flags,
+		["stat"] = stat
 	}
 end
 
+local function stat_t(speed, weight)
+	if speed and weight then
+		return {
+			["speed"] = speed,
+			["weight"] = weight
+		}
+	end
+	return nil
+end
+
+local function stat_str(stat)
+	if stat then
+		return string.format("%d%d", stat["speed"], stat["weight"])
+	end
+
+	return "0"
+end
+
 -- Read the leaderboard
 local f = io.open(FILENAME, "r")
 if f then
 	for l in f:lines() do
 		-- Leaderboard is stored in the following tab separated format
-		-- name, skin, color, time, splits, flags
+		-- mapnum, name, skin, color, time, splits, flags, stat
 		local t = {}
 		for word in (l+"\t"):gmatch("(.-)\t") do
 			table.insert(t, word)
@@ -109,10 +254,7 @@ if f then
 			flags = tonumber(t[7])
 		end
 
-		local lbt = lb[lbID(t[1], flags)]
+		scoreTable = getScoreTable(tonumber(t[1]), flags) or {}
-		if lbt == nil then
-			lbt = {}
-		end
 
 		local spl = {}
 		if t[6] != nil then
@@ -121,26 +263,39 @@ if f then
 			end
 		end
 
+		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)
+			end
+		end
+
 		table.insert(
-			lbt,
+			scoreTable,
 			score_t(
-				t[1],
+				tonumber(t[1]),
 				t[2],
 				t[3],
 				t[4],
 				tonumber(t[5]),
 				spl,
-				flags
+				flags,
+				stats
 			)
 		)
-		lb[lbID(t[1], flags)] = lbt
+
+		setScoreTable(tonumber(t[1]), flags, scoreTable)
 	end
+
+	sortScores()
 	f:close()
 else
 	print("Failed to open file: ", FILENAME)
 end
 
-local function allowJoin(v)
+function allowJoin(v)
 	if not cv_interrupt.value then
 		local y
 		if v then
@@ -172,6 +327,13 @@ local function initLeaderboard(player)
 		disable = disable or ingame() > 1
 	end
 	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)
@@ -266,8 +428,11 @@ local function changelevel(player, ...)
 	else
 		--Extended map numbers
 		p = ALPH:find(p) - 1
-		q = (tonumber(q) or ALPH:find(q) + 9)
+		local qn = tonumber(q)
-		mapnum = 36 * p + q + 100
+		if qn == nil then
+			qn = ALPH:find(q) + 9
+		end
+		mapnum = 36 * p + qn + 100
 	end
 	
 	if mapheaderinfo[mapnum] == nil then
@@ -279,6 +444,24 @@ 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
@@ -287,23 +470,187 @@ local function clearcheats(player)
 end
 COM_AddCommand("spba_clearcheats", clearcheats)
 
+local function scrollGUI(player, ...)
+	if not doyoudare(player) then return end
+
+	if drawState == DS_DEFAULT then
+		scroll_to(player)
+	else
+		drawState = DS_DEFAULT
+	end
+end
+COM_AddCommand("scroll", scrollGUI)
+
+local function findRival(player, ...)
+	local rival, page = ...
+	page = (tonumber(page) or 1) - 1
+
+	if rival == nil then
+		CONS_Printf(player, "Print the times of your rival.\nUsage: rival <playername> <page>")
+		return
+	end
+
+	local colors = {
+		[1] = "\x85",
+		[0] = "\x89",
+		[-1] = "\x88"
+	}
+	
+	local sym = {
+		[true] = "-",
+		[false] = "",
+	}
+
+	local scores = {}
+	local totalScores = 0
+	local totalDiff = 0
+
+
+	CONS_Printf(player, string.format("\x89%s's times:", rival))
+	CONS_Printf(player, "MAP  	 Time    	  Diff    	Mode")
+
+	for mode, tbl in pairs(lb) do
+		scores[mode] = {}
+
+		for map, scoreTable in pairs(tbl) do
+			local rivalScore = nil
+			local yourScore = nil
+
+			for _, score in pairs(scoreTable) do
+				if score["name"] == player.name then
+					yourScore = score
+				elseif score["name"] == rival then
+					rivalScore = score
+				end
+
+				if rivalScore and yourScore then
+					break
+				end
+			end
+
+			if rivalScore and yourScore then
+				totalDiff = totalDiff + yourScore["time"] - rivalScore["time"]
+			end
+
+			if rivalScore then
+				totalScores = totalScores + 1
+				table.insert(
+					scores[mode],
+					{
+						["rival"] = rivalScore,
+						["your"] = yourScore
+					}
+				)
+			end
+		end
+	end
+
+	local i = 0
+	local stop = 19
+	local o = page * stop
+
+	local function sortf(a, b)
+		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
+
+		table.sort(tbl, sortf)
+
+		for _, score in ipairs(tbl) do
+			if o then
+				o = o - 1
+				continue
+			end
+			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
+
+			if score["your"] then
+				local diff = score["your"]["time"] - score["rival"]["time"]
+				local color = colors[clamp(-1, diff, 1)]
+
+				CONS_Printf(
+					player,
+					string.format(
+						"%s	%8s	%s%9s	\x80%s",
+						G_BuildMapName(score["rival"]["map"]),
+						ticsToTime(score["rival"]["time"]),
+						color,
+						sym[diff<0] + ticsToTime(abs(diff)),
+						modestr
+					)
+				)
+			else
+				CONS_Printf(
+					player,
+					string.format(
+						"%s	%8s	%9s	%s",
+						G_BuildMapName(score["rival"]["map"]),
+						ticsToTime(score["rival"]["time"]),
+						ticsToTime(0, true),
+						modestr
+					)
+				)
+			end
+		end
+	end
+
+	CONS_Printf(
+		player,
+		string.format(
+			"Your score = %s%s%s",
+			colors[clamp(-1, totalDiff, 1)],
+			sym[totalDiff<0],
+			ticsToTime(abs(totalDiff))
+		)
+	)
+
+	CONS_Printf(
+		player,
+		string.format(
+			"Page %d out of %d",
+			page + 1,
+			totalScores / stop + 1
+		)
+	)
+end
+COM_AddCommand("rival", findRival)
+
 --DEBUGGING
 --local function printTable(tb)
---	for k, v in pairs(tb) do
+--	for mode, tbl in pairs(tb) do
---		for i = 1, #v do
+--		for map, scoreTable in pairs(tbl) do
---			print("TABLE: " + k, tb[k])
+--			print(string.format("[%d][%d] #%d", mode, map, #scoreTable))
---			if v[i] != nil then
---				print(
---					v[i]["name"],
---					v[i]["skin"],
---					v[i]["color"],
---					v[i]["time"],
---					table.concat(v[i]["splits"]),
---					v[i]["flags"],
---					","
---				)
 --
---			end
+--			--if scoreTable != nil then
+--			--	print(
+--			--		v[i]["name"],
+--			--		v[i]["skin"],
+--			--		v[i]["color"],
+--			--		v[i]["time"],
+--			--		table.concat(v[i]["splits"]),
+--			--		v[i]["flags"],
+--			--		","
+--			--	)
+--			--		
+--			--end
 --		end
 --	end
 --end
@@ -312,16 +659,23 @@ addHook("MapLoad", function()
 		timeFinished = 0
 		splits = {}
 		prevLap = 0
+		drawState = DS_DEFAULT
+		scrollY = 50 * FRACUNIT
+		scrollAcc = 0
 
 		allowJoin(true)
 		--printTable(lb)
 	end
 )
 
-local function ticsToTime(tics)
+function ticsToTime(tics, pure)
+	if tics == 0 and pure then
+		return "-:--:--"
+	end
+
 	return string.format(
 		"%d:%02d:%02d",
-		G_TicsToMinutes(tics),
+		G_TicsToMinutes(tics, true),
 		G_TicsToSeconds(tics),
 		G_TicsToCentiseconds(tics)
 	)
@@ -340,56 +694,83 @@ 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] = " ."
+}
 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
 	local pos = ((leveltime / 16) % (#text - maxwidth + shift * 2)) + 1 - shift
+
+	local cursor = ""
+	if pos < #text - maxwidth + 1 then
+		cursor = cursors[((leveltime / 11) % #cursors) + 1]
+	end
+
+	-- The pos is the index going from -shift to #text + shift
+	-- It's clamped within the text boundaries ie.
+	-- 0 < pos < #text - maxwidth
 	pos = min(max(pos, 1), #text - maxwidth + 1)
-	return text:sub(pos, pos + maxwidth - 1)
+	return text:sub(pos, pos + maxwidth - 1) + cursor
 end
 
 -- Bats on ...
 local bodium = {V_YELLOWMAP, V_GRAYMAP, V_BROWNMAP, 0}
 
-local splitColor = {[true]=V_SKYMAP, [false]=V_REDMAP}
+local splitColor = {
-local splitSymbol = {[true]="-", [false]="+"}
+	[-1] = V_SKYMAP,
+	[0] = V_PURPLEMAP,
+	[1] = V_REDMAP
+}
+local splitSymbol = {
+	[-1] = "-",
+	[0] = "",
+	[1] = "+"
+}
 
 local showSplit = 0
 local VFLAGS = V_SNAPTOLEFT
-local function drawScoreboard(v, player)
+local FACERANK_DIM = 16
-	if disable then return end
+local FACERANK_SPC = FACERANK_DIM + 4
-	if player != displayplayers[0] then return end
+local function drawScore(v, player, pos, x, y, gui, faceRank, score, drawPos, textVFlags)
+	textVFlags = textVFlags or V_HUDTRANSHALF
 
-	cachePatches(v)
+	--draw Patch/chili
-	
+	v.draw(x, y, faceRank, V_HUDTRANS | VFLAGS, v.getColormap("sonic", score["color"]))
-	local m = lb[lbID(gamemap, Flags)]
+	if player.name == score["name"] then
-	if m == nil then
+		v.draw(x, y, PATCH["CHILI"][(leveltime / 4) % 8], V_HUDTRANS | VFLAGS)
-		return
 	end
 
-	local gui = cv_gui.value
+	-- Encore
-	if leveltime < START_TIME or player.exiting or player.lives == 0 then
+	if score["flags"] & F_ENCORE then
-		gui = GUI_ON
+		local bob = sin((leveltime + i * 5) * (ANG10))
-	end
+		v.drawScaled(
-
+			x * FRACUNIT,
-	if gui then
+			bob + (y + FACERANK_DIM / 2) * FRACUNIT,
-		for i, score in ipairs(m) do
+			FRACUNIT / 6,
-			local name = score["name"]
+			PATCH["RUBY"],
-			local skin = skins[score["skin"]]
+			V_HUDTRANS
-			if skin == nil then
+		)
-				skin = skins["sonic"]
-			end
-			local skinPatch = PATCH["FACERANK"][skin.name]
-
-			--        |    OFFSET   | + |      PADDING       | * |INDEX|
-			local h = ((200 / 4) + 4) + (skinPatch.height + 4) * (i - 1)
-
-			v.draw(4, h, skinPatch, V_HUDTRANS | VFLAGS, v.getColormap("sonic", score["color"]))
-			if player.name == name then
-				v.draw(4, h, PATCH["CHILI"][(leveltime / 4) % 8], V_HUDTRANS | VFLAGS)
 	end
 
 	-- SPB
@@ -397,49 +778,68 @@ local function drawScoreboard(v, player)
 		local scale = FRACUNIT / 4
 		drawitem(
 			v,
-					4 - 2,
+			x - 2,
-					h - 2,
+			y - 2,
 			scale,
-					PATCH["SPB"],
+			modePatch(F_SPBATK),
 			V_HUDTRANS | VFLAGS
 		)
 		if score["flags"] & F_SPBEXP then
 			drawitem(
 				v,
-						skinPatch.width,
+				x + FACERANK_DIM - 4,
-						h - 2,
+				y - 2,
 				scale,
-						PATCH["INV"][(leveltime / 4) % 6],
+				modePatch(F_SPBEXP),
 				V_HUDTRANS | VFLAGS
 			)
 		end
 		if score["flags"] & F_SPBBIG then
 			drawitem(
 				v,
-						4 - 2,
+				x - 2,
-						h + skinPatch.height - 4,
+				y + FACERANK_DIM - 4,
 				scale,
-						PATCH["BIG"],
+				modePatch(F_SPBBIG),
 				V_HUDTRANS | VFLAGS
 			)
 		end
 		if score["flags"] & F_SPBJUS then
 			drawitem(
 				v,
-						skinPatch.width,
+				x + FACERANK_DIM - 4,
-						h + skinPatch.height - 4,
+				y + FACERANK_DIM - 4,
 				scale,
-						PATCH["HYUD"],
+				modePatch(F_SPBJUS),
 				V_HUDTRANS | VFLAGS
 			)
 		end
 	end
 
-			if gui == GUI_ON or (gui == GUI_SPLITS and showSplit)
+	-- Position
+	if drawPos then
+		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")
+	end
+
+	if gui == GUI_ON or (gui == GUI_SPLITS and showSplit) then
+		local name = score["name"]
+
 		-- Shorten long names
 		local stralign = "left"
 		local MAXWIDTH = 70
-				local px = 6
+		local px = 2
 		local py = 0
 		if v.stringWidth(name) > MAXWIDTH then
 			stralign = "thin"
@@ -454,34 +854,143 @@ local function drawScoreboard(v, player)
 		end
 
 		v.drawString(
-					px + skinPatch.width,
+			x + FACERANK_DIM + px,
-					h + py,
+			y + py,
 			name,
-					V_HUDTRANSHALF | V_ALLOWLOWERCASE | VFLAGS,
+			textVFlags | V_ALLOWLOWERCASE | VFLAGS,
 			stralign
 		)
 
 		-- Draw splits
-				if showSplit and score["splits"][prevLap] != nil then
+		if showSplit and score["splits"] and score["splits"][prevLap] != nil then
 			local split = splits[prevLap] - score["splits"][prevLap]
 			v.drawString(
-						px + skinPatch.width,
+				x + px + FACERANK_DIM,
-						h + 8,
+				y + 8,
-						splitSymbol[split < 0] + ticsToTime(abs(split)),
+				splitSymbol[clamp(-1, split, 1)] + ticsToTime(abs(split)),
-						V_HUDTRANSHALF | splitColor[split < 0] | VFLAGS
+				textVFlags | splitColor[clamp(-1, split, 1)] | VFLAGS
 			)
 		else
 			v.drawString(
-						px + skinPatch.width,
+				x + px + FACERANK_DIM,
-						h + 8,
+				y + 8,
-						ticsToTime(score["time"]),
+				ticsToTime(score["time"], true),
-						V_HUDTRANSHALF | bodium[min(i, 4)] | VFLAGS
+				textVFlags | bodium[min(pos, 4)] | VFLAGS
 			)
 		end
 	end
 end
+
+local function drawDefault(v, player, scoreTable, gui)
+	local yoffset = (200 / 4) + 4
+	local x = 4
+
+
+	-- Draw placeholder score
+	if scoreTable == nil then
+		drawScore(v, player, 1, x, y, gui, PATCH["NORANK"], {["name"] = UNCLAIMED, ["time"] = 0, ["flags"] = 0})
+	else
+		for pos, score in ipairs(scoreTable) do
+			if pos > 5 then break end
+
+			local faceRank = PATCH["FACERANK"][score.skin] or PATCH["NORANK"]
+			local y = yoffset + (FACERANK_SPC) * (pos - 1)
+			drawScore(
+				v, player, pos,
+				x, y,
+				gui, faceRank,
+				score
+			)
 		end
 	end
+end
+
+local function drawScroll(v, player, scoreTable, gui)
+	if scoreTable then
+		scrollY = scrollY + FixedMul(1 * FRACUNIT, scrollAcc)
+
+		local minim = -((#scoreTable - 1) * FACERANK_SPC * FRACUNIT)
+		local maxim = (200 - FACERANK_DIM) * FRACUNIT
+
+		scrollY = clamp(minim, scrollY, maxim)
+
+		-- Bounceback
+		if scrollY == minim or scrollY == maxim then
+			scrollAcc = -FixedMul(scrollAcc, FRACUNIT / 3)
+		end
+
+		local x = 10
+		if #scoreTable >= 10 then
+			x = x + 8
+			if #scoreTable >= 100 then
+				x = x + 8
+			end
+		end
+
+		local y = FixedInt(scrollY)
+
+		for pos, score in ipairs(scoreTable) do
+			local faceRank = PATCH["FACERANK"][score.skin] or PATCH["NORANK"]
+			drawScore(
+				v, player, pos,
+				x, y + ((pos - 1) * FACERANK_SPC),
+				gui, faceRank,
+				score,
+				true,
+				V_HUDTRANS
+			)
+		end
+	end
+end
+local function drawAuto(v, player, scoreTable, gui)
+end
+
+local scrollToPos = nil
+local function drawScrollTo(v, player, scoreTable, gui)
+	drawState = DS_SCROLL
+	if scrollToPos == nil then return end
+
+	scrollY = (-(scrollToPos * FACERANK_SPC) + (100 - FACERANK_SPC / 2)) * FRACUNIT
+	scrollToPos = nil
+	drawScroll(v, player, scoreTable, gui)
+end
+
+local stateFunctions = {
+	[DS_DEFAULT] = drawDefault,
+	[DS_SCROLL] = drawScroll,
+	[DS_AUTO] = drawAuto,
+	[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 gui = cv_gui.value
+	if leveltime < START_TIME or player.exiting or player.lives == 0 then
+		gui = GUI_ON
+	end
+
+	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")
 
 function cachePatches(v)
@@ -493,6 +1002,8 @@ function cachePatches(v)
 			PATCH["CHILI"][i-1] = v.cachePatch("K_CHILI" + i)
 		end
 
+		PATCH["NORANK"] = v.cachePatch("M_NORANK")
+
 		PATCH["FACERANK"] = {}
 		for skin in skins.iterate do
 			PATCH["FACERANK"][skin.name] = v.cachePatch(skin.facerank)
@@ -505,24 +1016,45 @@ 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
+-- Find location of player and scroll to it
-local function lbComp(a, b)
+function scroll_to(player)
-	-- Calculates the difficulty, harder has higher priority
+	local m = scoreTable or {}
-	-- if s is positive then a is harder
+
-	-- if s is negative then b is harder
+	scrollToPos = 2
-	-- if s is 0 then compare time
+	for pos, score in ipairs(m) do
-	local s = (a["flags"] & (F_SPBEXP | F_SPBBIG)) - (b["flags"] & (F_SPBEXP | F_SPBBIG))
+		if player.name == score["name"] then
-	return s > 0 or not(s < 0 or a["time"] >= b["time"])
+			scrollToPos = max(2, pos - 1)
+			break
+		end
+	end
+
+	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 m = lb[lbID(gamemap, Flags)]
+
-	if m == nil then
+	scoreTable =  $ or {}
-		m = {}
+
-	end
+	local pskin = skins[player.mo.skin]
 	local newscore = score_t(
 		gamemap,
 		player.name,
@@ -530,19 +1062,21 @@ local function saveTime(player)
 		player.skincolor,
 		timeFinished,
 		splits,
-		Flags
+		Flags,
+		stat_t(player.HMRs or pskin.kartspeed, player.HMRw or pskin.kartweight)
 	)
 
 	-- Check if you beat your previous best
-	for i = 1, #m do
+	for i = 1, #scoreTable do
-		if m[i]["name"] == player.name then
+		if scoreTable[i]["name"] == player.name then
-			if lbComp(newscore, m[i]) then
+			if lbComp(newscore, scoreTable[i]) then
-				table.remove(m, i)
+				table.remove(scoreTable, i)
 				S_StartSound(nil, 130)
 				break
 			else
 				-- You suck lol
 				S_StartSound(nil, 201)
+				scroll_to(player)
 				return
 			end
 		end
@@ -550,16 +1084,23 @@ local function saveTime(player)
 
 	print("Saving score")
 	table.insert(
-		m,
+		scoreTable,
 		newscore
 	)
 
-	table.sort(m, lbComp)
+	table.sort(scoreTable, lbComp)
-	while #m > 5 do
+	while #scoreTable > cv_saves.value do
-		table.remove(m)
+		table.remove(scoreTable)
 	end
 
-	lb[lbID(gamemap, Flags)] = m
+	scroll_to(player)
+
+	setScoreTable(gamemap, Flags, scoreTable)
+
+	if not StatTrack then
+		writeStats()
+		StatTrack = true
+	end
 
 	local f = assert(io.open(FILENAME, "w"))
 	if f == nil then
@@ -567,20 +1108,22 @@ local function saveTime(player)
 		return
 	end
 
-	for k, v in pairs(lb) do
+	for _, tbl in pairs(lb) do
-		for i = 1, #v do
+		for _, scoreTable in pairs(tbl) do
-			local s = v[i]
+			for _, score in ipairs(scoreTable) do
 				f:write(
-				s["map"], "\t",
+					score["map"], "\t",
-				s["name"], "\t",
+					score["name"], "\t",
-				s["skin"], "\t",
+					score["skin"], "\t",
-				s["color"], "\t",
+					score["color"], "\t",
-				s["time"], "\t",
+					score["time"], "\t",
-				table.concat(s["splits"], " "), "\t",
+					table.concat(score["splits"], " "), "\t",
-				s["flags"], "\n"
+					score["flags"], "\t",
+					stat_str(score["stat"]), "\n"
 				)
 			end
 		end
+	end
 
 	f:close()
 end
@@ -616,12 +1159,19 @@ local function think()
 	end
 
 	if disable then
-		if cv_afk.value and ingame() > 1 then
+		if AntiAFK then
+			if ingame() > 1 then
 				for p in players.iterate do
-				if p.valid and not p.spectator and not p.exiting then
+					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
+
+						--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)
@@ -635,13 +1185,13 @@ local function think()
 					end
 				end
 			end
+		end
 
 		help = true
 		return
 	end
-	if showSplit > 0 then
+
-		showSplit = showSplit - 1
+	showSplit = max(0, showSplit - 1)
-	end
 
 	local p = getGamer()
 	if leveltime < START_TIME then
@@ -650,7 +1200,7 @@ local function think()
 			if ingame() == 1  then
 				if help then
 					help = false
-					chatprint("\x89Leaderboard Commands:\nretry exit findmap changelevel spba_clearcheats lb_gui", true)
+					chatprint(HELP_MESSAGE, true)
 				end
 			else
 				help = true
@@ -658,7 +1208,13 @@ 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
@@ -677,14 +1233,14 @@ local function think()
 			end
 			if clearcheats then
 				clearcheats = false
-				for p in players.iterate do
+				for q in players.iterate do
-					p.SPBAKARTBIG = false
+					q.SPBAKARTBIG = false
-					p.SPBAjustice = false
+					q.SPBAjustice = false
-					p.SPBAshutup = 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
@@ -692,19 +1248,44 @@ local function think()
 					Flags = $ | F_SPBJUS
 				end
 			end
-			end
+
 		end
 		if not (Flags & F_SPBATK) then
 			hud.enable("freeplay")
 		end
 	end
 
-	local cv_teamchange = CV_FindVar("allowteamchange")
+	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
+		if drawState == DS_SCROLL then
+			if p.cmd.buttons & BT_BACKWARD then
+				scrollAcc = scrollAcc - FRACUNIT / 3
+			elseif p.cmd.buttons & BT_FORWARD then
+				scrollAcc = scrollAcc + FRACUNIT / 3
+			else
+				scrollAcc = FixedMul(scrollAcc, (FRACUNIT * 90) / 100)
+				if scrollAcc < FRACUNIT and scrollAcc > -FRACUNIT then
+					scrollAcc = 0
+				end
+			end
+		end
+
+		if p.lives == 0 then
+			drawState = DS_SCROLL
+		end
+
 		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)
@@ -714,6 +1295,7 @@ local function think()
 					allowJoin(true)
 				end
 			end
+		end
 
 		if p.laps >= mapheaderinfo[gamemap].numlaps and timeFinished == 0 then
 			timeFinished = p.realtime
@@ -731,15 +1313,30 @@ local function interThink()
 		COM_BufInsertText(server, "map " + nextMap)
 		nextMap = nil
 	end
-	if not CV_FindVar("allowteamchange").value then
+
+	if not cv_teamchange then
+		cv_teamchange = CV_FindVar("allowteamchange")
+	end
+
+	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)
+	return max(min_v, min(v, max_v))
+end
 
 local function netvars(net)
-	lb = net($)
+	Flags = net($)
 	splits = net($)
 	prevLap = net($)
+	drawState = net($)
+	StatTrack = net($)
+	EncoreInitial = net($)
+	lb = net($)
 end
 addHook("NetVars", netvars)