diff --git a/Net/network_manager.gd b/Net/network_manager.gd index 897b369..edeb6ca 100644 --- a/Net/network_manager.gd +++ b/Net/network_manager.gd @@ -389,7 +389,7 @@ func is_server() -> bool: func is_online() -> bool: var p := multiplayer.multiplayer_peer return p != null and not (p is OfflineMultiplayerPeer) - + ## True on the machine that owns authoritative world logic: the server when ## online, or the single player when offline. Station logic and spawning should diff --git a/Stations/station_movement.gd b/Stations/station_movement.gd index 61ba138..993bf5a 100644 --- a/Stations/station_movement.gd +++ b/Stations/station_movement.gd @@ -172,7 +172,7 @@ func _is_move_position_valid() -> bool: var pickable = body as XRToolsPickable if pickable and pickable is XRToolsPickable and Helper.is_node_decendant_of(pickable.get_picked_up_by(), get_parent()): continue - + return false for area in move_ghost.get_overlapping_areas(): @@ -184,7 +184,7 @@ func _is_move_position_valid() -> bool: return true -@rpc("any_peer", "call_remote", "reliable") +@rpc("any_peer", "call_local", "reliable") func server_handle_drop(new_transform: Transform3D, client_thinks_valid: bool): SweetLogger.debug("enter") if not multiplayer.is_server(): @@ -210,6 +210,7 @@ func server_handle_drop(new_transform: Transform3D, client_thinks_valid: bool): SweetLogger.debug("transform applied") + @rpc("any_peer", "call_local", "reliable") # Server updates clients func server_artificial_pickup(): SweetLogger.debug("enter") diff --git a/content/station_layouts/small_line.tscn b/content/station_layouts/small_line.tscn index 94552d2..eb811e1 100644 --- a/content/station_layouts/small_line.tscn +++ b/content/station_layouts/small_line.tscn @@ -3,6 +3,10 @@ [ext_resource type="PackedScene" uid="uid://j7caslh27nor" path="res://stations/Hob.tscn" id="1_1wuvq"] [ext_resource type="PackedScene" uid="uid://efaec6ymgabo" path="res://stations/Counter.tscn" id="2_3qwcq"] [ext_resource type="PackedScene" uid="uid://dvrk268s7gkxh" path="res://stations/sink.tscn" id="3_3qwcq"] +[ext_resource type="PackedScene" uid="uid://c6rift56ql3f8" path="res://stations/BurgerBunsDispenser.tscn" id="4_5eled"] +[ext_resource type="PackedScene" uid="uid://cwnwo4i28upap" path="res://stations/raw_burger_dispenser.tscn" id="5_0342k"] +[ext_resource type="PackedScene" uid="uid://ck5tuftqmyiue" path="res://stations/plate_dispenser.tscn" id="6_b5gb1"] +[ext_resource type="PackedScene" uid="uid://caf0xanmxbshy" path="res://stations/table.tscn" id="7_0342k"] [node name="SmallLine" type="Node3D" unique_id=1844128818] @@ -12,4 +16,16 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.6, 0, 0) [node name="Sink" parent="." unique_id=2055277359 instance=ExtResource("3_3qwcq")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.2, 0, 0) + +[node name="BurgerBunsDispenser" parent="." unique_id=1410160280 instance=ExtResource("4_5eled")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.2, 0, 0) + +[node name="RawBurgerDispenser" parent="." unique_id=383615587 instance=ExtResource("5_0342k")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.6, 0, 0) + +[node name="PlateDispenser" parent="." unique_id=53391541 instance=ExtResource("6_b5gb1")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.8000001, 0, 0) + +[node name="Table" parent="." unique_id=987495548 instance=ExtResource("7_0342k")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.4, 0, 1.2)