Skip to content

hotkeys for adjusting step-by-step #2769

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
aBlueShadow wants to merge 2 commits into
base: master
Choose a base branch
from
Open

hotkeys for adjusting step-by-step #2769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e57b891
hotkeys for aiming step-by-step
Mar 8, 2026
2d3943e
add stepwise keybinding for scanning
Mar 8, 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
18 changes: 18 additions & 0 deletions src/gui/hotkeyConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,8 @@ Keys::Keys() :
weapons_disable_aim_lock("WEAPONS_AIM_LOCK_DISABLE"),
weapons_aim_left("WEAPONS_AIM_LEFT", "G"),
weapons_aim_right("WEAPONS_AIM_RIGHT", "H"),
weapons_aim_left_step("WEAPONS_AIM_LEFT_STEP"),
weapons_aim_right_step("WEAPONS_AIM_RIGHT_STEP"),

//Science
science_scan_object("SCIENCE_SCAN_OBJECT", "S"),
Expand All @@ -242,6 +244,18 @@ Keys::Keys() :
{"SCIENCE_SCAN_PARAM_SET_3"},
{"SCIENCE_SCAN_PARAM_SET_4"},
}},
science_scan_param_increase_step{{
{"SCIENCE_SCAN_PARAM_INCREASE_STEP_1"},
{"SCIENCE_SCAN_PARAM_INCREASE_STEP_2"},
{"SCIENCE_SCAN_PARAM_INCREASE_STEP_3"},
{"SCIENCE_SCAN_PARAM_INCREASE_STEP_4"},
}},
science_scan_param_decrease_step{{
{"SCIENCE_SCAN_PARAM_DECREASE_STEP_1"},
{"SCIENCE_SCAN_PARAM_DECREASE_STEP_2"},
{"SCIENCE_SCAN_PARAM_DECREASE_STEP_3"},
{"SCIENCE_SCAN_PARAM_DECREASE_STEP_4"},
}},

//Engineering
engineering_select_system{
Expand Down Expand Up @@ -417,6 +431,8 @@ void Keys::init()
weapons_disable_aim_lock.setLabel(tr("hotkey_menu", "Weapons"), tr("hotkey_Weapons", "Disable missile aim lock"));
weapons_aim_left.setLabel(tr("hotkey_menu", "Weapons"), tr("hotkey_Weapons", "Turn missile aim to the left"));
weapons_aim_right.setLabel(tr("hotkey_menu", "Weapons"), tr("hotkey_Weapons", "Turn missile aim to the right"));
weapons_aim_left_step.setLabel(tr("hotkey_menu", "Weapons"), tr("hotkey_Weapons", "Turn missile aim left (15° steps)"));
weapons_aim_right_step.setLabel(tr("hotkey_menu", "Weapons"), tr("hotkey_Weapons", "Turn missile aim right (15° steps)"));

//Science
science_scan_object.setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Scan object"));
Expand All @@ -427,6 +443,8 @@ void Keys::init()
science_scan_param_increase[n].setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Scanning parameter {number} increase").format({{"number", string(n+1)}}));
science_scan_param_decrease[n].setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Scanning parameter {number} decrease").format({{"number", string(n+1)}}));
science_scan_param_set[n].setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Set scanning parameter {number} (joystick)").format({{"number", string(n+1)}}));
science_scan_param_increase_step[n].setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Scan parameter {number} increase stepwise").format({{"number", string(n+1)}}));
science_scan_param_decrease_step[n].setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Scan parameter {number} decrease stepwise").format({{"number", string(n+1)}}));
}

//Engineering
Expand Down
4 changes: 4 additions & 0 deletions src/gui/hotkeyConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ class Keys
sp::io::Keybinding weapons_disable_aim_lock;
sp::io::Keybinding weapons_aim_left;
sp::io::Keybinding weapons_aim_right;
sp::io::Keybinding weapons_aim_left_step;
sp::io::Keybinding weapons_aim_right_step;

//Science
sp::io::Keybinding science_scan_object;
Expand All @@ -118,6 +120,8 @@ class Keys
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;
std::array<sp::io::Keybinding, 4> science_scan_param_increase_step;
std::array<sp::io::Keybinding, 4> science_scan_param_decrease_step;

//Engineering
sp::io::Keybinding engineering_select_system[ShipSystem::COUNT];
Expand Down
4 changes: 4 additions & 0 deletions src/screenComponents/scanningDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ void GuiScanningDialog::onUpdate()
for(int n=0; n<max_sliders; n++)
{
float adjust = (keys.science_scan_param_increase[n].getValue() - keys.science_scan_param_decrease[n].getValue()) * 0.01f;
if (keys.science_scan_param_decrease_step[n].getDown())
adjust =-0.02f;
if (keys.science_scan_param_increase_step[n].getDown())
adjust =0.02f;
if (adjust != 0.0f)
{
sliders[n]->setValue(sliders[n]->getValue() + adjust);
Expand Down
11 changes: 11 additions & 0 deletions src/screens/crew1/singlePilotScreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,17 @@ void SinglePilotScreen::onUpdate()
}

auto aim_adjust = keys.weapons_aim_left.getValue() - keys.weapons_aim_right.getValue();
// when using 15° steps, make sure the angle is a multiple of 15
if (keys.weapons_aim_left_step.getDown())
{
missile_aim->setValue(std::round(missile_aim->getValue()/15)*15);
aim_adjust =3.0f;
}
if (keys.weapons_aim_right_step.getDown())
{
missile_aim->setValue(std::round(missile_aim->getValue()/15)*15);
aim_adjust =-3.0f;
}
if (aim_adjust != 0.0f)
{
missile_aim->setValue(missile_aim->getValue() - 5.0f * aim_adjust);
Expand Down
11 changes: 11 additions & 0 deletions src/screens/crew4/tacticalScreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,17 @@ void TacticalScreen::onUpdate()
}

auto aim_adjust = keys.weapons_aim_left.getValue() - keys.weapons_aim_right.getValue();
// when using 15° steps, make sure the angle is a multiple of 15
if (keys.weapons_aim_left_step.getDown())
{
missile_aim->setValue(std::round(missile_aim->getValue()/15)*15);
aim_adjust =3.0f;
}
if (keys.weapons_aim_right_step.getDown())
{
missile_aim->setValue(std::round(missile_aim->getValue()/15)*15);
aim_adjust =-3.0f;
}
if (aim_adjust != 0.0f)
{
missile_aim->setValue(missile_aim->getValue() - 5.0f * aim_adjust);
Expand Down
11 changes: 11 additions & 0 deletions src/screens/crew6/weaponsScreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,17 @@ void WeaponsScreen::onUpdate()
}
}
auto aim_adjust = keys.weapons_aim_left.getValue() - keys.weapons_aim_right.getValue();
// when using 15° steps, make sure the angle is a multiple of 15
if (keys.weapons_aim_left_step.getDown())
{
missile_aim->setValue(std::round(missile_aim->getValue()/15)*15);
aim_adjust =3.0f;
}
if (keys.weapons_aim_right_step.getDown())
{
missile_aim->setValue(std::round(missile_aim->getValue()/15)*15);
aim_adjust =-3.0f;
}
if (aim_adjust != 0.0f)
{
missile_aim->setValue(missile_aim->getValue() - 5.0f * aim_adjust);
Expand Down