Skip to content
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

Jump to bottom

Re-add hotkey label for attack move #6010

Merged
merged 5 commits into from
Mar 23, 2024
Merged

Re-add hotkey label for attack move #6010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
33f5bf2
Re-add hotkey label for attack move
lL1l1 Mar 20, 2024
0d21e44
Add changelog
lL1l1 Mar 20, 2024
4e900de
Move assignment into declaration
lL1l1 Mar 21, 2024
0535e55
annotate keying
lL1l1 Mar 21, 2024
2d5c1a2
Merge branch 'deploy/fafdevelop' into UI/alt+rmb
Garanas Mar 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelog/3804.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ Via this feature one could assign attack orders to (mobile) units that you lack

## Features

- (#6010) Add a hotkey label for the Attack Move button

- (#6015, #6016) Extend the context-based templates feature

The context-based templates feature generates and adjusts templates based on the context of your mouse. Globally speaking, this is one of two categories:
Expand Down
9 changes: 8 additions & 1 deletion lua/keymap/hotkeylabels.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,14 @@ function getKeyTables()
local helpIdRelations = {}
local otherRelations = {}
local upgradeKey = false
local orderKeys = {}
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],
}
}

-- 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
Expand Down