Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved consistency of default controls

Browse Source
This commit is contained in:
Joshua Barretto 2021-06-30 13:39:37 +01:00
parent a7f7ea6327
commit cf01dd7df7
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Food now has limited regeneration strength but longer duration. - Food now has limited regeneration strength but longer duration.
- Harvester boss now has new abilities and AI - Harvester boss now has new abilities and AI
- Death particles and SFX - Death particles and SFX
- Default keybindings were made more consistent
### Removed ### Removed

20
voxygen/src/settings/control.rs
View File

@ -52,7 +52,7 @@ impl From<ControlSettingsSerde> for ControlSettings {
/// (roll and wall jump) are both situations where you cannot glide (the other /// (roll and wall jump) are both situations where you cannot glide (the other
/// default mapping for LShift). /// default mapping for LShift).
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
const MIDDLE_CLICK_KEY: KeyMouse = KeyMouse::Key(VirtualKeyCode::LShift); const MIDDLE_CLICK_KEY: KeyMouse = KeyMouse::Key(VirtualKeyCode::Grave);
#[cfg(not(target_os = "macos"))] #[cfg(not(target_os = "macos"))]
const MIDDLE_CLICK_KEY: KeyMouse = KeyMouse::Mouse(MouseButton::Middle); const MIDDLE_CLICK_KEY: KeyMouse = KeyMouse::Mouse(MouseButton::Middle);
@ -124,22 +124,22 @@ impl ControlSettings {
GameInput::Sit => KeyMouse::Key(VirtualKeyCode::K), GameInput::Sit => KeyMouse::Key(VirtualKeyCode::K),
GameInput::Dance => KeyMouse::Key(VirtualKeyCode::J), GameInput::Dance => KeyMouse::Key(VirtualKeyCode::J),
GameInput::Greet => KeyMouse::Key(VirtualKeyCode::H), GameInput::Greet => KeyMouse::Key(VirtualKeyCode::H),
GameInput::Glide => KeyMouse::Key(VirtualKeyCode::LShift), GameInput::Glide => KeyMouse::Key(VirtualKeyCode::LControl),
GameInput::Climb => KeyMouse::Key(VirtualKeyCode::Space), GameInput::Climb => KeyMouse::Key(VirtualKeyCode::Space),
GameInput::ClimbDown => KeyMouse::Key(VirtualKeyCode::LControl), GameInput::ClimbDown => KeyMouse::Key(VirtualKeyCode::LShift),
GameInput::SwimUp => KeyMouse::Key(VirtualKeyCode::Space), GameInput::SwimUp => KeyMouse::Key(VirtualKeyCode::Space),
GameInput::SwimDown => KeyMouse::Key(VirtualKeyCode::LShift), GameInput::SwimDown => KeyMouse::Key(VirtualKeyCode::LShift),
GameInput::Fly => KeyMouse::Key(VirtualKeyCode::H), GameInput::Fly => KeyMouse::Key(VirtualKeyCode::H),
GameInput::Sneak => KeyMouse::Key(VirtualKeyCode::LControl), GameInput::Sneak => KeyMouse::Key(VirtualKeyCode::LShift),
GameInput::ToggleLantern => KeyMouse::Key(VirtualKeyCode::G), GameInput::ToggleLantern => KeyMouse::Key(VirtualKeyCode::G),
GameInput::Mount => KeyMouse::Key(VirtualKeyCode::F), GameInput::Mount => KeyMouse::Key(VirtualKeyCode::F),
GameInput::Map => KeyMouse::Key(VirtualKeyCode::M), GameInput::Map => KeyMouse::Key(VirtualKeyCode::M),
GameInput::Bag => KeyMouse::Key(VirtualKeyCode::B), GameInput::Bag => KeyMouse::Key(VirtualKeyCode::B),
GameInput::Trade => KeyMouse::Key(VirtualKeyCode::R), GameInput::Trade => KeyMouse::Key(VirtualKeyCode::T),
GameInput::Social => KeyMouse::Key(VirtualKeyCode::O), GameInput::Social => KeyMouse::Key(VirtualKeyCode::O),
GameInput::Crafting => KeyMouse::Key(VirtualKeyCode::C), GameInput::Crafting => KeyMouse::Key(VirtualKeyCode::C),
GameInput::Spellbook => KeyMouse::Key(VirtualKeyCode::P), GameInput::Spellbook => KeyMouse::Key(VirtualKeyCode::P),
GameInput::Settings => KeyMouse::Key(VirtualKeyCode::N), GameInput::Settings => KeyMouse::Key(VirtualKeyCode::F10),
GameInput::Help => KeyMouse::Key(VirtualKeyCode::F1), GameInput::Help => KeyMouse::Key(VirtualKeyCode::F1),
GameInput::ToggleInterface => KeyMouse::Key(VirtualKeyCode::F2), GameInput::ToggleInterface => KeyMouse::Key(VirtualKeyCode::F2),
GameInput::ToggleDebug => KeyMouse::Key(VirtualKeyCode::F3), GameInput::ToggleDebug => KeyMouse::Key(VirtualKeyCode::F3),
@ -149,7 +149,7 @@ impl ControlSettings {
GameInput::Roll => MIDDLE_CLICK_KEY, GameInput::Roll => MIDDLE_CLICK_KEY,
GameInput::Respawn => KeyMouse::Key(VirtualKeyCode::Space), GameInput::Respawn => KeyMouse::Key(VirtualKeyCode::Space),
GameInput::Interact => KeyMouse::Key(VirtualKeyCode::E), GameInput::Interact => KeyMouse::Key(VirtualKeyCode::E),
GameInput::ToggleWield => KeyMouse::Key(VirtualKeyCode::T), GameInput::ToggleWield => KeyMouse::Key(VirtualKeyCode::R),
GameInput::FreeLook => KeyMouse::Key(VirtualKeyCode::L), GameInput::FreeLook => KeyMouse::Key(VirtualKeyCode::L),
GameInput::AutoWalk => KeyMouse::Key(VirtualKeyCode::Period), GameInput::AutoWalk => KeyMouse::Key(VirtualKeyCode::Period),
GameInput::CameraClamp => KeyMouse::Key(VirtualKeyCode::Apostrophe), GameInput::CameraClamp => KeyMouse::Key(VirtualKeyCode::Apostrophe),
@ -165,9 +165,9 @@ impl ControlSettings {
GameInput::Slot9 => KeyMouse::Key(VirtualKeyCode::Key9), GameInput::Slot9 => KeyMouse::Key(VirtualKeyCode::Key9),
GameInput::Slot10 => KeyMouse::Key(VirtualKeyCode::Q), GameInput::Slot10 => KeyMouse::Key(VirtualKeyCode::Q),
GameInput::SwapLoadout => KeyMouse::Key(VirtualKeyCode::Tab), GameInput::SwapLoadout => KeyMouse::Key(VirtualKeyCode::Tab),
GameInput::Select => KeyMouse::Key(VirtualKeyCode::Y), GameInput::Select => KeyMouse::Key(VirtualKeyCode::X),
GameInput::AcceptGroupInvite => KeyMouse::Key(VirtualKeyCode::U), GameInput::AcceptGroupInvite => KeyMouse::Key(VirtualKeyCode::Y),
GameInput::DeclineGroupInvite => KeyMouse::Key(VirtualKeyCode::I), GameInput::DeclineGroupInvite => KeyMouse::Key(VirtualKeyCode::N),
GameInput::MapZoomIn => KeyMouse::Key(VirtualKeyCode::Plus), GameInput::MapZoomIn => KeyMouse::Key(VirtualKeyCode::Plus),
GameInput::MapZoomOut => KeyMouse::Key(VirtualKeyCode::Minus), GameInput::MapZoomOut => KeyMouse::Key(VirtualKeyCode::Minus),
} }