Skip to content

Refactor previous/next target selection, add targeting keybinds #2841

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

Open
oznogon wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Refactor previous/next target selection, add targeting keybinds #2841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dacb62d
Refactor previous/next target selection
oznogon Apr 7, 2026
4a30d51
trying to fix probe view next scannable object
gwaland Apr 7, 2026
303b75d
Merge branch 'master' into 2703-target-cycle-keybinds
oznogon Apr 14, 2026
4c83cea
Merge branch 'master' into 2703-target-cycle-keybinds
oznogon Apr 15, 2026
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
30 changes: 30 additions & 0 deletions src/gui/hotkeyConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,9 @@ Keys::Keys() :
{"WEAPONS_FIRE_TUBE16"},
}},
weapons_enemy_next_target("WEAPONS_TARGET_NEXT_ENEMY", "C"),
weapons_enemy_prev_target("WEAPONS_TARGET_PREV_ENEMY"),
weapons_next_target("WEAPONS_TARGET_NEXT", "Z"),
weapons_prev_target("WEAPONS_TARGET_PREV"),
weapons_toggle_shields("WEAPONS_SHIELDS_TOGGLE", "S"),
weapons_enable_shields("WEAPONS_SHIELDS_ENABLE"),
weapons_disable_shields("WEAPONS_SHIELDS_DISABLE"),
Expand All @@ -231,6 +233,11 @@ Keys::Keys() :
science_scan_object("SCIENCE_SCAN_OBJECT", "S"),
science_scan_abort("SCIENCE_SCAN_ABORT", "D"),
science_select_next_scannable("SCIENCE_SELECT_NEXT_SCANNABLE", "C"),
science_select_prev_scannable("SCIENCE_SELECT_PREV_SCANNABLE"),
science_next_target("SCIENCE_TARGET_NEXT"),
science_prev_target("SCIENCE_TARGET_PREV"),
science_enemy_next_target("SCIENCE_TARGET_NEXT_ENEMY"),
science_enemy_prev_target("SCIENCE_TARGET_PREV_ENEMY"),
science_scan_param_increase{{
{"SCIENCE_SCAN_PARAM_INCREASE_1"},
{"SCIENCE_SCAN_PARAM_INCREASE_2"},
Expand Down Expand Up @@ -313,6 +320,14 @@ Keys::Keys() :
relay_alert_level_none("RELAY_ALERT_NONE"),
relay_alert_level_yellow("RELAY_ALERT_YELLOW"),
relay_alert_level_red("RELAY_ALERT_RED"),
relay_next_target("RELAY_TARGET_NEXT"),
relay_prev_target("RELAY_TARGET_PREV"),
relay_enemy_next_target("RELAY_TARGET_NEXT_ENEMY"),
relay_enemy_prev_target("RELAY_TARGET_PREV_ENEMY"),
relay_next_hackable("RELAY_TARGET_NEXT_HACKABLE"),
relay_prev_hackable("RELAY_TARGET_PREV_HACKABLE"),
relay_next_probe("RELAY_TARGET_NEXT_PROBE"),
relay_prev_probe("RELAY_TARGET_PREV_PROBE"),

// GM screen
gm_delete("GM_DELETE", "Delete"),
Expand Down Expand Up @@ -415,7 +430,9 @@ void Keys::init()
weapons_fire_tube[n].setLabel(tr("hotkey_menu", "Weapons"), tr("hotkey_Weapons", "Fire tube {number}").format({{"number", string(n + 1)}}));
}
weapons_enemy_next_target.setLabel(tr("hotkey_menu", "Weapons"), tr("hotkey_Weapons", "Select next hostile target"));
weapons_enemy_prev_target.setLabel(tr("hotkey_menu", "Weapons"), tr("hotkey_Weapons", "Select previous hostile target"));
weapons_next_target.setLabel(tr("hotkey_menu", "Weapons"), tr("hotkey_Weapons", "Select next target (any)"));
weapons_prev_target.setLabel(tr("hotkey_menu", "Weapons"), tr("hotkey_Weapons", "Select previous target (any)"));
weapons_toggle_shields.setLabel(tr("hotkey_menu", "Weapons"), tr("hotkey_Weapons", "Toggle shields"));
weapons_enable_shields.setLabel(tr("hotkey_menu", "Weapons"), tr("hotkey_Weapons", "Enable shields"));
weapons_disable_shields.setLabel(tr("hotkey_menu", "Weapons"), tr("hotkey_Weapons", "Disable shields"));
Expand All @@ -436,6 +453,11 @@ void Keys::init()
science_scan_object.setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Scan object"));
science_scan_abort.setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Abort scan"));
science_select_next_scannable.setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Select next scannable object"));
science_select_prev_scannable.setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Select previous scannable object"));
science_next_target.setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Select next target (any)"));
science_prev_target.setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Select previous target (any)"));
science_enemy_next_target.setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Select next hostile target"));
science_enemy_prev_target.setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Select previous hostile target"));
for (auto n = 0u; n < science_scan_param_increase.size(); n++)
{
science_scan_param_increase[n].setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Scanning parameter {number} increase").format({{"number", string(n + 1)}}));
Expand Down Expand Up @@ -502,6 +524,14 @@ void Keys::init()
relay_alert_level_none.setLabel(tr("hotkey_menu", "Relay"), tr("hotkey_Relay", "Alert level: Normal"));
relay_alert_level_yellow.setLabel(tr("hotkey_menu", "Relay"), tr("hotkey_Relay", "Alert level: Yellow"));
relay_alert_level_red.setLabel(tr("hotkey_menu", "Relay"), tr("hotkey_Relay", "Alert level: Red"));
relay_next_target.setLabel(tr("hotkey_menu", "Relay"), tr("hotkey_Relay", "Select next target (any)"));
relay_prev_target.setLabel(tr("hotkey_menu", "Relay"), tr("hotkey_Relay", "Select previous target (any)"));
relay_enemy_next_target.setLabel(tr("hotkey_menu", "Relay"), tr("hotkey_Relay", "Select next hostile target"));
relay_enemy_prev_target.setLabel(tr("hotkey_menu", "Relay"), tr("hotkey_Relay", "Select previous hostile target"));
relay_next_hackable.setLabel(tr("hotkey_menu", "Relay"), tr("hotkey_Relay", "Select next hackable target"));
relay_prev_hackable.setLabel(tr("hotkey_menu", "Relay"), tr("hotkey_Relay", "Select previous hackable target"));
relay_next_probe.setLabel(tr("hotkey_menu", "Relay"), tr("hotkey_Relay", "Select next probe"));
relay_prev_probe.setLabel(tr("hotkey_menu", "Relay"), tr("hotkey_Relay", "Select previous probe"));

// Cinematic view
cinematic.init();
Expand Down
15 changes: 15 additions & 0 deletions src/gui/hotkeyConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,9 @@ class Keys
std::array<sp::io::Keybinding, 16> weapons_unload_tube;
std::array<sp::io::Keybinding, 16> weapons_fire_tube;
sp::io::Keybinding weapons_enemy_next_target;
sp::io::Keybinding weapons_enemy_prev_target;
sp::io::Keybinding weapons_next_target;
sp::io::Keybinding weapons_prev_target;
sp::io::Keybinding weapons_toggle_shields;
sp::io::Keybinding weapons_enable_shields;
sp::io::Keybinding weapons_disable_shields;
Expand All @@ -120,6 +122,11 @@ class Keys
sp::io::Keybinding science_scan_object;
sp::io::Keybinding science_scan_abort;
sp::io::Keybinding science_select_next_scannable;
sp::io::Keybinding science_select_prev_scannable;
sp::io::Keybinding science_next_target;
sp::io::Keybinding science_prev_target;
sp::io::Keybinding science_enemy_next_target;
sp::io::Keybinding science_enemy_prev_target;
std::array<sp::io::Keybinding, 4> science_scan_param_increase;
std::array<sp::io::Keybinding, 4> science_scan_param_decrease;
std::array<sp::io::Keybinding, 4> science_scan_param_set;
Expand Down Expand Up @@ -158,6 +165,14 @@ class Keys
sp::io::Keybinding relay_alert_level_none;
sp::io::Keybinding relay_alert_level_yellow;
sp::io::Keybinding relay_alert_level_red;
sp::io::Keybinding relay_next_target;
sp::io::Keybinding relay_prev_target;
sp::io::Keybinding relay_enemy_next_target;
sp::io::Keybinding relay_enemy_prev_target;
sp::io::Keybinding relay_next_hackable;
sp::io::Keybinding relay_prev_hackable;
sp::io::Keybinding relay_next_probe;
sp::io::Keybinding relay_prev_probe;

// Cinematic view binds
struct CinematicKeys {
Expand Down
Loading
Loading