restore kartencore to initial value

leaderboard.lua

@@ -11,6 +11,10 @@ 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"
@@ -28,9 +32,12 @@ 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 PREVENT_JOIN_TIME = START_TIME + TICRATE * 5
@@ -112,25 +119,79 @@ 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)
-	local mode = flags & F_SPBATK
+	setST(lb, map, flags, scoreTable)
-	lb[mode] = lb[mode] or {}
-	lb[mode][map] = scoreTable
 end
 
 local function getScoreTable(map, flags)
-	--local id = tostring(map)
+	return getST(lb, map, flags)
-	--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
 
-local function score_t(map, name, skin, color, time, splits, flags, restat)
+-- 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)
 	return {
 		["map"]    = map,
 		["name"]   = name,
@@ -139,11 +200,11 @@ local function score_t(map, name, skin, color, time, splits, flags, restat)
 		["time"]   = time,
 		["splits"] = splits,
 		["flags"]  = flags,
-		["restat"] = restat
+		["stat"] = stat
 	}
 end
 
-local function restat_t(speed, weight)
+local function stat_t(speed, weight)
 	if speed and weight then
 		return {
 			["speed"] = speed,
@@ -153,9 +214,9 @@ local function restat_t(speed, weight)
 	return nil
 end
 
-local function restat_str(restat)
+local function stat_str(stat)
-	if restat then
+	if stat then
-		return string.format("%d%d", restat["speed"], restat["weight"])
+		return string.format("%d%d", stat["speed"], stat["weight"])
 	end
 
 	return "0"
@@ -166,7 +227,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, restat
+		-- mapnum, name, skin, color, time, splits, flags, stat
 		local t = {}
 		for word in (l+"\t"):gmatch("(.-)\t") do
 			table.insert(t, word)
@@ -189,9 +250,9 @@ if f then
 		local stats = nil
 		if t[8] != nil then
 			if #t[8] >= 2 then
-				local speed = string.sub(t[8], 1, 1)
+				local speed = tonumber(string.sub(t[8], 1, 1))
-				local weight = string.sub(t[8], 2, 2)
+				local weight = tonumber(string.sub(t[8], 2, 2))
-				stats = restat_t(speed, weight)
+				stats = stat_t(speed, weight)
 			end
 		end
 
@@ -208,9 +269,11 @@ if f then
 				stats
 			)
 		)
+
 		setScoreTable(tonumber(t[1]), flags, scoreTable)
 	end
 
+	sortScores()
 	f:close()
 else
 	print("Failed to open file: ", FILENAME)
@@ -248,6 +311,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)
@@ -364,6 +434,10 @@ 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
@@ -703,15 +777,18 @@ local function drawScore(v, player, pos, x, y, gui, faceRank, score, drawPos, te
 		v.drawNum(x, y + 3, pos, textVFlags | VFLAGS)
 	end
 
-	-- Restats
+	-- Stats
-	local restat = score["restat"]
+	local stat = score["stat"]
-	if restat then
+	local pskin = skins[score["skin"]]
-		v.drawString(x + FACERANK_DIM - 2, y + 4, restat["speed"], V_HUDTRANS | VFLAGS, "small")
+	if stat and not (
-		v.drawString(x + FACERANK_DIM - 2, y + 8, restat["weight"], V_HUDTRANS | VFLAGS, "small")
+			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"]
 
@@ -887,16 +964,6 @@ 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 {}
@@ -912,9 +979,25 @@ 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,
@@ -923,7 +1006,7 @@ local function saveTime(player)
 		timeFinished,
 		splits,
 		Flags,
-		restat_t(player.HMRs, player.HMRw)
+		stat_t(player.HMRs or pskin.kartspeed, player.HMRw or pskin.kartweight)
 	)
 
 	-- Check if you beat your previous best
@@ -957,6 +1040,11 @@ 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)
@@ -974,7 +1062,7 @@ local function saveTime(player)
 					score["time"], "\t",
 					table.concat(score["splits"], " "), "\t",
 					score["flags"], "\t",
-					restat_str(score["restat"]), "\n"
+					stat_str(score["stat"]), "\n"
 				)
 			end
 		end
@@ -1165,9 +1253,12 @@ function clamp(min_v, 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)