Add encore support

README.md

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

leaderboard.lua

@@ -20,6 +20,7 @@ local FILENAME = "leaderboard.txt"
 local nextMap = nil
 
 local Flags = 0
+local F_ENCORE = 0x80
 
 -- SPB flags with the least significance first
 local F_SPBATK = 0x1
@@ -121,7 +122,7 @@ local function getScoreTable(map, flags)
 	--return id
 
 	local mode = flags & F_SPBATK
-	return lb[mode] and lb[mode][map] or {}
+	return lb[mode] and lb[mode][map] or nil
 end
 
 local function score_t(map, name, skin, color, time, splits, flags, restat)
@@ -171,7 +172,7 @@ if f then
 			flags = tonumber(t[7])
 		end
 
-		local scoreTable = getScoreTable(tonumber(t[1]), flags)
+		local scoreTable = getScoreTable(tonumber(t[1]), flags) or {}
 
 		local spl = {}
 		if t[6] != nil then
@@ -352,6 +353,20 @@ 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 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
@@ -616,12 +631,25 @@ 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
+
 	--draw Patch/chili
 	v.draw(x, y, faceRank, V_HUDTRANS | VFLAGS, v.getColormap("sonic", score["color"]))
 	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
+		)
+	end
+
 	-- SPB
 	if score["flags"] & F_SPBATK then
 		local scale = FRACUNIT / 4
@@ -766,10 +794,10 @@ 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
+		if #scoreTable >= 100 then
 			x = x + 8
 		end
 
@@ -850,6 +878,7 @@ function cachePatches(v)
 		end
 		PATCH["BIG"] = v.cachePatch("K_ISGROW")
 		PATCH["HYUD"] = v.cachePatch("K_ISHYUD")
+		PATCH["RUBY"] = v.cachePatch("RUBYICON")
 	end
 end
 
@@ -865,7 +894,7 @@ end
 
 -- Find location of player and scroll to it
 function scroll_to(player)
-	local m = getScoreTable(gamemap, Flags)
+	local m = getScoreTable(gamemap, Flags) or {}
 
 	scrollToPos = 2
 	for pos, score in ipairs(m) do
@@ -879,7 +908,7 @@ function scroll_to(player)
 end
 
 local function saveTime(player)
-	local scoreTable = getScoreTable(gamemap, Flags)
+	local scoreTable = getScoreTable(gamemap, Flags) or {}
 
 	local newscore = score_t(
 		gamemap,
@@ -1021,7 +1050,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