Merge branch 'master' of https://github.com/beyond-all-reason/BYAR-Ch…

…obby

LuaMenu/configs/gameConfig/byar/mapDetails.lua

@@ -172,7 +172,7 @@ return {
 ['Stronghold v5.0.1']={Width=16, Height=16, Is1v1=nil, IsTeam=1, IsFFA=1, IsCertified=1, Special=nil, Flat=1, Hills=1, Water=nil, IsInPool=1, PlayerCount='16', TeamCount='2', Author='Nikuksis, Beherith', InfoText=nil, LastUpdate=1718014501},
 ['Sulphur Springs v1.1']={Width=24, Height=24, Is1v1=nil, IsTeam=1, IsFFA=nil, IsCertified=1, Special='West vs South', Flat=1, Hills=nil, Water=1, IsInPool=1, PlayerCount='16', TeamCount='2', Author='Nikuksis', InfoText='West vs South team game map. A lot of hot geysers spread here.', LastUpdate=1683982264},
 ['Sunderance V1.3']={Width=16, Height=16, Is1v1=1, IsTeam=1, IsFFA=nil, IsCertified=1, Special=nil, Flat=1, Hills=1, Water=nil, IsInPool=1, PlayerCount='16', TeamCount='4', Author='Moose', InfoText='Rugged mountains and grassy plains.', LastUpdate=1683982309},
-['Supreme Isthmus v1.8']={Width=24, Height=24, Is1v1=nil, IsTeam=1, IsFFA=nil, IsCertified=1, Special=nil, Flat=1, Hills=1, Water=1, IsInPool=1, PlayerCount='16', TeamCount='2', Author='Nikuksis', InfoText='24x24 BAR remake of a famous map.', LastUpdate=1720560055},
+['Supreme Isthmus Winter v1.8.1']={Width=24, Height=24, Is1v1=nil, IsTeam=1, IsFFA=nil, IsCertified=1, Special=nil, Flat=1, Hills=1, Water=1, IsInPool=1, PlayerCount='16', TeamCount='2', Author='Nikuksis', InfoText='Merry Christmas and Happy New 2025!', LastUpdate=1733249869},
 ['Supreme_Crossing 2.2']={Width=16, Height=16, Is1v1=nil, IsTeam=1, IsFFA=nil, IsCertified=1, Special=nil, Flat=1, Hills=nil, Water=1, IsInPool=1, PlayerCount='8', TeamCount='2', Author='IceXuick', InfoText='A slightly different eroded map', LastUpdate=1683982289},
 ['Supreme_Crossing_V1']={Width=16, Height=16, Is1v1=nil, IsTeam=1, IsFFA=nil, IsCertified=1, Special=nil, Flat=1, Hills=nil, Water=1, IsInPool=1, PlayerCount='8', TeamCount='2', Author='Beherith', InfoText=nil, LastUpdate=1683982319},
 ['Swirly Rock v1.1']={Width=24, Height=16, Is1v1=nil, IsTeam=1, IsFFA=nil, IsCertified=1, Special=nil, Flat=nil, Hills=1, Water=nil, IsInPool=1, PlayerCount='16', TeamCount='2', Author='Nikuksis', InfoText='Large valley to swirl your way to victory.', LastUpdate=1690392567},

LuaMenu/configs/gameConfig/byar/savedBoxes.dat

@@ -252,7 +252,7 @@ Stronghold v5.0.1.smf:4|0 0 70 70;130 130 200 200;0 130 70 200;130 0 200 70
 Sulphur Springs v1.1.smf:2|56 167 200 200;0 0 31 147
 Sunderance V1.3.smf:2|0 0 200 40;0 160 200 200
 Sunderance V1.3.smf:4|0 0 40 40;160 160 200 200;0 160 40 200;160 0 200 40
-Supreme Isthmus v1.8.smf:2|0 120 80 200;120 0 200 80
+Supreme Isthmus Winter v1.8.1.smf:2|0 120 80 200;120 0 200 80
 Supreme_Crossing 2.2.smf:2|0 120 80 200;120 0 200 80
 Supreme_Crossing_V1.smf:2|0 120 80 200;120 0 200 80
 Swirly Rock v1.1.smf:2|0 0 50 200;150 0 200 200

LuaMenu/configs/gameConfig/byar/welcomePanelItems.lua

@@ -15,6 +15,18 @@ local welcomePanelItems = {
         Text = "Welcome back Commander. We hope you are ready for epic Singleplayer and Multiplayer battles. Check out our Discord and join the community!\n",
     },
 
+    {
+        Header = "Map Update: Supreme Isthmus Winter",
+        Text = " \n" .. " \n" .. "Supreme Isthmus has recieved a winter-themed update for Christmas from Nikuksis.",
+        Image = "LuaMenu/configs/gameConfig/byar/minimapOverride/Supreme_Isthmus_Winter_v1.8.1.jpg",
+    },
+
+    {
+        Header = "New Map: Cells",
+        Text = " \n" .. " \n" .. "An open desert with rocky ridges for 8v8 Teams. By RebelNode.",
+        Image = "LuaMenu/configs/gameConfig/byar/minimapOverride/Cells_1.2.jpg",
+    },
+
     {
         Header = "Now Available: BAR Guides",
         Text = "New to Beyond All Reason? Check out these new Guides on Discord written by Zeteo!" .. " \n" .. " \n",
@@ -27,12 +39,6 @@ local welcomePanelItems = {
         Text = "A comprehensive new system for saving and loading game configurations and modoptions. It supports current map, startboxes, modoptions, and AI team placement and configurations. You can access this dialog by clicking on the Option Presets button in the battle room. Thanks to jere500 for the contribution.",
     },
 
-    {
-        Header = "New Map: Claymore",
-        Text = " \n" .. " \n" .. "A volcanic island of black sand and sparse vegetation. 5-10-15 player FFA. By Moose and Beherith.",
-        Image = "LuaMenu/configs/gameConfig/byar/minimapOverride/Claymore_3.jpg",
-    },
-
     {
         Header = "New Official Trailer released, help us making it big!",
         Text = "We've just deployed a brand-new cinematic trailer, and we need your help to spread the word! We believe the strongest community is built through word-of-mouth, so we're counting on you to take Beyond All Reason to new heights. " .. " \n" .. " \n" .. "Watch the trailer, share it with your friends, and let’s make this a massive success together! \n",

LuaMenu/widgets/gui_optionpresets_panel.lua

@@ -137,22 +137,6 @@ local function applyPreset(presetName)
 			battleLobby:SayBattle("!nbTeams " .. presetMPBattleSettings["nbTeams"])
 		end
 
-		-- modoptions
-		currentModoptions = presetObj["Modoptions"]
-		if (currentModoptions ~= nil and enabledOptions["Modoptions"]) then
-			-- if multiplayer have to disable other modoptions first:
-			if (multiplayer) then
-				-- now apply the modoptions as the baseline
-				local combinedModoptions = multiplayerModoptions
-				for key, value in pairs(currentModoptions) do
-					multiplayerModoptions[key] = value
-				end
-				currentModoptions = combinedModoptions
-			end
-
-			battleLobby:SetModOptions(currentModoptions)
-		end
-
 		-- map
 		local presetMapName = presetObj["Map"]
 		if (presetMapName ~= nil and enabledOptions["Map"]) then
@@ -196,6 +180,27 @@ local function applyPreset(presetName)
 					battlestatusoptions)
 			end
 		end
+
+		-- modoptions
+		currentModoptions = presetObj["Modoptions"]
+		if (currentModoptions ~= nil and enabledOptions["Modoptions"]) then
+			-- if multiplayer have to disable other modoptions first:
+			if (multiplayer) then
+				local isBoss = battle.bossed
+				if isBoss and isBoss == true then
+					-- now apply the modoptions as the baseline
+					local combinedModoptions = multiplayerModoptions
+					for key, value in pairs(currentModoptions) do
+						multiplayerModoptions[key] = value
+					end
+					currentModoptions = combinedModoptions
+				else
+					WG.Delay(function() battleLobby:SayBattleEx("tried to apply a preset containing modoptions, but was prevented due to not being boss") end, 1.5)
+					return
+				end
+			end
+			battleLobby:SetModOptions(currentModoptions)
+		end
 	end
 end