JonShard/VRyHungry1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'multi2' of https://git.offcoursegames.com/JonShard/VRyHungry1 into multi2

Browse Source
This commit is contained in:
algodoogle
2026-07-26 14:33:20 +01:00
parent 776aaa3020 5ca64b8dff
commit 7ac87984bc
2 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Items/Charcoal.tscn
-1
View File
@@ -11,7 +11,6 @@
[ext_resource type="Script" path="res://Net/net_pickable.gd" id="20_netpk"] [ext_resource type="Script" path="res://Net/net_pickable.gd" id="20_netpk"]
[sub_resource type="CylinderShape3D" id="CylinderShape3D_gkni8"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_gkni8"]
custom_solver_bias = 0.1
height = 0.1 height = 0.1
radius = 0.1 radius = 0.1
Prefabs/combinable_item.gd
-3
View File
@@ -72,13 +72,10 @@ func _on_body_entered(body: Node3D) -> void:
# Instantiate the result of combination and free the two ingredient items # Instantiate the result of combination and free the two ingredient items
func _combine(other_body: Node3D, result: PackedScene) -> void: func _combine(other_body: Node3D, result: PackedScene) -> void:
print("CombinableItem _combine: combining %s + %s into %s" % [_food_item.id, _find_food_item(other_body).id, result.resource_path]) print("CombinableItem _combine: combining %s + %s into %s" % [_food_item.id, _find_food_item(other_body).id, result.resource_path])
_combining = true
# Get Snapzone # Get Snapzone
var snap_zone := _pickable.get_picked_up_by() var snap_zone := _pickable.get_picked_up_by()
if not snap_zone or not snap_zone.has_method("pick_up_object"): if not snap_zone or not snap_zone.has_method("pick_up_object"):
push_warning("CombineZone: base item is not held by a snap zone; cannot combine.")
_combining = false
return return
# Spawn the result through the server (so it replicates to every peer, # Spawn the result through the server (so it replicates to every peer,