From f1c952f5d6fb2113cb5a77783765dd243495d821 Mon Sep 17 00:00:00 2001
From: Voyager <voyagerxyx@arrmail.net>
Date: Mon, 24 Aug 2026 10:36:17 -0400
Subject: [PATCH] Clarify hotbar zoom control labels

---
 settings/controller_mapping_manager.gd     |  4 ++--
 settings/keyboard_mouse_mapping_manager.gd |  4 ++--
 tests/controller_mapping_validation.gd     | 16 ++++++++++++++++
 tests/keyboard_mouse_mapping_validation.gd | 10 ++++++++++
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/settings/controller_mapping_manager.gd b/settings/controller_mapping_manager.gd
index 8c17e7f..278022e 100644
--- a/settings/controller_mapping_manager.gd
+++ b/settings/controller_mapping_manager.gd
@@ -84,7 +84,7 @@ const ROLE_LABELS: Dictionary = {
 	ROLE_LB: "focus chat or world",
 	ROLE_RB: "primary action",
 	ROLE_POINTER_MODIFIER: "virtual mouse modifier",
-	ROLE_CAMERA_ZOOM: "camera zoom",
+	ROLE_CAMERA_ZOOM: "zoom modifier (+RT)",
 	ROLE_SELECT: "chat",
 	ROLE_START: "pause",
 	ROLE_LEFT_STICK_CLICK: "sprint",
@@ -96,7 +96,7 @@ const ROLE_LABELS: Dictionary = {
 	ROLE_LEFT_STICK_X: "move left / right",
 	ROLE_LEFT_STICK_Y: "move up / down",
 	ROLE_RIGHT_STICK_X: "camera left / right",
-	ROLE_RIGHT_STICK_Y: "camera up / down",
+	ROLE_RIGHT_STICK_Y: "camera up / down (+RT to zoom)",
 }
 
 const ROLE_PROMPTS: Dictionary = {
diff --git a/settings/keyboard_mouse_mapping_manager.gd b/settings/keyboard_mouse_mapping_manager.gd
index 591bc52..54dacc8 100644
--- a/settings/keyboard_mouse_mapping_manager.gd
+++ b/settings/keyboard_mouse_mapping_manager.gd
@@ -86,8 +86,8 @@ const ROLE_LABELS: Dictionary = {
 	ROLE_PRIMARY_ACTION: "primary action",
 	ROLE_ALTERNATE_REEL: "alternate reel",
 	ROLE_CAMERA_DRAG: "rotate camera",
-	ROLE_CAMERA_ZOOM_IN: "camera zoom in",
-	ROLE_CAMERA_ZOOM_OUT: "camera zoom out",
+	ROLE_CAMERA_ZOOM_IN: "hotbar select (+SHIFT to zoom)",
+	ROLE_CAMERA_ZOOM_OUT: "hotbar select (+SHIFT to zoom)",
 	ROLE_PLAYER_MENU: "player menu",
 	ROLE_TACKLE_BOX: "tackle box",
 	ROLE_PROP_BOOK: "prop book",
diff --git a/tests/controller_mapping_validation.gd b/tests/controller_mapping_validation.gd
index b93d475..3a4645a 100644
--- a/tests/controller_mapping_validation.gd
+++ b/tests/controller_mapping_validation.gd
@@ -14,6 +14,22 @@ func _init() -> void:
 
 
 func _run() -> void:
+	if (
+		ControllerMappingManagerType.ROLE_LABELS[
+			ControllerMappingManagerType.ROLE_CAMERA_ZOOM
+		] != "zoom modifier (+RT)"
+	):
+		push_error("controller zoom modifier label is misleading")
+		quit(1)
+		return
+	if (
+		ControllerMappingManagerType.ROLE_LABELS[
+			ControllerMappingManagerType.ROLE_RIGHT_STICK_Y
+		] != "camera up / down (+RT to zoom)"
+	):
+		push_error("controller vertical camera label omits the RT zoom chord")
+		quit(1)
+		return
 	var manager := ControllerMappingManagerType.new()
 	root.add_child(manager)
 	await process_frame
diff --git a/tests/keyboard_mouse_mapping_validation.gd b/tests/keyboard_mouse_mapping_validation.gd
index db0bb71..1b95e01 100644
--- a/tests/keyboard_mouse_mapping_validation.gd
+++ b/tests/keyboard_mouse_mapping_validation.gd
@@ -38,6 +38,16 @@ func _run() -> void:
 			KeyboardMouseMappingManagerType.ROLE_INTERACT
 		) == "e"
 	)
+	assert(
+		KeyboardMouseMappingManagerType.ROLE_LABELS[
+			KeyboardMouseMappingManagerType.ROLE_CAMERA_ZOOM_IN
+		] == "hotbar select (+SHIFT to zoom)"
+	)
+	assert(
+		KeyboardMouseMappingManagerType.ROLE_LABELS[
+			KeyboardMouseMappingManagerType.ROLE_CAMERA_ZOOM_OUT
+		] == "hotbar select (+SHIFT to zoom)"
+	)
 	assert(
 		str(defaults[
 			str(KeyboardMouseMappingManagerType.ROLE_PRIMARY_ACTION)