Add action descriptions

3 files changed, 31 insertions, 4 deletions

diff --git a/client/menu/settings/input/input_manager.gd b/client/menu/settings/input/input_manager.gd
index 0123574d..9f79a398 100644
--- a/client/menu/settings/input/input_manager.gd
+++ b/client/menu/settings/input/input_manager.gd
@@ -15,6 +15,33 @@
 #
 extends Node
 
+var action_descriptions = {
+	"forwards": tr("Move forwards"),
+	"backwards": tr("Move backwards"),
+	"left": tr("Move left"),
+	"right": tr("Move right"),
+	"rotate_left": tr("Rotate camera to the left"),
+	"rotate_right": tr("Rotate camera to the right"),
+	"rotate_up": tr("Rotate camera upwards"),
+	"rotate_down": tr("Rotate camera downwards"),
+	"interact": tr("Interact", "Interacting with items, etc."),
+	"boost": tr("Boost movement"),
+	"zoom_in": tr("Zoom in"),
+	"zoom_out": tr("Zoom out"),
+	"chat": tr("Toggle chat", "Toggle chat on or off"),
+	"reset": tr("Reset camera view"),
+	"fullscreen": tr("Toggle fullscreen"),
+	"previous": tr("Previous"),
+	"next": tr("Next"),
+	"start_game": tr("Start game"),
+	"join_spectate": tr("Join / Spectate"),
+	"zoom_in_discrete": tr("Zoom in (discrete)"),
+	"zoom_out_discrete": tr("Zoom out (discrete)"),
+	"scroll_down": tr("Scroll down"),
+	"scroll_up": tr("Scroll up"),
+
+}
+
 var default_input_map = {}
 var input_map
 
@@ -34,7 +61,7 @@ func input_map_to_settings_dictionary(map: Dictionary) -> Dictionary:
 	var settings_dict := {}
 	for k in map.keys():
 		var events = map[k]
-		settings_dict[k] = InputSetting.new(k, events)
+		settings_dict[k] = InputSetting.new(action_descriptions[k] if action_descriptions.has(k) else k, events)
 	return settings_dict
 
 func settings_dictionary_to_input_map(settings: Dictionary) -> Dictionary:
diff --git a/client/player/controllable_player.gd b/client/player/controllable_player.gd
index c5180264..c654c070 100644
--- a/client/player/controllable_player.gd
+++ b/client/player/controllable_player.gd
@@ -59,7 +59,7 @@ func _process(delta):
 	update_touch_scrolls()
 
 func _process_movement(delta):
-	var input = Input.get_vector("left", "right", "forward", "backwards") if is_input_enabled() else Vector2.ZERO
+	var input = Input.get_vector("left", "right", "forwards", "backwards") if is_input_enabled() else Vector2.ZERO
 	var boost = Input.is_action_pressed("boost") or (Global.get_setting("latch_boost") and boosting)
 	input = input.rotated( - game.camera.angle_target)
 	if Input.is_action_pressed("interact") or Input.is_action_just_released("interact"):
diff --git a/client/project.godot b/client/project.godot
index b705eed8..d8265c1d 100644
--- a/client/project.godot
+++ b/client/project.godot
@@ -55,7 +55,7 @@ ui_menu={
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194305,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
 ]
 }
-forward={
+forwards={
 "deadzone": 0.2,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null)
 , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":1,"axis_value":-1.0,"script":null)
@@ -196,7 +196,7 @@ scroll_up={
 [internationalization]
 
 locale/translations=PackedStringArray("res://po/de.po", "res://po/fr.po", "res://po/es.po", "res://po/ja.po", "res://po/fi.po", "res://po/he.po", "res://po/tr.po", "res://po/ar.po", "res://po/zh_Hant.po", "res://po/zh_Hans.po", "res://po/pl.po", "res://po/pt.po")
-locale/translations_pot_files=PackedStringArray("res://global.gd", "res://menu/overlay.tscn", "res://menu/setup.tscn", "res://menu/character.tscn", "res://menu/error.tscn", "res://menu/ingame.tscn", "res://menu/lobby.tscn", "res://menu/main.tscn", "res://menu/settings.tscn", "res://menu/ingame.gd", "res://menu/lobby.gd", "res://menu/popup_message.gd", "res://multiplayer.gd", "res://menu/hairstyle_preview.gd", "res://menu/credits.tscn", "res://menu/credits.gd", "res://menu/rating/rating.gd", "res://menu/warning_popup.tscn", "res://menu/play.tscn", "res://menu/settings/input/input_value_node.gd", "res://menu/settings/input/input_value_node.tscn")
+locale/translations_pot_files=PackedStringArray("res://global.gd", "res://menu/overlay.tscn", "res://menu/setup.tscn", "res://menu/character.tscn", "res://menu/error.tscn", "res://menu/ingame.tscn", "res://menu/lobby.tscn", "res://menu/main.tscn", "res://menu/settings.tscn", "res://menu/ingame.gd", "res://menu/lobby.gd", "res://menu/popup_message.gd", "res://multiplayer.gd", "res://menu/hairstyle_preview.gd", "res://menu/credits.tscn", "res://menu/credits.gd", "res://menu/rating/rating.gd", "res://menu/warning_popup.tscn", "res://menu/play.tscn", "res://menu/settings/input/input_value_node.gd", "res://menu/settings/input/input_value_node.tscn", "res://menu/settings/input/input_manager.gd")
 
 [rendering]