From 96b8a582fe97cbf901e888aec90089e35aa4613f Mon Sep 17 00:00:00 2001
From: Ada Lovegirls <8178784-adalovegirls@users.noreply.gitlab.com>
Date: Wed, 17 Feb 2021 21:10:14 +0000
Subject: [PATCH] Fixed missing controller actions

(cherry picked from commit 2ef5fb90e89bf3f8f0acc84e269f6948c696c196)
---
 CHANGELOG.md              | 1 +
 voxygen/src/controller.rs | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46089cca7e..1430a88635 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Made zooming work on wayland
 - Fixed AI behavior so only humanoids will attempt to roll
 - Fixed missing GameInputs (sneak, swimup, swimdown) in controller mapping
+- Fixed missing controller actions (dance and crafting)
 - Fixed a bug where the stairs to the boss floor in dungeons would sometimes not spawn
 - Fixed waypoints being placed underwater
 
diff --git a/voxygen/src/controller.rs b/voxygen/src/controller.rs
index 3c058c0262..1bbc05a644 100644
--- a/voxygen/src/controller.rs
+++ b/voxygen/src/controller.rs
@@ -95,6 +95,9 @@ impl From<&crate::settings::GamepadSettings> for ControllerSettings {
                 map.entry(settings.game_buttons.sit)
                     .or_default()
                     .push(GameInput::Sit);
+                map.entry(settings.game_buttons.dance)
+                    .or_default()
+                    .push(GameInput::Dance);
                 map.entry(settings.game_buttons.glide)
                     .or_default()
                     .push(GameInput::Glide);
@@ -131,6 +134,9 @@ impl From<&crate::settings::GamepadSettings> for ControllerSettings {
                 map.entry(settings.game_buttons.social)
                     .or_default()
                     .push(GameInput::Social);
+                map.entry(settings.game_buttons.crafting)
+                    .or_default()
+                    .push(GameInput::Crafting);
                 map.entry(settings.game_buttons.spellbook)
                     .or_default()
                     .push(GameInput::Spellbook);