leaderboard.lua

@@ -11,10 +11,6 @@ local prevLap = 0
 local splits = {}
 local PATCH = nil
 local help = true
-local EncoreInitial = nil
-
--- 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"
@@ -32,12 +28,9 @@ 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 PREVENT_JOIN_TIME = START_TIME + TICRATE * 5
@@ -119,79 +112,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_separate",
-	defaultvalue = 0,
-	flags = CV_NETVAR | CV_CALL,
-	PossibleValue = CV_YesNo,
-	func = function(v)
-		if v.value then
-			ST_SEP = F_SPBATK | F_SPBBIG | F_SPBEXP
-		else
-			ST_SEP = F_SPBATK
-		end
-
-		reinit_lb()
-	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,
@@ -200,11 +139,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,
@@ -214,9 +153,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"
@@ -227,7 +166,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)
@@ -250,9 +189,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
 
@@ -269,11 +208,9 @@ if f then
 				stats
 			)
 		)
-
 		setScoreTable(tonumber(t[1]), flags, scoreTable)
 	end
 
-	sortScores()
 	f:close()
 else
 	print("Failed to open file: ", FILENAME)
@@ -311,13 +248,6 @@ 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)
@@ -434,10 +364,6 @@ local function toggleEncore(player)
 	end
 
 	local enc = CV_FindVar("kartencore")
-	if EncoreInitial == nil then
-		EncoreInitial = enc.value
-	end
-
 	if enc.value then
 		COM_BufInsertText(server, "kartencore off")
 	else
@@ -777,18 +703,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 = 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"]
 
@@ -964,6 +887,16 @@ function cachePatches(v)
 	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 = getScoreTable(gamemap, Flags) or {}
@@ -979,25 +912,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 {}
 
-	local pskin = skins[player.mo.skin]
 	local newscore = score_t(
 		gamemap,
 		player.name,
@@ -1006,7 +923,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
@@ -1040,11 +957,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)
@@ -1062,7 +974,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
@@ -1253,12 +1165,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)