Skip to content

Fix excess orders stopping other orders' creation #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MrRowey merged 1 commit into from
Nov 19, 2023
Merged

Fix excess orders stopping other orders' creation #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions lua/ui/game/orders.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1520,7 +1520,7 @@ local function CreateAltOrders(availableOrders, availableToggles, units)
-- Create the alt order buttons
for index, availOrder in availableOrders do
if not standardOrdersTable[availOrder] then continue end -- Skip any orders we don't have in our table
if not commonOrders[availOrder] then
if not commonOrders[availOrder] and slotForOrder[availOrder] ~= nil then
local orderInfo = standardOrdersTable[availOrder] or AbilityInformation[availOrder]
local orderCheckbox = AddOrder(orderInfo, slotForOrder[availOrder], true)

Expand Down Expand Up @@ -1552,7 +1552,7 @@ local function CreateAltOrders(availableOrders, availableToggles, units)

for index, availToggle in availableToggles do
if not standardOrdersTable[availToggle] then continue end -- Skip any orders we don't have in our table
if not commonOrders[availToggle] then
if not commonOrders[availToggle] and slotForOrder[availToggle] ~= nil then
local orderInfo = standardOrdersTable[availToggle] or AbilityInformation[availToggle]
local orderCheckbox = AddOrder(orderInfo, slotForOrder[availToggle], true)

Expand Down Expand Up @@ -1671,9 +1671,8 @@ function SetAvailableOrders(availableOrders, availableToggles, newSelection)
end
end

if numValidOrders <= 12 then
CreateAltOrders(availableOrders, availableToggles, currentSelection)
end
CreateAltOrders(availableOrders, availableToggles, currentSelection)


controls.orderButtonGrid:EndBatch()
if table.empty(currentSelection) and controls.bg.Mini then
Expand Down