Merge branch 'lonsfor-patch-1'

No need to constantly look up the cvar when it can be saved

leaderboard.lua

@@ -11,19 +11,22 @@ local prevLap = 0
 local splits = {}
 local PATCH = nil
 local help = true
+local EncoreInitial = nil
+local cv_teamchange
+local scoreTable
 
-local LIFE = {}
+-- Tracks if stats have been written or not
-local faceranks = {}
+local StatTrack = false
-local dvd = {}
 
 local UNCLAIMED = "Unclaimed Record"
-local HELP_MESSAGE = "\x89Leaderboard Commands:\nretry exit findmap changelevel spba_clearcheats lb_gui rival scroll"
+local HELP_MESSAGE = "\x89Leaderboard Commands:\nretry exit findmap changelevel spba_clearcheats lb_gui rival scroll encore"
 local FILENAME = "leaderboard.txt"
 
 -- Retry / changelevel map
 local nextMap = nil
 
 local Flags = 0
+local F_ENCORE = 0x80
 
 -- SPB flags with the least significance first
 local F_SPBATK = 0x1
@@ -31,11 +34,15 @@ 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 AFK_BALANCE_WARN = AFK_BALANCE - TICRATE * 10
 local PREVENT_JOIN_TIME = START_TIME + TICRATE * 5
 
 local GUI_OFF    = 0x0
@@ -65,6 +72,8 @@ local clamp
 local scroll_to
 
 local ticsToTime
+
+local allowJoin
 ---------------
 
 local cv_gui = CV_RegisterVar({
@@ -74,11 +83,24 @@ local cv_gui = CV_RegisterVar({
 	PossibleValue = {Off = GUI_OFF, Splits = GUI_SPLITS, On = GUI_ON}
 })
 
-local cv_afk = CV_RegisterVar({
+local AntiAFK = true
+CV_RegisterVar({
 	name = "lb_afk",
 	defaultvalue = 1,
-	flags = CV_NETVAR,
+	flags = CV_NETVAR | CV_CALL,
-	PossibleValue = CV_OnOff
+	PossibleValue = CV_OnOff,
+	func = function(v)
+		-- Set players afkTime and toggle AntiAFK
+		if v.value then
+			for p in players.iterate do
+				p.afkTime = leveltime
+			end
+
+			AntiAFK = true
+		else
+			AntiAFK = false
+		end
+	end
 })
 
 local cv_enable = CV_RegisterVar({
@@ -88,6 +110,9 @@ local cv_enable = CV_RegisterVar({
 	PossibleValue = CV_OnOff,
 	func = function(v)
 		disable = $ or not v.value
+		if disable then
+			allowJoin(true)
+		end
 	end
 })
 
@@ -110,25 +135,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_combined",
+	defaultvalue = 1,
+	flags = CV_NETVAR | CV_CALL,
+	PossibleValue = CV_YesNo,
+	func = function(v)
+		if v.value then
+			ST_SEP = F_SPBATK
+		else
+			ST_SEP = F_SPBATK | F_SPBBIG | F_SPBEXP
+		end
+
+		reinit_lb()
+	end
+})
+
+local function score_t(map, name, skin, color, time, splits, flags, stat)
 	return {
 		["map"]    = map,
 		["name"]   = name,
@@ -137,11 +216,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,
@@ -151,9 +230,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"
@@ -164,7 +243,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)
@@ -175,7 +254,7 @@ if f then
 			flags = tonumber(t[7])
 		end
 
-		local scoreTable = getScoreTable(tonumber(t[1]), flags) or {}
+		scoreTable = getScoreTable(tonumber(t[1]), flags) or {}
 
 		local spl = {}
 		if t[6] != nil then
@@ -187,9 +266,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
 
@@ -206,15 +285,17 @@ if f then
 				stats
 			)
 		)
+
 		setScoreTable(tonumber(t[1]), flags, scoreTable)
 	end
 
+	sortScores()
 	f:close()
 else
 	print("Failed to open file: ", FILENAME)
 end
 
-local function allowJoin(v)
+function allowJoin(v)
 	if not cv_interrupt.value then
 		local y
 		if v then
@@ -246,6 +327,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)
@@ -356,6 +444,24 @@ 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 EncoreInitial == nil then
+		EncoreInitial = enc.value
+	end
+
+	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
@@ -447,13 +553,17 @@ local function findRival(player, ...)
 		return a["rival"]["map"] < b["rival"]["map"]
 	end
 
+	local modestrings = {
+		[F_SPBEXP] = "X",
+		[F_SPBBIG] = "B",
+		[F_SPBJUS] = "J",
+	}
+
 	for mode, tbl in pairs(scores) do
 		if i >= stop then break end
 
 		table.sort(tbl, sortf)
 
-		local spb = mode & F_SPBATK and "SPB" or "TA"
-
 		for _, score in ipairs(tbl) do
 			if o then
 				o = o - 1
@@ -462,6 +572,16 @@ local function findRival(player, ...)
 			if i >= stop then break end
 			i = i + 1
 
+			local modestr = "TA"
+			if score["rival"]["flags"] & F_SPBATK then
+				modestr = "SPB"
+				for k, v in pairs(modestrings) do
+					if score["rival"]["flags"] & k then
+						modestr = $ + v
+					end
+				end
+			end
+
 			if score["your"] then
 				local diff = score["your"]["time"] - score["rival"]["time"]
 				local color = colors[clamp(-1, diff, 1)]
@@ -474,7 +594,7 @@ local function findRival(player, ...)
 						ticsToTime(score["rival"]["time"]),
 						color,
 						sym[diff<0] + ticsToTime(abs(diff)),
-						spb
+						modestr
 					)
 				)
 			else
@@ -485,7 +605,7 @@ local function findRival(player, ...)
 						G_BuildMapName(score["rival"]["map"]),
 						ticsToTime(score["rival"]["time"]),
 						ticsToTime(0, true),
-						spb
+						modestr
 					)
 				)
 			end
@@ -535,23 +655,6 @@ COM_AddCommand("rival", findRival)
 --	end
 --end
 
-
-local cellSize = 16
-local function spawnCells(n)
-	local p = leveltime
-	for i = 0,n do
-		local x = (i * p) % (320/cellSize)
-		p = p + 7
-		local y = (i * p) % (200/cellSize)
-		p = p % 42 + 1
-
-		if not(LIFE[x] and LIFE[y]) then
-			LIFE[x] = $ or {}
-			LIFE[x][y] = true
-		end
-	end
-end
-
 addHook("MapLoad", function()
 		timeFinished = 0
 		splits = {}
@@ -562,18 +665,9 @@ addHook("MapLoad", function()
 
 		allowJoin(true)
 		--printTable(lb)
-
-		LIFE = {}
-		dvd = {}
 	end
 )
 
-local function life(player, ...)
-	local n = ...
-	spawnCells(n)
-end
-COM_AddCommand("life", life)
-
 function ticsToTime(tics, pure)
 	if tics == 0 and pure then
 		return "-:--:--"
@@ -581,117 +675,12 @@ function ticsToTime(tics, pure)
 
 	return string.format(
 		"%d:%02d:%02d",
-		G_TicsToMinutes(tics),
+		G_TicsToMinutes(tics, true),
 		G_TicsToSeconds(tics),
 		G_TicsToCentiseconds(tics)
 	)
 end
 
-local function ticLife()
-	local neigh = {}
-	local new = {}
-
-	for x, t in pairs(LIFE) do
-		for y, v in pairs(t) do
-			neigh[x-1] = $ or {}
-			neigh[x] = $ or {}
-			neigh[x+1] = $ or {}
-
-			neigh[x-1][y-1] = $ and $ + 1 or 1
-			neigh[x-1][y] = $ and $ + 1 or 1
-			neigh[x-1][y+1] = $ and $ + 1 or 1
-
-			neigh[x][y-1] = $ and $ + 1 or 1
-			neigh[x][y+1] = $ and $ + 1 or 1
-
-			neigh[x+1][y-1] = $ and $ + 1 or 1
-			neigh[x+1][y] = $ and $ + 1 or 1
-			neigh[x+1][y+1] = $ and $ + 1 or 1
-
-		end
-	end
-
-	for x, t in pairs(neigh) do
-		if x >= 0 and x * cellSize < 320 then
-			for y, v in pairs(t) do
-				if y >= 0 and y * cellSize < 200 then
-					-- 3 neighbours dead cell
-					if v == 3 and (LIFE[x] == nil or LIFE[x][y] == nil) then
-						new[x] = $ or {}
-						new[x][y] = true
-					elseif v >= 2 and v <= 3 and (LIFE[x] and LIFE[x][y] != nil) then
-						new[x] = $ or {}
-						new[x][y] = true
-					end
-				end
-			end
-		end
-	end
-
-	LIFE = new
-end
-
-local function drawLife(v, player)
-	for x, t in pairs(LIFE) do
-		for y, _ in pairs(t) do
-			v.drawScaled(
-				x * cellSize * FRACUNIT,
-				y * cellSize * FRACUNIT,
-				FixedDiv(cellSize * FRACUNIT, 16 * FRACUNIT),
-				PATCH["FACERANK"][faceranks[((x + y) % #faceranks) + 1]],
-				0,
-				v.getColormap("sonic", player.skincolor)
-			)
-		end
-	end
-end
-
-local function spawnDvd(p)
-	local size = (((p + leveltime) % 3) + 1) * 16
-	local rank = (#faceranks and faceranks[((p + leveltime) % #faceranks) + 1]) or "sonic"
-	local d = {
-		["x"] = max(((p + leveltime % 320) - size), 0) * FRACUNIT,
-		["y"] = max(((p + leveltime % 200) - size), 0) * FRACUNIT,
-		["xvel"] = (((p + leveltime) % 7) + 1) * FRACUNIT / 2,
-		["yvel"] = (((p + leveltime) % 5) + 1) * FRACUNIT / 2,
-		["rank"] = rank,
-		["color"] = ((p + leveltime) % MAXSKINCOLORS - 1) + 1,
-		["size"] = size,
-	}
-
-	table.insert(dvd, d)
-end
-
-local function ticDvd()
-	for i, d in ipairs(dvd) do
-		d.x = $ + d.xvel
-		d.y = $ + d.yvel
-
-		if d.x < 0 or d.x + d.size * FRACUNIT > 320 * FRACUNIT then
-			d.xvel = -$
-			clamp(0, d.x, 320 * FRACUNIT)
-		end
-
-		if d.y < 0 or d.y + d.size * FRACUNIT > 200 * FRACUNIT then
-			d.yvel = -$
-			clamp(0, d.y, 200 * FRACUNIT)
-		end
-	end
-end
-
-local function drawDvd(v, player)
-	for i, d in ipairs(dvd) do
-		v.drawScaled(
-			d.x,
-			d.y,
-			FixedDiv(d.size * FRACUNIT, 16 * FRACUNIT),
-			PATCH["FACERANK"][d.rank],
-			0,
-			v.getColormap("sonic", d.color)
-		)
-	end
-end
-
 -- Item patches have the amazing property of being displaced 12x 13y pixels
 local iXoffset = 13 * FRACUNIT
 local iYoffset = 12 * FRACUNIT
@@ -705,6 +694,20 @@ local function drawitem(v, x, y, scale, itempatch, vflags)
 	)
 end
 
+local modePatches = {
+	[F_SPBATK] = "SPB",
+	[F_SPBJUS] = "HYUD",
+	[F_SPBBIG] = "BIG",
+	[F_SPBEXP] = "INV"
+}
+
+local function modePatch(flag)
+	if flag == F_SPBEXP then
+		return PATCH[modePatches[flag]][(leveltime / 4) % 6]
+	end
+	return PATCH[modePatches[flag]]
+end
+
 local cursors = {
 	[1] = ". ",
 	[2] = " ."
@@ -751,12 +754,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
@@ -765,7 +781,7 @@ local function drawScore(v, player, pos, x, y, gui, faceRank, score, drawPos, te
 			x - 2,
 			y - 2,
 			scale,
-			PATCH["SPB"],
+			modePatch(F_SPBATK),
 			V_HUDTRANS | VFLAGS
 		)
 		if score["flags"] & F_SPBEXP then
@@ -774,7 +790,7 @@ local function drawScore(v, player, pos, x, y, gui, faceRank, score, drawPos, te
 				x + FACERANK_DIM - 4,
 				y - 2,
 				scale,
-				PATCH["INV"][(leveltime / 4) % 6],
+				modePatch(F_SPBEXP),
 				V_HUDTRANS | VFLAGS
 			)
 		end
@@ -784,7 +800,7 @@ local function drawScore(v, player, pos, x, y, gui, faceRank, score, drawPos, te
 				x - 2,
 				y + FACERANK_DIM - 4,
 				scale,
-				PATCH["BIG"],
+				modePatch(F_SPBBIG),
 				V_HUDTRANS | VFLAGS
 			)
 		end
@@ -794,7 +810,7 @@ local function drawScore(v, player, pos, x, y, gui, faceRank, score, drawPos, te
 				x + FACERANK_DIM - 4,
 				y + FACERANK_DIM - 4,
 				scale,
-				PATCH["HYUD"],
+				modePatch(F_SPBJUS),
 				V_HUDTRANS | VFLAGS
 			)
 		end
@@ -805,15 +821,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 = score["skin"] and 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"]
 
@@ -903,10 +922,10 @@ local function drawScroll(v, player, scoreTable, gui)
 		local x = 10
 		if #scoreTable >= 10 then
 			x = x + 8
-		end
 			if #scoreTable >= 100 then
 				x = x + 8
 			end
+		end
 
 		local y = FixedInt(scrollY)
 
@@ -943,17 +962,20 @@ local stateFunctions = {
 	[DS_SCRLTO] = drawScrollTo
 }
 
+-- Draw mode and return pos + 1 if success
+local function drawMode(v, pos, flag)
+	if not (Flags & flag) then return pos end
+
+	drawitem(v, pos * 6 + 1, 194, FRACUNIT / 4, modePatch(flag), V_SNAPTOBOTTOM | V_SNAPTOLEFT)
+	return pos + 1
+end
+
 local function drawScoreboard(v, player)
 	if disable then return end
 	if player != displayplayers[0] then return end
 
 	cachePatches(v)
 
-	drawLife(v, player)
-	drawDvd(v, player)
-	
-	local scoreTable = getScoreTable(gamemap, Flags)
-
 	local gui = cv_gui.value
 	if leveltime < START_TIME or player.exiting or player.lives == 0 then
 		gui = GUI_ON
@@ -962,6 +984,12 @@ local function drawScoreboard(v, player)
 	if gui then
 		stateFunctions[drawState](v, player, scoreTable, gui)
 	end
+
+	local pos = 0
+	-- Draw current active modes bottom left
+	pos = drawMode(v, pos, F_SPBJUS)
+	pos = drawMode(v, pos, F_SPBBIG)
+	pos = drawMode(v, pos, F_SPBEXP)
 end
 hud.add(drawScoreboard, "game")
 
@@ -979,7 +1007,6 @@ function cachePatches(v)
 		PATCH["FACERANK"] = {}
 		for skin in skins.iterate do
 			PATCH["FACERANK"][skin.name] = v.cachePatch(skin.facerank)
-			table.insert(faceranks, skin.name)
 		end
 
 		PATCH["SPB"] = v.cachePatch("K_ISSPB")
@@ -989,22 +1016,13 @@ function cachePatches(v)
 		end
 		PATCH["BIG"] = v.cachePatch("K_ISGROW")
 		PATCH["HYUD"] = v.cachePatch("K_ISHYUD")
+		PATCH["RUBY"] = v.cachePatch("RUBYICON")
 	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 {}
+	local m = scoreTable or {}
 
 	scrollToPos = 2
 	for pos, score in ipairs(m) do
@@ -1017,9 +1035,26 @@ function scroll_to(player)
 	drawState = DS_SCRLTO
 end
 
-local function saveTime(player)
+-- Write skin stats to each score where there are none
-	local scoreTable = getScoreTable(gamemap, Flags) or {}
+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)
+
+	scoreTable =  $ or {}
+
+	local pskin = skins[player.mo.skin]
 	local newscore = score_t(
 		gamemap,
 		player.name,
@@ -1028,7 +1063,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
@@ -1062,6 +1097,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)
@@ -1079,7 +1119,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
@@ -1098,10 +1138,6 @@ end
 
 local function regLap(player)
 	if player.laps > prevLap and timeFinished == 0 then
-		spawnCells(1000)
-		for i = 0,player.laps * 3 do
-			spawnDvd((i + 1) + 7)
-		end
 		prevLap = player.laps
 		table.insert(splits, player.realtime)
 		showSplit = 5 * TICRATE
@@ -1123,12 +1159,19 @@ local function think()
 	end
 
 	if disable then
-		if cv_afk.value and ingame() > 1 then
+		if AntiAFK then
+			if ingame() > 1 then
 				for p in players.iterate do
 					if p.valid and not p.spectator and not p.exiting and p.lives > 0 then
 						if p.cmd.buttons then
 							p.afkTime = leveltime
 						end
+
+						--Away from kart
+						if p.afkTime + AFK_BALANCE_WARN == leveltime then
+							chatprintf(p, "[AFK] \x89You will be moved to spectator in 10 seconds!", false)
+							S_StartSound(nil, 26, p)
+						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)
@@ -1142,6 +1185,7 @@ local function think()
 					end
 				end
 			end
+		end
 
 		help = true
 		return
@@ -1149,12 +1193,6 @@ local function think()
 
 	showSplit = max(0, showSplit - 1)
 
-	if leveltime % 10 == 0 then
-		ticLife()
-	end
-
-	ticDvd()
-
 	local p = getGamer()
 	if leveltime < START_TIME then
 		-- Help message
@@ -1170,7 +1208,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
@@ -1189,14 +1233,14 @@ local function think()
 			end
 			if clearcheats then
 				clearcheats = false
-				for p in players.iterate do
+				for q in players.iterate do
-					p.SPBAKARTBIG = false
+					q.SPBAKARTBIG = false
-					p.SPBAjustice = false
+					q.SPBAjustice = false
-					p.SPBAshutup = false
+					q.SPBAshutup = false
 				end
 			end
-			for p in players.iterate do
+
-				if not p.spectator then
+			if p then
 				if p.SPBAKARTBIG then
 					Flags = $ | F_SPBBIG
 				end
@@ -1204,14 +1248,19 @@ local function think()
 					Flags = $ | F_SPBJUS
 				end
 			end
-			end
+
 		end
 		if not (Flags & F_SPBATK) then
 			hud.enable("freeplay")
 		end
 	end
 
-	local cv_teamchange = CV_FindVar("allowteamchange")
+	scoreTable = getScoreTable(gamemap, Flags)
+
+	if not cv_teamchange then
+		cv_teamchange = CV_FindVar("allowteamchange")
+	end
+
 	if p then
 		-- Scroll controller
 		-- Spectators can't input buttons so let the gamer do it
@@ -1236,6 +1285,7 @@ local function think()
 			p.afkTime = leveltime
 		end
 
+		if not replayplayback then
 			if leveltime > PREVENT_JOIN_TIME and p.afkTime + AFK_TIMEOUT > leveltime then
 				if cv_teamchange.value then
 					allowJoin(false)
@@ -1245,6 +1295,7 @@ local function think()
 					allowJoin(true)
 				end
 			end
+		end
 
 		if p.laps >= mapheaderinfo[gamemap].numlaps and timeFinished == 0 then
 			timeFinished = p.realtime
@@ -1262,11 +1313,17 @@ local function interThink()
 		COM_BufInsertText(server, "map " + nextMap)
 		nextMap = nil
 	end
-	if not CV_FindVar("allowteamchange").value then
+
+	if not cv_teamchange then
+		cv_teamchange = CV_FindVar("allowteamchange")
+	end
+
+	if not cv_teamchange.value then
 		allowJoin(true)
 	end
 end
 addHook("IntermissionThinker", interThink)
+addHook("VoteThinker", interThink)
 
 -- Returns the values clamed between min, max
 function clamp(min_v, v, max_v)
@@ -1274,9 +1331,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)