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

Stabilize camera input across fishing and radial menus

Browse source
This commit is contained in:
Alexander Sellite 2026-08-22 22:56:30 -04:00
parent 6fd1aa0388
commit 8f8398cbcd
4 changed files with 147 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

37
tests/gathering_showcase_validation.gd
View file

@ -30,8 +30,14 @@ func _run() -> void:
var player := main.get("_player") as Player
var fishing_spot := main.get_node("%FishingSpot") as FishingSpot
var game_ui := main.get_node("%GameUI") as GameUI
var catalog := main.get("fish_catalog") as FishPool
assert(player != null and fishing_spot != null and catalog != null)
assert(
player != null
and fishing_spot != null
and game_ui != null
and catalog != null
)
fishing_spot.minimum_showcase_duration = 0.15
assert(player.bag.add_item(&"crab_net"))
assert(player.hotbar.assign_item(0, &"crab_net"))
@ -82,6 +88,18 @@ func _run() -> void:
await process_frame
assert(fishing_spot.get("_pending_catch") == null)
# A radial menu can open after the showcase panel disappears but before the
# pocket animation restores gameplay. Its camera lock must not overwrite the
# showcase's underlying camera state when the two finish in either order.
Input.action_press("open_emotes")
var emote_press := InputEventAction.new()
emote_press.action = &"open_emotes"
emote_press.pressed = true
game_ui.call("_input", emote_press)
var emote_menu := game_ui.get_node("%EmoteRadialMenu") as EmoteRadialMenu
assert(emote_menu.is_open())
assert(not bool(player.call("_is_camera_input_enabled")))
var pocket_deadline: int = Time.get_ticks_msec() + 6000
while (
Time.get_ticks_msec() < pocket_deadline
@ -91,6 +109,23 @@ func _run() -> void:
assert(fishing_spot.state == FishingSpot.FishingState.READY)
assert(player.is_movement_enabled())
assert(bool(player.call("_is_movement_input_enabled")))
assert(not bool(player.call("_is_camera_input_enabled")))
Input.action_release("open_emotes")
var emote_release := InputEventAction.new()
emote_release.action = &"open_emotes"
emote_release.pressed = false
game_ui.call("_input", emote_release)
assert(not emote_menu.is_open())
assert(bool(player.call("_is_camera_input_enabled")))
# A focused chat field or popup can consume the wheel's release event. The
# polled action state must still close the radial and release its camera lock.
Input.action_press("open_emotes")
game_ui.call("_input", emote_press)
assert(emote_menu.is_open())
Input.action_release("open_emotes")
await process_frame
assert(not emote_menu.is_open())
assert(bool(player.call("_is_camera_input_enabled")))
assert(player.inventory.contains_catch_id(crab_catch.catch_id))
assert(bool(player.get("_active_item_is_net")))