Add support for blocked submenu options

Some menus, such as when targeting other players, use mixins which are themselves menus. We have to dive down one more layer to resolve those. The official UI source does this submenu thing (as opposed to recursion) so this should exactly mimic how the base game now works.

IceHUD.lua

@@ -772,11 +772,25 @@ local function munge_unit_menu(menu)
 	if data.GetMenuButtons then
 		local btns = data.GetMenuButtons()
 		for i=1, #btns do
+			if btns[i].IsMenu() then
+				local subbtns = btns[i].GetMenuButtons()
+				for j=1, #subbtns do
+					if BLACKLISTED_UNIT_MENU_OPTIONS[subbtns[j]:GetText()] then
+						found = true
+						break
+					end
+				end
+			else
 				if BLACKLISTED_UNIT_MENU_OPTIONS[btns[i]:GetText()] then
 					found = true
 					break
 				end
 			end
+
+			if found then
+				break
+			end
+		end
 	else
 		for _, v in ipairs(data) do
 			if BLACKLISTED_UNIT_MENU_OPTIONS[v] then
@@ -797,6 +811,17 @@ local function munge_unit_menu(menu)
 		local new_buttons_list = {}
 		local btns = data.GetMenuButtons()
 		for i=1, #btns do
+			if btns[i].IsMenu() then
+				local subbtns = btns[i].GetMenuButtons()
+				for j=1, #subbtns do
+					local blacklisted = BLACKLISTED_UNIT_MENU_OPTIONS[subbtns[j]:GetText()]
+					if not blacklisted then
+						new_buttons_list[#new_buttons_list+1] = subbtns[j]
+					elseif blacklisted ~= true then
+						new_buttons_list[#new_buttons_list+1] = blacklisted
+					end
+				end
+			else
 				local blacklisted = BLACKLISTED_UNIT_MENU_OPTIONS[btns[i]:GetText()]
 				if not blacklisted then
 					new_buttons_list[#new_buttons_list+1] = btns[i]
@@ -804,6 +829,7 @@ local function munge_unit_menu(menu)
 					new_buttons_list[#new_buttons_list+1] = blacklisted
 				end
 			end
+		end
 
 		new_data = data
 		function new_data:GetMenuButtons()

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+v1.13.14.3:
+
+- Restored right-click menus on Info and Health bars when targeting other players.
+
 v1.13.14.2:
 
 - Restored right-click menus on Info and Health bars.

this_version.md

@@ -1,5 +1,9 @@
 # Changelog
 
+v1.13.14.3:
+
+- Restored right-click menus on Info and Health bars when targeting other players.
+
 v1.13.14.2:
 
 - Restored right-click menus on Info and Health bars.