woofmeow/netfishing
woofmeow/netfishing
1
0
Fork 0
Code Issues 34 Pull requests Projects 1 Releases 24 Packages Wiki Activity Actions

feat: integrate fishing item transitions

Browse source
This commit is contained in:
Alexander Sellite 2026-08-09 18:43:54 -04:00
parent 692b6eeb2a
commit 63a5009b33
11 changed files with 719 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

28
fishing/fishing_spot.gd
View file

@ -67,7 +67,6 @@ signal showcase_changed(
signal bite_activated
signal bite_prompt_changed(is_visible: bool)
signal ready_for_equipment_refresh
signal fish_showcase_toggle_requested
signal art_ui_toggle_requested
enum FishingState {
@ -510,13 +509,6 @@ func _unhandled_input(event: InputEvent) -> void:
FishingState.READY:
if not _new_cast_press_armed:
return
if (
_local_hotbar != null
and not _local_hotbar.get_selected_fish_catch_id().is_empty()
):
fish_showcase_toggle_requested.emit()
get_viewport().set_input_as_handled()
return
var active_item: ItemDataType = _get_active_item()
if (
active_item != null
@ -1134,7 +1126,7 @@ func _on_catch_completed() -> void:
return
_stop_fight_audio()
_active_player.set_fighting_visual(false)
_active_player.set_fishing_visual(false)
_active_player.set_retract_visual()
state = FishingState.SHOWING_CATCH
_showcase_ready = false
_showcase_outcome_completed = false
@ -1156,6 +1148,12 @@ func _on_catch_escaped() -> void:
func _on_outcome_completed(outcome: StringName) -> void:
var retracting_player := _active_player
if (
retracting_player != null
and not retracting_player.is_retract_visual_complete()
):
await retracting_player.retract_visual_finished
if state == FishingState.RETURNING:
var cleanup_message: String = _pending_cleanup_message
_pending_cleanup_message = ""
@ -1260,7 +1258,15 @@ func _cleanup_attempt(
_stop_reeling_audio()
if _active_player != null:
_active_player.set_fighting_visual(false)
_active_player.set_fishing_visual(false)
if visual_outcome.is_empty():
_active_player.set_fishing_visual(false)
elif visual_outcome == &"catch":
# A successful catch already retracted the line before the fish
# showcase. Returning from the pocket transition should settle back
# to idle instead of replaying the retract animation.
_active_player.set_fishing_visual(false)
else:
_active_player.set_retract_visual()
if not visual_outcome.is_empty():
if state == FishingState.RETURNING:
return
@ -1746,6 +1752,8 @@ func _on_network_catch_received(fish_catch: FishCatchType) -> void:
PackedInt32Array(), -1, false
)
_presentation.set_line_mode(FishingPresentationType.LineMode.TAUT)
if _active_player != null:
_active_player.set_retract_visual()
_presentation.play_outcome(&"catch")

15
fishing/remote_fishing_presentation.gd
View file

@ -100,7 +100,7 @@ func show_bite() -> void:
func play_return(showcase_catch: FishCatch = null) -> void:
if _owner != null and is_instance_valid(_owner):
_owner.set_fighting_visual(false)
_owner.set_fishing_visual(false)
_owner.set_retract_visual()
if not _active or _bobber == null:
cleanup()
return_completed.emit()
@ -199,6 +199,12 @@ func _on_return_finished() -> void:
_bobber.visible = false
_line.visible = false
_line_mesh.clear_surfaces()
if (
_owner != null
and is_instance_valid(_owner)
and not _owner.is_retract_visual_complete()
):
await _owner.retract_visual_finished
if (
_return_showcase_catch != null
and _owner != null
@ -216,7 +222,12 @@ func _on_return_finished() -> void:
func _on_showcase_finished() -> void:
_showcase_tween = null
if _owner != null and is_instance_valid(_owner):
_owner.end_catch_showcase()
_owner.end_catch_showcase(_on_showcase_put_away_finished)
return
_on_showcase_put_away_finished()
func _on_showcase_put_away_finished() -> void:
return_completed.emit()