woofmeow/straywild
woofmeow/straywild
3
5
Fork 2
Code Issues 40 Projects 1 Releases 43 Packages Wiki Activity Actions

Clarify hotbar zoom control labels

Browse source
This commit is contained in:
Alexander Sellite 2026-08-24 10:36:17 -04:00
parent c65176b99f
commit f1c952f5d6
4 changed files with 30 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
settings/controller_mapping_manager.gd
View file

@ -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 = {

4
settings/keyboard_mouse_mapping_manager.gd
View file

@ -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",

16
tests/controller_mapping_validation.gd
View file

@ -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

10
tests/keyboard_mouse_mapping_validation.gd
View file

@ -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)