Sync

LuaMenu/configs/gameConfig/zk/ModOptions.lua

@@ -1,4 +1,3 @@
-
 -- $Id: ModOptions.lua 4642 2009-05-22 05:32:36Z carrepairer $
 
 
@@ -83,7 +82,7 @@ local options = {
 			{ key='none', name = "Off", desc = 'Turns commsharing off.' },
 		},
 	},
-	
+
   {
     key = "noelo",
     name = "No Elo",
@@ -563,7 +562,6 @@ local options = {
 --    --  }
 --    },
 --  },
-
   {
     key    = 'chicken',
     name   = 'Chicken',

LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitEconomist/stable/config/behaviour.json

@@ -555,7 +555,7 @@
 	},
 	"hoverraid": {
 		"role": ["raider"],
-		"attribute": ["melee","scout"],		
+		"attribute": ["melee","scout"],
 		"pwr_mod": 0.9,
 		"pwr_mod": 0.8,
 		"limit": 20,

LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitEconomist/stable/config/build_chain.json

@@ -190,4 +190,4 @@
 		}
 	}
 }
-}
+}

LuaMenu/configs/gameConfig/zk/defaultSettings/AI/Skirmish/DevCircuitEconomist/stable/config/commander.json

@@ -376,4 +376,4 @@
 		}
 	}
 }
-} 
+}

LuaMenu/widgets/api_battle_proposal_handler.lua

@@ -48,15 +48,15 @@ local function CheckCancelProposal(message)
 		})
 	end
 	currentProposal = nil
-	
+
 	return true
 end
 
 local function GetProposalFromString(message)
 	if string.sub(message, 1, 1) ~= "!" or string.sub(message, 1, 14) ~= "!proposebattle"then
 		return false
 	end
-	
+
 	local data = message:split(" ")
 	local paramValues = {}
 	for i = 1, #data do
@@ -69,14 +69,14 @@ local function GetProposalFromString(message)
 			end
 		end
 	end
-	
+
 	local proposalValues = {
 		minelo = paramValues[1] or false,
 		maxelo = paramValues[2] or false,
 		minsize = math.max(1, math.floor(paramValues[3] or 4)),
 	}
 	proposalValues.maxsize = math.max(proposalValues.minsize, paramValues[4] or 8)
-	
+
 	return true, proposalValues
 end
 
@@ -91,12 +91,12 @@ local function CheckProposalSent(prop)
 		})
 		return false
 	end
-	
+
 	currentProposal = prop
-	
+
 	currentProposal.currentPlayers = 1
 	currentProposal.acceptedPlayers = {}
-	
+
 	Chotify:Post({
 		title = "Battle Proposal",
 		body = "New proposal sent.\nUse !endproposal to cancel.",
@@ -121,17 +121,17 @@ function BattleProposalHandler.AddClickableInvites(userName, preMessage, message
 	if myProposal and CheckCancelProposal(message) then
 		return onTextClick, textTooltip
 	end
-	
+
 	local hasProposal, prop = GetProposalFromString(message)
 	if not hasProposal then
 		return onTextClick, textTooltip
 	end
-	
+
 	local myInfo = WG.LibLobby.lobby:GetMyInfo()
 	local effectiveSkill = math.max(myInfo.skill or 1500, myInfo.casualSkill or 1500)
 	local skillTooLow = (prop.minelo and effectiveSkill < prop.minelo)
 	local skillTooHigh = (prop.maxelo and effectiveSkill > prop.maxelo)
-	
+
 	if myProposal then
 		if skillTooLow then
 			Chotify:Post({
@@ -146,13 +146,13 @@ function BattleProposalHandler.AddClickableInvites(userName, preMessage, message
 			})
 			return onTextClick, textTooltip
 		end
-		
+
 		CheckProposalSent(prop)
 	end
-	
+
 	local startIndex = string.len(preMessage)
 	local endIndex = startIndex + string.len(message) + 1
-	
+
 	if not (skillTooLow or skillTooLow) then
 		onTextClick[#onTextClick + 1] = {
 			startIndex = startIndex,
@@ -171,7 +171,7 @@ function BattleProposalHandler.AddClickableInvites(userName, preMessage, message
 			}
 		}
 	end
-	
+
 	local proposalString
 	if skillTooLow then
 		proposalString = "Your skill rating is too low for this proposal."
@@ -191,7 +191,7 @@ function BattleProposalHandler.AddClickableInvites(userName, preMessage, message
 		end
 		proposalString = proposalString .. "\nA battle will open when " .. prop.minsize .. " players accept."
 	end
-	
+
 	textTooltip[#textTooltip + 1] = {
 		startIndex = startIndex,
 		endIndex = endIndex,
@@ -223,7 +223,7 @@ function DelayedInitialize()
 		if (currentProposal.minelo and effectiveSkill < currentProposal.minelo) or (currentProposal.maxelo and effectiveSkill > currentProposal.maxelo) then
 			return
 		end
-		
+
 		if currentProposal.battleHostComplete then
 			lobby:BattleProposalBattleInvite(userName, currentProposal.battleID, currentProposal.password)
 			Chotify:Post({
@@ -232,14 +232,14 @@ function DelayedInitialize()
 			})
 			return
 		end
-		
+
 		currentProposal.currentPlayers = currentProposal.currentPlayers + 1
 		currentProposal.acceptedPlayers[userName] = true
 		Chotify:Post({
 			title = "Battle Proposal",
 			body = userName .. " accepted.\nPlayers: " .. currentProposal.currentPlayers .. "/" .. currentProposal.minsize,
 		})
-		
+
 		if currentProposal.currentPlayers >= currentProposal.minsize and not currentProposal.openingBattleName then
 			-- Check for users leaving
 			for acceptedUserName, _ in pairs(currentProposal.acceptedPlayers) do
@@ -249,7 +249,7 @@ function DelayedInitialize()
 					currentProposal.currentPlayers = currentProposal.currentPlayers - 1
 				end
 			end
-			
+
 			-- Host the battle
 			if currentProposal.currentPlayers >= currentProposal.minsize then
 				WG.BattleRoomWindow.LeaveBattle()
@@ -272,7 +272,7 @@ function DelayedInitialize()
 		if battleInfo.title ~= currentProposal.openingBattleName then
 			return
 		end
-		
+
 		for acceptedUserName, _ in pairs(currentProposal.acceptedPlayers) do
 			lobby:BattleProposalBattleInvite(acceptedUserName, battleID, currentProposal.password)
 		end
@@ -294,7 +294,7 @@ function DelayedInitialize()
 			body = "Joining " .. userName .. "'s battle",
 		})
 	end
-	
+
 	lobby:AddListener("OnBattleProposalResponse", OnBattleProposalResponse)
 	lobby:AddListener("OnJoinedBattle", OnJoinedBattle)
 	lobby:AddListener("OnBattleProposalBattleInvite", OnBattleProposalBattleInvite)

LuaMenu/widgets/api_chili.lua

@@ -107,14 +107,14 @@ function widget:DrawScreen()
 		gl.PopMatrix()
 	end
 	gl.Color(1,1,1,1)
-	
+
 	if loadFade then
 		local vsx,vsy = gl.GetViewSizes()
 		gl.Color(1,1,1,loadFade)
 		gl.Texture(loadTex)
 		gl.TexRect(0,0,vsx,vsy)
 		gl.Color(1,1,1,1)
-		
+
 		if not hideInterface then
 			loadFade = loadFade - 0.18
 			if loadFade <= 0 then

LuaMenu/widgets/api_download_handler.lua

@@ -18,7 +18,7 @@ local externalFunctions = {}
 local listeners = {}
 local wrapperFunctions = {}
 
-local downloadQueue = {} -- {name, fileType, priority, id}
+local downloadQueue = {} -- {name, fileType, priority, id, retryCount}
 local downloadCount = 0
 local topPriority = 0
 local removedDownloads = {}
@@ -191,6 +191,15 @@ local function RemoveDownload(name, fileType, putInRemoveList, removalType)
 	end
 	downloadQueue[index] = downloadQueue[#downloadQueue]
 	downloadQueue[#downloadQueue] = nil
+
+	if putInRemoveList and removalType == "fail" and WG.Chobby.Configuration.downloadRetryCount then
+		local lastFailed = removedDownloads[#removedDownloads]
+		if  lastFailed.retryCount < WG.Chobby.Configuration.downloadRetryCount then
+			Spring.Echo("Downloading of ", name, fileType, "failed, retryCount=", lastFailed.retryCount)
+			lastFailed.retryCount = lastFailed.retryCount + 1
+			externalFunctions.RetryDownload(name,fileType)
+		end
+	end
 	requestUpdate = true
 	return true
 end
@@ -225,6 +234,7 @@ function externalFunctions.QueueDownload(name, fileType, priority)
 		fileType = fileType,
 		priority = priority,
 		id = downloadCount,
+		retryCount = 0,
 	}
 	requestUpdate = true
 	CallListeners("DownloadQueued", downloadCount, name, fileType)

LuaMenu/widgets/api_limit_fps.lua

@@ -101,7 +101,7 @@ function widget:AllowDraw()
 		framesInBuffer = oldFramesInBuffer + 1
 		return true
 	end
-	
+
 	return false
 end