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

Add data-driven fish selection and catch showcase

Browse source
This commit is contained in:
Alexander Sellite 2026-07-25 15:15:24 -04:00
parent ae2f724fe2
commit bd2768b676
39 changed files with 1226 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

45
ui/game_ui.gd
View file

@ -6,27 +6,42 @@ const FishingSpotType = preload("res://fishing/fishing_spot.gd")
@onready var _status_label: Label = %StatusLabel
@onready var _bluegill_count_label: Label = %BluegillCountLabel
@onready var _bass_count_label: Label = %BassCountLabel
@onready var _carp_count_label: Label = %CarpCountLabel
@onready var _catch_track: Control = %CatchTrack
@onready var _green_catch_progress: ProgressBar = %GreenCatchProgress
@onready var _red_chase_progress: ProgressBar = %RedChaseProgress
@onready var _barrier_markers: Control = %BarrierMarkers
@onready var _barrier_summary: Label = %BarrierSummary
@onready var _barrier_health: Label = %BarrierHealth
@onready var _showcase_details: Label = %ShowcaseDetails
var _showcase_active: bool = false
func setup(inventory: FishInventoryType, fishing_spot: FishingSpotType) -> void:
inventory.contents_changed.connect(_on_inventory_contents_changed)
fishing_spot.status_changed.connect(_on_fishing_status_changed)
fishing_spot.catch_display_changed.connect(_on_catch_display_changed)
fishing_spot.showcase_changed.connect(_on_showcase_changed)
_update_bluegill_count(inventory.get_count(&"bluegill"))
_bass_count_label.text = "Bass: %d" % inventory.get_count(&"bass")
_carp_count_label.text = "Carp: %d" % inventory.get_count(&"carp")
func _on_inventory_contents_changed(fish_id: StringName, count: int) -> void:
if fish_id == &"bluegill":
_update_bluegill_count(count)
match fish_id:
&"bluegill":
_update_bluegill_count(count)
&"bass":
_bass_count_label.text = "Bass: %d" % count
&"carp":
_carp_count_label.text = "Carp: %d" % count
func _on_fishing_status_changed(status: String) -> void:
if _showcase_active:
return
_status_label.text = status
_status_label.visible = not status.is_empty()
@ -132,5 +147,31 @@ func _clear_barrier_markers() -> void:
marker.queue_free()
func _on_showcase_changed(
fish_name: String,
rarity_name: String,
weight_lb: float,
visible: bool,
) -> void:
_showcase_active = visible
if not visible:
_status_label.text = ""
_status_label.visible = false
_showcase_details.text = ""
_showcase_details.visible = false
return
_catch_track.visible = false
_barrier_summary.visible = false
_barrier_health.visible = false
_clear_barrier_markers()
_status_label.text = "You caught a %s!" % fish_name
_status_label.visible = true
_showcase_details.text = (
"%.1f lb • %s\nLeft click or Escape to put away"
% [weight_lb, rarity_name]
)
_showcase_details.visible = true
func _update_bluegill_count(count: int) -> void:
_bluegill_count_label.text = "Bluegill: %d" % count

19
ui/game_ui.tscn
View file

@ -21,7 +21,7 @@ script = ExtResource("1_ui")
offset_left = 16.0
offset_top = 16.0
offset_right = 176.0
offset_bottom = 62.0
offset_bottom = 104.0
[node name="MarginContainer" type="MarginContainer" parent="InventoryPanel"]
theme_override_constants/margin_left = 12
@ -29,10 +29,20 @@ theme_override_constants/margin_top = 8
theme_override_constants/margin_right = 12
theme_override_constants/margin_bottom = 8
[node name="BluegillCountLabel" type="Label" parent="InventoryPanel/MarginContainer"]
[node name="VBoxContainer" type="VBoxContainer" parent="InventoryPanel/MarginContainer"]
[node name="BluegillCountLabel" type="Label" parent="InventoryPanel/MarginContainer/VBoxContainer"]
unique_name_in_owner = true
text = "Bluegill: 0"
[node name="BassCountLabel" type="Label" parent="InventoryPanel/MarginContainer/VBoxContainer"]
unique_name_in_owner = true
text = "Bass: 0"
[node name="CarpCountLabel" type="Label" parent="InventoryPanel/MarginContainer/VBoxContainer"]
unique_name_in_owner = true
text = "Carp: 0"
[node name="FishingPanel" type="PanelContainer" parent="."]
anchors_preset = 7
anchor_left = 0.5
@ -61,6 +71,11 @@ visible = false
text = ""
horizontal_alignment = 1
[node name="ShowcaseDetails" type="Label" parent="FishingPanel/MarginContainer/VBoxContainer"]
unique_name_in_owner = true
visible = false
horizontal_alignment = 1
[node name="CatchTrack" type="Control" parent="FishingPanel/MarginContainer/VBoxContainer"]
unique_name_in_owner = true
visible = false