v1.2.15

leaderboard.lua

@@ -1,14 +1,18 @@
 -- Leaderboards written by Not
+-- Reusable
 
 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
 
 -- SPB flags with the least significance first
@@ -19,11 +23,55 @@ 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
+
+local GUI_OFF    = 0x0
+local GUI_SPLITS = 0x1
+local GUI_ON     = 0x2
 
 -- patch caching function
 local cachePatches
 
+local cv_gui = CV_RegisterVar({
+	name = "lb_gui",
+	defaultvalue = GUI_ON,
+	flags = 0,
+	PossibleValue = {Off = GUI_OFF, Splits = GUI_SPLITS, On = GUI_ON}
+})
+
+local cv_afk = CV_RegisterVar({
+	name = "lb_afk",
+	defaultvalue = 1,
+	flags = CV_NETVAR,
+	PossibleValue = CV_OnOff
+})
+
+local cv_enable = CV_RegisterVar({
+	name = "lb_enable",
+	defaultvalue = 1,
+	flags = CV_NETVAR | CV_CALL,
+	PossibleValue = CV_OnOff,
+	func = function(v)
+		disable = $ or not v.value
+	end
+})
+
+local cv_interrupt = CV_RegisterVar({
+	name = "lb_interrupt",
+	defaultvalue = 0,
+	flags = CV_NETVAR | CV_CALL,
+	PossibleValue = CV_OnOff,
+	func = function(v)
+		if v.value then
+			COM_BufInsertText(server, "allowteamchange yes")
+		end
+	end
+})
+
+
 local function lbID(map, flags)
 	local id = tostring(map)
 	if flags & F_SPBATK then
@@ -92,6 +140,21 @@ else
 	print("Failed to open file: ", FILENAME)
 end
 
+local function allowJoin(v)
+	if not cv_interrupt.value then
+		local y
+		if v then
+			y = "yes"
+			hud.enable("freeplay")
+		else
+			y = "no"
+			hud.disable("freeplay")
+		end
+
+		COM_BufInsertText(server, "allowteamchange " + y)
+	end
+end
+
 local function ingame()
 	local n = 0
 	for p in players.iterate do
@@ -103,12 +166,18 @@ local function ingame()
 end
 
 local function initLeaderboard(player)
+	if disable and leveltime < START_TIME then
 		disable = ingame() > 1
+	else
+		disable = disable or ingame() > 1
+	end
+	disable = $ or not cv_enable.value
+	player.afkTime = leveltime
 end
 addHook("PlayerSpawn", initLeaderboard)
 
 local function doyoudare(player)
-	if disable or player.spectator then
+	if ingame() > 1 or player.spectator then
 		CONS_Printf(player, "How dare you")
 		return false
 	end
@@ -117,7 +186,11 @@ end
 
 local function retry(player, ...)
 	if doyoudare(player) then
-		COM_BufInsertText(server, "map " + G_BuildMapName(gamemap))
+		-- Prevents bind crash
+		if leveltime < 20 then
+			return
+		end
+		nextMap = G_BuildMapName(gamemap)
 	end
 end
 COM_AddCommand("retry", retry)
@@ -129,6 +202,33 @@ local function exitlevel(player, ...)
 end
 COM_AddCommand("exit", exitlevel)
 
+local function findMap(player, ...)
+	local search = ...
+	if search == nil then 
+
+		return
+	end
+
+	for i = 1, #mapheaderinfo do
+		local map = mapheaderinfo[i]
+		if map == nil then
+			continue
+		end
+
+		if map.lvlttl:lower():find(search:lower()) then
+			CONS_Printf(
+				player,
+				string.format(
+					"%s - %s",
+					G_BuildMapName(i),
+					map.lvlttl
+				)
+			)
+		end
+	end
+end
+COM_AddCommand("findmap", findMap)
+
 local function mapNotExists(player, map)
 	CONS_Printf(player, string.format("Map doesn't exist: %s", map:upper()))
 end
@@ -139,6 +239,9 @@ local function changelevel(player, ...)
 	if not doyoudare(player) then
 		return
 	end
+	if leveltime < 20 then
+		return
+	end
 
 	local map = ...
 	if map == nil then
@@ -172,7 +275,7 @@ local function changelevel(player, ...)
 		return
 	end
 
-	COM_BufInsertText(server, "map " + (G_BuildMapName(mapnum)))
+	nextMap = G_BuildMapName(mapnum)
 end
 COM_AddCommand("changelevel", changelevel)
 
@@ -209,6 +312,8 @@ addHook("MapLoad", function()
 		timeFinished = 0
 		splits = {}
 		prevLap = 0
+
+		allowJoin(true)
 		--printTable(lb)
 	end
 )
@@ -246,7 +351,9 @@ local function marquee(text, maxwidth)
 	return text:sub(pos, pos + maxwidth - 1)
 end
 
+-- Bats on ...
 local bodium = {V_YELLOWMAP, V_GRAYMAP, V_BROWNMAP, 0}
+
 local splitColor = {[true]=V_SKYMAP, [false]=V_REDMAP}
 local splitSymbol = {[true]="-", [false]="+"}
 
@@ -263,6 +370,12 @@ local function drawScoreboard(v, player)
 		return
 	end
 
+	local gui = cv_gui.value
+	if leveltime < START_TIME or player.exiting or player.lives == 0 then
+		gui = GUI_ON
+	end
+
+	if gui then
 		for i, score in ipairs(m) do
 			local name = score["name"]
 			local skin = skins[score["skin"]]
@@ -322,6 +435,7 @@ local function drawScoreboard(v, player)
 				end
 			end
 
+			if gui == GUI_ON or (gui == GUI_SPLITS and showSplit)
 				-- Shorten long names
 				local stralign = "left"
 				local MAXWIDTH = 70
@@ -348,7 +462,7 @@ local function drawScoreboard(v, player)
 				)
 
 				-- Draw splits
-		if showSplit > 0 and score["splits"][prevLap] != nil then
+				if showSplit and score["splits"][prevLap] != nil then
 					local split = splits[prevLap] - score["splits"][prevLap]
 					v.drawString(
 						px + skinPatch.width,
@@ -366,6 +480,8 @@ local function drawScoreboard(v, player)
 				end
 			end
 		end
+	end
+end
 hud.add(drawScoreboard, "game")
 
 function cachePatches(v)
@@ -399,7 +515,7 @@ local function lbComp(a, b)
 	-- 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"])
+	return s > 0 or not(s < 0 or a["time"] >= b["time"])
 end
 
 local function saveTime(player)
@@ -471,7 +587,7 @@ end
 
 -- DEBUGGING
 --local function saveLeaderboard(player, ...)
---	timeFinished = player.realtime
+--	timeFinished = tonumber(... or player.realtime)
 --	splits = {1000, 2000, 3000}
 --	saveTime(player)
 --end
@@ -485,8 +601,41 @@ 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 cv_afk.value and 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.afkTime = leveltime
+					end
+					if p.afkTime + 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.afkTime = leveltime
+				end
+			end
+		end
+
 		help = true
 		return
 	end
@@ -494,13 +643,14 @@ local function think()
 		showSplit = showSplit - 1
 	end
 
-	if leveltime < startTime then
+	local p = getGamer()
+	if leveltime < START_TIME then
 		-- Help message
-		if leveltime == startTime - TICRATE * 3 then
+		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)
+					chatprint("\x89Leaderboard Commands:\nretry exit findmap changelevel spba_clearcheats lb_gui", true)
 				end
 			else
 				help = true
@@ -509,16 +659,10 @@ local function think()
 
 		-- Autospec
 		if leveltime == 1 then
-			local gamer = nil
-			for p in players.iterate do
-				if p.valid and not p.spectator then
-					gamer = #p
-				end
-			end
-			if gamer then
-				for p in players.iterate do
-					if p.valid and p.spectator then
-						COM_BufInsertText(p, string.format("view \"%d\"", gamer))
+			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
@@ -526,7 +670,7 @@ local function think()
 		
 		-- 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
@@ -550,19 +694,52 @@ local function think()
 				end
 			end
 		end
+		if not (Flags & F_SPBATK) then
+			hud.enable("freeplay")
+		end
+	end
+
+	local cv_teamchange = CV_FindVar("allowteamchange")
+	if p then
+		if p.cmd.buttons then
+			p.afkTime = leveltime
+		end
+
+		if leveltime > PREVENT_JOIN_TIME and p.afkTime + AFK_TIMEOUT > leveltime then
+			if cv_teamchange.value then
+				allowJoin(false)
+			end
+		elseif p.afkTime + AFK_TIMEOUT < leveltime then
+			if not cv_teamchange.value then
+				allowJoin(true)
+			end
 		end
 
-	for p in players.iterate do
 		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($)
+	splits = net($)
+	prevLap = net($)
 end
 addHook("NetVars", netvars)