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

32
network/network_fish_showcase_service.gd
View file

@ -39,6 +39,19 @@ func setup(
_local_hotbar.selected_assignment_changed.connect(
_on_selected_assignment_changed
)
var selected_kind: int = (
_local_hotbar.get_selected_assignment_kind()
)
var selected_identity: StringName = StringName()
if selected_kind == PlayerHotbarType.AssignmentKind.ITEM:
selected_identity = _local_hotbar.get_selected_item_id()
elif selected_kind == PlayerHotbarType.AssignmentKind.FISH:
selected_identity = _local_hotbar.get_selected_fish_catch_id()
_on_selected_assignment_changed(
_local_hotbar.get_selected_slot(),
selected_kind,
selected_identity,
)
func toggle_selected_fish() -> bool:
@ -180,7 +193,7 @@ func _apply_state(data: Dictionary) -> void:
if avatar == null:
return
if not bool(data["visible"]):
avatar.set_held_fish(null, 1.0, false)
avatar.set_held_fish(null, 1.0, false, true)
return
var fish: FishDataType = _fish_catalog.get_fish_by_id(
StringName(str(data["fish_id"]))
@ -197,13 +210,16 @@ func _on_selected_assignment_changed(
kind: int,
identity: StringName,
) -> void:
if (
_local_visible
and (
kind != PlayerHotbarType.AssignmentKind.FISH
or identity != _local_catch_id
)
):
if kind == PlayerHotbarType.AssignmentKind.FISH:
if _local_visible and identity == _local_catch_id:
return
var fish_catch: FishCatchType = _local_inventory.get_catch_by_id(identity)
if fish_catch != null and fish_catch.is_valid():
_submit_local_state(fish_catch, true)
elif _local_visible:
_submit_local_state(null, false)
return
if _local_visible:
_submit_local_state(null, false)

5
network/network_item_use_service.gd
View file

@ -353,7 +353,10 @@ func _apply_equipped(data: Dictionary) -> void:
if avatar != null:
var item_id := StringName(str(data["item_id"]))
var item: ItemData = _catalog.get_item_by_id(item_id)
avatar.set_active_item_is_rod(int(data["category"]) == ItemData.Category.ROD)
avatar.set_active_item_is_rod(
int(data["category"]) == ItemData.Category.ROD,
true,
)
avatar.set_active_art_kit(
item.icon if item != null else null,
item_id == ArtShopStockType.ART_KIT_ITEM_ID and bool(data["owns_item"]),