From 33f5bf2973d4356fafca44abaac88db42d7ed460 Mon Sep 17 00:00:00 2001 From: lL1l1 <82986251+lL1l1@users.noreply.github.com> Date: Tue, 19 Mar 2024 23:43:30 -0700 Subject: [PATCH 1/4] Re-add hotkey label for attack move --- lua/keymap/hotkeylabels.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lua/keymap/hotkeylabels.lua b/lua/keymap/hotkeylabels.lua index 37cbe7524b..60c3527cee 100644 --- a/lua/keymap/hotkeylabels.lua +++ b/lua/keymap/hotkeylabels.lua @@ -113,6 +113,12 @@ function getKeyTables() local upgradeKey = false local orderKeys = {} + -- Special case for the attack move order because it can't be bound from the user key map + orderKeys["attack_move"] = { + ["key"] = 'RMB', + ["colour"] = colours[3], + } + -- Get them from the building tab for groupName, groupItems in unitkeygroups do -- Since this file hardcodes all unit ids that can be affected by hotbuild, helpidrelations will get them all local g = groupName:lower() From 0d21e443a06f113b749620c97aea3c7f885b4d5f Mon Sep 17 00:00:00 2001 From: lL1l1 <82986251+lL1l1@users.noreply.github.com> Date: Tue, 19 Mar 2024 23:51:32 -0700 Subject: [PATCH 2/4] Add changelog --- changelog/3804.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/3804.md b/changelog/3804.md index 05676d97df..a36cb2a582 100644 --- a/changelog/3804.md +++ b/changelog/3804.md @@ -10,7 +10,7 @@ ## Features - +- (#6010) Add a hotkey label for the Attack Move button ## Graphics From 4e900ded75eb3ce2376a8310c1c5826414e24cdd Mon Sep 17 00:00:00 2001 From: lL1l1 <82986251+lL1l1@users.noreply.github.com> Date: Thu, 21 Mar 2024 13:37:21 -0700 Subject: [PATCH 3/4] Move assignment into declaration --- lua/keymap/hotkeylabels.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/keymap/hotkeylabels.lua b/lua/keymap/hotkeylabels.lua index 60c3527cee..49ebda8bf9 100644 --- a/lua/keymap/hotkeylabels.lua +++ b/lua/keymap/hotkeylabels.lua @@ -111,13 +111,13 @@ function getKeyTables() local helpIdRelations = {} local otherRelations = {} local upgradeKey = false - local orderKeys = {} - - -- Special case for the attack move order because it can't be bound from the user key map - orderKeys["attack_move"] = { + local orderKeys = { + -- Special assignment for the attack move order because it can't be bound from the user key map + ["attack_move"] = { ["key"] = 'RMB', ["colour"] = colours[3], } + } -- Get them from the building tab for groupName, groupItems in unitkeygroups do -- Since this file hardcodes all unit ids that can be affected by hotbuild, helpidrelations will get them all From 0535e55331aa52746ce6901e6e1c91802b364e25 Mon Sep 17 00:00:00 2001 From: lL1l1 <82986251+lL1l1@users.noreply.github.com> Date: Thu, 21 Mar 2024 13:40:42 -0700 Subject: [PATCH 4/4] annotate keying --- lua/keymap/hotkeylabels.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/keymap/hotkeylabels.lua b/lua/keymap/hotkeylabels.lua index 49ebda8bf9..367875cb3a 100644 --- a/lua/keymap/hotkeylabels.lua +++ b/lua/keymap/hotkeylabels.lua @@ -113,6 +113,7 @@ function getKeyTables() local upgradeKey = false local orderKeys = { -- Special assignment for the attack move order because it can't be bound from the user key map + -- Keyed the same as the tooltip for the attack move button ["attack_move"] = { ["key"] = 'RMB', ["colour"] = colours[3],