asellite/netfishing
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Add Cooler, Bag, and compact hotbar systems

Browse source
This commit is contained in:
Alexander Sellite 2026-07-25 20:12:29 -04:00
parent 8cd3e83285
commit 49e7faaf84
32 changed files with 1613 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

23
player/player.gd
View file

@ -6,6 +6,8 @@ const CollectionLogType = preload("res://collection/collection_log.gd")
const FishCatchType = preload("res://fish/fish_catch.gd")
const FishSaleServiceType = preload("res://economy/fish_sale_service.gd")
const PlayerWalletType = preload("res://economy/player_wallet.gd")
const PlayerBagType = preload("res://inventory/player_bag.gd")
const PlayerHotbarType = preload("res://inventory/player_hotbar.gd")
class ShowcaseCameraSnapshot:
extends RefCounted
@ -67,6 +69,8 @@ class ShowcaseCameraSnapshot:
@onready var collection_log: CollectionLogType = %CollectionLog
@onready var wallet: PlayerWalletType = %Wallet
@onready var fish_sale_service: FishSaleServiceType = %FishSaleService
@onready var bag: PlayerBagType = %Bag
@onready var hotbar: PlayerHotbarType = %Hotbar
@onready var _cast_origin: Marker3D = %CastOrigin
@onready var _fishing_rod: Node3D = %FishingRod
@onready var _fishing_rod_tip: Marker3D = %FishingRodTip
@ -198,10 +202,18 @@ func _unhandled_input(event: InputEvent) -> void:
get_viewport().set_input_as_handled()
return
if event.is_action_pressed("camera_zoom_in"):
if (
event is InputEventMouseButton
and event.shift_pressed
and event.is_action_pressed("camera_zoom_in")
):
_set_target_zoom(_target_zoom - zoom_step)
get_viewport().set_input_as_handled()
elif event.is_action_pressed("camera_zoom_out"):
elif (
event is InputEventMouseButton
and event.shift_pressed
and event.is_action_pressed("camera_zoom_out")
):
_set_target_zoom(_target_zoom + zoom_step)
get_viewport().set_input_as_handled()
@ -298,6 +310,13 @@ func get_fishing_rod() -> Node3D:
return _fishing_rod
func set_active_item_is_rod(active_is_rod: bool) -> void:
if _showcase_rod_state_stored:
_showcase_rod_visibility = active_is_rod
else:
_fishing_rod.visible = active_is_rod
func get_cast_origin_position() -> Vector3:
return _cast_origin.global_position

12
player/player.tscn
View file

@ -1,10 +1,12 @@
[gd_scene load_steps=13 format=3]
[gd_scene load_steps=15 format=3]
[ext_resource type="Script" path="res://player/player.gd" id="1_script"]
[ext_resource type="Script" path="res://inventory/fish_inventory.gd" id="2_inventory"]
[ext_resource type="Script" path="res://collection/collection_log.gd" id="3_collection"]
[ext_resource type="Script" path="res://economy/player_wallet.gd" id="4_wallet"]
[ext_resource type="Script" path="res://economy/fish_sale_service.gd" id="5_sale_service"]
[ext_resource type="Script" path="res://inventory/player_bag.gd" id="6_bag"]
[ext_resource type="Script" path="res://inventory/player_hotbar.gd" id="7_hotbar"]
[sub_resource type="CapsuleShape3D" id="PlayerShape"]
radius = 0.45
@ -88,6 +90,14 @@ script = ExtResource("4_wallet")
unique_name_in_owner = true
script = ExtResource("5_sale_service")
[node name="Bag" type="Node" parent="."]
unique_name_in_owner = true
script = ExtResource("6_bag")
[node name="Hotbar" type="Node" parent="."]
unique_name_in_owner = true
script = ExtResource("7_hotbar")
[node name="CatchDisplayAnchor" type="Marker3D" parent="Visuals"]
unique_name_in_owner = true
position = Vector3(0, 1.45, -1.15)