Add item placement marker
This commit is contained in:
parent
d8cdc48c01
commit
a43ed5ccb2
BIN
assets/item_placement_marker/Highlight.material
Normal file
BIN
assets/item_placement_marker/Highlight.material
Normal file
Binary file not shown.
BIN
assets/item_placement_marker/Material.material
Normal file
BIN
assets/item_placement_marker/Material.material
Normal file
Binary file not shown.
BIN
assets/item_placement_marker/item_placement_marker.glb
Normal file
BIN
assets/item_placement_marker/item_placement_marker.glb
Normal file
Binary file not shown.
1065
assets/item_placement_marker/item_placement_marker.glb.import
Normal file
1065
assets/item_placement_marker/item_placement_marker.glb.import
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,8 @@
|
|||||||
[gd_scene load_steps=4 format=2]
|
[gd_scene load_steps=5 format=2]
|
||||||
|
|
||||||
[ext_resource path="res://assets/sound/handleSmallLeather.ogg" type="AudioStream" id=1]
|
[ext_resource path="res://assets/sound/handleSmallLeather.ogg" type="AudioStream" id=1]
|
||||||
[ext_resource path="res://scripts/item_holder.gd" type="Script" id=2]
|
[ext_resource path="res://scripts/item_holder.gd" type="Script" id=2]
|
||||||
|
[ext_resource path="res://assets/item_placement_marker/item_placement_marker.glb" type="PackedScene" id=3]
|
||||||
|
|
||||||
[sub_resource type="SphereShape" id=4]
|
[sub_resource type="SphereShape" id=4]
|
||||||
radius = 0.8
|
radius = 0.8
|
||||||
@ -19,3 +20,6 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.372095, 0 )
|
|||||||
|
|
||||||
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
|
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
|
||||||
stream = ExtResource( 1 )
|
stream = ExtResource( 1 )
|
||||||
|
|
||||||
|
[node name="item_placement_marker" parent="." instance=ExtResource( 3 )]
|
||||||
|
transform = Transform( 0.745014, 0, 0, 0, 0.745014, 0, 0, 0, 0.745014, 0, 0.0394753, 0 )
|
||||||
|
@ -860,6 +860,8 @@ valign = 1
|
|||||||
[node name="hunger_timer" type="Timer" parent="."]
|
[node name="hunger_timer" type="Timer" parent="."]
|
||||||
unique_name_in_owner = true
|
unique_name_in_owner = true
|
||||||
|
|
||||||
|
[connection signal="area_entered" from="model_transform/DungMan/TriggerVolume" to="." method="_on_TriggerVolume_area_entered"]
|
||||||
|
[connection signal="area_exited" from="model_transform/DungMan/TriggerVolume" to="." method="_on_TriggerVolume_area_exited"]
|
||||||
[connection signal="timeout" from="model_transform/DungMan/blink_timer" to="." method="_on_blink_timer_timeout"]
|
[connection signal="timeout" from="model_transform/DungMan/blink_timer" to="." method="_on_blink_timer_timeout"]
|
||||||
[connection signal="timeout" from="hunger_timer" to="." method="_on_hunger_timer_timeout"]
|
[connection signal="timeout" from="hunger_timer" to="." method="_on_hunger_timer_timeout"]
|
||||||
|
|
||||||
|
@ -75,6 +75,12 @@ func take_from_player(player) -> bool:
|
|||||||
emit_signal("item_changed", item_in_hold)
|
emit_signal("item_changed", item_in_hold)
|
||||||
return true
|
return true
|
||||||
|
|
||||||
|
func on_player_focus_enter():
|
||||||
|
$item_placement_marker/Item_Placement_Marker.material_override = preload("res://assets/item_placement_marker/Highlight.material")
|
||||||
|
|
||||||
|
func on_player_focus_exit():
|
||||||
|
$item_placement_marker/Item_Placement_Marker.material_override = null
|
||||||
|
|
||||||
func on_player_interact(player) -> bool:
|
func on_player_interact(player) -> bool:
|
||||||
if has_item() and player.has_item():
|
if has_item() and player.has_item():
|
||||||
return swap_with_player(player)
|
return swap_with_player(player)
|
||||||
|
@ -139,3 +139,17 @@ func start_playing_rover_game():
|
|||||||
|
|
||||||
func stop_playing_rover_game():
|
func stop_playing_rover_game():
|
||||||
state.on_stop_playing_rover_game()
|
state.on_stop_playing_rover_game()
|
||||||
|
|
||||||
|
func _on_TriggerVolume_area_entered(area):
|
||||||
|
var owner = area
|
||||||
|
if owner.has_meta("owner"):
|
||||||
|
owner = area.get_meta("owner")
|
||||||
|
if owner.has_method("on_player_focus_enter"):
|
||||||
|
owner.on_player_focus_enter()
|
||||||
|
|
||||||
|
func _on_TriggerVolume_area_exited(area):
|
||||||
|
var owner = area
|
||||||
|
if owner.has_meta("owner"):
|
||||||
|
owner = area.get_meta("owner")
|
||||||
|
if owner.has_method("on_player_focus_exit"):
|
||||||
|
owner.on_player_focus_exit()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user