Use MaxEvenPlayers and QueueOrder. Fixes #772.

Author: GoogleFrog

LuaMenu/widgets/gui_battle_room_window.lua

@@ -628,9 +628,9 @@ end
 local function SortPlayers(a, b)
 	local sA = battleLobby:GetUserBattleStatus(a.name)
 	local sB = battleLobby:GetUserBattleStatus(b.name)
-	--Spring.Echo("battleLobbybattleLobby", sA, (sA and sA.joinTime), (sB and sB.joinTime))
-	local joinA = (sA and sA.joinTime) or ""
-	local joinB = (sB and sB.joinTime) or ""
+	--Spring.Echo("battleLobbybattleLobby", sA, (sA and sA.queueOrder), (sB and sB.queueOrder))
+	local joinA = (sA and sA.queueOrder) or 0
+	local joinB = (sB and sB.queueOrder) or 0
 	return joinA < joinB
 end
 
@@ -825,7 +825,11 @@ local function SetupPlayerPanel(playerParent, spectatorParent, battle, battleID)
 
 			local function UpdatePlayerPositions()
 				local maxPlayers = (battleLobby:GetBattle(battleID) and battleLobby:GetBattle(battleID).maxPlayers) or 300
+				local maxEvenPlayers = (battleLobby:GetBattle(battleID) and battleLobby:GetBattle(battleID).maxEvenPlayers) or 0
 				table.sort(teamStack.children, SortPlayers)
+				if (#teamStack.children)%2 == 1 and #teamStack.children < maxEvenPlayers then
+					maxPlayers = #teamStack.children - 1
+				end
 				local position = 0
 				local waitingListPosition = false
 				for i = 1, #teamStack.children do
@@ -1006,6 +1010,10 @@ local function SetupPlayerPanel(playerParent, spectatorParent, battle, battleID)
 				PositionChildren(parentStack, parentScroll.height)
 			end
 
+			function teamData.UpdateMaxPlayers()
+				UpdatePlayerPositions()
+			end
+			
 			team[teamIndex] = teamData
 		end
 		return team[teamIndex]
@@ -1088,6 +1096,12 @@ local function SetupPlayerPanel(playerParent, spectatorParent, battle, battleID)
 		RemovePlayerFromTeam(botName)
 	end
 
+	function externalFunctions.UpdateMaxPlayers()
+		for teamIndex, teamData in pairs(team) do
+			teamData.UpdateMaxPlayers()
+		end
+	end
+
 	return externalFunctions
 end
 
@@ -1947,6 +1961,9 @@ local function InitializeControls(battleID, oldLobby, topPoportion, setupData)
 		end
 
 		infoHandler.UpdateBattleInfo(updatedBattleID, newInfo)
+		if newInfo.maxPlayers or newInfo.maxEvenPlayers then
+			playerHandler.UpdateMaxPlayers()
+		end
 	end
 
 	local function OnLeftBattle(listener, leftBattleID, userName)

libs/liblobby/lobby/interface_zerok.lua

@@ -990,6 +990,7 @@ function Interface:_BattleAdded(data)
 		port = header.Port,
 
 		maxPlayers = header.MaxPlayers,
+		maxEvenPlayers = header.MaxEvenPlayers,
 		passworded = (header.Password and header.Password ~= "" and true) or false,
 
 		engineName = "Spring " .. header.Engine,
@@ -1086,6 +1087,7 @@ function Interface:_BattleUpdate(data)
 
 	local battleInfo = {
 		maxPlayers = header.MaxPlayers,
+		maxEvenPlayers = header.MaxEvenPlayers,
 		passworded = password,
 
 		engineName = header.Engine,
@@ -1120,6 +1122,7 @@ function Interface:_UpdateUserBattleStatus(data)
 		teamNumber    = data.TeamNumber,
 		sync          = data.Sync,
 		joinTime      = data.JoinTime,
+		queueOrder    = data.QueueOrder,
 	}
 	if not data.Name then
 		Spring.Log(LOG_SECTION, LOG.ERROR, "_UpdateUserBattleStatus missing data.Name field")

libs/liblobby/lobby/lobby.lua

@@ -694,6 +694,7 @@ function Lobby:_OnBattleOpened(battleID, battle)
 		port = battle.port,
 
 		maxPlayers = battle.maxPlayers,
+		maxEvenPlayers = battle.maxEvenPlayers,
 		passworded = battle.passworded,
 
 		engineName = battle.engineName,
@@ -807,6 +808,7 @@ function Lobby:_OnUpdateBattleInfo(battleID, battleInfo)
 	end
 
 	battle.maxPlayers = battleInfo.maxPlayers or battle.maxPlayers
+	battle.maxEvenPlayers = battleInfo.maxEvenPlayers or battle.maxEvenPlayers
 	if battleInfo.passworded ~= nil then
 		battle.passworded = battleInfo.passworded
 	end
@@ -865,6 +867,7 @@ function Lobby:_OnUpdateUserBattleStatus(userName, status)
 	userData.owner      = status.owner or userData.owner
 	userData.teamColor  = status.teamColor or userData.teamColor
 	userData.joinTime   = status.joinTime or userData.JoinTime
+	userData.queueOrder = status.queueOrder or userData.queueOrder
 
 	status.allyNumber   = userData.allyNumber
 	status.teamNumber   = userData.teamNumber
@@ -875,6 +878,7 @@ function Lobby:_OnUpdateUserBattleStatus(userName, status)
 	status.owner        = userData.owner
 	status.teamColor    = userData.teamColor
 	status.joinTime     = userData.joinTime
+	status.queueOrder   = userData.queueOrder
 	self:_CallListeners("OnUpdateUserBattleStatus", userName, status)
 
 	if changedSpectator or changedAllyTeam then