More RK logic.

Author: GoogleFrog

LuaRules/Configs/RogueK/base_loadout.lua

@@ -0,0 +1,46 @@
+
+local rewardDefs = VFS.Include("LuaRules/Configs/RogueK/reward_defs.lua")
+
+local loadout = {
+	rerolls = 3,
+	factories = {
+		{
+			baseDef = "factoryjump",
+			units = {},
+		},
+		{
+			baseDef = "factorytank",
+			units = {},
+		},
+		{
+			baseDef = "factoryplane",
+			units = {},
+		},
+	},
+	commander = {
+	},
+	structures = {
+		"staticmex",
+		"energywind",
+		"energysolar",
+		"staticrearm",
+		"staticradar",
+	},
+}
+
+local function TranslateStringList(data)
+	for i = 1, #data do
+		if type(data[i]) == "string" then
+			data[i] = rewardDefs.flatRewards[data[i]]
+		end
+	end
+end
+
+TranslateStringList(loadout.structures)
+TranslateStringList(loadout.commander)
+for i = 1, #loadout.factories do
+	TranslateStringList(loadout.factories[i])
+end
+
+
+return loadout

LuaRules/Configs/RogueK/reward_defs.lua

@@ -13,6 +13,8 @@ local function MakeUnitUnlock(name)
 	local def = {
 		name = name,
 		humanName = ud.humanName,
+		description = (ud.humanName or "???") .. " - " .. (Spring.Utilities.GetDescription(ud) or ""),
+		image = 'unitpics/' .. name .. '.png',
 		unitDefName = name,
 		structure = not moveType,
 		factory = moveType and ((moveType == 2 and 1) or 3),
@@ -21,6 +23,33 @@ local function MakeUnitUnlock(name)
 	return def
 end
 
+local commChassiOptions = {
+	{
+		name = "commstrike",
+		humanName = "Strike Chassis",
+		image = 'unitpics/commstrike.png',
+		commander = true,
+	},
+	{
+		name = "commsupport",
+		humanName = "Engineer Chassis",
+		image = 'unitpics/commsupport.png',
+		commander = true,
+	},
+	{
+		name = "commrecon",
+		humanName = "Recon Chassis",
+		image = 'unitpics/commrecon.png',
+		commander = true,
+	},
+	{
+		name = "commassault",
+		humanName = "Guardian Chassis",
+		image = 'unitpics/commassault.png',
+		commander = true,
+	},
+}
+
 local function ProcessUnitList(unitList)
 	local out = {}
 	for i = 1, #unitList do
@@ -30,6 +59,11 @@ local function ProcessUnitList(unitList)
 end
 
 local categories = {
+	comm_chassis = {
+		humanName = "Commander",
+		base_options = 4,
+		options = commChassiOptions,
+	},
 	constructor = {
 		humanName = "Constructor",
 		options = ProcessUnitList({
@@ -68,11 +102,26 @@ local categories = {
 			"turretemp",
 		}),
 	},
+	start_structures = {
+		humanName = "Starting Structures",
+		options = ProcessUnitList({
+			"staticmex",
+			"energywind",
+			"energysolar",
+			"staticradar",
+		}),
+	},
 }
 
+-- How many options are shown for a reward and how many extra are added with tech points.
+local BASE_OPTIONS = 3
+local TECH_OPTIONS = 3
+
 local flatRewards = {}
 local alreadyIn = {}
 for reward, data in pairs(categories) do
+	data.base_options = data.base_options or BASE_OPTIONS
+	data.extra_options = data.extra_options or TECH_OPTIONS
 	for i = 1, #data.options do
 		local name = data.options[i].name
 		if not alreadyIn[name] then

LuaRules/Gadgets/game_rogue_progression.lua

@@ -26,9 +26,6 @@ local CustomKeyToUsefulTable = Spring.Utilities.CustomKeyToUsefulTable
 
 local PLAYER_ALLYTEAM = 0
 
--- How many options are shown for a reward and how many extra are added with tech points.
-local BASE_OPTIONS = 3
-local TECH_OPTIONS = 3
 
 local extraRewards = {} -- TODO, mid-mission bonus objective rewards are registered here
 
@@ -38,13 +35,13 @@ local function SetupTeamProgression(teamID, rewards)
 	-- The host reads rk_loadout when creating the next game. Players send updated
 	-- loadouts to luarules for this purpose.
 	Spring.SetTeamRulesParam(teamID, "rk_loadout", customKeys.rk_loadout)
+	Spring.Echo("Writing loading for", teamID)
 
 	for i = 1, #rewards do
 		local reward = rewardDefs.categories[rewards[i]]
-		Spring.Echo("humanNamehumanNamehumanName", reward.humanName)
 		Spring.SetTeamRulesParam(teamID, "rk_reward_name_" .. i, rewards[i])
-		Spring.SetTeamRulesParam(teamID, "rk_reward_display_count_" .. i, BASE_OPTIONS)
-		Spring.SetTeamRulesParam(teamID, "rk_reward_display_tech_" .. i, TECH_OPTIONS)
+		Spring.SetTeamRulesParam(teamID, "rk_reward_display_count_" .. i, reward.base_options)
+		Spring.SetTeamRulesParam(teamID, "rk_reward_display_extra_per_tech_" .. i, reward.extra_options)
 		Spring.Utilities.PermuteList(reward.options)
 		for j = 1, #reward.options do
 			Spring.SetTeamRulesParam(teamID, "rk_reward_option_" .. i .. "_" .. j, reward.options[j].name)

LuaRules/Utilities/unitDefReplacements.lua

@@ -269,7 +269,7 @@ function Spring.Utilities.GetDescription(ud, unitID)
 	end
 
 	local name_override = ud.customParams.statsname or ud.name
-	local desc = WG.Translate ("units", name_override .. ".description") or ud.tooltip
+	local desc = (WG and WG.Translate ("units", name_override .. ".description")) or ud.tooltip
 	local isValidUnit = Spring.ValidUnitID(unitID)
 	if isValidUnit then
 		local customTooltip = GetCustomTooltip(unitID, ud)
@@ -280,7 +280,7 @@ function Spring.Utilities.GetDescription(ud, unitID)
 
 	local buildSpeed = spGetUnitBuildSpeed(unitID, ud.id)
 	if buildSpeed > 0 then
-		return WG.Translate("interface", "builds_at", {desc = desc, bp = math.round(buildSpeed, 1)}) or desc
+		return (WG and WG.Translate("interface", "builds_at", {desc = desc, bp = math.round(buildSpeed, 1)})) or desc
 	end
 	return desc
 end
@@ -389,7 +389,7 @@ if Spring.GetModOptions().techk == "1" and WG then
 		end
 
 		local name_override = ud.customParams.statsname or ud.name
-		local desc = WG.Translate ("units", name_override .. ".description") or ud.tooltip
+		local desc = (WG and WG.Translate ("units", name_override .. ".description")) or ud.tooltip
 		local isValidUnit = Spring.ValidUnitID(unitID)
 		if isValidUnit then
 			local tech = GetTechLevel(unitID) or 1
@@ -405,7 +405,7 @@ if Spring.GetModOptions().techk == "1" and WG then
 				local mult = math.pow(2, (WG.SelectedTechLevel or 1) - 1)
 				buildSpeed = buildSpeed * mult
 			end
-			return WG.Translate("interface", "builds_at", {desc = desc, bp = math.round(buildSpeed, 1)}) or desc
+			return (WG and WG.Translate("interface", "builds_at", {desc = desc, bp = math.round(buildSpeed, 1)})) or desc
 		end
 		return desc
 	end

LuaUI/Widgets/gui_chili_rogue_rewards.lua

@@ -54,7 +54,7 @@ local loadoutDisplay
 
 --------------------------------------------------------------------------------
 --------------------------------------------------------------------------------
--- Utils
+-- Loadout Handling
 
 local function AddItemToLoadout(reward)
 	local targetTable
@@ -66,6 +66,9 @@ local function AddItemToLoadout(reward)
 	elseif reward.structure then
 		targetTable = currentLoadout.structures
 		itemType = "structure"
+	elseif reward.commander then
+		targetTable = currentLoadout.commander
+		itemType = "commander"
 	end
 	targetTable[#targetTable + 1] = reward
 	loadoutDisplay.AddToLoadoutDisplay(reward)
@@ -76,6 +79,21 @@ local function SendLoadout()
 	Spring.SendLuaRulesMsg("rk_loadout " .. encoded)
 end
 
+local function ReadLoadout()
+	local teamID = Spring.GetMyTeamID()
+	local encoded = Spring.GetTeamRulesParam(teamID, "rk_loadout")
+	local loadout = CustomKeyToUsefulTable(encoded)
+	if loadout.needInit then
+		loadout = VFS.Include("LuaRules/Configs/RogueK/base_loadout.lua")
+	end
+	return loadout
+end
+
+--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
+-- Utils
+
+
 local function ClickRewardCategoryButton(buttonID)
 	for i = 1, #rewardButtons do
 		rewardButtons[i].SetSelection(buttonID == i)
@@ -155,9 +173,6 @@ local function SetupRewardSelectionView(parent)
 		holder:SetVisibility(true)
 
 		for i = 1, math.max(#buttons, #rewardOptions) do
-			if not rewardOptions[i] then
-				buttons[i]:SetVisibility(false)
-			end
 			if not buttons[i] then
 				buttons[i] = Chili.Button:New{
 					parent = holder,
@@ -168,10 +183,15 @@ local function SetupRewardSelectionView(parent)
 					height = 45,
 				}
 			end
-			local rewardName = rewardOptions[i]
-			buttons[i]:SetCaption(rewardDefs.flatRewards[rewardName].humanName)
-			buttons[i].OnClick[1] = function ()
-				SelectReward(buttonID, rewardID, rewardName)
+			if rewardOptions[i] then
+				local rewardName = rewardOptions[i]
+				buttons[i]:SetCaption(rewardDefs.flatRewards[rewardName].humanName)
+				buttons[i].OnClick[1] = function ()
+					SelectReward(buttonID, rewardID, rewardName)
+				end
+				buttons[i]:SetVisibility(true)
+			else
+				buttons[i]:SetVisibility(false)
 			end
 		end
 	end
@@ -349,24 +369,35 @@ local function MakeRewardList(holder, name, leftBound, rightBound, itemList)
 
 	function externalFunctions.AddItem(item)
 		x, y, paragraphOffset = GetIconPosition(posIndex, iconsAcross, paragraphOffset)
-		local rawTooltip = item.name
-		local imageControl = Chili.Image:New{
+		local button = Chili.Button:New{
 			x = x,
 			y = y,
 			width = LOADOUT_ICON_SIZE,
 			height = LOADOUT_ICON_SIZE,
-			keepAspect = true,
-			color = color,
-			tooltip = item.name,
-			file = 'unitpics/' .. item.name .. '.png',
+			tooltip = item.description,
+			caption = false,
+			padding = {0, 0, 0, 0},
+			noFont = true,
 			parent = rewardsHolder,
 		}
+		local image = Chili.Image:New{
+			x = 0,
+			y = 0,
+			width = LOADOUT_ICON_SIZE,
+			height = LOADOUT_ICON_SIZE,
+			file = item.image,
+			parent = button,
+		}
 		local text = Chili.TextBox:New{
 			text = item.humanName or item.name,
-			parent = imageControl,
+			x = 4,
+			y = 4,
+			right = 4,
+			font = {size = 10},
+			parent = image,
 		}
 		itemControls[#itemControls + 1] = {
-			image = imageControl,
+			button = button,
 		}
 		posIndex = posIndex + 1
 	end
@@ -381,7 +412,7 @@ local function MakeRewardList(holder, name, leftBound, rightBound, itemList)
 		posIndex = 0
 		for i = 1, #itemControls do
 			x, y, paragraphOffset = GetIconPosition(posIndex, iconsAcross, paragraphOffset)
-			itemControls[i].image:SetPos(x, y)
+			itemControls[i].button:SetPos(x, y)
 
 			posIndex = posIndex + 1
 		end
@@ -402,14 +433,18 @@ local function SetupLoadoutPanel(bottomPanel)
 		return
 	end
 
-	local structures
+	local structures, commanderModules
 	local factories = {}
 	local function ResizeLoadout(xSize)
 		local offset = 5
 		if structures then
 			structures.ResizeFunction(xSize / 2)
 			offset = structures.SetPosition(offset)
 		end
+		if commanderModules then
+			commanderModules.ResizeFunction(xSize / 2)
+			offset = commanderModules.SetPosition(offset)
+		end
 
 		offset = 5
 		for i = 1, #factories do
@@ -439,6 +474,7 @@ local function SetupLoadoutPanel(bottomPanel)
 	}
 
 	structures = MakeRewardList(loadoutPanel, "Structures", "50%", 12, currentLoadout.structures)
+	commanderModules = MakeRewardList(loadoutPanel, "Commander", "50%", 12, currentLoadout.commander)
 	for i = 1, #currentLoadout.factories do
 		factories[i] = MakeRewardList(loadoutPanel, "Factory " .. i, 12, "50%", currentLoadout.factories[i].units)
 	end
@@ -451,6 +487,8 @@ local function SetupLoadoutPanel(bottomPanel)
 			factories[item.factory].AddItem(item)
 		elseif item.structure then
 			structures.AddItem(item)
+		elseif item.commander then
+			commanderModules.AddItem(item)
 		end
 		ResizeLoadout(loadoutPanel.width)
 	end
@@ -542,10 +580,7 @@ local function MakePostgamePanel()
 end
 
 local function InitializeRewardSelection()
-	local teamID = Spring.GetMyTeamID()
-	local encoded = Spring.GetTeamRulesParam(teamID, "rk_loadout")
-	currentLoadout = CustomKeyToUsefulTable(encoded)
-	
+	currentLoadout = ReadLoadout()
 	MakePostgamePanel()
 	ClickFirstEnabledButton()
 end