krampus/grunk
1
0
Fork 0
generated from krampus/template-godot4
Code Issues 68 Pull Requests Actions Packages Projects 1 Releases 6 Wiki Activity

Fix world item pickup & retinal scanner item awareness

Browse Source
This commit is contained in:
Rob Kelly 2025-07-10 17:56:01 -06:00
parent 6647868d82
commit 7c63077312
4 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/props/interactive.gd
View File

@ -21,6 +21,7 @@ func _ready() -> void:
controller.connect(SELECT_SIGNAL, select) controller.connect(SELECT_SIGNAL, select)
controller.add_user_signal(DESELECT_SIGNAL) controller.add_user_signal(DESELECT_SIGNAL)
controller.connect(DESELECT_SIGNAL, deselect) controller.connect(DESELECT_SIGNAL, deselect)
controller.tree_exited.connect(deselect)
controller.add_user_signal(ACTIVATE_SIGNAL) controller.add_user_signal(ACTIVATE_SIGNAL)
controller.connect(ACTIVATE_SIGNAL, activate) controller.connect(ACTIVATE_SIGNAL, activate)

6
src/props/retinal_scanner/retinal_scanner.gd
View File

@ -8,6 +8,7 @@ signal activated
func _ready() -> void: func _ready() -> void:
interactive.controller.connect(Interactive.SELECT_SIGNAL, _on_interactive_selected)
_deferred_init.call_deferred() _deferred_init.call_deferred()
@ -52,3 +53,8 @@ func serialize() -> Dictionary:
func deserialize(state: Dictionary) -> void: func deserialize(state: Dictionary) -> void:
enabled = state["enabled"] enabled = state["enabled"]
func _process(_delta: float) -> void:
# TODO don't do this in _process
interactive.enabled = enabled and _has_item()

1
src/props/retinal_scanner/retinal_scanner.tscn
View File

@ -24,6 +24,7 @@ font_size = 96
outline_size = 24 outline_size = 24
[node name="InteractiveBody" type="StaticBody3D" parent="."] [node name="InteractiveBody" type="StaticBody3D" parent="."]
unique_name_in_owner = true
collision_layer = 3 collision_layer = 3
collision_mask = 0 collision_mask = 0

2
src/world/world.tscn
View File

@ -4,7 +4,7 @@
[ext_resource type="Resource" uid="uid://tgac5tnfx56r" path="res://src/world/world_manager.tres" id="2_5kmgb"] [ext_resource type="Resource" uid="uid://tgac5tnfx56r" path="res://src/world/world_manager.tres" id="2_5kmgb"]
[ext_resource type="PackedScene" uid="uid://byvjsvavbg5xe" path="res://src/ui/menus/pause_menu/pause_menu.tscn" id="2_6fy3g"] [ext_resource type="PackedScene" uid="uid://byvjsvavbg5xe" path="res://src/ui/menus/pause_menu/pause_menu.tscn" id="2_6fy3g"]
[ext_resource type="Resource" uid="uid://0i72bf8ip1lx" path="res://src/world/spook_manager.tres" id="3_l0av5"] [ext_resource type="Resource" uid="uid://0i72bf8ip1lx" path="res://src/world/spook_manager.tres" id="3_l0av5"]
[ext_resource type="PackedScene" uid="uid://bov4ok76woyc" path="res://levels/ghost_ship/ghost_ship.tscn" id="4_5kmgb"] [ext_resource type="PackedScene" uid="uid://b8rv6dg4tgaeb" path="res://levels/mechanic_test/mechanic_test.tscn" id="4_5kmgb"]
[ext_resource type="PackedScene" uid="uid://c0uitm5cg88h1" path="res://src/ui/menus/kill_screen/kill_screen.tscn" id="6_l0av5"] [ext_resource type="PackedScene" uid="uid://c0uitm5cg88h1" path="res://src/ui/menus/kill_screen/kill_screen.tscn" id="6_l0av5"]
[ext_resource type="PackedScene" uid="uid://brknr57xc2cp0" path="res://src/ui/elements/save_icon/save_icon.tscn" id="7_5kmgb"] [ext_resource type="PackedScene" uid="uid://brknr57xc2cp0" path="res://src/ui/elements/save_icon/save_icon.tscn" id="7_5kmgb"]