Merge pull request 'Add level selector / leaderboard browser' (#7) from browser into master

browser.lua

@@ -12,6 +12,8 @@ local ZoneAct = lb_ZoneAct
 local TicsToTime = lb_TicsToTime
 -----------------------------
 
+local cv_kartencore
+
 local function mapIndexOffset(n)
 	return (mapIndex + n + #maps - 1) % #maps + 1
 end
@@ -53,6 +55,7 @@ local mappY = 26
 local ttlY = mappY + FixedMul(30, FRACUNIT / scalar)
 local scoresY =  ttlY + 16
 
+local sin = sin
 local function drawMapPatch(v, offset)
 	local scale = FRACUNIT / (abs(offset) + scalar)
 	local mapName = G_BuildMapName(getMap(offset))
@@ -68,6 +71,26 @@ local function drawMapPatch(v, offset)
 		scale,
 		mapp
 	)
+
+end
+
+local function drawEncore(v)
+	if not cv_kartencore then
+		cv_kartencore = CV_FindVar("kartencore")
+	end
+
+	if not cv_kartencore.value then
+		return
+	end
+
+	local rubyp = v.cachePatch("RUBYICON")
+	local bob = sin(leveltime * ANG10) * 2
+	v.drawScaled(
+		hlfScrnWdth * FRACUNIT,
+		mappY * FRACUNIT + bob,
+		FRACUNIT,
+		rubyp
+	)
 end
 
 local colors = {
@@ -181,7 +204,7 @@ local function drawGamemode(v)
 		end
 
 		if m & F_SPBEXP then
-			local invp = v.cachePatch("K_ITINV"..(leveltime / 6 % 7 + 1))
+			local invp = v.cachePatch("K_ITINV"..(leveltime / 3 % 7 + 1))
 			v.drawScaled(
 				modeX * FRACUNIT - scaledHalf + xoff,
 				modeY * FRACUNIT - scaledHalf,
@@ -236,7 +259,7 @@ local function drawFlags(v, x, y, flags)
 			nx = $ + margin
 		end
 		if flags & F_SPBEXP then
-			local invp = v.cachePatch("K_ISINV"..(leveltime / 6 % 6 + 1))
+			local invp = v.cachePatch("K_ISINV"..(leveltime / 3 % 6 + 1))
 			v.drawScaled(nx, ny, scale, invp)
 			nx = $ + margin
 		end
@@ -281,7 +304,7 @@ local colorFlags = {
 	[0] = V_SKYMAP,
 	[1] = 0
 }
-local function drawScore(v, i, pos, score)
+local function drawScore(v, i, pos, score, highlight)
 	local y = scoresY + i * 18
 	local textFlag = colorFlags[pos%2]
 
@@ -293,6 +316,13 @@ local function drawScore(v, i, pos, score)
 	local facerank = skin and v.cachePatch(skin.facerank) or v.cachePatch("M_NORANK")
 	v.draw(column[1], y, facerank, 0, v.getColormap("sonic", score["color"]))
 
+	-- chili
+	if highlight then
+		local chilip = v.cachePatch("K_CHILI"..leveltime/4%8+1)
+		v.draw(column[1], y, chilip)
+		textFlag = V_YELLOWMAP
+	end
+
 	-- stats
 	drawStats(v, column[1], y, score["skin"], score["stat"])
 	-- name
@@ -303,7 +333,7 @@ local function drawScore(v, i, pos, score)
 	drawFlags(v, column[4], y, score["flags"])
 end
 
-local function drawBrowser(v)
+local function drawBrowser(v, player)
 	if not leaderboard then return end
 
 	v.fadeScreen(0xFF00, 16)
@@ -319,6 +349,7 @@ local function drawBrowser(v)
 
 	-- current map
 	drawMapPatch(v, 0)
+	drawEncore(v)
 	drawMapStrings(v)
 	drawGamemode(v)
 
@@ -334,7 +365,7 @@ local function drawBrowser(v)
 	scrollPos = max(min(scrollPos, scores - 3), 1)
 	local endi = min(scrollPos + 7, scores)
 	for i = scrollPos, endi do
-		drawScore(v, i - scrollPos + 1, i, scoreTable[i])
+		drawScore(v, i - scrollPos + 1, i, scoreTable[i], scoreTable[i].name == player.name)
 	end
 end
 rawset(_G, "DrawBrowser", drawBrowser)
@@ -395,6 +426,8 @@ local function resetKeyRepeat()
 	repeatCount = 0
 end
 
+local ValidButtons = BT_ACCELERATE | BT_BRAKE | BT_FORWARD | BT_BACKWARD | BT_DRIFT | BT_ATTACK
+
 -- return value indicates we want to exit the browser
 local function controller(player)
 	keyRepeat = max(0, $ - 1)
@@ -405,32 +438,38 @@ local function controller(player)
 
 	local cmd = player.cmd
 	if not keyRepeat then
-		if cmd.driftturn > 0 then
+		if not (cmd.buttons & ValidButtons or cmd.driftturn) then
-			updateMapIndex(-1)
+			return
-			updateKeyRepeat()
+		end
-		elseif cmd.driftturn < 0 then
+
-			updateMapIndex(1)
 		updateKeyRepeat()
+
+		if cmd.buttons & BT_BRAKE then
+			S_StartSound(nil, 115)
+			return true
+		elseif cmd.buttons & BT_ACCELERATE then
+			COM_BufInsertText(player, "changelevel "..G_BuildMapName(maps[mapIndex]))
+			return true
+		elseif cmd.buttons & BT_ATTACK then
+			COM_BufInsertText(player, "encore")
+		elseif cmd.driftturn then
+			local dir = cmd.driftturn > 0 and -1 or 1
+
+			if encoremode then
+				updateMapIndex(-dir)
+			else
+				updateMapIndex(dir)
+			end
 		elseif cmd.buttons & BT_FORWARD then
 			scrollPos = $ - 1
-			updateKeyRepeat()
 		elseif cmd.buttons & BT_BACKWARD then
 			scrollPos = $ + 1
-			updateKeyRepeat()
 		elseif cmd.buttons & BT_DRIFT then
 			scrollPos = 1
 			if modes and #modes then
 				mode = $ % #modes + 1
 				prefMode = modes[mode]
 			end
-			updateKeyRepeat()
-		elseif cmd.buttons & BT_BRAKE then
-			S_StartSound(nil, 115)
-			return true
-		elseif cmd.buttons & BT_ACCELERATE then
-			S_StartSound(nil, 143)
-			COM_BufInsertText(player, "changelevel "..G_BuildMapName(maps[mapIndex]))
-			return true
 		end
 	end
 end

leaderboard.lua

@@ -863,7 +863,7 @@ local modePatches = {
 
 local function modePatch(flag)
 	if flag == F_SPBEXP then
-		return PATCH[modePatches[flag]][(leveltime / 4) % 6]
+		return PATCH[modePatches[flag]][(leveltime / 3) % 6]
 	end
 	return PATCH[modePatches[flag]]
 end
@@ -1122,7 +1122,7 @@ local function drawScrollTo(v, player, scoreTable, gui)
 end
 
 local function drawBrowser(v, player)
-	DrawBrowser(v, lb)
+	DrawBrowser(v, player)
 end
 
 local stateFunctions = {