Garanas
commented
2 years ago This should be fixed with https://github.com/FAForever/fa/pull/4379 , can you confirm that the same happens on the FAF Develop game type? The PR you mention ( #4379 ) did not reach production yet
Describe the bug
Hey I thought it might be helpful to note that since game version 3745 custom target priorities don't work for me.
In ATP I added three extensive lists (
GroundDenial,NavalDenial, andAirDenial) in order have my units target the enemy units that I thought would pose the biggest threat for area control, and other tactical reasons.I suspect that PRs #4338 and #4379 might be related to this issue.
The
orders.luamodified by me in Advanced target priorities 1.1 follows (expand to view the code). In there you can also see that I wrote a small utility function called_encodePriorityTablethat lets me write the priority lists more succintly.See
```lua local Dragger = import('/lua/maui/dragger.lua').Dragger local createSettingsWindow local textures = '/mods/Advanced target priorities/textures/' local originalIsToggleMode = IsToggleMode local originalUpdateToggleIcon = UpdateToggleIcon local originalCreateCommonOrders = CreateCommonOrders local attackOrder = false local separateWindow local currentPreset = "Default" -- _encodePriorityTable("HELLO WORLD 123 + 2", "WORLD") -- -- returns -- -- "{categories.HELLO * categories.WORLD * categories.123 + categories.2, categories.WORLD}" function _encodePriorityTable(...) local result = "{" for i, v in ipairs(arg) do if i > 1 then result = result..", " end local n = 1 while n > 0 do v, n = v:gsub("(%w+) (%w+)", "%1 * %2") end v, _ = v:gsub("(%w+)", "categories.%1") result = result..v end result = result.."}" return result end local PrioritySettings = { category = {}, priorityTables = { ACU = "{categories.COMMAND}", Power = "{categories.ENERGYPRODUCTION * categories.STRUCTURE}", PD = "{categories.DEFENSE * categories.DIRECTFIRE * categories.STRUCTURE}", Units = "{categories.MOBILE - categories.COMMAND - categories.EXPERIMENTAL - categories.ENGINEER}", Shields = "{categories.SHIELD}", EXP = "{categories.EXPERIMENTAL}", Engies = "{categories.ENGINEER * categories.RECLAIMABLE}", Arty = "{categories.ARTILLERY}", Fighters = "{categories.AIR * categories.ANTIAIR - categories.EXPERIMENTAL}", SMD = "{categories.TECH3 * categories.STRUCTURE * categories.ANTIMISSILE}", Gunship = "{categories.AIR * categories.GROUNDATTACK}", Mex = "{categories.MASSEXTRACTION}", Snipe = "{categories.COMMAND, categories.STRATEGIC, categories.ANTIMISSILE * categories.TECH3, ".. "categories.MASSEXTRACTION * categories.STRUCTURE * categories.TECH3, categories.MASSEXTRACTION * categories.STRUCTURE * categories.TECH2, ".. "categories.ENERGYPRODUCTION * categories.STRUCTURE * categories.TECH3, categories.ENERGYPRODUCTION * categories.STRUCTURE * categories.TECH2, ".. "categories.MASSFABRICATION * categories.STRUCTURE, categories.SHIELD,}", Naval = "{categories.MOBILE * categories.NAVAL * categories.TECH3, categories.MOBILE * categories.NAVAL * categories.TECH2, categories.MOBILE * categories.NAVAL * categories.TECH1}", Bships = "{categories.BATTLESHIP}", Destros = "{categories.DESTROYER}", Cruiser = "{categories.CRUISER}", SACU = "{categories.SUBCOMMANDER}", Factory = "{categories.TECH3 * categories.STRUCTURE * categories.FACTORY, categories.TECH2 * categories.STRUCTURE * categories.FACTORY, categories.TECH1 * categories.STRUCTURE * categories.FACTORY}", AirDenial = _encodePriorityTable( "daa0206", -- Mercy "xrl0302", -- Fire Beetle "TECH3 ANTIAIR AIR - GROUNDATTACK", -- ASF "TECH3 ANTIAIR GROUNDATTACK AIR", -- Restos "TECH2 ANTIAIR AIR", -- Swifties "TECH1 ANTIAIR AIR", -- Inties "SHIELD - EXPERIMENTAL", "TECH3 OPTICS STRUCTURE", "OMNI STRUCTURE", "EXPERIMENTAL ECONOMIC STRUCTURE", "MASSFABRICATION ECONOMIC STRUCTURE", "ENERGYSTORAGE ECONOMIC STRUCTURE", "RADAR STRUCTURE", "CRUISER", "TECH3 ENGINEER", "TECH2 ENGINEER", "TECH1 ENGINEER", "ENGINEERSTATION", "TECH3 ANTIAIR STRUCTURE", "TECH2 ANTIAIR STRUCTURE", "TECH3 MOBILE ANTIAIR", "TECH2 MOBILE ANTIAIR", "TECH1 ANTIAIR STRUCTURE", "TECH1 MOBILE ANTIAIR", "TECH3 ENERGYPRODUCTION STRUCTURE", "TECH3 LAND FACTORY STRUCTURE - SUPPORTFACTORY", "TECH3 AIR FACTORY STRUCTURE - SUPPORTFACTORY", "TECH3 NAVAL FACTORY STRUCTURE - SUPPORTFACTORY", "TECH2 ENERGYPRODUCTION STRUCTURE", "TECH2 LAND FACTORY STRUCTURE - SUPPORTFACTORY", "TECH2 AIR FACTORY STRUCTURE - SUPPORTFACTORY", "TECH2 NAVAL FACTORY STRUCTURE - SUPPORTFACTORY", "TECH3 MASSEXTRACTION STRUCTURE", "HYDROCARBON STRUCTURE", "TECH2 MASSEXTRACTION STRUCTURE", "TECH1 ENERGYPRODUCTION STRUCTURE", "TECH1 MASSEXTRACTION STRUCTURE", "TECH3 FACTORY STRUCTURE", "TECH2 FACTORY STRUCTURE", "TECH1 FACTORY STRUCTURE" ), GroundDenial = _encodePriorityTable( "daa0206", -- Mercy "xrl0302", -- Fire Beetle "SHIELD - EXPERIMENTAL", "TECH3 OPTICS STRUCTURE", "OMNI STRUCTURE", "EXPERIMENTAL ECONOMIC STRUCTURE", "MASSFABRICATION ECONOMIC STRUCTURE", "ENERGYSTORAGE ECONOMIC STRUCTURE", "RADAR STRUCTURE", "LAND SCOUT", "TECH3 ENGINEER - COMMAND - SUBCOMMANDER", "TECH2 ENGINEER - COMMAND - SUBCOMMANDER", "TECH1 ENGINEER - COMMAND - SUBCOMMANDER", "ENGINEERSTATION", "TECH3 STRUCTURE DIRECTFIRE", "TECH2 STRUCTURE DIRECTFIRE", "TECH3 SNIPER", "TECH3 MOBILE ARTILLERY", "TECH3 MOBILE SILO", "TECH1 STRUCTURE DIRECTFIRE", "TECH3 ENERGYPRODUCTION STRUCTURE", "TECH3 AIR FACTORY STRUCTURE - SUPPORTFACTORY", "TECH3 LAND FACTORY STRUCTURE - SUPPORTFACTORY", "TECH3 NAVAL FACTORY STRUCTURE - SUPPORTFACTORY", "TECH2 CYBRAN BOT", "TECH2 UEF BOT", "TECH2 MOBILE SILO", "TECH1 MOBILE ARTILLERY", "TECH2 ENERGYPRODUCTION STRUCTURE", "TECH2 AIR FACTORY STRUCTURE - SUPPORTFACTORY", "TECH2 LAND FACTORY STRUCTURE - SUPPORTFACTORY", "TECH2 NAVAL FACTORY STRUCTURE - SUPPORTFACTORY", "TECH2 MOBILE ARTILLERY", "TECH3 MOBILE - COMMAND - ANTIAIR", "TECH2 MOBILE - COMMAND - ANTIAIR", "TECH1 BOT - ANTIAIR", "TECH1 MOBILE - COMMAND - ANTIAIR", "TECH2 STRUCTURE ARTILLERY", "TECH3 MASSEXTRACTION STRUCTURE", "TECH2 MASSEXTRACTION STRUCTURE", "HYDROCARBON STRUCTURE", "TECH3 MASSEXTRACTION STRUCTURE", "TECH2 ENERGYPRODUCTION STRUCTURE", "TECH3 FACTORY STRUCTURE", "TECH2 FACTORY STRUCTURE", "TECH1 FACTORY STRUCTURE" ), NavalDenial = _encodePriorityTable( "daa0206", -- Mercy "xrl0302", -- Fire Beetle "TECH3 ANTINAVY AIR", "TECH3 GROUNDATTACK AIR", "TECH2 ANTINAVY AIR", "TECH2 GROUNDATTACK AIR", "TECH1 GROUNDATTACK AIR", "NAVAL SHIELD", "TECH3 HOVER SHIELD", "TECH2 HOVER SHIELD", "SONAR STRUCTURE", "COMMAND", "SUBCOMMANDER", "TECH3 ENGINEER", "TECH2 ENGINEER", "TECH1 ENGINEER", "TECH3 NAVAL FACTORY STRUCTURE - SUPPORTFACTORY", "NUKESUB - SERAPHIM", "NAVAL STEALTHFIELD", "BATTLESHIP - xes0307", -- Bships excluding UEF Bcruisers "TECH3 ANTINAVY STRUCTURE", "xes0307", -- UEF Bcruisers "NUKESUB SERAPHIM", "TECH2 ANTINAVY STRUCTURE", "DESTROYER", "xes0102", -- Coopers "T2SUBMARINE", "CRUISER", "TECH1 NAVAL FACTORY STRUCTURE", "TECH1 FRIGATE", "T1SUBMARINE", "SHIELD - EXPERIMENTAL", "ANTIMISSILE STRUCTURE", "TECH3 OPTICS STRUCTURE", "OMNI STRUCTURE", "EXPERIMENTAL ECONOMIC STRUCTURE", "MASSFABRICATION ECONOMIC STRUCTURE", "ENERGYSTORAGE ECONOMIC STRUCTURE", "RADAR STRUCTURE", "ENGINEERSTATION", "TECH2 ARTILLERY STRUCTURE", "TECH3 SNIPER", "TECH3 MOBILE ARTILLERY", "TECH3 MOBILE SILO", "TECH3 ENERGYPRODUCTION STRUCTURE", "TECH3 AIR FACTORY STRUCTURE - SUPPORTFACTORY", "TECH3 LAND FACTORY STRUCTURE - SUPPORTFACTORY", "TECH2 AIR FACTORY STRUCTURE - SUPPORTFACTORY", "TECH2 LAND FACTORY STRUCTURE - SUPPORTFACTORY", "TECH1 LAND FACTORY STRUCTURE", "TECH3 LAND FACTORY STRUCTURE", "TECH2 LAND FACTORY STRUCTURE", "TECH3 MASSEXTRACTION STRUCTURE", "TECH2 ENERGYPRODUCTION STRUCTURE", "TECH2 MASSEXTRACTION STRUCTURE", "HYDROCARBON STRUCTURE", "TECH1 ENERGYPRODUCTION STRUCTURE", "TECH1 MASSEXTRACTION STRUCTURE", "TECH3 FACTORY STRUCTURE", "TECH1 FACTORY STRUCTURE", "TECH2 FACTORY STRUCTURE" ), }, exclusive = {ACU = false, Power = false, PD = false, Units = false, Shields = false, EXP = false, Engies = false, Arty = false, Fighters = false, SMD = false, Gunship = false, Mex = false, Snipe = false, AirDenial = false, GroundDenial = false, NavalDenial = false}, buttonLayout = { {"ACU", "Units", "PD", "Engies", "Shields", "EXP", "AirDenial"}, --first column. bottom --> top {"Mex", "Power", "SMD", "Arty", "Gunship", "Fighters", "GroundDenial"}, --second column. bottom --> top {"Factory", "SACU", "Cruiser", "Destros", "Bships", "Naval", "NavalDenial"}, --third column. bottom --> top }, } local defaultPrefs = { buttonLayoutSeparate = { {}, {}, {}, }, showSeparateWindow = false, lockSeparateWindow = false, windowWidth = 120, windowHeight = 155, hideAbilities = false, } local PrioritySettingsPrefs local tempPrefs = Prefs.GetFromCurrentProfile("AdvancedPriotities") if tempPrefs then for k,tbl in tempPrefs.buttonLayoutSeparate do for k, name in tbl do if name == 'false' then tbl[k] = nil end end end PrioritySettingsPrefs = tempPrefs else PrioritySettingsPrefs = defaultPrefs end local prioStateTextures = { Default = textures..'default.dds', ACU = textures..'ACU.dds', Power = textures..'power.dds', PD = textures..'PD.dds', Units = textures..'units.dds', Shields = textures..'shields.dds', EXP = textures..'EXP.dds', Engies = textures..'engies.dds', Arty = textures..'arty.dds', Fighters = textures..'fighters.dds', SMD = textures..'SMD.dds', Gunship = textures..'gunship.dds', Mex = textures..'mex.dds', Snipe = textures..'snipe.dds', Mixed = textures..'mixed.dds', Empty = textures..'smallBlack.dds', Factory = textures..'Factory.dds', SACU = textures..'SACU.dds', Cruiser = textures..'Cruiser.dds', Destros = textures..'Destros.dds', Bships = textures..'Bships.dds', Naval = textures..'Naval.dds', } function CreateCommonOrders(availableOrders, init) originalCreateCommonOrders(availableOrders, init) if currentSelection[1] then if not orderCheckboxMap.RULEUCC_Attack._isDisabled then attackOrder = true else attackOrder = false if separateWindow then separateWindow:Hide() end end UpdatePrioState() elseif separateWindow then separateWindow:Hide() end end function CheckForMixedPriorities(units) local name for key, unit in units do if not name then name = UnitData[unit:GetEntityId()].WepPriority or "Default" else local preset = UnitData[unit:GetEntityId()].WepPriority or "Default" if name ~= preset then return "Mixed" end end end return name end function UpdatePrioState() local units = currentSelection local control = controls.bg if not control.prioState then control.prioState = Bitmap(control, UIUtil.UIFile(textures..'smallBlack.dds')) LayoutHelpers.AtRightTopIn(control.prioState, control, 25, 15) control.prioState.Depth:Set(100) control.prioState:DisableHitTest() end if units[1] then local priority = CheckForMixedPriorities(units) currentPreset = priority if prioStateTextures[priority] then if control.prioState.textBitmap then control.prioState.textBitmap:Destroy() control.prioState.textBitmap = nil end control.prioState:SetTexture(UIUtil.UIFile(prioStateTextures[priority])) else --using CreateText for presets without texture control.prioState:SetTexture(UIUtil.UIFile(textures..'smallBlack.dds')) if control.prioState.textBitmap then control.prioState.textBitmap:Destroy() control.prioState.textBitmap = nil end control.prioState.textBitmap = Bitmap(control.prioState, UIUtil.UIFile(textures..'smallBlack.dds')) LayoutHelpers.AtRightTopIn(control.prioState.textBitmap, control.prioState, 0, 0) control.prioState.textBitmap.text = UIUtil.CreateText(control.prioState.textBitmap, priority, 10, 'Arial') control.prioState.textBitmap.text:SetColor("White") LayoutHelpers.AtCenterIn(control.prioState.textBitmap.text, control.prioState) end if attackOrder and PrioritySettingsPrefs.showSeparateWindow then if separateWindow then UpdateSeparateWindow() else CreateSeparateWindow() end end end end function CreatePrioBorder(parent) local prioBorder = {} prioBorder.topleft = Bitmap(parent, UIUtil.UIFile('/game/ability_brd/chat_brd_ul.dds')) prioBorder.bottomleft = Bitmap(parent, UIUtil.UIFile('/game/ability_brd/chat_brd_ll.dds')) prioBorder.topright = Bitmap(parent, UIUtil.UIFile('/game/ability_brd/chat_brd_ur.dds')) prioBorder.bottomright = Bitmap(parent, UIUtil.UIFile('/game/ability_brd/chat_brd_lr.dds')) prioBorder.topmid = Bitmap(parent, UIUtil.UIFile('/game/ability_brd/chat_brd_horz_um.dds')) prioBorder.bottommid = Bitmap(parent, UIUtil.UIFile('/game/ability_brd/chat_brd_lm.dds')) prioBorder.midleft = Bitmap(parent, UIUtil.UIFile('/game/ability_brd/chat_brd_vert_l.dds')) prioBorder.midright = Bitmap(parent, UIUtil.UIFile('/game/ability_brd/chat_brd_vert_r.dds')) prioBorder.back = Bitmap(parent, UIUtil.UIFile('/game/ability_brd/chat_brd_m.dds')) local x = 56 --topleft relative coordinates local y = -18 local width = 210 local height = 155 --corners LayoutHelpers.AtLeftTopIn(prioBorder.topleft, parent, x, y) LayoutHelpers.AtLeftTopIn(prioBorder.bottomleft, prioBorder.topleft, 0, height) LayoutHelpers.AtLeftTopIn(prioBorder.topright, prioBorder.topleft, width, 0) LayoutHelpers.AtLeftTopIn(prioBorder.bottomright, prioBorder.topleft, width, height) --mid LayoutHelpers.AtLeftTopIn(prioBorder.topmid, prioBorder.topleft, 18, 0) prioBorder.topmid.Width:Set(width - 18) LayoutHelpers.AtLeftTopIn(prioBorder.bottommid, prioBorder.topleft, 18, height) prioBorder.bottommid.Width:Set(width - 18) LayoutHelpers.AtLeftTopIn(prioBorder.midleft, prioBorder.topleft, 0, 18) prioBorder.midleft.Height:Set(height - 18) LayoutHelpers.AtLeftTopIn(prioBorder.midright, prioBorder.topleft, width, 18) prioBorder.midright.Height:Set(height - 18) --background LayoutHelpers.AtLeftTopIn(prioBorder.back, prioBorder.topleft, 18 , 18) prioBorder.back.Width:Set(width - 18) prioBorder.back.Height:Set(height - 18) return prioBorder end function CreatePrioButtons(parent) local buttons = {{},{},{}} local active = false local function CreateButton(prioTable, name, exclusive) local btn = Checkbox(parent) btn.Width:Set(70) btn.Height:Set(20) if not active and name == currentPreset then btn:SetNewTextures( UIUtil.UIFile(textures..'Button1active.dds'), UIUtil.UIFile(textures..'Button1active.dds'), UIUtil.UIFile(textures..'Button2.dds'), UIUtil.UIFile(textures..'Button2.dds') ) active = true else btn:SetNewTextures( UIUtil.UIFile(textures..'Button1.dds'), UIUtil.UIFile(textures..'Button1.dds'), UIUtil.UIFile(textures..'Button2.dds'), UIUtil.UIFile(textures..'Button2.dds') ) end if name then btn.OnCheck = function(control, checked) SetWeaponPriorities(prioTable, name, exclusive) end LayoutHelpers.AtLeftTopIn(UIUtil.CreateText(parent, name, 14, UIUtil.bodyFont), btn, 10, 0) else -- empty button btn:DisableHitTest() end return btn end --"Default" button buttons.default = Checkbox(parent) buttons.default.Width:Set(70) buttons.default.Height:Set(30) if currentPreset == "Default" then buttons.default:SetNewTextures( UIUtil.UIFile(textures..'Button1active.dds'), UIUtil.UIFile(textures..'Button1active.dds'), UIUtil.UIFile(textures..'Button2big.dds'), UIUtil.UIFile(textures..'Button2big.dds') ) active = true else buttons.default:SetNewTextures( UIUtil.UIFile(textures..'Button1.dds'), UIUtil.UIFile(textures..'Button1.dds'), UIUtil.UIFile(textures..'Button2big.dds'), UIUtil.UIFile(textures..'Button2big.dds') ) end LayoutHelpers.AtLeftTopIn(buttons.default, parent, 65, 117) buttons.default.OnCheck = function(control, checked) SetWeaponPriorities(0, "Default") end LayoutHelpers.AtCenterIn(UIUtil.CreateText(parent, "Default", 18, UIUtil.bodyFont), buttons.default) --"Snipe" button buttons.snipe = Checkbox(parent) buttons.snipe.Width:Set(70) buttons.snipe.Height:Set(30) if not active and currentPreset == "Snipe" then buttons.snipe:SetNewTextures( UIUtil.UIFile(textures..'Button1active.dds'), UIUtil.UIFile(textures..'Button1active.dds'), UIUtil.UIFile(textures..'Button2big.dds'), UIUtil.UIFile(textures..'Button2big.dds') ) active = true else buttons.snipe:SetNewTextures( UIUtil.UIFile(textures..'Button1.dds'), UIUtil.UIFile(textures..'Button1.dds'), UIUtil.UIFile(textures..'Button2big.dds'), UIUtil.UIFile(textures..'Button2big.dds') ) end LayoutHelpers.AtLeftTopIn(buttons.snipe, buttons.default, 70, 0) buttons.snipe.OnCheck = function(control, checked) SetWeaponPriorities(PrioritySettings.priorityTables.Snipe, "Snipe", false) end LayoutHelpers.AtCenterIn(UIUtil.CreateText(parent, "Snipe", 18, UIUtil.bodyFont), buttons.snipe) --first column for i, name in PrioritySettings.buttonLayout[1] or {} do local name = PrioritySettings.buttonLayout[1][i] buttons[1][i] = CreateButton(PrioritySettings.priorityTables[name], name, PrioritySettings.exclusive[name]) if i == 1 then LayoutHelpers.AtLeftTopIn(buttons[1][i], parent, 65, 95) else LayoutHelpers.Above(buttons[1][i], buttons[1][i-1]) end end --second column for i, name in PrioritySettings.buttonLayout[2] or {} do local name = PrioritySettings.buttonLayout[2][i] buttons[2][i] = CreateButton(PrioritySettings.priorityTables[name], name, PrioritySettings.exclusive[name]) if i == 1 then LayoutHelpers.AtLeftTopIn(buttons[2][i], buttons[1][1], 70, 0) else LayoutHelpers.Above(buttons[2][i], buttons[2][i-1]) end end --third column for i, name in PrioritySettings.buttonLayout[3] or {} do local name = PrioritySettings.buttonLayout[3][i] buttons[3][i] = CreateButton(PrioritySettings.priorityTables[name], name, PrioritySettings.exclusive[name]) if i == 1 then LayoutHelpers.AtLeftTopIn(buttons[3][i], buttons[2][1], 70, 0) else LayoutHelpers.Above(buttons[3][i], buttons[3][i-1]) end end --settings button buttons.settings = Checkbox(parent) buttons.settings.Width:Set(14) buttons.settings.Height:Set(14) buttons.settings:SetNewTextures( UIUtil.UIFile(textures..'Expand.dds'), UIUtil.UIFile(textures..'Expand.dds'), UIUtil.UIFile(textures..'Expand2.dds'), UIUtil.UIFile(textures..'Expand2.dds') ) buttons.settings.OnCheck = function(control, checked) if not createSettingsWindow then createSettingsWindow = import('/mods/Advanced target priorities/modules/settings.lua').CreateSettingsWindow end createSettingsWindow() end LayoutHelpers.AtLeftTopIn(buttons.settings, parent.prioBorder.topright, 2, 4) return buttons end function CreateFirestatePopup(parent, selected) local bg = Bitmap(parent, UIUtil.UIFile('/game/ability_brd/chat_brd_m.dds')) bg.border = CreateBorder(bg) bg.prioBorder = CreatePrioBorder(bg) bg:DisableHitTest(true) bg.prioButtons = CreatePrioButtons(bg) local function CreateButton(index, info) local btn = Checkbox(bg, GetOrderBitmapNames(info.bitmap)) btn.info = info btn.index = index btn.HandleEvent = function(control, event) if event.Type == 'MouseEnter' then CreateMouseoverDisplay(control, control.info.helpText, 1) elseif event.Type == 'MouseExit' then if controls.mouseoverDisplay then controls.mouseoverDisplay:Destroy() controls.mouseoverDisplay = false end end return Checkbox.HandleEvent(control, event) end btn.OnCheck = function(control, checked) parent:_OnFirestateSelection(control.index, control.info.id) end return btn end local i = 1 bg.buttons = {} for index, state in retaliateStateInfo do if index ~= -1 then bg.buttons[i] = CreateButton(index, state) if i == 1 then LayoutHelpers.AtBottomIn(bg.buttons[i], bg) LayoutHelpers.AtLeftIn(bg.buttons[i], bg) else LayoutHelpers.Above(bg.buttons[i], bg.buttons[i-1]) end i = i + 1 end end bg.Height:Set(function() return table.getsize(bg.buttons) * bg.buttons[1].Height() end) bg.Width:Set(bg.buttons[1].Width) if UIUtil.currentLayout == 'left' then LayoutHelpers.RightOf(bg, parent, 40) else LayoutHelpers.Above(bg, parent, 20) end bg.Depth:Set(30) return bg end function CreateSeparateWindow() if separateWindow then separateWindow:Destroy() separateWindow = nil end local width = PrioritySettingsPrefs.windowWidth local height = PrioritySettingsPrefs.windowHeight local backgroundDepth = 20 local posX = PrioritySettingsPrefs.posX local posY = PrioritySettingsPrefs.posY ----------- Back and borders------------- ----------------------------------------- separateWindow = Bitmap(GetFrame(0), UIUtil.UIFile('/game/ability_brd/chat_brd_m.dds')) separateWindow.Depth:Set(backgroundDepth) separateWindow.Width:Set(width) separateWindow.Height:Set(height) if posX and posY then separateWindow.Left:Set(posX) separateWindow.Top:Set(posY) else LayoutHelpers.AtLeftTopIn(separateWindow, controls.bg, 340, -120) end separateWindow.HandleEvent = function(self, event) if event.Type == 'ButtonPress' and not PrioritySettingsPrefs.lockSeparateWindow then local drag = Dragger() local offX = event.MouseX - self.Left() local offY = event.MouseY - self.Top() drag.OnMove = function(dragself, x, y) self.Left:Set(x - offX) self.Top:Set(y - offY) GetCursor():SetTexture(UIUtil.GetCursor('MOVE_WINDOW')) end drag.OnRelease = function(dragself) GetCursor():Reset() drag:Destroy() PrioritySettingsPrefs.posX = self.Left() PrioritySettingsPrefs.posY = self.Top() UpdatePriorityPrefs() end PostDragger(self:GetRootFrame(), event.KeyCode, drag) end end separateWindow.topleft = Bitmap(separateWindow, UIUtil.UIFile('/game/ability_brd/chat_brd_ul.dds')) LayoutHelpers.AtLeftTopIn(separateWindow.topleft, separateWindow, -18, -18) separateWindow.topleft.Depth:Set(backgroundDepth) separateWindow.topright = Bitmap(separateWindow, UIUtil.UIFile('/game/ability_brd/chat_brd_ur.dds')) LayoutHelpers.AtRightTopIn(separateWindow.topright, separateWindow, -18, -18) separateWindow.topright.Depth:Set(backgroundDepth) separateWindow.bottomleft = Bitmap(separateWindow, UIUtil.UIFile('/game/ability_brd/chat_brd_ll.dds')) LayoutHelpers.AtLeftTopIn(separateWindow.bottomleft, separateWindow, -18, height) separateWindow.bottomleft.Depth:Set(backgroundDepth) separateWindow.bottomright = Bitmap(separateWindow, UIUtil.UIFile('/game/ability_brd/chat_brd_lr.dds')) LayoutHelpers.AtRightTopIn(separateWindow.bottomright, separateWindow, -18, height) separateWindow.bottomright.Depth:Set(backgroundDepth) separateWindow.topmid = Bitmap(separateWindow, UIUtil.UIFile('/game/ability_brd/chat_brd_horz_um.dds')) LayoutHelpers.AtLeftTopIn(separateWindow.topmid, separateWindow, 0, -18) separateWindow.topmid.Width:Set(width) separateWindow.topmid.Depth:Set(backgroundDepth) separateWindow.bottommid = Bitmap(separateWindow, UIUtil.UIFile('/game/ability_brd/chat_brd_lm.dds')) LayoutHelpers.AtLeftTopIn(separateWindow.bottommid, separateWindow, 0, height) separateWindow.bottommid.Width:Set(width) separateWindow.bottommid.Depth:Set(backgroundDepth) separateWindow.midleft = Bitmap(separateWindow, UIUtil.UIFile('/game/ability_brd/chat_brd_vert_l.dds')) LayoutHelpers.AtLeftTopIn(separateWindow.midleft, separateWindow, -18, 0) separateWindow.midleft.Height:Set(height) separateWindow.midleft.Depth:Set(backgroundDepth) separateWindow.midright = Bitmap(separateWindow, UIUtil.UIFile('/game/ability_brd/chat_brd_vert_r.dds')) LayoutHelpers.AtRightTopIn(separateWindow.midright, separateWindow, -18, 0) separateWindow.midright.Height:Set(height) separateWindow.midright.Depth:Set(backgroundDepth) ---------Buttons--------- ------------------------- separateWindow.Buttons = {} separateWindow.ActiveButton = currentPreset local active = false local buttons = separateWindow.Buttons --"Default" button buttons.Default = Checkbox(separateWindow) buttons.Default.Width:Set(70) buttons.Default.Height:Set(30) if currentPreset == "Default" then buttons.Default:SetNewTextures( UIUtil.UIFile(textures..'Button1active.dds'), UIUtil.UIFile(textures..'Button1active.dds'), UIUtil.UIFile(textures..'Button2big.dds'), UIUtil.UIFile(textures..'Button2big.dds') ) separateWindow.ActiveButton = "Default" active = true else buttons.Default:SetNewTextures( UIUtil.UIFile(textures..'Button1.dds'), UIUtil.UIFile(textures..'Button1.dds'), UIUtil.UIFile(textures..'Button2big.dds'), UIUtil.UIFile(textures..'Button2big.dds') ) end LayoutHelpers.AtLeftTopIn(buttons.Default, separateWindow, -8, height - 22) buttons.Default.OnCheck = function(control, checked) SetWeaponPriorities(0, "Default") end LayoutHelpers.AtCenterIn(UIUtil.CreateText(separateWindow, "Default", 18, UIUtil.bodyFont), buttons.Default) --"Snipe" button buttons.Snipe = Checkbox(separateWindow) buttons.Snipe.Width:Set(70) buttons.Snipe.Height:Set(30) if not active and currentPreset == "Snipe" then buttons.Snipe:SetNewTextures( UIUtil.UIFile(textures..'Button1active.dds'), UIUtil.UIFile(textures..'Button1active.dds'), UIUtil.UIFile(textures..'Button2big.dds'), UIUtil.UIFile(textures..'Button2big.dds') ) active = true separateWindow.ActiveButton = "Snipe" else buttons.Snipe:SetNewTextures( UIUtil.UIFile(textures..'Button1.dds'), UIUtil.UIFile(textures..'Button1.dds'), UIUtil.UIFile(textures..'Button2big.dds'), UIUtil.UIFile(textures..'Button2big.dds') ) end LayoutHelpers.AtLeftTopIn(buttons.Snipe, buttons.Default, 70, 0) buttons.Snipe.OnCheck = function(control, checked) SetWeaponPriorities(PrioritySettings.priorityTables.Snipe, "Snipe", false) end LayoutHelpers.AtCenterIn(UIUtil.CreateText(separateWindow, "Snipe", 18, UIUtil.bodyFont), buttons.Snipe) --small buttons local function CreateButton(prioTable, name, exclusive) local btn = Checkbox(separateWindow) btn.Width:Set(70) btn.Height:Set(20) if not active and name == currentPreset then btn:SetNewTextures( UIUtil.UIFile(textures..'Button1active.dds'), UIUtil.UIFile(textures..'Button1active.dds'), UIUtil.UIFile(textures..'Button2.dds'), UIUtil.UIFile(textures..'Button2.dds') ) active = true else btn:SetNewTextures( UIUtil.UIFile(textures..'Button1.dds'), UIUtil.UIFile(textures..'Button1.dds'), UIUtil.UIFile(textures..'Button2.dds'), UIUtil.UIFile(textures..'Button2.dds') ) end if name then btn.OnCheck = function(control, checked) SetWeaponPriorities(prioTable, name, exclusive) end LayoutHelpers.AtLeftTopIn(UIUtil.CreateText(separateWindow, name, 14, UIUtil.bodyFont), btn, 10, 0) else -- empty button btn:DisableHitTest() end return btn end local previousButton --first column for i, name in PrioritySettingsPrefs.buttonLayoutSeparate[1] or {} do local name = PrioritySettingsPrefs.buttonLayoutSeparate[1][i] buttons[name] = CreateButton(PrioritySettings.priorityTables[name], name, PrioritySettings.exclusive[name]) LayoutHelpers.AtLeftTopIn(buttons[name], buttons.Default, 0, -2 - 20 * i) end --second column for i, name in PrioritySettingsPrefs.buttonLayoutSeparate[2] or {} do local name = PrioritySettingsPrefs.buttonLayoutSeparate[2][i] buttons[name] = CreateButton(PrioritySettings.priorityTables[name], name, PrioritySettings.exclusive[name]) LayoutHelpers.AtLeftTopIn(buttons[name], buttons.Snipe, 0, -2 - 20 * i) end --third column for i, name in PrioritySettingsPrefs.buttonLayoutSeparate[3] or {} do local name = PrioritySettingsPrefs.buttonLayoutSeparate[3][i] buttons[name] = CreateButton(PrioritySettings.priorityTables[name], name, PrioritySettings.exclusive[name]) LayoutHelpers.AtLeftTopIn(buttons[name], buttons.Snipe, 70, -2 - 20 * i) end end function UpdateSeparateWindow() separateWindow:Show() local activeButton = separateWindow.ActiveButton if currentPreset == activeButton then return end if activeButton == "Default" or activeButton == "Snipe" then separateWindow.Buttons[activeButton]:SetNewTextures( UIUtil.UIFile(textures..'Button1.dds'), UIUtil.UIFile(textures..'Button1.dds'), UIUtil.UIFile(textures..'Button2big.dds'), UIUtil.UIFile(textures..'Button2big.dds') ) elseif separateWindow.Buttons[activeButton] then separateWindow.Buttons[activeButton]:SetNewTextures( UIUtil.UIFile(textures..'Button1.dds'), UIUtil.UIFile(textures..'Button1.dds'), UIUtil.UIFile(textures..'Button2.dds'), UIUtil.UIFile(textures..'Button2.dds') ) end if currentPreset == "Default" or currentPreset == "Snipe" then separateWindow.Buttons[currentPreset]:SetNewTextures( UIUtil.UIFile(textures..'Button1active.dds'), UIUtil.UIFile(textures..'Button1active.dds'), UIUtil.UIFile(textures..'Button2big.dds'), UIUtil.UIFile(textures..'Button2big.dds') ) elseif separateWindow.Buttons[currentPreset] then separateWindow.Buttons[currentPreset]:SetNewTextures( UIUtil.UIFile(textures..'Button1active.dds'), UIUtil.UIFile(textures..'Button1active.dds'), UIUtil.UIFile(textures..'Button2.dds'), UIUtil.UIFile(textures..'Button2.dds') ) end separateWindow.ActiveButton = currentPreset end function UpdatePriorityPrefs() local modifiedTablePrefs = table.deepcopy(PrioritySettingsPrefs) for k,tbl in modifiedTablePrefs.buttonLayoutSeparate do i = 1 while i < 7 do if not tbl[i] then tbl[i] = 'false' end i = i + 1 end end Prefs.SetToCurrentProfile("AdvancedPriotities", modifiedTablePrefs) Prefs.SavePreferences() import('/lua/ui/game/unitview.lua').UpdateAbilitiesSettings() end function GetPrioritySettingsPrefs() return PrioritySettingsPrefs end function GetPrioritySettings() return PrioritySettings end function DestroySeparateWindow() if separateWindow then separateWindow:Destroy() separateWindow = nil end end function ToggleMode() if currentPreset ~= "Snipe" then SetWeaponPriorities(PrioritySettings.priorityTables.Snipe, "Snipe", false) else SetWeaponPriorities(0, "Default") end end local KeyMapper = import('/lua/keymap/keymapper.lua') KeyMapper.SetUserKeyAction('Toggle_snipe_default', {action = 'UI_Lua import("/lua/ui/game/orders.lua").ToggleMode()', category = 'Target priorities', order = 103}) KeyMapper.SetUserKeyAction('Shift_Toggle_snipe_default', {action = 'UI_Lua import("/lua/ui/game/orders.lua").ToggleMode()', category = 'Target priorities', order = 104}) ```orders.luaTo Reproduce
Patch the mod Advanced target priorities 1.1 by replacing
orders.luawith the code noted above (the file is located inAdvanced target priorities/hook/lua/keymap/).To add GroundDenial, NavalDenial, and AirDenial as hotkeys, replace
misckeyactions.lua(located inAdvanced target priorities/hook/lua/ui/game/) with the following code.
```lua local originalSetWeaponPriorities = SetWeaponPriorities local updatePrioState local KeyMapper = import('/lua/keymap/keymapper.lua') local PrioritySettings function SetWeaponPriorities(prioritiesString, name, exclusive) originalSetWeaponPriorities(prioritiesString, name, exclusive) if updatePrioState then ForkThread(function() WaitSeconds(0.1) updatePrioState() WaitSeconds(0.1) updatePrioState() WaitSeconds(0.2) updatePrioState() end) else updatePrioState = import('/lua/ui/game/orders.lua').UpdatePrioState ForkThread(function() WaitSeconds(0.1) updatePrioState() WaitSeconds(0.1) updatePrioState() WaitSeconds(0.2) updatePrioState() end) end end function SetWeaponPrioritiesHotkey(name) if not PrioritySettings then PrioritySettings = import('/lua/ui/game/orders.lua').GetPrioritySettings() end SetWeaponPriorities(PrioritySettings.priorityTables[name], name, PrioritySettings.exclusive[name]) end --------HOTKEYS----------- --Default KeyMapper.SetUserKeyAction('Default', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("Default")', category = 'Target priorities', order = 75}) KeyMapper.SetUserKeyAction('Shift_Default', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("Default")', category = 'Target priorities', order = 76}) --ACU KeyMapper.SetUserKeyAction('ACU', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("ACU")', category = 'Target priorities', order = 77}) KeyMapper.SetUserKeyAction('Shift_ACU', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("ACU")', category = 'Target priorities', order = 78}) --Power KeyMapper.SetUserKeyAction('Power', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("Power")', category = 'Target priorities', order = 79}) KeyMapper.SetUserKeyAction('Shift_Power', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("Power")', category = 'Target priorities', order = 80}) --PD KeyMapper.SetUserKeyAction('PD', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("PD")', category = 'Target priorities', order = 81}) KeyMapper.SetUserKeyAction('Shift_PD', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("PD")', category = 'Target priorities', order = 82}) --Units KeyMapper.SetUserKeyAction('Units', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("Units")', category = 'Target priorities', order = 83}) KeyMapper.SetUserKeyAction('Shift_Units', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("Units")', category = 'Target priorities', order = 84}) --Shields KeyMapper.SetUserKeyAction('Shields', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("Shields")', category = 'Target priorities', order = 85}) KeyMapper.SetUserKeyAction('Shift_Shields', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("Shields")', category = 'Target priorities', order = 86}) --EXP KeyMapper.SetUserKeyAction('EXP', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("EXP")', category = 'Target priorities', order = 87}) KeyMapper.SetUserKeyAction('Shift_EXP', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("EXP")', category = 'Target priorities', order = 88}) --Engies KeyMapper.SetUserKeyAction('Engies', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("Engies")', category = 'Target priorities', order = 89}) KeyMapper.SetUserKeyAction('Shift_Engies', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("Engies")', category = 'Target priorities', order = 90}) --Arty KeyMapper.SetUserKeyAction('Arty', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("Arty")', category = 'Target priorities', order = 91}) KeyMapper.SetUserKeyAction('Shift_Arty', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("Arty")', category = 'Target priorities', order = 92}) --Fighters KeyMapper.SetUserKeyAction('Fighters', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("Fighters")', category = 'Target priorities', order = 93}) KeyMapper.SetUserKeyAction('Shift_Fighters', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("Fighters")', category = 'Target priorities', order = 94}) --SMD KeyMapper.SetUserKeyAction('SMD', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("SMD")', category = 'Target priorities', order = 95}) KeyMapper.SetUserKeyAction('Shift_SMD', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("SMD")', category = 'Target priorities', order = 96}) --Gunship KeyMapper.SetUserKeyAction('Gunship', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("Gunship")', category = 'Target priorities', order = 97}) KeyMapper.SetUserKeyAction('Shift_Gunship', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("Gunship")', category = 'Target priorities', order = 98}) --Mex KeyMapper.SetUserKeyAction('Mex', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("Mex")', category = 'Target priorities', order = 99}) KeyMapper.SetUserKeyAction('Shift_Mex', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("Mex")', category = 'Target priorities', order = 100}) --Snipe KeyMapper.SetUserKeyAction('Snipe', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("Snipe")', category = 'Target priorities', order = 101}) KeyMapper.SetUserKeyAction('Shift_Snipe', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("Snipe")', category = 'Target priorities', order = 102}) --Naval KeyMapper.SetUserKeyAction('target_Naval', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("Naval")', category = 'Target priorities', order = 103}) KeyMapper.SetUserKeyAction('Shift_target_Naval', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("Naval")', category = 'Target priorities', order = 104}) --Bships KeyMapper.SetUserKeyAction('target_Bships', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("Bships")', category = 'Target priorities', order = 105}) KeyMapper.SetUserKeyAction('Shift_target_Bships', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("Bships")', category = 'Target priorities', order = 106}) --Destros KeyMapper.SetUserKeyAction('target_Destros', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("Destros")', category = 'Target priorities', order = 107}) KeyMapper.SetUserKeyAction('Shift_target_Destros', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("Destros")', category = 'Target priorities', order = 108}) --AirDenial KeyMapper.SetUserKeyAction('target_AirDenial', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("AirDenial")', category = 'Target priorities', order = 109}) KeyMapper.SetUserKeyAction('Shift_target_AirDenial', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("AirDenial")', category = 'Target priorities', order = 110}) --GroundDenial KeyMapper.SetUserKeyAction('target_GroundDenial', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("GroundDenial")', category = 'Target priorities', order = 111}) KeyMapper.SetUserKeyAction('Shift_target_GroundDenial', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("GroundDenial")', category = 'Target priorities', order = 112}) --NavalDenial KeyMapper.SetUserKeyAction('target_NavalDenial', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("NavalDenial")', category = 'Target priorities', order = 113}) KeyMapper.SetUserKeyAction('Shift_target_NavalDenial', {action = 'UI_Lua import("/lua/keymap/misckeyactions.lua").SetWeaponPrioritiesHotkey("NavalDenial")', category = 'Target priorities', order = 114}) ```misckeyactions.luaNotice that the commander does not respect the target priority "GroundDenial" anymore.
Expected behavior
For example, in "GroundDenial", commander should prioritize engineers or t1 arties, but it doesn't do that anymore.
From time 8:26 of the replay #18515513 my commander has priority set to GroundDenial, but it targets tanks instead of t1 artillery and selens.