From 0f77ceaeef82da327fb5bcb5ce8d9c9ef6b15514 Mon Sep 17 00:00:00 2001
From: flo <sunflowerstarfishmail@gmail.com>
Date: Thu, 30 Sep 2021 18:48:42 +0000
Subject: [PATCH] change gamepad mapping

---
 voxygen/src/controller.rs       |  3 +++
 voxygen/src/settings/gamepad.rs | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/voxygen/src/controller.rs b/voxygen/src/controller.rs
index 9f6fb4938a..2d48fb57a0 100644
--- a/voxygen/src/controller.rs
+++ b/voxygen/src/controller.rs
@@ -96,6 +96,9 @@ impl From<&crate::settings::GamepadSettings> for ControllerSettings {
                 map.entry(settings.game_buttons.slot9)
                     .or_default()
                     .push(GameInput::Slot9);
+                map.entry(settings.game_buttons.slot10)
+                    .or_default()
+                    .push(GameInput::Slot10);
                 map.entry(settings.game_buttons.toggle_cursor)
                     .or_default()
                     .push(GameInput::ToggleCursor);
diff --git a/voxygen/src/settings/gamepad.rs b/voxygen/src/settings/gamepad.rs
index 53313cc047..2443fea466 100644
--- a/voxygen/src/settings/gamepad.rs
+++ b/voxygen/src/settings/gamepad.rs
@@ -57,6 +57,7 @@ pub mod con_settings {
         pub slot7: Button,
         pub slot8: Button,
         pub slot9: Button,
+        pub slot10: Button,
         pub toggle_cursor: Button,
         pub escape: Button,
         pub enter: Button,
@@ -150,8 +151,8 @@ pub mod con_settings {
             Self {
                 primary: Button::Simple(GilButton::RightTrigger2),
                 secondary: Button::Simple(GilButton::LeftTrigger2),
-                block: Button::Simple(GilButton::Unknown),
-                slot1: Button::Simple(GilButton::Unknown),
+                block: Button::Simple(GilButton::LeftThumb),
+                slot1: Button::Simple(GilButton::RightThumb),
                 slot2: Button::Simple(GilButton::Unknown),
                 slot3: Button::Simple(GilButton::Unknown),
                 slot4: Button::Simple(GilButton::Unknown),
@@ -160,8 +161,9 @@ pub mod con_settings {
                 slot7: Button::Simple(GilButton::Unknown),
                 slot8: Button::Simple(GilButton::Unknown),
                 slot9: Button::Simple(GilButton::Unknown),
-                toggle_cursor: Button::Simple(GilButton::Unknown),
-                escape: Button::Simple(GilButton::Start),
+                slot10: Button::Simple(GilButton::DPadDown),
+                toggle_cursor: Button::Simple(GilButton::DPadRight),
+                escape: Button::Simple(GilButton::Select),
                 enter: Button::Simple(GilButton::Unknown),
                 command: Button::Simple(GilButton::Unknown),
                 move_forward: Button::Simple(GilButton::Unknown),
@@ -179,12 +181,12 @@ pub mod con_settings {
                 sneak: Button::Simple(GilButton::East),
                 toggle_lantern: Button::Simple(GilButton::DPadLeft),
                 mount: Button::Simple(GilButton::North),
-                map: Button::Simple(GilButton::Select),
-                bag: Button::Simple(GilButton::DPadRight),
+                map: Button::Simple(GilButton::Start),
+                bag: Button::Simple(GilButton::Unknown),
                 quest_log: Button::Simple(GilButton::Unknown),
                 character_window: Button::Simple(GilButton::Unknown),
                 social: Button::Simple(GilButton::Unknown),
-                crafting: Button::Simple(GilButton::DPadDown),
+                crafting: Button::Simple(GilButton::Unknown),
                 spellbook: Button::Simple(GilButton::Unknown),
                 settings: Button::Simple(GilButton::Unknown),
                 help: Button::Simple(GilButton::Unknown),
@@ -200,7 +202,7 @@ pub mod con_settings {
                 respawn: Button::Simple(GilButton::South),
                 interact: Button::Simple(GilButton::North),
                 toggle_wield: Button::Simple(GilButton::West),
-                swap_loadout: Button::Simple(GilButton::LeftThumb),
+                swap_loadout: Button::Simple(GilButton::DPadUp),
             }
         }
     }