draw browser when gui is disabled

Reviewed-on: #9

browser.lua

@@ -12,6 +12,7 @@ local ModeSep
 -- lb_common.lua
 local ZoneAct = lb_ZoneAct
 local TicsToTime = lb_TicsToTime
+local mapChecksum = lb_map_checksum
 
 -- lb_store.lua
 local GetMapRecords = lb_get_map_records
@@ -50,7 +51,7 @@ local function updateMapIndex(n)
 	mapIndex = mapIndexOffset(n)
 	scrollPos = 1
 
-	MapRecords = GetMapRecords(maps[mapIndex], ModeSep)
+	MapRecords = GetMapRecords(maps[mapIndex], mapChecksum(maps[mapIndex]), ModeSep)
 
 	updateModes()
 end
@@ -388,7 +389,7 @@ local function initBrowser(modeSep)
 	end
 
 	-- initialize MapRecords
-	MapRecords = GetMapRecords(gamemap, ModeSep)
+	MapRecords = GetMapRecords(gamemap, mapChecksum(gamemap), ModeSep)
 
 	scrollPos = 1
 	updateModes()

lb_common.lua

@@ -1,3 +1,17 @@
+rawset(_G, "lb_score_t", function(map, name, skin, color, time, splits, flags, stat, checksum)
+	return {
+		["map"]    = map,
+		["name"]   = name,
+		["skin"]   = skin,
+		["color"]  = color,
+		["time"]   = time,
+		["splits"] = splits,
+		["flags"]  = flags,
+		["stat"] = stat,
+		["checksum"] = checksum
+	}
+end)
+
 rawset(_G, "lb_TicsToTime", function(tics, pure)
 	if tics == 0 and pure then
 		return "-:--:--"
@@ -44,3 +58,52 @@ rawset(_G, "lb_comp", function(a, b)
 	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 djb2(message)
+	local digest = 5381
+	for c in message:gmatch(".") do
+		digest = (($ << 5) + $) + string.byte(c)
+	end
+
+	return digest
+end
+
+-- Produce a checksum by using the maps title, subtitle and zone
+rawset(_G, "lb_map_checksum", function(mapnum)
+	local mh = mapheaderinfo[mapnum]
+	if not mh then
+		return nil
+	end
+
+	local digest = string.format("%04x", djb2(mh.lvlttl..mh.subttl..mh.zonttl))
+	return string.sub(digest, #digest - 3)
+end)
+
+rawset(_G, "lb_mapnum_from_extended", function(map)
+	local p, q = map:upper():match("MAP(%w)(%w)$", 1)
+	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)

lb_store.lua

@@ -5,10 +5,14 @@
 -- lb_common.lua
 local stat_t = lb_stat_t
 local lbComp = lb_comp
+local score_t = lb_score_t
+local mapChecksum = lb_map_checksum
+local mapnumFromExtended = lb_mapnum_from_extended
 
 ----------------------------
 
 local LEADERBOARD_FILE = "leaderboard.txt"
+local COLDSTORE_FILE = "leaderboard.coldstore.txt"
 
 -- ColdStore are records loaded from lua addons
 -- this table should never be modified outside of the AddColdStore function
@@ -17,43 +21,123 @@ local ColdStore = {}
 -- Livestore are new records nad records loaded from leaderboard.txt file
 local LiveStore = {}
 
+-- parse score function
+local parseScore
+
+local MSK_SPEED = 0xF0
+local MSK_WEIGHT = 0xF
+local function stat_str(stat)
+	if stat then
+		return string.format("%d%d", (stat & MSK_SPEED) >> 4, stat & MSK_WEIGHT)
+	end
+
+	return "0"
+end
+
+local function isSameRecord(a, b, modeSep)
+	return a.name == b.name and (a.flags & modeSep) == (b.flags & modeSep)
+end
+
+-- insert or replace the score in dest
+local function insertOrReplace(dest, score, modeSep)
+	for i, record in ipairs(dest) do
+		if isSameRecord(record, score, modeSep) then
+			if lbComp(score, record) then
+				dest[i] = score
+			end
+			return
+		end
+	end
+
+	table.insert(dest, score)
+end
+
+local function dumpStoreToFile(filename, store)
+	local f = assert(
+		io.open(filename, "w"),
+		"Failed to open file for writing: "..filename
+	)
+
+	f:setvbuf("line")
+
+	for mapid, checksums in pairs(store) do
+		for checksum, records in pairs(checksums) do
+			for _, record in ipairs(records) do
+				if not record.checksum or record.checksum == "" then
+					record.checksum = mapChecksum(record.map) or ""
+				end
+
+				f:write(
+					mapid, "\t",
+					record.name, "\t",
+					record.skin, "\t",
+					record.color, "\t",
+					record.time, "\t",
+					table.concat(record.splits, " "), "\t",
+					record.flags, "\t",
+					stat_str(record.stat), "\t",
+					record.checksum, "\n"
+				)
+			end
+		end
+	end
+
+	f:close()
+end
 
 -- GLOBAL
 -- Returns a list of all maps with records
 local function MapList()
 	local maps = {}
-	for map in pairs(ColdStore) do
-		maps[map] = true
+	for mapid, checksums in pairs(ColdStore) do
+		maps[mapid] = $ or {}
+		for checksum in pairs(checksums) do
+			maps[mapid][checksum] = true
+		end
+	end
+	for mapid, checksums in pairs(LiveStore) do
+		maps[mapid] = $ or {}
+		for checksum in pairs(checksums) do
+			maps[mapid][checksum] = true
 		end
-	for map in pairs(LiveStore) do
-		maps[map] = true
 	end
 
 	local maplist = {}
-	for map in pairs(maps) do
-		table.insert(maplist, map)
+	for mapid, checksums in pairs(maps) do
+		for checksum in pairs(checksums) do
+			table.insert(maplist, {["id"] = mapid, ["checksum"] = checksum})
 		end
-	table.sort(maplist)
+	end
+	table.sort(maplist, function(a, b) return a.id < b.id end)
 
 	return maplist
 end
 rawset(_G, "lb_map_list", MapList)
 
 -- GLOBAL
--- Function for adding records from lua
+-- Function for adding a single record from lua
 local function AddColdStore(record)
 	ColdStore[record.map] = $ or {}
-	table.insert(ColdStore[record.map], record)
+	ColdStore[record.map][record.checksum] = $ or {}
+
+	table.insert(ColdStore[record.map][record.checksum], record)
 end
 rawset(_G, "lb_add_coldstore_record", AddColdStore)
 
+-- GLOBAL
+-- Function for adding a single record in string form from lua
+local function AddColdStoreString(record)
+	AddColdStore(parseScore(record))
+end
+rawset(_G, "lb_add_coldstore_record_string", AddColdStoreString)
 
 -- Insert mode separated records from the flat sourceTable into dest
-local function insertRecords(dest, sourceTable, modeSep)
+local function insertRecords(dest, sourceTable, checksum, modeSep)
 	if not sourceTable then return end
+	if not sourceTable[checksum] then return end
 
 	local mode = nil
-	for _, record in ipairs(sourceTable) do
+	for _, record in ipairs(sourceTable[checksum]) do
 		mode = record.flags & modeSep
 		dest[mode] = $ or {}
 		table.insert(dest[mode], record)
@@ -63,14 +147,14 @@ end
 -- GLOBAL
 -- Construct the leaderboard table of the supplied mapid
 -- combines the ColdStore and LiveStore records
-local function GetMapRecords(map, modeSep)
+local function GetMapRecords(map, checksum, modeSep)
 	local mapRecords = {}
 
 	-- Insert ColdStore records
-	insertRecords(mapRecords, ColdStore[map], modeSep)
+	insertRecords(mapRecords, ColdStore[map], checksum, modeSep)
 
 	-- Insert LiveStore records
-	insertRecords(mapRecords, LiveStore[map], modeSep)
+	insertRecords(mapRecords, LiveStore[map], checksum, modeSep)
 
 	-- Sort records
 	for _, records in pairs(mapRecords) do
@@ -95,67 +179,20 @@ local function GetMapRecords(map, modeSep)
 end
 rawset(_G, "lb_get_map_records", GetMapRecords)
 
-local function insertOrReplaceRecord(map, score, modeSep)
-	LiveStore[map] = $ or {}
-
-	for i, record in ipairs(LiveStore[map]) do
-		-- Replace the record 
-		if record.name == score.name
-			and (record.flags & modeSep) == (score.flags & modeSep) then
-			LiveStore[map][i] = score
-			return
-		end
-	end
-
-	table.insert(LiveStore[map], score)
-
-	-- TODO: remove excess records
-end
-
-local MSK_SPEED = 0xF0
-local MSK_WEIGHT = 0xF
-local function stat_str(stat)
-	if stat then
-		return string.format("%d%d", (stat & MSK_SPEED) >> 4, stat & MSK_WEIGHT)
-	end
-
-	return "0"
-end
-
 -- GLOBAL
 -- Save a record to the LiveStore and write to disk
--- SaveRecord will replace the record holders previous record but it will not compare any record times
+-- SaveRecord will replace the record holders previous record
 local function SaveRecord(score, map, modeSep)
-	insertOrReplaceRecord(map, score, modeSep)
+	local checksum = mapChecksum(map)
+	LiveStore[map] = $ or {}
+	LiveStore[map][checksum] = $ or {}
+	insertOrReplace(LiveStore[map][checksum], score, modeSep)
 
 	print("Saving score")
-
-	if not isserver then return end
-
-	local f = assert(
-		io.open(LEADERBOARD_FILE, "w"),
-		"Failed to open file for writing: "..LEADERBOARD_FILE
-	)
-
-	f:setvbuf("line")
-
-	for mapid, records in pairs(LiveStore) do
-		for _, record in ipairs(records) do
-			f:write(
-				mapid, "\t",
-				record.name, "\t",
-				record.skin, "\t",
-				record.color, "\t",
-				record.time, "\t",
-				table.concat(record.splits, " "), "\t",
-				record.flags, "\t",
-				stat_str(record.stat), "\n"
-			)
+	if isserver then 
+		dumpStoreToFile(LEADERBOARD_FILE, LiveStore)
 	end
 end
-
-	f:close()
-end
 rawset(_G, "lb_save_record", SaveRecord)
 
 local function netvars(net)
@@ -164,20 +201,7 @@ end
 
 addHook("NetVars", netvars)
 
-local function score_t(map, name, skin, color, time, splits, flags, stat)
-	return {
-		["map"]    = map,
-		["name"]   = name,
-		["skin"]   = skin,
-		["color"]  = color,
-		["time"]   = time,
-		["splits"] = splits,
-		["flags"]  = flags,
-		["stat"] = stat
-	}
-end
-
-local function parseScore(str)
+function parseScore(str)
 	-- Leaderboard is stored in the following tab separated format
 	-- mapnum, name, skin, color, time, splits, flags, stat
 	local t = {}
@@ -206,6 +230,8 @@ local function parseScore(str)
 		end
 	end
 
+	local checksum = t[9] or ""
+
 	return score_t(
 		tonumber(t[1]), -- Map
 		t[2],		-- Name
@@ -214,25 +240,155 @@ local function parseScore(str)
 		tonumber(t[5]),	-- Time
 		splits,
 		flags,
-		stats
+		stats,
+		checksum:lower()
 	)
 end
 rawset(_G, "lb_parse_score", parseScore)
 
--- Load the livestore
-do
-	if isserver then
+-- Read and parse a store file
+local function loadStoreFile(filename)
 	local f = assert(
-			io.open(LEADERBOARD_FILE, "r"),
-			"Failed to open file: "..LEADERBOARD_FILE
+		io.open(filename, "r"),
+		"Failed to open file for reading: "..filename
 	)
 
+	local store = {}
+
 	for l in f:lines() do
 		local score = parseScore(l)
-			LiveStore[score.map] = $ or {}
-			table.insert(LiveStore[score.map], score)
+		store[score.map] = $ or {}
+		store[score.map][score.checksum] = $ or {}
+		table.insert(store[score.map][score.checksum], score)
 	end
 
 	f:close()
+
+	return store
+end
+
+-- GLOBAL
+-- Command for moving records from one map to another
+local function moveRecords(from, to, modeSep)
+	local function moveRecordsInStore(store)
+		if not (store[from.id] and store[from.id][from.checksum]) then
+			return 0
+		end
+
+		store[to.id] = $ or {}
+		store[to.id][to.checksum] = $ or {}
+		for i, score in ipairs(store[from.id][from.checksum]) do
+			score.map = to.id
+			score.checksum = to.checksum
+			insertOrReplace(store[to.id][to.checksum], score, modeSep)
+		end
+
+		-- Destroy the original table
+		store[from.id][from.checksum] = nil
+	end
+
+	-- move livestore records and write to disk
+	moveRecordsInStore(LiveStore)
+
+	if isserver then
+		dumpStoreToFile(LEADERBOARD_FILE, LiveStore)
+
+		-- move coldstore records
+		local ok, coldstore = pcall(loadStoreFile, COLDSTORE_FILE)
+		if ok and coldstore then
+			moveRecordsInStore(coldstore)
+			dumpStoreToFile(COLDSTORE_FILE, coldstore)
 		end
 	end
+end
+rawset(_G, "lb_move_records", moveRecords)
+
+-- Helper function for those upgrading from 1.2 to 1.3
+COM_AddCommand("lb_write_checksums", function(player)
+	local count = 0
+	local moved = {}
+
+	-- Gather movable records (no checksum, map loaded)
+	for map, checksums in pairs(LiveStore) do
+		for checksum, records in pairs(checksums) do
+			if checksum == "" then
+				local sum = mapChecksum(map)
+
+				if not sum then continue end
+
+				moved[map] = {}
+				moved[map][sum] = {}
+
+				for i, record in ipairs(records) do
+					record.checksum = sum
+					table.insert(moved[map][sum], record)
+				end
+			end
+		end
+	end
+
+	-- Write moved to livestore
+	for map, checksums in pairs(moved) do
+		LiveStore[map] = $ or {}
+		for checksum, records in pairs(checksums) do
+			LiveStore[map][checksum] = $ or {}
+			for i, score in ipairs(records) do
+				table.insert(LiveStore[map][checksum], score)
+			end
+			count = $ + #records
+		end
+		LiveStore[map][""] = nil
+	end
+
+	if isserver then
+		dumpStoreToFile(LEADERBOARD_FILE, LiveStore)
+	end
+
+	CONS_Printf(player, string.format("Successful operation on %d records", count))
+end, COM_ADMIN)
+
+COM_AddCommand("lb_known_maps", function(player, map)
+	local mapnum = gamemap
+	if map then
+		mapnum = mapnumFromExtended(map)
+		if not mapnum then
+			CONS_Printf(player, string.format("invalid map '%s'", map))
+			return
+		end
+	end
+
+	local known = {}
+
+	if LiveStore[mapnum] then
+		for checksum, records in pairs(LiveStore[mapnum]) do
+			known[checksum] = #records
+		end
+	end
+	if ColdStore[mapnum] then
+		for checksum, records in pairs(ColdStore[mapnum]) do
+			known[checksum] = $ or 0 + #records
+		end
+	end
+
+	CONS_Printf(player, "Map     Chck   Records")
+	for checksum, count in pairs(known) do
+		CONS_Printf(player, string.format("%s   %s   %d", G_BuildMapName(mapnum), checksum, count))
+	end
+end)
+
+COM_AddCommand("lb_download_live_records", function(player, filename)
+	if not filename then
+		CONS_Printf(player, "Usage: lb_download_live_records <filename>")
+		return
+	end
+
+	if filename:sub(#filename-3) != ".txt" then
+		filename = $..".txt"
+	end
+	dumpStoreToFile(filename, LiveStore)
+end, COM_LOCAL)
+
+-- Load the livestore
+if isserver then
+	LiveStore = loadStoreFile(LEADERBOARD_FILE)
+end

leaderboard.lua

@@ -1,6 +1,28 @@
 -- Leaderboards written by Not
 -- Reusable
 
+---------- Imported functions -------------
+-- lb_common.lua
+local ticsToTime = lb_TicsToTime
+local zoneAct = lb_ZoneAct
+local stat_t = lb_stat_t
+local lbComp = lb_comp
+local mapChecksum = lb_map_checksum
+local score_t = lb_score_t
+local mapnumFromExtended = lb_mapnum_from_extended
+
+-- browser.lua
+local InitBrowser = InitBrowser
+local DrawBrowser = DrawBrowser
+local BrowserController = BrowserController
+
+-- lb_store.lua
+local GetMapRecords = lb_get_map_records
+local SaveRecord = lb_save_record
+local MapList = lb_map_list
+local MoveRecords = lb_move_records
+--------------------------------------------
+
 -- Holds the current maps records table including all modes
 local MapRecords = {}
 
@@ -85,24 +107,6 @@ local scroll_to
 
 local allowJoin
 
--- Imported functions --
-
--- lb_common.lua
-local ticsToTime = lb_TicsToTime
-local zoneAct = lb_ZoneAct
-local stat_t = lb_stat_t
-local lbComp = lb_comp
-
--- browser.lua
-local InitBrowser = InitBrowser
-local DrawBrowser = DrawBrowser
-local BrowserController = BrowserController
-
--- lb_store.lua
-local GetMapRecords = lb_get_map_records
-local SaveRecord = lb_save_record
-local MapList = lb_map_list
----------------
 
 -- cvars
 local cv_teamchange
@@ -181,19 +185,6 @@ local cv_spb_separate = CV_RegisterVar({
 	end
 })
 
-local function score_t(map, name, skin, color, time, splits, flags, stat)
-	return {
-		["map"]    = map,
-		["name"]   = name,
-		["skin"]   = skin,
-		["color"]  = color,
-		["time"]   = time,
-		["splits"] = splits,
-		["flags"]  = flags,
-		["stat"] = stat
-	}
-end
-
 local MSK_SPEED = 0xF0
 local MSK_WEIGHT = 0xF
 
@@ -342,35 +333,6 @@ local function findMap(player, ...)
 end
 COM_AddCommand("findmap", findMap)
 
-local function mapnumFromExtended(map)
-	local p, q = map:upper():match("MAP(%w)(%w)$", 1)
-	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 = {
 	[F_SPBEXP] = "X",
 	[F_SPBBIG] = "B",
@@ -403,7 +365,7 @@ local function records(player, ...)
 			return
 		end
 
-		mapRecords = GetMapRecords(mapnum, ST_SEP)
+		mapRecords = GetMapRecords(mapnum, mapChecksum(mapnum), ST_SEP)
 	end
 
 	local map = mapheaderinfo[mapnum]
@@ -562,14 +524,14 @@ local function findRival(player, ...)
 	local totalDiff = 0
 
 	CONS_Printf(player, string.format("\x89%s's times:", rival))
-	CONS_Printf(player, "MAP  	 Time    	  Diff    	Mode")
+	CONS_Printf(player, "MAP   CHCK	 Time    	  Diff    	Mode")
 
 	local maplist = MapList()
 	local mapRecords
 	local rivalScore
 	local yourScore
 	for i = 1, #maplist do
-		mapRecords = GetMapRecords(maplist[i], ST_SEP)
+		mapRecords = GetMapRecords(maplist[i].id, maplist[i].checksum, ST_SEP)
 
 		for mode, records in pairs(mapRecords) do
 			scores[mode] = $ or {}
@@ -636,9 +598,10 @@ local function findRival(player, ...)
 				CONS_Printf(
 					player,
 					string.format(
-						"%s	%8s	%s%9s	\x80%s",
-						G_BuildMapName(score["rival"]["map"]),
-						ticsToTime(score["rival"]["time"]),
+						"%s %4s	%8s	%s%9s	\x80%s",
+						G_BuildMapName(score.rival.map),
+						score.rival.checksum,
+						ticsToTime(score.rival.time),
 						color,
 						sym[diff<0] + ticsToTime(abs(diff)),
 						modestr
@@ -648,9 +611,10 @@ local function findRival(player, ...)
 				CONS_Printf(
 					player,
 					string.format(
-						"%s	%8s	%9s	%s",
-						G_BuildMapName(score["rival"]["map"]),
-						ticsToTime(score["rival"]["time"]),
+						"%s %4s	%8s	%9s	%s",
+						G_BuildMapName(score.rival.map),
+						score.rival.checksum,
+						ticsToTime(score.rival.time),
 						ticsToTime(0, true),
 						modestr
 					)
@@ -680,6 +644,64 @@ local function findRival(player, ...)
 end
 COM_AddCommand("rival", findRival)
 
+local function moveRecords(player, from_map, from_checksum, to_map, to_checksum)
+	if not(from_map and from_checksum and to_map) then
+		CONS_Printf(player, "Usage: lb_move_records <from_map> <from_checksum> <to_map> [<to_checksum>]")
+		CONS_Printf(
+			player,
+			string.format(
+				"Summary: Move records from one map to another.\n"..
+				"If no <to_checksum> is supplied then the checksum of the current loaded map %s is used.\n"..
+				"Hint: Use lb_known_maps to find checksums",
+				to_map or "<to_map>"
+			)
+		)
+		return
+	end
+
+	local from = {
+		["id"] = mapnumFromExtended(from_map),
+		["checksum"] = from_checksum:lower()
+	}
+
+	local to = {
+		["id"] = mapnumFromExtended(to_map),
+	}
+	to.checksum = to_checksum or mapChecksum(to.id)
+
+	if not to.checksum then
+		CONS_Printf(player, string.format("error: %s is not loaded; provide to_checksum to continue", to_map:upper()))
+		return
+	end
+	if #to.checksum != 4 or to.checksum:match("[^a-f0-9]") then
+		CONS_Printf(player, string.format("error: %s is an invalid checksum; checksums are of length 4 and can contain only 0-9a-f", to.checksum))
+		return
+	end
+
+	to.checksum = $:lower()
+
+	local mapRecords = GetMapRecords(from.id, from.checksum, F_SPBATK | F_SPBBIG | F_SPBEXP)
+	local recordCount = 0
+	for mode, records in pairs(mapRecords) do
+		recordCount = $ + #records
+	end
+
+	MoveRecords(from, to, ST_SEP)
+
+	CONS_Printf(
+		player,
+		string.format(
+			"%d records have been moved from\x82 %s %s\x80 to\x88 %s %s",
+			recordCount,
+			from_map, from.checksum,
+			to_map, to.checksum
+		)
+	)
+
+	CONS_Printf(player, "Please repack coldstore and restart the server for changes to take effect.")
+end
+COM_AddCommand("lb_move_records", moveRecords, COM_ADMIN)
+
 --DEBUGGING
 --local function printTable(tb)
 --	for mode, tbl in pairs(tb) do
@@ -714,7 +736,7 @@ addHook("MapLoad", function()
 		allowJoin(true)
 		--printTable(lb)
 
-		MapRecords = GetMapRecords(gamemap, ST_SEP)
+		MapRecords = GetMapRecords(gamemap, mapChecksum(gamemap), ST_SEP)
 	end
 )
 
@@ -1024,7 +1046,7 @@ local function drawScoreboard(v, player)
 
 	cachePatches(v)
 
-	local gui = cv_gui.value
+	local gui = cv_gui.value or drawState == DS_BROWSER
 
 	-- Force enable gui at start and end of the race
 	if leveltime < START_TIME or player.exiting or player.lives == 0 then
@@ -1033,7 +1055,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
@@ -1041,6 +1062,7 @@ local function drawScoreboard(v, player)
 		pos = drawMode(v, pos, F_SPBBIG)
 		pos = drawMode(v, pos, F_SPBEXP)
 	end
+end
 hud.add(drawScoreboard, "game")
 
 function cachePatches(v)
@@ -1149,7 +1171,8 @@ local function saveTime(player)
 		TimeFinished,
 		splits,
 		Flags,
-		stat_t(player.HMRs or pskin.kartspeed, player.HMRw or pskin.kartweight)
+		stat_t(player.HMRs or pskin.kartspeed, player.HMRw or pskin.kartweight),
+		mapChecksum(gamemap)
 	)
 
 	-- Check if you beat your previous best
@@ -1178,7 +1201,7 @@ local function saveTime(player)
 	FlashVFlags = YellowFlash
 
 	-- Reload the MapRecords
-	MapRecords = GetMapRecords(gamemap, ST_SEP)
+	MapRecords = GetMapRecords(gamemap, mapChecksum(gamemap), ST_SEP)
 
 	-- Set the updated ScoreTable
 	ScoreTable = MapRecords[Flags]

tools/coldstore.py

@@ -1,18 +1,31 @@
-#!/bin/python
+#!/usr/bin/env python3
 import sys
-from os import linesep
+from os import path
+linesep = "\n"
 
-if len(sys.argv) != 4 or not sys.argv[1] or not sys.argv[2] or not sys.argv[3]:
-	print("Usage: coldstore.py <leaderboard.txt> <coldstore.txt> <leaderboard_records.lua>")
+if len(sys.argv) != 3 or not sys.argv[1] or not sys.argv[2]:
+	print("Usage: coldstore.py <game_directory> <leaderboard_records.lua>")
+	print("\t<game_directory>\t\tthe game directory where wads and luafiles reside. Usually at '$HOME/.srb2kart'.")
+	print("\t<leaderboard_records.lua>\tthe output name for the records packed lua file. It will be saved within <game_directory>.")
 	quit()
 
-leaderboard_txt = sys.argv[1]
-coldstore_txt = sys.argv[2]
-records_lua = sys.argv[3]
+if not sys.argv[2].endswith(".lua"):
+	print("{} must end with .lua".format(sys.argv[2]))
+	quit()
+
+game_dir = sys.argv[1]
+leaderboard_txt = path.join(game_dir, "luafiles", "leaderboard.txt")
+coldstore_txt = path.join(game_dir, "luafiles", "leaderboard.coldstore.txt")
+records_lua = path.join(game_dir, sys.argv[2])
 
 def ParseScore(score):
 	# Map Name Skin Color Time Splits Flags Stat
 	split = score.split("\t")
+
+	checksum = ""
+	if len(split) > 8:
+		checksum = split[8]
+
 	return {
 		"map": split[0],
 		"name": split[1],
@@ -21,7 +34,8 @@ def ParseScore(score):
 		"time": int(split[4]),
 		"splits": split[5],
 		"flags": int(split[6]),
-		"stat": split[7]
+		"stat": split[7],
+		"checksum": checksum
 	}
 
 # Compare scores
@@ -30,13 +44,19 @@ def CompareScore(a, b):
 
 F_SEP = 0xF
 def SameScore(a, b):
-	return a["name"] == b["name"] and (a["flags"] & F_SEP) == (b["flags"] & F_SEP)
+	return a["name"] == b["name"] and a["checksum"] == b["checksum"] and (a["flags"] & F_SEP) == (b["flags"] & F_SEP)
 
 def LoadRecordsFromFile(path):
 	records = []
+	try:
 		with open(path, "r") as f:
 			for line in f.readlines():
-			records.append(ParseScore(line.strip()))
+				line = line.strip()
+				if line != "":
+					records.append(ParseScore(line))
+	except FileNotFoundError:
+		pass
+
 	return records
 
 def AddScore(records, score):
@@ -65,30 +85,41 @@ for score in recordsList:
 
 # convert records to flat list
 recordsList = []
+rejected = []
 for mapTable in records.values():
 	for score in mapTable:
-		recordsList.append("\t".join([str(v) for v in list(score.values())]))
+		scoreStr = "\t".join([str(v) for v in list(score.values())])
+		# only allow records with checksums
+		if score["checksum"] != "":
+			recordsList.append(scoreStr)
+		else:
+			rejected.append(scoreStr)
 
 # truncate and write records to coldstore
 with open(coldstore_txt, "w") as f:
 	for score in recordsList:
 			f.write(score + linesep)
 
-luaA = """local ParseScore = lb_parse_score
-local AddColdStore = lb_add_coldstore_record
+luaA = """do
+	local AddColdStore = lb_add_coldstore_record_string
 	local records = {
 """
 luaB = """	}
 	for _, str in ipairs(records) do
-	AddColdStore(ParseScore(str))
+		AddColdStore(str)
+	end
 end
 """
 # pack the records.lua file
 with open(records_lua, "w") as f:
 	f.write(luaA)
 	for score in recordsList:
-		f.write("\"{}\",{}".format(score, linesep))
+		score = score.replace("\\", "\\\\")
+		score = score.replace("\"", "\\\"")
+		f.write("\t\t\"{}\",{}".format(score, linesep))
 	f.write(luaB)
 
-# truncate leaderboard.txt
-with open(leaderboard_txt, "w"): pass
+# truncate and rewrite rejected scores to leaderboard.txt
+with open(leaderboard_txt, "w") as f:
+	for score in rejected:
+		f.write(score + linesep)