Merge branch 'master' into ThornEel-new-campaign-scenario

Author: Thorneel

LuaMenu/configs/gameConfig/zk/ModOptions.lua

@@ -415,6 +415,14 @@ local options = {
     type    = "string",
     def     = "",
   },
+  {
+    key     = "tweakdefs",
+    name    = "Tweak Defs",
+    desc    = "A base64 encoded snippet of code that modifies game definitions.",
+    section = 'experimental',
+    type    = "string",
+    def     = "",
+  },
 --[[
   {
     key    = 'damagemult',
@@ -579,7 +587,6 @@ local options = {
       { key = 'Chicken: Custom', name = "Chicken: Custom", desc = 'Customize your chicken.' },
     },
   },
---[[ Broken, see gamseide ticket #3567
   {
     key = "playerchickens",
     name = "Players as chickens",
@@ -588,7 +595,6 @@ local options = {
     def = false,
     section = 'chicken',
   },
-]]
   {
     key	= "eggs",
     name = "Chicken Eggs",
@@ -738,6 +744,30 @@ local options = {
   },
 }
 
+for i = 1, 9 do
+	options[#options + 1] =  {
+		key     = "tweakunits" .. i,
+		name    = "Tweak Units " .. i,
+		desc    = "A base64 encoded lua table of unit parameters to change.",
+		section = 'experimental',
+		type    = "string",
+		def     = "",
+		noLobby = true,
+	}
+end
+
+for i = 1, 9 do
+	options[#options + 1] =  {
+		key     = "tweakdefs" .. i,
+		name    = "Tweak Defs " .. i,
+		desc    = "A base64 encoded snippet of code that modifies game definitions.",
+		section = 'experimental',
+		type    = "string",
+		def     = "",
+		noLobby = true,
+	}
+end
+
 --// add key-name to the description (so you can easier manage modoptions in springie)
 for i=1,#options do
   local opt = options[i]

LuaMenu/widgets/chobby/components/chat_windows.lua

@@ -605,6 +605,14 @@ function ChatWindows:RedactMessage(msg)
 			msg = string.sub(msg, 0, UserIDPos) .. "REDACTED" .. string.sub(msg, endPos)
 		end
 	end
+	local installIDPos = string.find(msg, [["InstallID":"]])
+	if installIDPos then
+		installIDPos = installIDPos + 12
+		local endPos = string.find(msg, [["]], installIDPos + 1)
+		if endPos then
+			msg = string.sub(msg, 0, installIDPos) .. "REDACTED" .. string.sub(msg, endPos)
+		end
+	end
 	return msg
 end
 

LuaMenu/widgets/gui_campaign_saveload.lua

@@ -21,6 +21,9 @@ local SAVE_DIR = "Saves/campaign"
 local SAVE_DIR_LENGTH = string.len(SAVE_DIR) + 2
 local AUTOSAVE_DIR = SAVE_DIR .. "/auto"
 
+-- Never ask for commander name on first campaign start.
+local DEFAULT_COMMANDER_NAME = "Commander"
+
 --------------------------------------------------------------------------------
 -- data
 --------------------------------------------------------------------------------
@@ -452,7 +455,7 @@ function CampaignSaveWindow.PromptInitialSaveName()
 	local Configuration = WG.Chobby.Configuration
 	if not Configuration.campaignSaveFile then
 		local lobby = WG.LibLobby.lobby
-		local commName = (lobby and lobby.myUserName) or Configuration.suggestedNameFromSteam
+		local commName = (lobby and lobby.myUserName) or Configuration.suggestedNameFromSteam or DEFAULT_COMMANDER_NAME
 		if commName then
 			WG.CampaignData.StartNewGame()
 			WG.CampaignData.SetupNewSave(commName, 2)

LuaMenu/widgets/gui_modoptions_panel.lua

@@ -536,7 +536,7 @@ function ModoptionsPanel.LoadModotpions(gameName, newBattleLobby)
 	-- Set modoptionDefaults
 	for i = 1, #modoptions do
 		local data = modoptions[i]
-		if data.key and data.def ~= nil then
+		if data.key and (not data.noLobby) and (data.def ~= nil) then
 			if type(data.def) == "boolean" then
 				modoptionDefaults[data.key] = tostring((data.def and 1) or 0)
 			elseif type(data.def) == "number" then
@@ -553,7 +553,7 @@ function ModoptionsPanel.LoadModotpions(gameName, newBattleLobby)
 		local data = modoptions[i]
 		if data.type == "section" then
 			modoptionStructure.sectionTitles[data.key] = data.name
-		else
+		elseif not data.noLobby then
 			if data.section then
 				modoptionStructure.sections[data.section] = modoptionStructure.sections[data.section] or {
 					title = data.section,

LuaMenu/widgets/gui_steam_release_notifier.lua

@@ -157,14 +157,15 @@ end
 --------------------------------------------------------------------------------
 -- Widget Interface
 
-function widget:Initialize()
-	CHOBBY_DIR = LUA_DIRNAME .. "widgets/chobby/"
-	VFS.Include(LUA_DIRNAME .. "widgets/chobby/headers/exports.lua", nil, VFS.RAW_FIRST)
-end
+--function widget:Initialize()
+--	CHOBBY_DIR = LUA_DIRNAME .. "widgets/chobby/"
+--	VFS.Include(LUA_DIRNAME .. "widgets/chobby/headers/exports.lua", nil, VFS.RAW_FIRST)
+--end
+--
+--function widget:Update()
+--	WG.Delay(SteamCheckPopup, 2)
+--	widgetHandler:RemoveCallIn("Update")
+--end
 
-function widget:Update()
-	WG.Delay(SteamCheckPopup, 2)
-	widgetHandler:RemoveCallIn("Update")
-end
 --------------------------------------------------------------------------------
 --------------------------------------------------------------------------------

LuaMenu/widgets/gui_tutorial_handler.lua

@@ -28,6 +28,7 @@ local function StartTutorial()
 	if tutorialPrompt then
 		tutorialPrompt.Remove()
 	end
+	WG.CampaignSaveWindow.PromptInitialSaveName()
 	WG.Chobby.interfaceRoot.OpenSingleplayerTabByName("campaign")
 	WG.CampaignHandler.OpenPlanetScreen(TUTORIAL_PLANET)
 	WG.CampaignHandler.StartPlanetMission(TUTORIAL_PLANET)

campaign/sample/planets/planet56.lua

@@ -25,7 +25,7 @@ local function GetPlanet(planetUtilities, planetID)
 			primaryType = "G4V",
 			milRating = 1,
 			feedbackLink = "http://zero-k.info/Forum/Thread/24510",
-			text = "There is technology on this world, that is both much more ancient and more andvanced than it should be. There are the remains of several raiding parties sent by the Empire to try - without success - and capture it."
+			text = "There is technology on this world, that is both much more ancient and more advanced than it should be. There are the remains of several raiding parties sent by the Empire to try - without success - and capture it."
 			.. "\n "
 			.. "\nAutomated defenses have suffered from the raids, but are still operational - and a Detriment roaming around. How can it be working after half an eternity exposed and without maintenance?"
 			,

libs/liblobby/lobby/interface_zerok.lua

@@ -44,6 +44,7 @@ function Interface:Register(userName, password, email, useSteamLogin)
 		PasswordHash = password,
 		SteamAuthToken = steamToken,
 		UserID = (config and config.UserID) or 0,
+		InstallID = (config and config.InstallID) or 0,
 	}
 	self:_SendCommand("Register " .. json.encode(sendData))
 	return self
@@ -65,6 +66,7 @@ function Interface:Login(user, password, cpu, localIP, lobbyVersion, useSteamLog
 	if steamToken and (not password) and not REVERSE_COMPAT then
 		sendData = {
 			UserID = (config and config.UserID) or 0,
+			InstallID = (config and config.InstallID) or 0,
 			ClientType = 1,
 			LobbyVersion = lobbyVersion,
 			SteamAuthToken = steamToken,
@@ -75,6 +77,7 @@ function Interface:Login(user, password, cpu, localIP, lobbyVersion, useSteamLog
 			Name = user,
 			PasswordHash = password,
 			UserID = (config and config.UserID) or 0,
+			InstallID = (config and config.InstallID) or 0,
 			ClientType = 1,
 			LobbyVersion = lobbyVersion,
 			SteamAuthToken = steamToken,