Merge pull request #919 from AntlerForce/master

Gate Random to Singleplayer only too
beyond-all-reason · Feb 18, 2025 · e2f55bd · e2f55bd
2 parents 818b314 + c1d9cfe
commit e2f55bd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/LuaMenu/configs/gameConfig/byar/sidedata.lua b/LuaMenu/configs/gameConfig/byar/sidedata.lua
@@ -13,9 +13,11 @@ return {
 		name = "Legion",
 		logo = SIDEPICS_DIR .. "legion.png",
 		requiresModoption = "experimentallegionfaction",
+		singleplayerOnly = true,
 	},
 	{
 		name = "Random",
 		logo = SIDEPICS_DIR .. "random.png",
+		singleplayerOnly = true,
 	},
 }
diff --git a/LuaMenu/widgets/gui_side_change_window.lua b/LuaMenu/widgets/gui_side_change_window.lua
@@ -32,9 +32,11 @@ local function CreateSideChangeWindow(opts)
 	local modoptions = battleLobby.modoptions
 
 	for index, data in ipairs(sidedata) do
-		if not data.requiresModoption or (modoptions and modoptions[data.requiresModoption] == "1" and battleLobby.name == "singleplayer") then
-			factionMap[data.name] = index - 1
-			table.insert(factionNames, data.name)
+		if not data.requiresModoption or (modoptions and modoptions[data.requiresModoption] == "1") then
+			if not data.singleplayerOnly or battleLobby.name == "singleplayer" then
+				factionMap[data.name] = index - 1
+				table.insert(factionNames, data.name)
+			end
 		end
 	end
 

diff --git a/libs/liblobby/lobby/lobby.lua b/libs/liblobby/lobby/lobby.lua
@@ -1238,11 +1238,8 @@ function Lobby:_OnJoinedBattle(battleID, userName, scriptPassword)
 	end
 	if userName == self:GetMyUserName() then
 		local lastFaction = WG.Chobby.Configuration.lastFactionChoice
-		if lastFaction then
-			local sideData = WG.Chobby.Configuration:GetSideById(lastFaction)
-			if sideData and sideData.requiresModoption and (not self.modoptions or self.modoptions[sideData.requiresModoption] ~= "1") then
-				WG.Chobby.Configuration.lastFactionChoice = 0
-			end
+		if lastFaction and lastFaction > 1 then
+			WG.Chobby.Configuration.lastFactionChoice = 0
 		end
 	end
 	local found = false