v1.2.13

leaderboard.lua

@@ -3,10 +3,14 @@
 local FILENAME = "leaderboard.txt"
 local lb = {}
 local timeFinished = 0
-local disable = true
+local disable = false
 local prevLap = 0
 local splits = {}
 local PATCH = nil
+local help = true
+
+-- Retry / changelevel map
+local nextMap = nil
 
 local Flags = 0
 
@@ -18,7 +22,10 @@ local F_SPBEXP = 0x8
 
 local clearcheats = false
 
-local startTime = 6 * TICRATE + (3 * TICRATE / 4)
+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
 
 -- patch caching function
 local cachePatches
@@ -91,42 +98,115 @@ else
 	print("Failed to open file: ", FILENAME)
 end
 
-local function initLeaderboard(player)
-	local ingame = 0
+local function allowJoin(v)
+	local y
+	if v then
+		y = "yes"
+		hud.enable("freeplay")
+	else
+		y = "no"
+		hud.disable("freeplay")
+	end
+
+	COM_BufInsertText(server, "allowteamchange " + y)
+end
+
+local function ingame()
+	local n = 0
 	for p in players.iterate do
 		if p.valid and not p.spectator then
-			ingame = ingame + 1
+			n = $ + 1
 		end
 	end
-	
-	disable = ingame > 1
+	return n
+end
 
-	if disable then
-		--print("To many players in game, leaderboard has been disabled")
-		return
+local function initLeaderboard(player)
+	if disable and leveltime < START_TIME then
+		disable = ingame() > 1
+	else
+		disable = disable or ingame() > 1
 	end
+	player.afkTimeout = leveltime
 end
 addHook("PlayerSpawn", initLeaderboard)
 
-local function retry(player, ...)
-	if disable or player.spectator then
+local function doyoudare(player)
+	if ingame() > 1 or player.spectator then
 		CONS_Printf(player, "How dare you")
-		return
+		return false
 	end
+	return true
+end
 
-	COM_BufInsertText(server, "map " + G_BuildMapName(gamemap))
+local function retry(player, ...)
+	if doyoudare(player) then
+		-- Prevents bind crash
+		if leveltime < 20 then
+			return
+		end
+		nextMap = G_BuildMapName(gamemap)
+	end
 end
 COM_AddCommand("retry", retry)
 
 local function exitlevel(player, ...)
-	if disable or player.spectator then
-		CONS_Printf(player, "How dare you")
-		return
+	if doyoudare(player) then
+		G_ExitLevel()
 	end
-	G_ExitLevel()
 end
 COM_AddCommand("exit", exitlevel)
 
+local function mapNotExists(player, map)
+	CONS_Printf(player, string.format("Map doesn't exist: %s", map:upper()))
+end
+
+local ALPH = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+
+local function changelevel(player, ...)
+	if not doyoudare(player) then
+		return
+	end
+	if leveltime < 20 then
+		return
+	end
+
+	local map = ...
+	if map == nil then
+		CONS_Printf(player, "Usage: changelevel MAPXX")
+		return
+	end
+
+	local p, q = map:upper():match("MAP(%w)(%w)$", 1)
+	if not (p and q) then
+		CONS_Printf(player, string.format("Invalid map name: %s", map))
+		return
+	end
+
+	local mapnum = 0
+	if tonumber(p) != nil then
+		-- Non extended map numbers
+		if tonumber(q) == nil then
+			mapNotExists(player, map)
+			return
+		end
+		mapnum = tonumber(p) * 10 + tonumber(q)
+	else
+		--Extended map numbers
+		p = ALPH:find(p) - 1
+		q = (tonumber(q) or ALPH:find(q) + 9)
+		mapnum = 36 * p + q + 100
+	end
+	
+	if mapheaderinfo[mapnum] == nil then
+		mapNotExists(player, map)
+		return
+	end
+
+	nextMap = G_BuildMapName(mapnum)
+end
+COM_AddCommand("changelevel", changelevel)
+
 local function clearcheats(player)
 	if not player.spectator then
 		clearcheats = true
@@ -160,6 +240,8 @@ addHook("MapLoad", function()
 		timeFinished = 0
 		splits = {}
 		prevLap = 0
+
+		allowJoin(true)
 		--printTable(lb)
 	end
 )
@@ -186,11 +268,23 @@ local function drawitem(v, x, y, scale, itempatch, vflags)
 	)
 end
 
+local function marquee(text, maxwidth)
+	if #text <= maxwidth then
+		return text
+	end
+	
+	local shift = 16
+	local pos = ((leveltime / 16) % (#text - maxwidth + shift * 2)) + 1 - shift
+	pos = min(max(pos, 1), #text - maxwidth + 1)
+	return text:sub(pos, pos + maxwidth - 1)
+end
+
 local bodium = {V_YELLOWMAP, V_GRAYMAP, V_BROWNMAP, 0}
 local splitColor = {[true]=V_SKYMAP, [false]=V_REDMAP}
 local splitSymbol = {[true]="-", [false]="+"}
 
 local showSplit = 0
+local VFLAGS = V_SNAPTOLEFT
 local function drawScoreboard(v, player)
 	if disable then return end
 	if player != displayplayers[0] then return end
@@ -213,9 +307,9 @@ local function drawScoreboard(v, player)
 		--        |    OFFSET   | + |      PADDING       | * |INDEX|
 		local h = ((200 / 4) + 4) + (skinPatch.height + 4) * (i - 1)
 
-		v.draw(4, h, skinPatch, V_HUDTRANS, v.getColormap("sonic", score["color"]))
+		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)
+			v.draw(4, h, PATCH["CHILI"][(leveltime / 4) % 8], V_HUDTRANS | VFLAGS)
 		end
 
 		-- SPB
@@ -227,7 +321,7 @@ local function drawScoreboard(v, player)
 				h - 2,
 				scale,
 				PATCH["SPB"],
-				V_HUDTRANS
+				V_HUDTRANS | VFLAGS
 			)
 			if score["flags"] & F_SPBEXP then
 				drawitem(
@@ -236,7 +330,7 @@ local function drawScoreboard(v, player)
 					h - 2,
 					scale,
 					PATCH["INV"][(leveltime / 4) % 6],
-					V_HUDTRANS
+					V_HUDTRANS | VFLAGS
 				)
 			end
 			if score["flags"] & F_SPBBIG then
@@ -246,7 +340,7 @@ local function drawScoreboard(v, player)
 					h + skinPatch.height - 4,
 					scale,
 					PATCH["BIG"],
-					V_HUDTRANS
+					V_HUDTRANS | VFLAGS
 				)
 			end
 			if score["flags"] & F_SPBJUS then
@@ -256,7 +350,7 @@ local function drawScoreboard(v, player)
 					h + skinPatch.height - 4,
 					scale,
 					PATCH["HYUD"],
-					V_HUDTRANS
+					V_HUDTRANS | VFLAGS
 				)
 			end
 		end
@@ -273,19 +367,35 @@ local function drawScoreboard(v, player)
 				stralign = "small"
 				py = 2
 				if v.stringWidth(name, 0, "small") > MAXWIDTH then
-					name = name:sub(0, 15) + "..."
+					name = marquee(name, 15)
 				end
 			end
 		end
 
-		v.drawString(px + skinPatch.width, h + py, name, V_HUDTRANSHALF | V_ALLOWLOWERCASE, stralign)
+		v.drawString(
+			px + skinPatch.width,
+			h + py,
+			name,
+			V_HUDTRANSHALF | V_ALLOWLOWERCASE | VFLAGS,
+			stralign
+		)
 
 		-- Draw splits
 		if showSplit > 0 and score["splits"][prevLap] != nil then
 			local split = splits[prevLap] - score["splits"][prevLap]
-			v.drawString(px + skinPatch.width, h + 8, splitSymbol[split < 0] + ticsToTime(abs(split)), V_HUDTRANSHALF | splitColor[split < 0])
+			v.drawString(
+				px + skinPatch.width,
+				h + 8,
+				splitSymbol[split < 0] + ticsToTime(abs(split)),
+				V_HUDTRANSHALF | splitColor[split < 0] | VFLAGS
+			)
 		else
-			v.drawString(px + skinPatch.width, h + 8, ticsToTime(score["time"]), V_HUDTRANSHALF | bodium[min(i, 4)])
+			v.drawString(
+				px + skinPatch.width,
+				h + 8,
+				ticsToTime(score["time"]),
+				V_HUDTRANSHALF | bodium[min(i, 4)] | VFLAGS
+			)
 		end
 	end
 end
@@ -408,17 +518,76 @@ local function regLap(player)
 	end
 end
 
+local function getGamer()
+	for p in players.iterate do
+		if p.valid and not p.spectator then
+			return p
+		end
+	end
+end
+
 local function think()
+	if nextMap then
+		COM_BufInsertText(server, "map " + nextMap)
+		nextMap = nil
+	end
+
 	if disable 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.cmd.buttons then
+						p.afkTimeout = leveltime
+					end
+					if p.afkTimeout + AFK_BALANCE < leveltime then
+						p.spectator = true
+						chatprint("\x89" + p.name + " was moved to the other team for game balance", true)
+					end
+				end
+			end
+		else
+			for p in players.iterate do
+				if p.valid and not p.spectator then
+					p.afkTimeout = leveltime
+				end
+			end
+		end
+
+		help = true
 		return
 	end
 	if showSplit > 0 then
 		showSplit = showSplit - 1
 	end
 
-	if leveltime < startTime then
+	local p = getGamer()
+	if leveltime < START_TIME then
+		-- Help message
+		if leveltime == START_TIME - TICRATE * 3 then
+			if ingame() == 1  then
+				if help then
+					help = false
+					chatprint("\x89Leaderboard Commands:\nretry exit findmap changelevel spba_clearcheats", true)
+				end
+			else
+				help = true
+			end
+		end
+
+		-- Autospec
+		if leveltime == 1 then
+			if p then
+				for s in players.iterate do
+					if s.valid and s.spectator then
+						COM_BufInsertText(s, string.format("view \"%d\"", #p))
+					end
+				end
+			end
+		end
+		
+		-- Gamemode flags
 		Flags = $ & !(F_SPBATK | F_SPBEXP | F_SPBBIG | F_SPBJUS)
-		if leveltime > startTime - (3 * TICRATE) / 2 and server.SPBArunning then
+		if leveltime > START_TIME - (3 * TICRATE) / 2 and server.SPBArunning then
 			Flags = $ | F_SPBATK
 			if server.SPBAexpert then
 				Flags = $ | F_SPBEXP
@@ -444,16 +613,44 @@ local function think()
 		end
 	end
 
-	for p in players.iterate do
+	local cv_teamchange = CV_FindVar("allowteamchange")
+	if p then
+		if p.cmd.buttons then
+			p.afkTimeout = leveltime
+		end
+
+		if leveltime > PREVENT_JOIN_TIME and p.afkTimeout + AFK_TIMEOUT > leveltime then
+			if cv_teamchange.value then
+				allowJoin(false)
+			end
+		elseif p.afkTimeout + AFK_TIMEOUT < leveltime then
+			if not cv_teamchange.value then
+				allowJoin(true)
+			end
+		end
+
 		if p.laps >= mapheaderinfo[gamemap].numlaps and timeFinished == 0 then
 			timeFinished = p.realtime
 			saveTime(p)
 		end
 		regLap(p)
+	elseif cv_teamchange.value == 0 then
+		allowJoin(true)
 	end
 end
 addHook("ThinkFrame", think)
 
+local function interThink()
+	if nextMap then
+		COM_BufInsertText(server, "map " + nextMap)
+		nextMap = nil
+	end
+	if not CV_FindVar("allowteamchange").value then
+		allowJoin(true)
+	end
+end
+addHook("IntermissionThinker", interThink)
+
 local function netvars(net)
 	lb = net($)
 end