upstream -> zkch

LuaMenu/Addons/tablefunctions.lua

@@ -54,6 +54,22 @@ function Spring.Utilities.TableEqual(table1, table2)
 	return true
 end
 
+-- Returns whether the first table is equal to a subset of the second
+function Spring.Utilities.TableSubsetEquals(table1, table2)
+	if not table1 then
+		return true
+	end
+	if not table2 then
+		return false
+	end
+	for key, value in pairs(table1) do
+		if table2[key] ~= value then
+			return false
+		end
+	end
+	return true
+end
+
 function Spring.Utilities.TableToString(data)
 	 local str = ""
 

LuaMenu/Addons/timeFunctions.lua

@@ -0,0 +1,66 @@
+
+Spring.Utilities = Spring.Utilities or {}
+
+-------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------
+
+function Spring.Utilities.GetTimeToPast(pastTimeString, includeSeconds)
+	if (not pastTimeString) or (type(pastTimeString) ~= "string") then
+		return "??"
+	end
+
+	-- Example: 2016-07-21T14:49:00.4731696Z
+	local pastTime = {
+		string.sub(pastTimeString, 18, 19),
+		string.sub(pastTimeString, 15, 16),
+		string.sub(pastTimeString, 12, 13),
+		string.sub(pastTimeString, 9, 10),
+		--string.sub(pastTimeString, 6, 7),
+		--string.sub(pastTimeString, 0, 4),
+	}
+
+	for i = 1, #pastTime do
+		pastTime[i] = tonumber(pastTime[i])
+		if not pastTime[i] then
+			return "??"
+		end
+	end
+
+	local currentTime = {
+		tonumber(os.date("!%S")),
+		tonumber(os.date("!%M")),
+		tonumber(os.date("!%H")),
+		tonumber(os.date("!%d")),
+		--tonumber(os.date("!%m")),
+		--tonumber(os.date("!%Y")),
+	}
+
+	local pastSeconds = pastTime[1] + 60*(pastTime[2] + 60*pastTime[3])
+	local currentSeconds = currentTime[1] + 60*(currentTime[2] + 60*currentTime[3])
+	if currentTime[4] ~= pastTime[4] then
+		-- Always assume that the past time is one day behind.
+		currentSeconds = currentSeconds + 86400
+	end
+
+	local distanceSeconds = currentSeconds - pastSeconds
+	local hours = math.floor(distanceSeconds/3600)
+	local minutes = math.floor(distanceSeconds/60)%60
+	local seconds = math.floor(distanceSeconds)%60
+
+	--Spring.Echo("pastTime", pastTime[1], pastTime[2], pastTime[3], pastTime[4], "pastSeconds", pastSeconds)
+	--Spring.Echo("currentTime", currentTime[1], currentTime[2], currentTime[3], currentTime[4], "currentSeconds", currentSeconds)
+	--Spring.Echo("distanceSeconds", distanceSeconds)
+
+	local timeText = ""
+	if hours > 0 then
+		timeText = timeText .. hours .. "h "
+	end
+	if hours > 0 or minutes > 0 or (not includeSeconds) then
+		timeText = timeText .. minutes .. "m "
+	end
+	if includeSeconds then
+		timeText = timeText .. seconds .. "s "
+	end
+
+	return timeText
+end

LuaMenu/configs/gameConfig/zk/settingsMenu.lua

@@ -2,75 +2,90 @@ local settings = {
 	{
 		name = "Graphics",
 		presets = {
-			Minimal = {
-				WaterType = "Basic",
-				WaterQuality = "Low",
-				DeferredRendering = "Off",
-				Shadows = "None",
-				ShadowDetail = "Low",
-				ParticleLimit = "Minimal",
-				TerrainDetail = "Minimal",
-				VegetationDetail = "Minimal",
-				CompatibilityMode = "On",
-				AntiAliasing = "Off",
-				ShaderDetail = "Minimal",
-				FancySky = "Off",
+			{
+				name = "Minimal",
+				settings = {
+					WaterType = "Basic",
+					WaterQuality = "Low",
+					DeferredRendering = "Off",
+					Shadows = "None",
+					ShadowDetail = "Low",
+					ParticleLimit = "Minimal",
+					TerrainDetail = "Minimal",
+					VegetationDetail = "Minimal",
+					CompatibilityMode = "On",
+					AntiAliasing = "Off",
+					ShaderDetail = "Minimal",
+					FancySky = "Off",
+				}
 			},
-			Low = {
-				WaterType = "Bumpmapped",
-				WaterQuality = "Low",
-				DeferredRendering = "Off",
-				Shadows = "Units Only",
-				ShadowDetail = "Low",
-				ParticleLimit = "Low",
-				TerrainDetail = "Low",
-				VegetationDetail = "Low",
-				CompatibilityMode = "Off",
-				AntiAliasing = "Off",
-				ShaderDetail = "Low",
-				FancySky = "Off",
+			{
+				name = "Low",
+				settings = {
+					WaterType = "Bumpmapped",
+					WaterQuality = "Low",
+					DeferredRendering = "Off",
+					Shadows = "Units Only",
+					ShadowDetail = "Low",
+					ParticleLimit = "Low",
+					TerrainDetail = "Low",
+					VegetationDetail = "Low",
+					CompatibilityMode = "Off",
+					AntiAliasing = "Off",
+					ShaderDetail = "Low",
+					FancySky = "Off",
+				}
 			},
-			Medium = {
-				WaterType = "Bumpmapped",
-				WaterQuality = "Medium",
-				DeferredRendering = "On",
-				Shadows = "Units Only",
-				ShadowDetail = "Medium",
-				ParticleLimit = "Medium",
-				TerrainDetail = "Medium",
-				VegetationDetail = "Medium",
-				CompatibilityMode = "Off",
-				AntiAliasing = "Off",
-				ShaderDetail = "Medium",
-				FancySky = "Off",
+			{
+				name = "Medium",
+				settings = {
+					WaterType = "Bumpmapped",
+					WaterQuality = "Medium",
+					DeferredRendering = "On",
+					Shadows = "Units Only",
+					ShadowDetail = "Medium",
+					ParticleLimit = "Medium",
+					TerrainDetail = "Medium",
+					VegetationDetail = "Medium",
+					CompatibilityMode = "Off",
+					AntiAliasing = "Off",
+					ShaderDetail = "Medium",
+					FancySky = "Off",
+				}
 			},
-			High = {
-				WaterType = "Bumpmapped",
-				WaterQuality = "High",
-				DeferredRendering = "On",
-				Shadows = "Units and Terrain",
-				ShadowDetail = "Medium",
-				ParticleLimit = "High",
-				TerrainDetail = "High",
-				VegetationDetail = "High",
-				CompatibilityMode = "Off",
-				AntiAliasing = "Low",
-				ShaderDetail = "High",
-				FancySky = "Off",
+			{
+				name = "High",
+				settings = {
+					WaterType = "Bumpmapped",
+					WaterQuality = "High",
+					DeferredRendering = "On",
+					Shadows = "Units and Terrain",
+					ShadowDetail = "Medium",
+					ParticleLimit = "High",
+					TerrainDetail = "High",
+					VegetationDetail = "High",
+					CompatibilityMode = "Off",
+					AntiAliasing = "Low",
+					ShaderDetail = "High",
+					FancySky = "Off",
+				}
 			},
-			Ultra = {
-				WaterType = "Bumpmapped",
-				WaterQuality = "High",
-				DeferredRendering = "On",
-				Shadows = "Units and Terrain",
-				ShadowDetail = "Ultra",
-				ParticleLimit = "Ultra",
-				TerrainDetail = "Ultra",
-				VegetationDetail = "Ultra",
-				CompatibilityMode = "Off",
-				AntiAliasing = "High",
-				ShaderDetail = "Ultra",
-				FancySky = "On",
+			{
+				name = "Ultra",
+				settings = {
+					WaterType = "Bumpmapped",
+					WaterQuality = "High",
+					DeferredRendering = "On",
+					Shadows = "Units and Terrain",
+					ShadowDetail = "Ultra",
+					ParticleLimit = "Ultra",
+					TerrainDetail = "Ultra",
+					VegetationDetail = "Ultra",
+					CompatibilityMode = "Off",
+					AntiAliasing = "High",
+					ShaderDetail = "Ultra",
+					FancySky = "On",
+				}
 			},
 		},
 
@@ -458,6 +473,66 @@ local settings = {
 			},
 		},
 	},
+	{
+		name = "Interface",
+		presets = {
+			{
+				name = "Default",
+				settings = {
+					MouseZoomSpeed = 25,
+					IconDistance = 151,
+					MiddlePanSpeed = 10,
+					CameraPanSpeed = 10,
+				}
+			},
+		},
+		settings = {
+			{
+				name = "IconDistance",
+				humanName = "Icon Distance",
+				isNumberSetting = true,
+				applyName = "UnitIconDist",
+				minValue = 0,
+				maxValue = 10000,
+				springConversion = function(value)
+					return value
+				end,
+			},
+			{
+				name = "MouseZoomSpeed",
+				humanName = "Mouse Zoom Speed",
+				isNumberSetting = true,
+				applyName = "ScrollWheelSpeed",
+				minValue = 1,
+				maxValue = 500,
+				springConversion = function(value)
+					return value*-1
+				end,
+			},
+			{
+				name = "MiddlePanSpeed",
+				humanName = "Middle Click Pan Speed",
+				isNumberSetting = true,
+				applyName = "MiddleClickScrollSpeed",
+				minValue = 0,
+				maxValue = 1000,
+				springConversion = function(value)
+					return value*-1/2000
+				end,
+			},
+			{
+				name = "CameraPanSpeed",
+				humanName = "Camera Pan Speed",
+				isNumberSetting = true,
+				applyName = "OverheadScrollSpeed",
+				minValue = 0,
+				maxValue = 1000,
+				springConversion = function(value)
+					return value
+				end,
+			},
+		},
+	},
 }
 
 local settingsDefaults = {
@@ -473,6 +548,10 @@ local settingsDefaults = {
 	AntiAliasing = "Low",
 	ShaderDetail = "High",
 	FancySky = "Off",
+	MouseZoomSpeed = 25,
+	IconDistance = 151,
+	MiddlePanSpeed = 10,
+	CameraPanSpeed = 10,
 }
 
 return settings, settingsDefaults

LuaMenu/configs/gameConfig/zk/singleplayerMenu.lua

@@ -1,3 +1,16 @@
+
+-- Only show reasonably complete things in ZK mode
+if WG.Chobby.Configuration.singleplayer_mode == 2 then
+	return {
+		{
+			name = "skirmish", 
+			control = WG.BattleRoomWindow.GetSingleplayerControl(),
+			entryCheck = WG.BattleRoomWindow.SetSingleplayerGame,
+		},
+	}
+end
+
+-- Show everything in ZK Dev mode.
 return {
 	{
 		name = "quick_start",