Fix missile widget: crashes, tab layout, tooltips, count/progress bar

- Fix Chili Integral Menu crash: remove SetVisibility call on unparented
  tab button; tab presence is handled by the commandCount/SetTabs machinery.
- Guard nil ud.shieldPower in Chili Selections & CursorTip.
- Make the missile widget self-contained: inline the blast-radius draw code
  (the VFS include file was never committed) and enable it by default.
- Show missile commands: drop hidden flag, add action/params so they appear
  in the new Missiles tab with tooltips.
- Order buttons like the missile silo (row 1: Trinity, Reef; row 2: silo
  missiles in buildoptions order) via per-command col/row positions.
- Show count label ("xN") via DRAW_NAME_COMMANDS driven by the config's
  drawName flag.
- Show a factory-style build progress bar via a new
  WG.IntegralMenu.SetCommandProgress API (added to externalFunctions so it
  survives the Initialize assignment); source progress from unit build
  progress or stockpile build percent as appropriate.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: amnykon

LuaUI/Configs/integral_menu_config.lua

@@ -1,20 +1,25 @@
 local buildCmdFactory, buildCmdEconomy, buildCmdDefence, buildCmdSpecial, buildCmdUnits, cmdPosDef, factoryUnitPosDef = include("Configs/integral_menu_commands_processed.lua", nil, VFS.RAW_FIRST)
 
+-- Row 1: Trinity and Reef (standalone, not silo missiles).
+-- Row 2: the missile silo's missiles, in the silo's buildoptions order
+-- (tacnuke, seismic, empmissile, napalmmissile, missileslow).
 local missileCmds = {
-	{id = 39610, name = "EOS", icon = "tacnuke", tooltip = "Launch EOS (Tactical Nuke)\nTactical nuclear missile with high damage."},
-	{id = 39611, name = "Seismic", icon = "seismic", tooltip = "Launch Seismic\nArea denial seismic missile, slows units."},
-	{id = 39612, name = "Shockley", icon = "empmissile", tooltip = "Launch Shockley (EMP)\nElectromagnetic pulse missile disables units."},
-	{id = 39613, name = "Inferno", icon = "napalmmissile", tooltip = "Launch Inferno (Napalm)\nNapalm missile with persistent damage."},
-	{id = 39614, name = "Reef Missile", icon = "shipcarrier", tooltip = "Launch Disarm Missile\nDisables units temporarily."},
-	{id = 39615, name = "Trinity", icon = "staticnuke", tooltip = "Launch Trinity (Strategic Nuke)\nLong-range nuclear missile."},
-	{id = 39616, name = "Zeno", icon = "missileslow", tooltip = "Launch Zeno (Slow Missile)\nSlow homing missile with lingering damage."},
+	{id = 39615, name = "Trinity", icon = "staticnuke", col = 1, row = 1, tooltip = "Launch Trinity (Strategic Nuke)\nLong-range nuclear missile."},
+	{id = 39614, name = "Reef Missile", icon = "shipcarrier", col = 2, row = 1, tooltip = "Launch Disarm Missile\nDisables units temporarily."},
+	{id = 39610, name = "EOS", icon = "tacnuke", col = 1, row = 2, tooltip = "Launch EOS (Tactical Nuke)\nTactical nuclear missile with high damage."},
+	{id = 39611, name = "Seismic", icon = "seismic", col = 2, row = 2, tooltip = "Launch Seismic\nArea denial seismic missile, slows units."},
+	{id = 39612, name = "Shockley", icon = "empmissile", col = 3, row = 2, tooltip = "Launch Shockley (EMP)\nElectromagnetic pulse missile disables units."},
+	{id = 39613, name = "Inferno", icon = "napalmmissile", col = 4, row = 2, tooltip = "Launch Inferno (Napalm)\nNapalm missile with persistent damage."},
+	{id = 39616, name = "Zeno", icon = "missileslow", col = 5, row = 2, tooltip = "Launch Zeno (Slow Missile)\nSlow homing missile with lingering damage."},
 }
 
+local missileCmdPos = {}
+for _, missile in ipairs(missileCmds) do
+	missileCmdPos[missile.id] = {col = missile.col, row = missile.row}
+end
+
 local function isMissileCommand(cmdID)
-	for _, missile in ipairs(missileCmds) do
-		if cmdID == missile.id then return true end
-	end
-	return false
+	return missileCmdPos[cmdID] ~= nil
 end
 
 --------------------------------------------------------------------------------
@@ -498,7 +503,8 @@ for _, missile in ipairs(missileCmds) do
 	local icon = unitDef and ("#" .. unitDef.id) or (imageDir .. 'Bold/attack.png')
 	commandDisplayConfig[missile.id] = {
 		texture = icon,
-		tooltip = missile.tooltip
+		tooltip = missile.tooltip,
+		drawName = true, -- show the stockpile count / build progress string (set by the missile widget)
 	}
 end
 
@@ -533,7 +539,8 @@ local commandPanels = {
 		name = "missiles",
 		inclusionFunction = function(cmdID)
 			if not hasMissileUnits() then return false end
-			return isMissileCommand(cmdID)
+			local pos = missileCmdPos[cmdID]
+			return pos ~= nil, pos
 		end,
 		loiterable = true,
 		buttonLayoutConfig = buttonLayoutConfig.command,

LuaUI/Widgets/gui_chili_integral_menu.lua

@@ -122,6 +122,13 @@ end
 
 local commandPanels, commandPanelMap, commandDisplayConfig, hiddenCommands, textConfig, buttonLayoutConfig, instantCommands, cmdPosDef = include("Configs/integral_menu_config.lua")
 
+-- Commands whose displayConfig requests it draw their command.name (count / progress string) like stockpile.
+for cmdID, displayConfig in pairs(commandDisplayConfig) do
+	if displayConfig.drawName then
+		DRAW_NAME_COMMANDS[cmdID] = true
+	end
+end
+
 local statePanel = {}
 local tabPanel
 local selectionIndex = 0
@@ -554,6 +561,7 @@ local buttonsByCommand = {}
 local alreadyRemovedTag = {}
 local lastRemovedTagResetFrame = false
 
+
 --------------------------------------------------------------------------------
 --------------------------------------------------------------------------------
 -- Utility
@@ -2551,6 +2559,17 @@ options.fancySkinning.OnChange = UpdateBackgroundSkin
 local externalFunctions = {} -- Appear unused in repo but are used by missions.
 local initialized = false
 
+-- Lets other widgets show a factory-style build progress bar on a command button
+-- (e.g. the missile command center showing stockpile build progress).
+function externalFunctions.SetCommandProgress(cmdID, progress)
+	local button = buttonsByCommand[cmdID]
+	if button then
+		button.SetProgressBar(progress or 0)
+		return true
+	end
+	return false
+end
+
 function externalFunctions.GetCommandButtonPosition(cmdID)
 	if not buttonsByCommand[cmdID] then
 		return
@@ -2593,7 +2612,8 @@ function widget:Update()
 	UpdateButtonSelection(cmdID)
 	UpdateReturnToOrders(cmdID)
 
-	-- Update tab badges and visibility
+	-- Update tab badges. Tab presence/visibility is handled by the
+	-- commandCount + SetTabs machinery, driven by each panel's inclusionFunction.
 	for i = 1, #commandPanels do
 		local panelData = commandPanels[i]
 
@@ -2602,19 +2622,6 @@ function widget:Update()
 			local count = WG[panelData.badgeCountWG] or 0
 			panelData.tabButton:UpdateBadgeCount(count)
 		end
-
-		-- Update tab visibility for panels with dynamic visibility
-		if panelData.name == "missiles" and panelData.tabButton and panelData.tabButton.button then
-			local hasCommands = false
-			local customCommands = widgetHandler.customCommands
-			for j = 1, #customCommands do
-				if panelData.inclusionFunction(customCommands[j].id) then
-					hasCommands = true
-					break
-				end
-			end
-			panelData.tabButton.button:SetVisibility(hasCommands)
-		end
 	end
 end
 

LuaUI/Widgets/gui_chili_selections_and_cursortip.lua

@@ -2068,8 +2068,8 @@ local function GetSingleUnitInfoPanel(parentControl, isTooltipVersion)
 
 		local healthPos
 		if shieldBarUpdate then
-			if ud and (ud.shieldPower > 0 or ud.level) then
-				local shieldPower = (spGetUnitRulesParam(unitID, "comm_shield_max") or ud.shieldPower) * (Spring.GetUnitRulesParam(unitID, "totalShieldMaxMult") or 1)
+			if ud and ((ud.shieldPower or 0) > 0 or ud.level) then
+				local shieldPower = (spGetUnitRulesParam(unitID, "comm_shield_max") or ud.shieldPower or 0) * (Spring.GetUnitRulesParam(unitID, "totalShieldMaxMult") or 1)
 				local _, shieldCurrentPower = spGetUnitShieldState(unitID, -1)
 				if shieldCurrentPower and shieldPower then
 					shieldBarUpdate(true, nil, shieldCurrentPower, shieldPower, (shieldCurrentPower < shieldPower) and GetUnitShieldRegenString(unitID, ud))

LuaUI/Widgets/missle_command_center.lua

@@ -10,7 +10,7 @@ function widget:GetInfo()
     license   = "GNU GPL, v2 or later",
     layer     = 0,
     handler   = true,
-    enabled   = false,
+    enabled   = true,
   }
 end
 
@@ -21,7 +21,86 @@ end
 --------------------------------------------------------------------------------
 --------------------------------------------------------------------------------
 
-VFS.Include(LUAUI_DIRNAME.."Widgets/Utilities/engine_blast_radius.lua")
+local glVertex      = gl.Vertex
+local glPushAttrib  = gl.PushAttrib
+local glLineStipple = gl.LineStipple
+local glDepthTest   = gl.DepthTest
+local glLineWidth   = gl.LineWidth
+local glColor       = gl.Color
+local glBeginEnd    = gl.BeginEnd
+local glPopAttrib   = gl.PopAttrib
+local glPopMatrix   = gl.PopMatrix
+local glPushMatrix  = gl.PushMatrix
+local glScale       = gl.Scale
+local glTranslate   = gl.Translate
+local GL_LINE_LOOP  = GL.LINE_LOOP
+
+local circleDivs           = 64
+
+local PI                     = math.pi
+local cos                    = math.cos
+local sin                    = math.sin
+
+local aoeLineWidthMult     = 64
+local numAoECircles        = 9
+local aoeColor             = {1, 0, 0, 1}
+local mouseDistance = 1000
+local floor                  = math.floor
+
+local pulse_timmer = Spring.GetTimer()
+local function getPulse()
+  local time = Spring.DiffTimers(Spring.GetTimer(), pulse_timmer)
+  return 1 - (time - floor(time))
+end
+
+local function UnitCircleVertices()
+  for i = 1, circleDivs do
+    local theta = 2 * PI * i / circleDivs
+    glVertex(cos(theta), 0, sin(theta))
+  end
+end
+
+local function DrawCircle(x, y, z, radius)
+  glPushMatrix()
+  glTranslate(x, y, z)
+  glScale(radius, radius, radius)
+  glBeginEnd(GL_LINE_LOOP, UnitCircleVertices)
+  glPopMatrix()
+end
+
+local function drawBlastRadius(tx, ty, tz, weaponDef)
+  local aoe = weaponDef.damageAreaOfEffect
+  local ee = weaponDef.edgeEffectiveness
+
+  glLineWidth(math.max(0.05, aoeLineWidthMult * aoe / mouseDistance))
+
+  for i = 1, numAoECircles do
+    local proportion = i / (numAoECircles + 1)
+    local radius = aoe * proportion
+    local alpha = aoeColor[4] * (1 - proportion) / (1 - proportion * ee) * getPulse()
+    glColor(aoeColor[1], aoeColor[2], aoeColor[3], alpha)
+    DrawCircle(tx, ty, tz, radius)
+  end
+
+  glColor(1,1,1,1)
+  glLineWidth(1)
+end
+
+local function drawLine(x1, y1, z1, x2, y2, z2)
+  glPushAttrib(GL.LINE_BITS)
+  glLineStipple("springdefault")
+  glDepthTest(false)
+  glLineWidth(1)
+  glColor(1, 0, 0, 1)
+  glBeginEnd(GL.LINES, function()
+    glVertex(x1, y1, z1)
+    glVertex(x2, y2, z2)
+  end)
+
+  glColor(1, 1, 1, 1)
+  glLineStipple(false)
+  glPopAttrib()
+end
 
 --------------------------------------------------------------------------------
 --------------------------------------------------------------------------------
@@ -123,9 +202,17 @@ local function missle_class()
       if not Spring.GetUnitIsDead(unitID) then
         local unitDefID = Spring.GetUnitDefID(unitID)
         if unitDefID and self.launchableTypes[unitDefID] then
+          -- Silo-built missiles exist as nanoframes while under construction.
           local _, _, _, _, buildProgress = Spring.GetUnitHealth(unitID)
           if buildProgress and buildProgress < 1 then
             maxProgress = math.max(maxProgress, buildProgress)
+          else
+            -- Stockpiling weapons (Trinity, Reef, subtac) report progress toward
+            -- the next missile via the stockpile build percentage.
+            local _, _, stockpileProgress = Spring.GetUnitStockpile(unitID)
+            if stockpileProgress and stockpileProgress > 0 and stockpileProgress < 1 then
+              maxProgress = math.max(maxProgress, stockpileProgress)
+            end
           end
         end
       end
@@ -237,10 +324,13 @@ local function missle_class()
     local customCommands = widgetHandler.customCommands
 
     customCommands[#customCommands+1] = {
-      id      = self.cmd,
-      type    = self.cmdType,
-      hidden  = true,
-      cursor  = 'Attack',
+      id       = self.cmd,
+      type     = self.cmdType,
+      cursor   = 'Attack',
+      action   = "missile_" .. self.name,
+      name     = self.displayName,
+      disabled = self.disabled,
+      params   = {},
     }
   end
 
@@ -532,42 +622,6 @@ local commands = {
 
 local UPDATE_FREQUENCY = 0.25
 local timer = UPDATE_FREQUENCY + 1
-local buttonCache = {}
-
-local missileCommandIDs = {
-  [39610] = true,
-  [39611] = true,
-  [39612] = true,
-  [39613] = true,
-  [39614] = true,
-  [39615] = true,
-  [39616] = true,
-}
-
-local function findButtonsByCommand()
-  local screen = WG.Chili.Screen0
-  if not screen then return end
-
-  local function searchChildren(control)
-    if not control then return end
-
-    if control.cmdID and missileCommandIDs[control.cmdID] then
-      buttonCache[control.cmdID] = control
-    end
-
-    if control.children then
-      for _, child in ipairs(control.children) do
-        searchChildren(child)
-      end
-    end
-  end
-
-  if screen.children then
-    for _, child in ipairs(screen.children) do
-      searchChildren(child)
-    end
-  end
-end
 
 --------------------------------------------------------------------------------
 --------------------------------------------------------------------------------
@@ -585,48 +639,44 @@ function widget:Update(dt)
   end
   timer = 0
 
-  findButtonsByCommand()
-
   local totalMissileCount = 0
+  local changed = false
 
   for _, command in pairs(commands) do
     local count = command:getCount()
     local buildProgress = command:getMaxBuildProgress()
-    local customCommands = widgetHandler.customCommands
 
     totalMissileCount = totalMissileCount + count
 
-    for i = 1, #customCommands do
-      if customCommands[i].id == command.cmd then
-        local displayName = ""
-        if count > 0 then
-          displayName = "x" .. count
-        end
-        if buildProgress > 0 then
-          local progressPercent = math.floor(buildProgress * 100)
-          if displayName ~= "" then
-            displayName = displayName .. " (" .. progressPercent .. "%)"
-          else
-            displayName = progressPercent .. "%"
-          end
-        end
-        customCommands[i].name = displayName
+    -- Count string shown on the button (e.g. "x3"), empty when none stockpiled.
+    -- This is drawn by the integral menu via the command's name field (see
+    -- DRAW_NAME_COMMANDS / commandDisplayConfig.drawName).
+    local displayName = ""
+    if count > 0 then
+      displayName = "x" .. count
+    end
 
-        -- Disable button if no missiles available
-        customCommands[i].disabled = (count == 0)
+    -- Factory-style build progress bar on the button.
+    if WG.IntegralMenu and WG.IntegralMenu.SetCommandProgress then
+      WG.IntegralMenu.SetCommandProgress(command.cmd, buildProgress)
+    end
 
-        -- Update visual progress bar on button
-        local button = buttonCache[command.cmd]
-        if button and button.SetProgressBar then
-          button:SetProgressBar(buildProgress)
-        end
-        break
-      end
+    local disabled = (count == 0)
+    if command.displayName ~= displayName or command.disabled ~= disabled then
+      command.displayName = displayName
+      command.disabled = disabled
+      changed = true
     end
   end
 
   -- Export total count for tab badge
   WG.missileTotalCount = totalMissileCount
+
+  -- The integral menu only re-reads custom commands on CommandsChanged, so force
+  -- a layout update when the displayed count / progress actually changed.
+  if changed then
+    Spring.ForceLayoutUpdate()
+  end
 end
 
 function widget:CommandNotify(cmdID, cmdParams, cmdOptions)