diff --git a/Scenes/multiplayer_world.gd b/Net/multiplayer_world.gd similarity index 100% rename from Scenes/multiplayer_world.gd rename to Net/multiplayer_world.gd diff --git a/Scenes/multiplayer_world.gd.uid b/Net/multiplayer_world.gd.uid similarity index 100% rename from Scenes/multiplayer_world.gd.uid rename to Net/multiplayer_world.gd.uid diff --git a/Scenes/GameOvercontroler.gd b/Prefabs/GameOvercontroler.gd similarity index 100% rename from Scenes/GameOvercontroler.gd rename to Prefabs/GameOvercontroler.gd diff --git a/Scenes/GameOvercontroler.gd.uid b/Prefabs/GameOvercontroler.gd.uid similarity index 100% rename from Scenes/GameOvercontroler.gd.uid rename to Prefabs/GameOvercontroler.gd.uid diff --git a/Scenes/AlgoScene.tscn b/Scenes/AlgoScene.tscn index c430442..96de013 100644 --- a/Scenes/AlgoScene.tscn +++ b/Scenes/AlgoScene.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://22shbqdvnwgo"] -[ext_resource type="Script" path="res://main.gd" id="1_m3h4l"] +[ext_resource type="Script" uid="uid://d1cefhe3yyyds" path="res://Net/multiplayer_world.gd" id="1_nlnup"] [ext_resource type="PackedScene" uid="uid://j5s5wus7tuhb" path="res://prefabs/XROrigin.tscn" id="2_8pfaf"] [ext_resource type="Material" uid="uid://cmia50cfqxxo4" path="res://textures/dev_material_3d.tres" id="3_gatbn"] [ext_resource type="PackedScene" uid="uid://j7caslh27nor" path="res://stations/Hob.tscn" id="4_3lufs"] @@ -13,10 +13,10 @@ [ext_resource type="PackedScene" uid="uid://cwnwo4i28upap" path="res://stations/raw_burger_dispenser.tscn" id="15_m3h4l"] [ext_resource type="PackedScene" uid="uid://efaec6ymgabo" path="res://stations/Counter.tscn" id="15_tpcje"] [ext_resource type="PackedScene" uid="uid://caf0xanmxbshy" path="res://stations/table.tscn" id="16_g2k6a"] -[ext_resource type="Script" uid="uid://k8ywnvlhcic4" path="res://scenes/testworldLoad.gd" id="16_m3h4l"] +[ext_resource type="Script" uid="uid://k8ywnvlhcic4" path="res://test/testworldLoad.gd" id="16_m3h4l"] [ext_resource type="PackedScene" uid="uid://clujaf3u776a3" path="res://addons/godot-xr-tools/objects/viewport_2d_in_3d.tscn" id="17_gatbn"] [ext_resource type="PackedScene" uid="uid://xtcei2uvd5li" path="res://UI/game_over_panel.tscn" id="18_3lufs"] -[ext_resource type="Script" uid="uid://cwijoksyou1ey" path="res://scenes/GameOvercontroler.gd" id="19_3lufs"] +[ext_resource type="Script" uid="uid://cwijoksyou1ey" path="res://prefabs/GameOvercontroler.gd" id="19_3lufs"] [sub_resource type="BoxShape3D" id="BoxShape3D_vlqg6"] size = Vector3(16, 0.1, 16) @@ -38,7 +38,8 @@ sdfgi_enabled = true size = Vector3(16, 10, 0.1) [node name="Main" type="Node3D" unique_id=1312265607] -script = ExtResource("1_m3h4l") +script = ExtResource("1_nlnup") +populate_from_layout = false [node name="XROrigin3D" parent="." unique_id=2055526621 instance=ExtResource("2_8pfaf")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.6, 0) @@ -47,8 +48,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.6, 0) transform = Transform3D(-0.8660254, -0.43301278, 0.24999999, 0.3022632, -0.05510214, 0.9516306, -0.39829266, 0.8997021, 0.17860365, 0, 0, 0) [node name="Table" parent="." unique_id=1863572470 instance=ExtResource("16_g2k6a")] -transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 2.739665, 0.47583598, -1.1895752) -primary_duration = 35.0 +transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 2.739665, -0.023897558, -1.1895752) [node name="Floor" type="StaticBody3D" parent="." unique_id=122279514] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.05, 0) @@ -64,10 +64,10 @@ mesh = SubResource("BoxMesh_24d3s") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, -1.2) [node name="Hob2" parent="." unique_id=496572049 instance=ExtResource("4_3lufs")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.6, 0.5, -1.2) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.6, 0.00026646256, -1.2) [node name="Hob3" parent="." unique_id=421567982 instance=ExtResource("4_3lufs")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.2, 0.5, -1.2) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.2, 0.00026646256, -1.2) [node name="WorldEnvironment" type="WorldEnvironment" parent="." unique_id=1177077250] environment = SubResource("Environment_bvwq1") @@ -76,31 +76,31 @@ environment = SubResource("Environment_bvwq1") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.8, 0.015, -1.2) [node name="Sink" parent="." unique_id=2055277359 instance=ExtResource("12_ah4xa")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5997182, 0.5, -1.2) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5997182, 0.00026646256, -1.2) [node name="Sink2" parent="." unique_id=1692612192 instance=ExtResource("12_ah4xa")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.1997182, 0.5, -1.2) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.1997182, 0.00026646256, -1.2) [node name="DirtStation" parent="." unique_id=160842153 instance=ExtResource("13_46xi2")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.8000001, 0.5, -1.2) [node name="Counter2" parent="." unique_id=368890752 instance=ExtResource("15_tpcje")] -transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -1.8, 0.5, -0.6) +transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -1.8, 0.00026646256, -0.6) [node name="Counter3" parent="." unique_id=1498817646 instance=ExtResource("15_tpcje")] -transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -1.8, 0.5, 0) +transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -1.8, 0.00026646256, 0) [node name="Counter4" parent="." unique_id=906748771 instance=ExtResource("15_tpcje")] -transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -1.8, 0.5, 0.6) +transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -1.8, 0.00026646256, 0.6) [node name="Counter5" parent="." unique_id=1487893288 instance=ExtResource("15_tpcje")] -transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -0.6, 0.5, 1.2) +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -0.6, 0.00026646256, 1.2) [node name="Counter6" parent="." unique_id=1154936647 instance=ExtResource("15_tpcje")] -transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0, 0.5, 1.2) +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0, 0.00026646256, 1.2) [node name="Counter7" parent="." unique_id=990260272 instance=ExtResource("15_tpcje")] -transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0.6, 0.5, 1.2) +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0.6, 0.00026646256, 1.2) [node name="StaticBody3D" type="StaticBody3D" parent="." unique_id=315740174] diff --git a/Scenes/JonScene.tscn b/Scenes/JonScene.tscn index fdc348a..b310ef5 100644 --- a/Scenes/JonScene.tscn +++ b/Scenes/JonScene.tscn @@ -1,14 +1,13 @@ [gd_scene format=3 uid="uid://do6mrslyqe5qe"] -[ext_resource type="Script" uid="uid://d1cefhe3yyyds" path="res://scenes/multiplayer_world.gd" id="1_57ppd"] +[ext_resource type="Script" uid="uid://d1cefhe3yyyds" path="res://Net/multiplayer_world.gd" id="1_57ppd"] [ext_resource type="PackedScene" uid="uid://j5s5wus7tuhb" path="res://prefabs/XROrigin.tscn" id="2_o1b3t"] [ext_resource type="Material" uid="uid://cmia50cfqxxo4" path="res://textures/dev_material_3d.tres" id="3_irf4n"] [ext_resource type="Sky" uid="uid://c1abtpwhdm2d5" path="res://textures/sky/NightSkyHDRI009_16K.tres" id="7_n8fyw"] -[ext_resource type="PackedScene" uid="uid://q37nqadkibbp" path="res://scenes/door.tscn" id="10_l51r2"] +[ext_resource type="PackedScene" uid="uid://q37nqadkibbp" path="res://environment/door.tscn" id="10_l51r2"] [ext_resource type="PackedScene" uid="uid://b3m2ag8g5rj4r" path="res://items/hamburger.tscn" id="11_c8vo7"] -[ext_resource type="PackedScene" uid="uid://da6yrsnxvsrif" path="res://scenes/wall.tscn" id="11_slo47"] +[ext_resource type="PackedScene" uid="uid://da6yrsnxvsrif" path="res://environment/wall.tscn" id="11_slo47"] [ext_resource type="PackedScene" uid="uid://bp3v1jl8pctro" path="res://Containers/plate.tscn" id="12_1f3bw"] -[ext_resource type="PackedScene" uid="uid://bbg7dwsbxxh1t" path="res://scenes/cube_side_dispense.tscn" id="12_57ppd"] [ext_resource type="PackedScene" uid="uid://dlw5geheupgpt" path="res://stations/hatch.tscn" id="12_dpf3b"] [ext_resource type="PackedScene" uid="uid://e4i6o5oriecx" path="res://items/PickupCube.tscn" id="13_1f3bw"] [ext_resource type="PackedScene" uid="uid://caf0xanmxbshy" path="res://stations/table.tscn" id="13_yjosk"] @@ -17,14 +16,12 @@ [ext_resource type="PackedScene" uid="uid://efaec6ymgabo" path="res://stations/Counter.tscn" id="15_di04w"] [ext_resource type="PackedScene" uid="uid://xtcei2uvd5li" path="res://UI/game_over_panel.tscn" id="15_eoxxy"] [ext_resource type="PackedScene" uid="uid://ck5tuftqmyiue" path="res://stations/plate_dispenser.tscn" id="15_qxyk8"] -[ext_resource type="Script" uid="uid://cwijoksyou1ey" path="res://scenes/GameOvercontroler.gd" id="16_n8fyw"] +[ext_resource type="Script" uid="uid://cwijoksyou1ey" path="res://prefabs/GameOvercontroler.gd" id="16_n8fyw"] [ext_resource type="PackedScene" uid="uid://dvrk268s7gkxh" path="res://stations/sink.tscn" id="16_u5c1m"] [ext_resource type="PackedScene" uid="uid://cwnwo4i28upap" path="res://stations/raw_burger_dispenser.tscn" id="17_y7baw"] [ext_resource type="PackedScene" uid="uid://c6rift56ql3f8" path="res://stations/BurgerBunsDispenser.tscn" id="18_wvcs1"] [ext_resource type="PackedScene" uid="uid://duwrbvwcqcuk3" path="res://items/chips.tscn" id="22_2ndvi"] [ext_resource type="PackedScene" uid="uid://dgk88esxip5xi" path="res://items/knife.tscn" id="23_qxyk8"] -[ext_resource type="PackedScene" uid="uid://drwuhqb3pjtiy" path="res://items/potato.tscn" id="24_u5c1m"] -[ext_resource type="PackedScene" uid="uid://bpvp20hiagxxb" path="res://items/chopped_potato.tscn" id="25_y7baw"] [sub_resource type="Environment" id="Environment_bvwq1"] background_mode = 2 @@ -120,15 +117,6 @@ shape = SubResource("BoxShape3D_24d3s") transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 9.934778, 4.297072, -0.018813023) shape = SubResource("BoxShape3D_24d3s") -[node name="Counter2" parent="." unique_id=368890752 instance=ExtResource("15_di04w")] -transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -3.9477215, 0.5115016, 1.6896921) - -[node name="Counter4" parent="." unique_id=1748373996 instance=ExtResource("15_di04w")] -transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -3.9477215, 0.5115016, 1.0913646) - -[node name="Counter3" parent="." unique_id=1498817646 instance=ExtResource("15_di04w")] -transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -3.9477215, 0.5115016, 2.2925892) - [node name="GameOverPanel" parent="." unique_id=1234658657 instance=ExtResource("14_di04w")] transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -4.428178, 2.8122003, 3) scene = ExtResource("15_eoxxy") @@ -140,9 +128,6 @@ scene_properties_keys = PackedStringArray("game_over_panel.gd") [node name="controler" type="Node" parent="GameOverPanel" unique_id=803158176] script = ExtResource("16_n8fyw") -[node name="CubeSideDispenser2" parent="." unique_id=200950572 instance=ExtResource("12_57ppd")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.8484511, 0, 2.9119425) - [node name="Resturant" type="Node3D" parent="." unique_id=1083608050] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.6212463e-05, -0.010500789, 0.0014204979) @@ -425,37 +410,37 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.4, 0, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3, 0, 0) [node name="Table2" parent="Resturant" unique_id=1457688277 instance=ExtResource("13_yjosk")] -transform = Transform3D(1, 0, -1.7484555e-07, 0, 1, 0, 1.7484555e-07, 0, 1, 0.5999999, 0.48000002, -3) +transform = Transform3D(1, 0, -1.7484555e-07, 0, 1, 0, 1.7484555e-07, 0, 1, 0.5999999, -0.035479546, -3) [node name="Hob" parent="Resturant" unique_id=172418174 instance=ExtResource("14_2ndvi")] -transform = Transform3D(1.3113416e-07, 0, -1, 0, 1, 0, 1, 0, 1.3113416e-07, 4.2000003, 0.54, 1.7999992) +transform = Transform3D(1.3113416e-07, 0, -1, 0, 1, 0, 1, 0, 1.3113416e-07, 4.2000003, 0.024520457, 1.7999992) [node name="Hob2" parent="Resturant" unique_id=980569400 instance=ExtResource("14_2ndvi")] -transform = Transform3D(1.3113416e-07, 0, -1, 0, 1, 0, 1, 0, 1.3113416e-07, 4.200001, 0.54, 1.1999999) +transform = Transform3D(1.3113416e-07, 0, -1, 0, 1, 0, 1, 0, 1.3113416e-07, 4.200001, 0.024520457, 1.1999999) [node name="Counter" parent="Resturant" unique_id=1487893288 instance=ExtResource("15_di04w")] -transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 4.200001, 0.54, 2.3999996) +transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 4.200001, 0.024520457, 2.3999996) [node name="Counter2" parent="Resturant" unique_id=5128912 instance=ExtResource("15_di04w")] -transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 4.200001, 0.54, 3) +transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 4.200001, 0.024520457, 3) [node name="Counter3" parent="Resturant" unique_id=1298458612 instance=ExtResource("15_di04w")] -transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 4.2000003, 0.54, 0.5999999) +transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 4.2000003, 0.024520457, 0.5999999) [node name="Counter4" parent="Resturant" unique_id=1764980142 instance=ExtResource("15_di04w")] -transform = Transform3D(1.3113416e-07, 0, 1, 0, 1, 0, -1, 0, 1.3113416e-07, 4.7683716e-07, 0.54, 2.3999996) +transform = Transform3D(1.3113416e-07, 0, 1, 0, 1, 0, -1, 0, 1.3113416e-07, 4.7683716e-07, 0.024520457, 2.3999996) [node name="Counter5" parent="Resturant" unique_id=1015820252 instance=ExtResource("15_di04w")] -transform = Transform3D(1.3113416e-07, 0, 1, 0, 1, 0, -1, 0, 1.3113416e-07, 4.7683716e-07, 0.54, 3) +transform = Transform3D(1.3113416e-07, 0, 1, 0, 1, 0, -1, 0, 1.3113416e-07, 4.7683716e-07, 0.024520457, 3) [node name="PlateDispenser" parent="Resturant" unique_id=710538846 instance=ExtResource("15_qxyk8")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.6) [node name="Sink" parent="Resturant" unique_id=2055277359 instance=ExtResource("16_u5c1m")] -transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 0.6, 0.48000002, -0.6) +transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 0.6, -0.035479546, -0.6) [node name="Counter6" parent="Resturant" unique_id=2141915043 instance=ExtResource("15_di04w")] -transform = Transform3D(-1, 0, 8.742277e-08, 0, 1, 0, -8.742277e-08, 0, -1, 4.7683716e-07, 0.54, -0.6000006) +transform = Transform3D(-1, 0, 8.742277e-08, 0, 1, 0, -8.742277e-08, 0, -1, 4.7683716e-07, 0.024520457, -0.6000006) [node name="RawBurgerDispenser" parent="Resturant" unique_id=235630131 instance=ExtResource("17_y7baw")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1.2) @@ -464,7 +449,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1.2) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1.8000001) [node name="Table3" parent="Resturant" unique_id=1863572470 instance=ExtResource("13_yjosk")] -transform = Transform3D(-1, 0, 2.6226832e-07, 0, 1, 0, -2.6226832e-07, 0, -1, 3, 0.48000002, -3) +transform = Transform3D(-1, 0, 2.6226832e-07, 0, 1, 0, -2.6226832e-07, 0, -1, 3, -0.035479546, -3) [node name="Hamburger" parent="." unique_id=1675596942 instance=ExtResource("11_c8vo7")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.8000001, -0.6) @@ -480,12 +465,3 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.6, 1.2, -0.6) [node name="Knife" parent="." unique_id=1789694138 instance=ExtResource("23_qxyk8")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.2, 3) - -[node name="Potato" parent="." unique_id=275760487 instance=ExtResource("24_u5c1m")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.9600005, 1.1400001, 2.2800002) - -[node name="ChoppedPotato" parent="." unique_id=1564262551 instance=ExtResource("25_y7baw")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.96, 1.1400001, 1.6800001) - -[node name="Chips2" parent="." unique_id=2054749156 instance=ExtResource("22_2ndvi")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.9600003, 1.1400001, 1.08) diff --git a/Scenes/mainMenu.tscn b/Scenes/mainMenu.tscn index e491716..92cc787 100644 --- a/Scenes/mainMenu.tscn +++ b/Scenes/mainMenu.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://c1nv4w33fedj6"] -[ext_resource type="Script" path="res://main.gd" id="1_72gy5"] +[ext_resource type="Script" uid="uid://d1cefhe3yyyds" path="res://Net/multiplayer_world.gd" id="1_jfr2g"] [ext_resource type="PackedScene" uid="uid://j5s5wus7tuhb" path="res://prefabs/XROrigin.tscn" id="2_8wkh3"] [ext_resource type="Material" uid="uid://cmia50cfqxxo4" path="res://textures/dev_material_3d.tres" id="3_m56cs"] [ext_resource type="PackedScene" uid="uid://j7caslh27nor" path="res://stations/Hob.tscn" id="4_5kvh0"] @@ -35,7 +35,8 @@ ssil_enabled = true sdfgi_enabled = true [node name="Main" type="Node3D" unique_id=1312265607] -script = ExtResource("1_72gy5") +script = ExtResource("1_jfr2g") +populate_from_layout = false [node name="XROrigin3D" parent="." unique_id=2055526621 instance=ExtResource("2_8wkh3")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.36171648, 0, 0.81835127) @@ -61,7 +62,7 @@ shape = SubResource("BoxShape3D_vlqg6") mesh = SubResource("BoxMesh_24d3s") [node name="Hob" parent="." unique_id=1687971542 instance=ExtResource("4_5kvh0")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.29336345, 0.5, -1.484) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.29336345, 0.015500337, -1.484) [node name="WorldEnvironment" type="WorldEnvironment" parent="." unique_id=1177077250] environment = SubResource("Environment_bvwq1") @@ -112,7 +113,7 @@ transform = Transform3D(1, 0, -2.2351742e-08, -2.9802322e-08, 1.0000001, 0, -2.6 transform = Transform3D(1, 0, -2.2351742e-08, -2.9802322e-08, 1.0000001, -5.293956e-23, -2.6077032e-08, 1.4901161e-08, 1, 0.7462772, 1.0768684, -1.1673055) [node name="Sink" parent="." unique_id=2055277359 instance=ExtResource("12_8apyq")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.3147688, 0.5, -1.4940417) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.3147688, 0.015500337, -1.4940417) [node name="DirtStation" parent="." unique_id=160842153 instance=ExtResource("13_jnwcx")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.0864775, 0.5, -1.244947) @@ -148,16 +149,16 @@ transform = Transform3D(1, 0, -2.2351742e-08, -2.9802322e-08, 1.0000001, 0, -2.6 transform = Transform3D(1, 0, -2.2351742e-08, -2.9802322e-08, 1.0000001, -5.293956e-23, -2.6077032e-08, 1.4901161e-08, 1, -1.4505737, 1.0734154, 0.16882455) [node name="Counter" parent="." unique_id=1487893288 instance=ExtResource("15_yy81s")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.7124918, 0.5, -1.4886917) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.7124918, 0.015500337, -1.4886917) [node name="Counter2" parent="." unique_id=368890752 instance=ExtResource("15_yy81s")] -transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -1.7648025, 0.5, -0.4458799) +transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -1.7648025, 0.015500337, -0.4458799) [node name="Counter3" parent="." unique_id=1498817646 instance=ExtResource("15_yy81s")] -transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -1.7648025, 0.5, 0.55367994) +transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -1.7648025, 0.015500337, 0.55367994) [node name="Counter4" parent="." unique_id=906748771 instance=ExtResource("15_yy81s")] -transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -1.7648025, 0.5, 1.5539298) +transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -1.7648025, 0.015500337, 1.5539298) [node name="Hamburger3" parent="." unique_id=369573848 instance=ExtResource("10_qacki")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.7201865, 1.142413, 0.14773655) diff --git a/Scenes/multiPlayer.tscn b/Scenes/multiPlayer.tscn index 6561d9d..6e471a8 100644 --- a/Scenes/multiPlayer.tscn +++ b/Scenes/multiPlayer.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://c30i6h32w8p47"] -[ext_resource type="Script" uid="uid://d1cefhe3yyyds" path="res://scenes/multiplayer_world.gd" id="1_kdan8"] +[ext_resource type="Script" uid="uid://d1cefhe3yyyds" path="res://Net/multiplayer_world.gd" id="1_kdan8"] [ext_resource type="PackedScene" uid="uid://j5s5wus7tuhb" path="res://prefabs/XROrigin.tscn" id="2_g30gi"] [ext_resource type="Material" uid="uid://cmia50cfqxxo4" path="res://textures/dev_material_3d.tres" id="3_75ecy"] [ext_resource type="Sky" uid="uid://c1abtpwhdm2d5" path="res://textures/sky/NightSkyHDRI009_16K.tres" id="5_c3xgf"] diff --git a/Scenes/test_small.tscn b/Scenes/test_small.tscn index ca4adc0..f16ec29 100644 --- a/Scenes/test_small.tscn +++ b/Scenes/test_small.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://dbgu4r127ke5v"] -[ext_resource type="Script" uid="uid://d1cefhe3yyyds" path="res://scenes/multiplayer_world.gd" id="1_atgwk"] +[ext_resource type="Script" uid="uid://d1cefhe3yyyds" path="res://Net/multiplayer_world.gd" id="1_atgwk"] [ext_resource type="Sky" uid="uid://c1abtpwhdm2d5" path="res://textures/sky/NightSkyHDRI009_16K.tres" id="2_1jq86"] [ext_resource type="PackedScene" uid="uid://j5s5wus7tuhb" path="res://prefabs/XROrigin.tscn" id="3_bryd6"] [ext_resource type="Material" uid="uid://cmia50cfqxxo4" path="res://textures/dev_material_3d.tres" id="4_kpgm6"] @@ -13,7 +13,8 @@ [ext_resource type="PackedScene" uid="uid://caf0xanmxbshy" path="res://stations/table.tscn" id="11_gaw43"] [ext_resource type="PackedScene" uid="uid://clujaf3u776a3" path="res://addons/godot-xr-tools/objects/viewport_2d_in_3d.tscn" id="12_n58f2"] [ext_resource type="PackedScene" uid="uid://xtcei2uvd5li" path="res://UI/game_over_panel.tscn" id="13_hooyg"] -[ext_resource type="Script" uid="uid://cwijoksyou1ey" path="res://scenes/GameOvercontroler.gd" id="14_cqmpj"] +[ext_resource type="Script" uid="uid://cwijoksyou1ey" path="res://prefabs/GameOvercontroler.gd" id="14_cqmpj"] +[ext_resource type="PackedScene" uid="uid://sc6i0i1f0o48" path="res://stations/potato_dispenser.tscn" id="15_hooyg"] [sub_resource type="Environment" id="Environment_bvwq1"] background_mode = 2 @@ -92,10 +93,9 @@ transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 9.93 shape = SubResource("BoxShape3D_24d3s") [node name="Hob" parent="." unique_id=1687971542 instance=ExtResource("5_gfdi7")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.507, 0) [node name="Counter" parent="." unique_id=1487893288 instance=ExtResource("7_jnxsa")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.6, 0.512, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.6, 0, 0) [node name="Potato" parent="." unique_id=962444046 instance=ExtResource("8_1qeqw")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.273382, 1.5940565, -0.036002517) @@ -110,13 +110,13 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.6, 0, 0) script = ExtResource("9_atgwk") [node name="Sink" parent="." unique_id=1559059799 instance=ExtResource("10_dhas4")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.2, 0.5, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.2, 0, 0) [node name="Table" parent="." unique_id=1863572470 instance=ExtResource("11_gaw43")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.4, 0.5, 1.8) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.8, 0, 1.8) [node name="GameOverPanel" parent="." unique_id=522901881 instance=ExtResource("12_n58f2")] -transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -4.428178, 2.8122003, 3) +transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 2.7718225, 2.8122003, 1.8000003) scene = ExtResource("13_hooyg") viewport_size = Vector2(900, 600) transparent = 0 @@ -125,3 +125,6 @@ scene_properties_keys = PackedStringArray("game_over_panel.gd") [node name="controler" type="Node" parent="GameOverPanel" unique_id=1442195864] script = ExtResource("14_cqmpj") + +[node name="PotatoDispenser" parent="." unique_id=1410160280 instance=ExtResource("15_hooyg")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.8000002, 0, 0) diff --git a/Stations/BurgerBunsDispenser.tscn b/Stations/BurgerBunsDispenser.tscn index 1aeeba7..fedba90 100644 --- a/Stations/BurgerBunsDispenser.tscn +++ b/Stations/BurgerBunsDispenser.tscn @@ -2,6 +2,7 @@ [ext_resource type="Script" uid="uid://0y6wnjcsum6" path="res://stations/item_dispenser.gd" id="1_myl3s"] [ext_resource type="Script" uid="uid://cquqe4f1m1sw6" path="res://addons/godot-xr-tools/objects/snap_zone.gd" id="1_p30r1"] +[ext_resource type="PackedScene" uid="uid://cvucwxibtol5f" path="res://stations/StationMovement.tscn" id="1_u2p81"] [ext_resource type="PackedScene" uid="uid://c0lknik4noobs" path="res://items/BurgerBuns.tscn" id="2_1q74o"] [ext_resource type="PackedScene" uid="uid://mpapt5mkbuao" path="res://prefabs/slide_off_dome.tscn" id="4_rf1b2"] @@ -9,16 +10,22 @@ radius = 0.3 [sub_resource type="CylinderShape3D" id="CylinderShape3D_24d3s"] +height = 1.0 radius = 0.3 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_vlqg6"] albedo_color = Color(0.6784191, 0.54546416, 0.016760282, 1) -[node name="BurgerBunsDispenser" type="StaticBody3D" unique_id=1720683779] +[node name="BurgerBunsDispenser" type="Node3D" unique_id=1410160280] + +[node name="StationMovement" parent="." unique_id=946873975 node_paths=PackedStringArray("station") instance=ExtResource("1_u2p81")] +station = NodePath("../BurgerBunsDispenser") + +[node name="BurgerBunsDispenser" type="StaticBody3D" parent="." unique_id=1720683779] script = ExtResource("1_myl3s") item_scene = ExtResource("2_1q74o") -[node name="XRToolsSnapZone" type="Area3D" parent="." unique_id=805334513] +[node name="XRToolsSnapZone" type="Area3D" parent="BurgerBunsDispenser" unique_id=805334513] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00070536137, 1.0162505, -0.002165556) collision_layer = 65536 collision_mask = 65536 @@ -26,40 +33,43 @@ script = ExtResource("1_p30r1") snap_mode = 1 metadata/_custom_type_script = "uid://cquqe4f1m1sw6" -[node name="CollisionShape3D" type="CollisionShape3D" parent="XRToolsSnapZone" unique_id=1104626493] +[node name="CollisionShape3D" type="CollisionShape3D" parent="BurgerBunsDispenser/XRToolsSnapZone" unique_id=1104626493] shape = SubResource("SphereShape3D_xmbo2") -[node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=1470079357] +[node name="CollisionShape3D" type="CollisionShape3D" parent="BurgerBunsDispenser" unique_id=1470079357] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) shape = SubResource("CylinderShape3D_24d3s") -[node name="SlideOffDome" parent="." unique_id=1427609426 instance=ExtResource("4_rf1b2")] +[node name="SlideOffDome" parent="BurgerBunsDispenser" unique_id=1427609426 instance=ExtResource("4_rf1b2")] -[node name="CSGCombiner3D" type="CSGCombiner3D" parent="." unique_id=1746426494] +[node name="CSGCombiner3D" type="CSGCombiner3D" parent="BurgerBunsDispenser" unique_id=1746426494] -[node name="CSGCylinder3D" type="CSGCylinder3D" parent="CSGCombiner3D" unique_id=858311379] +[node name="CSGCylinder3D" type="CSGCylinder3D" parent="BurgerBunsDispenser/CSGCombiner3D" unique_id=858311379] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) radius = 0.3 +height = 1.0 sides = 32 -[node name="CSGCombiner3DBuns" type="CSGCombiner3D" parent="CSGCombiner3D" unique_id=1459017790] +[node name="CSGCombiner3DBuns" type="CSGCombiner3D" parent="BurgerBunsDispenser/CSGCombiner3D" unique_id=1459017790] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.16038476, 1.0341886, -0.09012994) autosmooth = true smoothing_angle = 138.9 -[node name="CSGCylinder3D2" type="CSGCylinder3D" parent="CSGCombiner3D/CSGCombiner3DBuns" unique_id=1328221793] +[node name="CSGCylinder3D2" type="CSGCylinder3D" parent="BurgerBunsDispenser/CSGCombiner3D/CSGCombiner3DBuns" unique_id=1328221793] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.004122257, 0) radius = 0.085 height = 0.04 sides = 16 material = SubResource("StandardMaterial3D_vlqg6") -[node name="CSGCylinder3D3" type="CSGCylinder3D" parent="CSGCombiner3D/CSGCombiner3DBuns" unique_id=686624728] +[node name="CSGCylinder3D3" type="CSGCylinder3D" parent="BurgerBunsDispenser/CSGCombiner3D/CSGCombiner3DBuns" unique_id=686624728] transform = Transform3D(0.82770383, -0.5611652, 0, 0.5611652, 0.82770383, 0, 0, 0, 1, -0.048392475, 0.029736161, 0) radius = 0.085 height = 0.04 sides = 16 material = SubResource("StandardMaterial3D_vlqg6") -[node name="CSGCylinder3D4" type="CSGCylinder3D" parent="CSGCombiner3D/CSGCombiner3DBuns/CSGCylinder3D3" unique_id=1113894081] +[node name="CSGCylinder3D4" type="CSGCylinder3D" parent="BurgerBunsDispenser/CSGCombiner3D/CSGCombiner3DBuns/CSGCylinder3D3" unique_id=1113894081] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.9604645e-08, 0.040259957, 0) radius = 0.085 height = 0.04 @@ -67,26 +77,26 @@ sides = 16 cone = true material = SubResource("StandardMaterial3D_vlqg6") -[node name="CSGCombiner3DBuns2" type="CSGCombiner3D" parent="CSGCombiner3D" unique_id=1636439623] +[node name="CSGCombiner3DBuns2" type="CSGCombiner3D" parent="BurgerBunsDispenser/CSGCombiner3D" unique_id=1636439623] transform = Transform3D(0.42896286, 0, -0.90332216, 0, 1, 0, 0.90332216, 0, 0.42896286, 0.13564643, 1.0341886, 0.20497215) autosmooth = true smoothing_angle = 138.9 -[node name="CSGCylinder3D2" type="CSGCylinder3D" parent="CSGCombiner3D/CSGCombiner3DBuns2" unique_id=190780737] +[node name="CSGCylinder3D2" type="CSGCylinder3D" parent="BurgerBunsDispenser/CSGCombiner3D/CSGCombiner3DBuns2" unique_id=190780737] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.004122257, 0) radius = 0.085 height = 0.04 sides = 16 material = SubResource("StandardMaterial3D_vlqg6") -[node name="CSGCylinder3D3" type="CSGCylinder3D" parent="CSGCombiner3D/CSGCombiner3DBuns2" unique_id=557804311] +[node name="CSGCylinder3D3" type="CSGCylinder3D" parent="BurgerBunsDispenser/CSGCombiner3D/CSGCombiner3DBuns2" unique_id=557804311] transform = Transform3D(0.82770383, -0.5611652, 0, 0.5611652, 0.82770383, 0, 0, 0, 1, -0.048392475, 0.029736161, 0) radius = 0.085 height = 0.04 sides = 16 material = SubResource("StandardMaterial3D_vlqg6") -[node name="CSGCylinder3D4" type="CSGCylinder3D" parent="CSGCombiner3D/CSGCombiner3DBuns2/CSGCylinder3D3" unique_id=605379447] +[node name="CSGCylinder3D4" type="CSGCylinder3D" parent="BurgerBunsDispenser/CSGCombiner3D/CSGCombiner3DBuns2/CSGCylinder3D3" unique_id=605379447] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.9604645e-08, 0.040259957, 0) radius = 0.085 height = 0.04 @@ -94,26 +104,26 @@ sides = 16 cone = true material = SubResource("StandardMaterial3D_vlqg6") -[node name="CSGCombiner3DBuns3" type="CSGCombiner3D" parent="CSGCombiner3D" unique_id=1594575583] +[node name="CSGCombiner3DBuns3" type="CSGCombiner3D" parent="BurgerBunsDispenser/CSGCombiner3D" unique_id=1594575583] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.17070979, 1.0341885, 0.07147646) autosmooth = true smoothing_angle = 138.9 -[node name="CSGCylinder3D2" type="CSGCylinder3D" parent="CSGCombiner3D/CSGCombiner3DBuns3" unique_id=1686142490] +[node name="CSGCylinder3D2" type="CSGCylinder3D" parent="BurgerBunsDispenser/CSGCombiner3D/CSGCombiner3DBuns3" unique_id=1686142490] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.004122257, 0) radius = 0.085 height = 0.04 sides = 16 material = SubResource("StandardMaterial3D_vlqg6") -[node name="CSGCylinder3D3" type="CSGCylinder3D" parent="CSGCombiner3D/CSGCombiner3DBuns3" unique_id=1773290691] +[node name="CSGCylinder3D3" type="CSGCylinder3D" parent="BurgerBunsDispenser/CSGCombiner3D/CSGCombiner3DBuns3" unique_id=1773290691] transform = Transform3D(0.82770383, -0.5611652, 0, 0.5611652, 0.82770383, 0, 0, 0, 1, -0.048392475, 0.029736161, 0) radius = 0.085 height = 0.04 sides = 16 material = SubResource("StandardMaterial3D_vlqg6") -[node name="CSGCylinder3D4" type="CSGCylinder3D" parent="CSGCombiner3D/CSGCombiner3DBuns3/CSGCylinder3D3" unique_id=801922493] +[node name="CSGCylinder3D4" type="CSGCylinder3D" parent="BurgerBunsDispenser/CSGCombiner3D/CSGCombiner3DBuns3/CSGCylinder3D3" unique_id=801922493] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.9604645e-08, 0.040259957, 0) radius = 0.085 height = 0.04 @@ -121,26 +131,26 @@ sides = 16 cone = true material = SubResource("StandardMaterial3D_vlqg6") -[node name="CSGCombiner3DBuns4" type="CSGCombiner3D" parent="CSGCombiner3D" unique_id=2055085730] +[node name="CSGCombiner3DBuns4" type="CSGCombiner3D" parent="BurgerBunsDispenser/CSGCombiner3D" unique_id=2055085730] transform = Transform3D(0.95670986, 0, 0.29104328, 0, 1, 0, -0.29104328, 0, 0.95670986, -0.08665481, 1.0341886, -0.10344604) autosmooth = true smoothing_angle = 138.9 -[node name="CSGCylinder3D2" type="CSGCylinder3D" parent="CSGCombiner3D/CSGCombiner3DBuns4" unique_id=547208858] +[node name="CSGCylinder3D2" type="CSGCylinder3D" parent="BurgerBunsDispenser/CSGCombiner3D/CSGCombiner3DBuns4" unique_id=547208858] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.004122257, 0) radius = 0.085 height = 0.04 sides = 16 material = SubResource("StandardMaterial3D_vlqg6") -[node name="CSGCylinder3D3" type="CSGCylinder3D" parent="CSGCombiner3D/CSGCombiner3DBuns4" unique_id=185898007] +[node name="CSGCylinder3D3" type="CSGCylinder3D" parent="BurgerBunsDispenser/CSGCombiner3D/CSGCombiner3DBuns4" unique_id=185898007] transform = Transform3D(0.82770383, -0.5611652, 0, 0.5611652, 0.82770383, 0, 0, 0, 1, -0.048392475, 0.029736161, 0) radius = 0.085 height = 0.04 sides = 16 material = SubResource("StandardMaterial3D_vlqg6") -[node name="CSGCylinder3D4" type="CSGCylinder3D" parent="CSGCombiner3D/CSGCombiner3DBuns4/CSGCylinder3D3" unique_id=2117029178] +[node name="CSGCylinder3D4" type="CSGCylinder3D" parent="BurgerBunsDispenser/CSGCombiner3D/CSGCombiner3DBuns4/CSGCylinder3D3" unique_id=2117029178] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.9604645e-08, 0.040259957, 0) radius = 0.085 height = 0.04 @@ -148,26 +158,26 @@ sides = 16 cone = true material = SubResource("StandardMaterial3D_vlqg6") -[node name="CSGCombiner3DBuns5" type="CSGCombiner3D" parent="CSGCombiner3D" unique_id=546748728] +[node name="CSGCombiner3DBuns5" type="CSGCombiner3D" parent="BurgerBunsDispenser/CSGCombiner3D" unique_id=546748728] transform = Transform3D(0.20608562, 0, -0.978534, 0, 1, 0, 0.978534, 0, 0.20608562, -0.047733016, 1.0341886, 0.19433105) autosmooth = true smoothing_angle = 138.9 -[node name="CSGCylinder3D2" type="CSGCylinder3D" parent="CSGCombiner3D/CSGCombiner3DBuns5" unique_id=102374914] +[node name="CSGCylinder3D2" type="CSGCylinder3D" parent="BurgerBunsDispenser/CSGCombiner3D/CSGCombiner3DBuns5" unique_id=102374914] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.004122257, 0) radius = 0.085 height = 0.04 sides = 16 material = SubResource("StandardMaterial3D_vlqg6") -[node name="CSGCylinder3D3" type="CSGCylinder3D" parent="CSGCombiner3D/CSGCombiner3DBuns5" unique_id=189923990] +[node name="CSGCylinder3D3" type="CSGCylinder3D" parent="BurgerBunsDispenser/CSGCombiner3D/CSGCombiner3DBuns5" unique_id=189923990] transform = Transform3D(0.82770383, -0.5611652, 0, 0.5611652, 0.82770383, 0, 0, 0, 1, -0.048392475, 0.029736161, 0) radius = 0.085 height = 0.04 sides = 16 material = SubResource("StandardMaterial3D_vlqg6") -[node name="CSGCylinder3D4" type="CSGCylinder3D" parent="CSGCombiner3D/CSGCombiner3DBuns5/CSGCylinder3D3" unique_id=1980594001] +[node name="CSGCylinder3D4" type="CSGCylinder3D" parent="BurgerBunsDispenser/CSGCombiner3D/CSGCombiner3DBuns5/CSGCylinder3D3" unique_id=1980594001] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.9604645e-08, 0.040259957, 0) radius = 0.085 height = 0.04 diff --git a/Stations/Counter.tscn b/Stations/Counter.tscn index 4933bc1..f4d0aa1 100644 --- a/Stations/Counter.tscn +++ b/Stations/Counter.tscn @@ -9,7 +9,7 @@ [ext_resource type="PackedScene" uid="uid://bxbocxdaayvwx" path="res://UI/progress_bar.tscn" id="6_racgh"] [sub_resource type="BoxShape3D" id="BoxShape3D_24d3s"] -size = Vector3(0.6, 1, 0.6) +size = Vector3(0.48521727, 0.040039063, 0.41994628) [sub_resource type="BoxShape3D" id="BoxShape3D_vlqg6"] size = Vector3(0.3, 0.05, 0.3) @@ -39,16 +39,18 @@ knife = NodePath("Knife") progress_bar = NodePath("ProgressBar3D") [node name="CollisionShape3DCuttingBoard" type="CollisionShape3D" parent="Counter" unique_id=706340473] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00157471, 0.51688915, 0.00070264935) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00088502467, 1.0178218, 0.0009101778) shape = SubResource("BoxShape3D_24d3s") [node name="CollisionShape3DCounter" type="CollisionShape3D" parent="Counter" unique_id=895680269] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5038623, 0) shape = SubResource("BoxShape3D_24d3s") [node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="Counter" unique_id=1941838513] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5038623, 0) [node name="GestureArea" type="Area3D" parent="Counter" unique_id=398687137] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.54, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.0438623, 0) collision_layer = 0 collision_mask = 65536 @@ -56,12 +58,12 @@ collision_mask = 65536 shape = SubResource("BoxShape3D_vlqg6") [node name="Knife" parent="Counter" unique_id=1675596942 instance=ExtResource("3_3gvdi")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.78000003, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.2838624, 0) freeze = true release_mode = 1 [node name="XRToolsSnapZone" type="Area3D" parent="Counter" unique_id=1647380272 groups=["station"]] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5608841, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.0647464, 0) collision_layer = 65536 collision_mask = 65540 script = ExtResource("1_dlkho") @@ -76,9 +78,10 @@ shape = SubResource("BoxShape3D_1ntq7") [node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="Counter/XRToolsSnapZone" unique_id=1786831079] [node name="ProgressBar3D" parent="Counter" unique_id=654673176 instance=ExtResource("6_racgh")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.78000003, -0.18) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.2838624, -0.18) [node name="CSGCombiner3D" type="CSGCombiner3D" parent="Counter" unique_id=451757283] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5038623, 0) [node name="CSGBox3D" type="CSGBox3D" parent="Counter/CSGCombiner3D" unique_id=305755330] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.046, -0.025) diff --git a/Stations/Hob.tscn b/Stations/Hob.tscn index 47d14fa..3e46cfb 100644 --- a/Stations/Hob.tscn +++ b/Stations/Hob.tscn @@ -175,10 +175,11 @@ station = NodePath("../Hob") script = ExtResource("1_7jc4g") [node name="CollisionShape3D" type="CollisionShape3D" parent="Hob" unique_id=1283846023] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.51483154, 0) shape = SubResource("BoxShape3D_kdxnr") [node name="XRToolsSnapZone" type="Area3D" parent="Hob" unique_id=538157739 groups=["station"]] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5270121, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.0418437, 0) collision_layer = 65536 collision_mask = 65540 script = ExtResource("2_er1dp") @@ -194,9 +195,10 @@ shape = SubResource("BoxShape3D_7uuqv") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.022546828, -0.5270121, 0.36528283) [node name="ProgressBar3D" parent="Hob" unique_id=654673176 instance=ExtResource("3_7uuqv")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.74736404, -0.09216304) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.2621956, -0.09216304) [node name="CSGCombiner3D" type="CSGCombiner3D" parent="Hob" unique_id=70901698] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.51483154, 0) [node name="CSGBox3D" type="CSGBox3D" parent="Hob/CSGCombiner3D" unique_id=1111505172] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00071543455, 3.7252903e-09, -0.008516133) @@ -286,7 +288,7 @@ root_node = NodePath("../..") libraries/ = SubResource("AnimationLibrary_ac5f3") [node name="OmniLight3D" type="OmniLight3D" parent="Hob" unique_id=1618457623] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5053487, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.0201802, 0) light_color = Color(1, 0.13725491, 0, 1) light_energy = 0.0 omni_range = 0.5 diff --git a/Stations/StationMovement.tscn b/Stations/StationMovement.tscn index 60044d7..9afc248 100644 --- a/Stations/StationMovement.tscn +++ b/Stations/StationMovement.tscn @@ -41,7 +41,7 @@ properties/2/spawn = true properties/2/replication_mode = 1 [sub_resource type="BoxShape3D" id="BoxShape3D_vlqg6"] -size = Vector3(0.5, 1, 0.5) +size = Vector3(0.5, 0.87231445, 0.5) [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_vlqg6"] transparency = 1 @@ -53,7 +53,7 @@ move_handle = NodePath("MoveHandle") move_ghost = NodePath("MoveGhost") [node name="MoveHandle" type="RigidBody3D" parent="." unique_id=954108203 groups=["platalbe_item"]] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.08, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, 0) collision_layer = 4 collision_mask = 196615 axis_lock_linear_y = true @@ -84,11 +84,11 @@ replication_config = SubResource("SceneReplicationConfig_np_cube") script = ExtResource("8_7mccn") [node name="MoveGhost" type="Area3D" parent="." unique_id=1305344236] -visible = false collision_layer = 0 -collision_mask = 524295 +collision_mask = 524291 [node name="CollisionShape3D" type="CollisionShape3D" parent="MoveGhost" unique_id=2074041383] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.44934082, 0) shape = SubResource("BoxShape3D_vlqg6") [node name="CSGCombiner3D" type="CSGCombiner3D" parent="MoveGhost" unique_id=283929246] @@ -96,20 +96,26 @@ collision_layer = 0 collision_mask = 524291 [node name="CSGBox3D" type="CSGBox3D" parent="MoveGhost/CSGCombiner3D" unique_id=1786907045] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) size = Vector3(0.6, 1, 0.6) material = SubResource("StandardMaterial3D_vlqg6") [node name="CSGBox3D2" type="CSGBox3D" parent="MoveGhost/CSGCombiner3D" unique_id=684823657] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5642835, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) size = Vector3(0.03, 0.03, 0.3) material = SubResource("StandardMaterial3D_vlqg6") [node name="CSGBox3D2" type="CSGBox3D" parent="MoveGhost/CSGCombiner3D/CSGBox3D2" unique_id=286640707] -transform = Transform3D(0.70451534, 0, -0.7096888, 0, 1, 0, 0.7096888, 0, 0.70451534, -0.046803005, 0, -0.096979) +transform = Transform3D(0.70451534, 0, -0.7096888, 0, 1, 0, 0.7096888, 0, 0.70451534, -0.046803005, 0.5, -0.096979) size = Vector3(0.03, 0.03, 0.12021485) material = SubResource("StandardMaterial3D_vlqg6") [node name="CSGBox3D3" type="CSGBox3D" parent="MoveGhost/CSGCombiner3D/CSGBox3D2" unique_id=1791902851] -transform = Transform3D(0.7073421, 0, 0.7068714, 0, 1, 0, -0.7068714, 0, 0.7073421, 0.04550519, 0, -0.096264325) +transform = Transform3D(0.7073421, 0, 0.7068714, 0, 1, 0, -0.7068714, 0, 0.7073421, 0.04550519, 0.5, -0.096264325) size = Vector3(0.03, 0.03, 0.12021485) material = SubResource("StandardMaterial3D_vlqg6") + +[node name="CSGBox3D4" type="CSGBox3D" parent="MoveGhost/CSGCombiner3D/CSGBox3D2" unique_id=83757100] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, -0.020843491) +size = Vector3(0.03, 0.03, 0.25904542) +material = SubResource("StandardMaterial3D_vlqg6") diff --git a/Scenes/cube_side_dispense.tscn b/Stations/cube_side_dispense.tscn similarity index 55% rename from Scenes/cube_side_dispense.tscn rename to Stations/cube_side_dispense.tscn index e89947d..a114ffd 100644 --- a/Scenes/cube_side_dispense.tscn +++ b/Stations/cube_side_dispense.tscn @@ -1,6 +1,7 @@ [gd_scene format=3 uid="uid://bbg7dwsbxxh1t"] [ext_resource type="Script" uid="uid://0y6wnjcsum6" path="res://stations/item_dispenser.gd" id="1_4m60m"] +[ext_resource type="PackedScene" uid="uid://cvucwxibtol5f" path="res://stations/StationMovement.tscn" id="1_qooyy"] [ext_resource type="PackedScene" uid="uid://e4i6o5oriecx" path="res://items/PickupCube.tscn" id="2_nn8tr"] [ext_resource type="Script" uid="uid://cquqe4f1m1sw6" path="res://addons/godot-xr-tools/objects/snap_zone.gd" id="3_ahn1e"] [ext_resource type="PackedScene" uid="uid://mpapt5mkbuao" path="res://prefabs/slide_off_dome.tscn" id="4_nn8tr"] @@ -9,6 +10,7 @@ radius = 0.3 [sub_resource type="CylinderShape3D" id="CylinderShape3D_24d3s"] +height = 1.0 radius = 0.29541016 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_24d3s"] @@ -18,11 +20,16 @@ albedo_color = Color(0.1764706, 1, 1, 1) material = SubResource("StandardMaterial3D_24d3s") size = Vector3(0.1, 0.1, 0.1) -[node name="CubeSideDispenser2" type="StaticBody3D" unique_id=200950572] +[node name="CubeSideDispenser" type="Node3D" unique_id=1285718741] + +[node name="StationMovement" parent="." unique_id=946873975 node_paths=PackedStringArray("station") instance=ExtResource("1_qooyy")] +station = NodePath("../CubeSideDispenser") + +[node name="CubeSideDispenser" type="StaticBody3D" parent="." unique_id=200950572] script = ExtResource("1_4m60m") item_scene = ExtResource("2_nn8tr") -[node name="XRToolsSnapZone" type="Area3D" parent="." unique_id=1018021004] +[node name="XRToolsSnapZone" type="Area3D" parent="CubeSideDispenser" unique_id=1018021004] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00070536137, 1.0440714, -0.002165556) collision_layer = 65536 collision_mask = 65536 @@ -30,43 +37,46 @@ script = ExtResource("3_ahn1e") snap_mode = 1 metadata/_custom_type_script = "uid://cquqe4f1m1sw6" -[node name="CollisionShape3D" type="CollisionShape3D" parent="XRToolsSnapZone" unique_id=182042233] +[node name="CollisionShape3D" type="CollisionShape3D" parent="CubeSideDispenser/XRToolsSnapZone" unique_id=182042233] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.15291119, 0) shape = SubResource("SphereShape3D_xmbo2") -[node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=1974757539] +[node name="CollisionShape3D" type="CollisionShape3D" parent="CubeSideDispenser" unique_id=1974757539] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) shape = SubResource("CylinderShape3D_24d3s") -[node name="SlideOffDome" parent="." unique_id=1427609426 instance=ExtResource("4_nn8tr")] +[node name="SlideOffDome" parent="CubeSideDispenser" unique_id=1427609426 instance=ExtResource("4_nn8tr")] -[node name="CSGCombiner3D" type="CSGCombiner3D" parent="." unique_id=1172420592] +[node name="CSGCombiner3D" type="CSGCombiner3D" parent="CubeSideDispenser" unique_id=1172420592] -[node name="CSGCylinder3D" type="CSGCylinder3D" parent="CSGCombiner3D" unique_id=1073546772] +[node name="CSGCylinder3D" type="CSGCylinder3D" parent="CubeSideDispenser/CSGCombiner3D" unique_id=1073546772] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) radius = 0.3 +height = 1.0 sides = 32 -[node name="Cubes" type="Node3D" parent="." unique_id=100532970] +[node name="Cubes" type="Node3D" parent="CubeSideDispenser" unique_id=100532970] -[node name="MeshInstance3D" type="MeshInstance3D" parent="Cubes" unique_id=2040729886] +[node name="MeshInstance3D" type="MeshInstance3D" parent="CubeSideDispenser/Cubes" unique_id=2040729886] transform = Transform3D(0.9709369, 0, 0.23933554, 0, 1, 0, -0.23933554, 0, 0.9709369, -0.0038359165, 1.0421022, -0.1349423) mesh = SubResource("BoxMesh_irf4n") -[node name="MeshInstance3D2" type="MeshInstance3D" parent="Cubes" unique_id=2119335322] +[node name="MeshInstance3D2" type="MeshInstance3D" parent="CubeSideDispenser/Cubes" unique_id=2119335322] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.1336323, 1.0421022, 0.049409628) mesh = SubResource("BoxMesh_irf4n") -[node name="MeshInstance3D3" type="MeshInstance3D" parent="Cubes" unique_id=896999260] +[node name="MeshInstance3D3" type="MeshInstance3D" parent="CubeSideDispenser/Cubes" unique_id=896999260] transform = Transform3D(0.94914126, 0, -0.31485054, 0, 1, 0, 0.31485054, 0, 0.94914126, 0.021345377, 1.0421022, 0.13508391) mesh = SubResource("BoxMesh_irf4n") -[node name="MeshInstance3D4" type="MeshInstance3D" parent="Cubes" unique_id=1055210121] +[node name="MeshInstance3D4" type="MeshInstance3D" parent="CubeSideDispenser/Cubes" unique_id=1055210121] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.14830339, 1.0421022, 0.054090023) mesh = SubResource("BoxMesh_irf4n") -[node name="MeshInstance3D5" type="MeshInstance3D" parent="Cubes" unique_id=1800524097] +[node name="MeshInstance3D5" type="MeshInstance3D" parent="CubeSideDispenser/Cubes" unique_id=1800524097] transform = Transform3D(0.966823, 0, -0.2554472, 0, 1, 0, 0.2554472, 0, 0.966823, 0.12695658, 1.0421022, -0.07926583) mesh = SubResource("BoxMesh_irf4n") -[node name="MeshInstance3D6" type="MeshInstance3D" parent="Cubes" unique_id=192094054] +[node name="MeshInstance3D6" type="MeshInstance3D" parent="CubeSideDispenser/Cubes" unique_id=192094054] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.11111963, 1.0421022, -0.094003916) mesh = SubResource("BoxMesh_irf4n") diff --git a/Stations/item_dispenser.gd b/Stations/item_dispenser.gd index 39a09e2..d54f170 100644 --- a/Stations/item_dispenser.gd +++ b/Stations/item_dispenser.gd @@ -3,7 +3,6 @@ extends StaticBody3D @export var item_scene : PackedScene @onready var snap_zone: XRToolsSnapZone = $XRToolsSnapZone -# Called when the node enters the scene tree for the first time. func _ready() -> void: if not item_scene: push_error("Item dispenser is missing a reference to it's item to dispense") @@ -11,10 +10,17 @@ func _ready() -> void: push_error("Item dispenser is missing a reference to its snap zone child") -# Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta: float) -> void: if not NetworkManager.owns_world(): return + #if snap_zone.picked_up_object: # Player picked up this station + #if visible: + #snap_zone.picked_up_object.enabled = true + #else: + #snap_zone.picked_up_object.enabled = false + #return + # if not snap_zone.picked_up_object: + print("Item dispenser is missing item, spawning new item") var new_item = NetworkManager.spawn_item(item_scene.resource_path, snap_zone.global_transform) snap_zone.pick_up_object(new_item) diff --git a/Stations/plate_dispenser.tscn b/Stations/plate_dispenser.tscn index b0513e8..769999a 100644 --- a/Stations/plate_dispenser.tscn +++ b/Stations/plate_dispenser.tscn @@ -1,5 +1,6 @@ [gd_scene format=3 uid="uid://ck5tuftqmyiue"] +[ext_resource type="PackedScene" uid="uid://cvucwxibtol5f" path="res://stations/StationMovement.tscn" id="1_jgjsq"] [ext_resource type="Script" uid="uid://0y6wnjcsum6" path="res://stations/item_dispenser.gd" id="1_jm0ik"] [ext_resource type="PackedScene" uid="uid://bp3v1jl8pctro" path="res://Containers/plate.tscn" id="2_tfo2i"] [ext_resource type="Script" uid="uid://cquqe4f1m1sw6" path="res://addons/godot-xr-tools/objects/snap_zone.gd" id="3_lr065"] @@ -9,13 +10,19 @@ radius = 0.3 [sub_resource type="CylinderShape3D" id="CylinderShape3D_24d3s"] +height = 1.0 radius = 0.3 -[node name="PlateDispenser" type="StaticBody3D" unique_id=710538846] +[node name="PlateDispenser" type="Node3D" unique_id=53391541] + +[node name="StationMovement" parent="." unique_id=946873975 node_paths=PackedStringArray("station") instance=ExtResource("1_jgjsq")] +station = NodePath("../PlateDispenser") + +[node name="PlateDispenser" type="StaticBody3D" parent="." unique_id=710538846] script = ExtResource("1_jm0ik") item_scene = ExtResource("2_tfo2i") -[node name="XRToolsSnapZone" type="Area3D" parent="." unique_id=238176038] +[node name="XRToolsSnapZone" type="Area3D" parent="PlateDispenser" unique_id=238176038] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00070536137, 1.1603245, -0.002165556) collision_layer = 65536 collision_mask = 65536 @@ -23,85 +30,88 @@ script = ExtResource("3_lr065") snap_mode = 1 metadata/_custom_type_script = "uid://cquqe4f1m1sw6" -[node name="CollisionShape3D" type="CollisionShape3D" parent="XRToolsSnapZone" unique_id=1942470044] +[node name="CollisionShape3D" type="CollisionShape3D" parent="PlateDispenser/XRToolsSnapZone" unique_id=1942470044] shape = SubResource("SphereShape3D_xmbo2") -[node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=831688237] +[node name="CollisionShape3D" type="CollisionShape3D" parent="PlateDispenser" unique_id=831688237] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) shape = SubResource("CylinderShape3D_24d3s") -[node name="SlideOffDome" parent="." unique_id=1427609426 instance=ExtResource("4_tfo2i")] +[node name="SlideOffDome" parent="PlateDispenser" unique_id=1427609426 instance=ExtResource("4_tfo2i")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.061363697, 0) -[node name="CSGCombiner3D" type="CSGCombiner3D" parent="." unique_id=696108271] +[node name="CSGCombiner3D" type="CSGCombiner3D" parent="PlateDispenser" unique_id=696108271] -[node name="CSGCylinder3D" type="CSGCylinder3D" parent="CSGCombiner3D" unique_id=1339763385] +[node name="CSGCylinder3D" type="CSGCylinder3D" parent="PlateDispenser/CSGCombiner3D" unique_id=1339763385] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) radius = 0.3 +height = 1.0 sides = 32 -[node name="Plates" type="Node3D" parent="." unique_id=1364909922] +[node name="Plates" type="Node3D" parent="PlateDispenser" unique_id=1364909922] -[node name="CSGCombiner3D" type="CSGCombiner3D" parent="Plates" unique_id=2128650644] +[node name="CSGCombiner3D" type="CSGCombiner3D" parent="PlateDispenser/Plates" unique_id=2128650644] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.0289642, 0) autosmooth = true smoothing_angle = 103.9 -[node name="CSGCylinder3D" type="CSGCylinder3D" parent="Plates/CSGCombiner3D" unique_id=472067854] +[node name="CSGCylinder3D" type="CSGCylinder3D" parent="PlateDispenser/Plates/CSGCombiner3D" unique_id=472067854] radius = 0.2 height = 0.03 sides = 16 -[node name="CSGCylinder3D" type="CSGCylinder3D" parent="Plates/CSGCombiner3D/CSGCylinder3D" unique_id=7092994] +[node name="CSGCylinder3D" type="CSGCylinder3D" parent="PlateDispenser/Plates/CSGCombiner3D/CSGCylinder3D" unique_id=7092994] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.010312311, 0) operation = 2 radius = 0.15 height = 0.03 sides = 16 -[node name="CSGCylinder3D2" type="CSGCylinder3D" parent="Plates/CSGCombiner3D" unique_id=23957958] +[node name="CSGCylinder3D2" type="CSGCylinder3D" parent="PlateDispenser/Plates/CSGCombiner3D" unique_id=23957958] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.027119078, 0) radius = 0.15 height = 0.02 -[node name="CSGCombiner3D2" type="CSGCombiner3D" parent="Plates" unique_id=404631280] +[node name="CSGCombiner3D2" type="CSGCombiner3D" parent="PlateDispenser/Plates" unique_id=404631280] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.0762081, 0) autosmooth = true smoothing_angle = 103.9 -[node name="CSGCylinder3D" type="CSGCylinder3D" parent="Plates/CSGCombiner3D2" unique_id=943162425] +[node name="CSGCylinder3D" type="CSGCylinder3D" parent="PlateDispenser/Plates/CSGCombiner3D2" unique_id=943162425] radius = 0.2 height = 0.03 sides = 16 -[node name="CSGCylinder3D" type="CSGCylinder3D" parent="Plates/CSGCombiner3D2/CSGCylinder3D" unique_id=218364524] +[node name="CSGCylinder3D" type="CSGCylinder3D" parent="PlateDispenser/Plates/CSGCombiner3D2/CSGCylinder3D" unique_id=218364524] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.010312311, 0) operation = 2 radius = 0.15 height = 0.03 sides = 16 -[node name="CSGCylinder3D2" type="CSGCylinder3D" parent="Plates/CSGCombiner3D2" unique_id=1548327331] +[node name="CSGCylinder3D2" type="CSGCylinder3D" parent="PlateDispenser/Plates/CSGCombiner3D2" unique_id=1548327331] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.027119078, 0) radius = 0.15 height = 0.02 -[node name="CSGCombiner3D3" type="CSGCombiner3D" parent="Plates" unique_id=1506211353] +[node name="CSGCombiner3D3" type="CSGCombiner3D" parent="PlateDispenser/Plates" unique_id=1506211353] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.1214186, 0) autosmooth = true smoothing_angle = 103.9 -[node name="CSGCylinder3D" type="CSGCylinder3D" parent="Plates/CSGCombiner3D3" unique_id=739830577] +[node name="CSGCylinder3D" type="CSGCylinder3D" parent="PlateDispenser/Plates/CSGCombiner3D3" unique_id=739830577] radius = 0.2 height = 0.03 sides = 16 -[node name="CSGCylinder3D" type="CSGCylinder3D" parent="Plates/CSGCombiner3D3/CSGCylinder3D" unique_id=1882120753] +[node name="CSGCylinder3D" type="CSGCylinder3D" parent="PlateDispenser/Plates/CSGCombiner3D3/CSGCylinder3D" unique_id=1882120753] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.010312311, 0) operation = 2 radius = 0.15 height = 0.03 sides = 16 -[node name="CSGCylinder3D2" type="CSGCylinder3D" parent="Plates/CSGCombiner3D3" unique_id=1904629745] +[node name="CSGCylinder3D2" type="CSGCylinder3D" parent="PlateDispenser/Plates/CSGCombiner3D3" unique_id=1904629745] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.027119078, 0) radius = 0.15 height = 0.02 diff --git a/Stations/potato_dispenser.tscn b/Stations/potato_dispenser.tscn new file mode 100644 index 0000000..c822266 --- /dev/null +++ b/Stations/potato_dispenser.tscn @@ -0,0 +1,127 @@ +[gd_scene format=3 uid="uid://sc6i0i1f0o48"] + +[ext_resource type="PackedScene" uid="uid://cvucwxibtol5f" path="res://stations/StationMovement.tscn" id="1_8orw3"] +[ext_resource type="Script" uid="uid://0y6wnjcsum6" path="res://stations/item_dispenser.gd" id="2_30d2d"] +[ext_resource type="PackedScene" uid="uid://drwuhqb3pjtiy" path="res://items/potato.tscn" id="3_mjqsn"] +[ext_resource type="Script" uid="uid://cquqe4f1m1sw6" path="res://addons/godot-xr-tools/objects/snap_zone.gd" id="4_fx1kw"] +[ext_resource type="PackedScene" uid="uid://mpapt5mkbuao" path="res://prefabs/slide_off_dome.tscn" id="5_ur331"] + +[sub_resource type="SphereShape3D" id="SphereShape3D_xmbo2"] +radius = 0.3 + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_24d3s"] +height = 1.0 +radius = 0.3 + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_d4wpw"] +albedo_color = Color(0.48, 0.34336, 0.1872, 1) + +[node name="PotatoDispenser" type="Node3D" unique_id=1410160280] + +[node name="StationMovement" parent="." unique_id=946873975 node_paths=PackedStringArray("station") instance=ExtResource("1_8orw3")] +station = NodePath("../PotatoDispenser") + +[node name="PotatoDispenser" type="StaticBody3D" parent="." unique_id=1720683779] +script = ExtResource("2_30d2d") +item_scene = ExtResource("3_mjqsn") + +[node name="XRToolsSnapZone" type="Area3D" parent="PotatoDispenser" unique_id=805334513] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00070536137, 1.0162505, -0.002165556) +collision_layer = 65536 +collision_mask = 65536 +script = ExtResource("4_fx1kw") +snap_mode = 1 +metadata/_custom_type_script = "uid://cquqe4f1m1sw6" + +[node name="CollisionShape3D" type="CollisionShape3D" parent="PotatoDispenser/XRToolsSnapZone" unique_id=1104626493] +shape = SubResource("SphereShape3D_xmbo2") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="PotatoDispenser" unique_id=1470079357] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) +shape = SubResource("CylinderShape3D_24d3s") + +[node name="SlideOffDome" parent="PotatoDispenser" unique_id=1427609426 instance=ExtResource("5_ur331")] +collision_layer = 4 +collision_mask = 0 + +[node name="CSGCombiner3D" type="CSGCombiner3D" parent="PotatoDispenser" unique_id=1746426494] + +[node name="CSGCylinder3D" type="CSGCylinder3D" parent="PotatoDispenser/CSGCombiner3D" unique_id=858311379] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) +radius = 0.3 +height = 1.0 +sides = 32 + +[node name="CSGCombiner3DPotato" type="CSGCombiner3D" parent="PotatoDispenser/CSGCombiner3D" unique_id=462017195] + +[node name="CSGSphere3D" type="CSGSphere3D" parent="PotatoDispenser/CSGCombiner3D/CSGCombiner3DPotato" unique_id=359972032] +transform = Transform3D(0.7382242, 0, -0.6745554, 0, 1, 0, 0.6745554, 0, 0.7382242, -0.15066577, 1.0408545, 0.076017424) +radius = 0.06 +radial_segments = 32 +material = SubResource("StandardMaterial3D_d4wpw") + +[node name="CSGSphere3D2" type="CSGSphere3D" parent="PotatoDispenser/CSGCombiner3D/CSGCombiner3DPotato/CSGSphere3D" unique_id=1185082311] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.06550818) +radius = 0.053 +radial_segments = 32 +material = SubResource("StandardMaterial3D_d4wpw") + +[node name="CSGSphere3D2" type="CSGSphere3D" parent="PotatoDispenser/CSGCombiner3D/CSGCombiner3DPotato" unique_id=1791611208] +transform = Transform3D(0.9110552, 0.37138447, -0.17903017, -0.38194957, 0.92377764, -0.02737245, 0.15521842, 0.09331828, 0.98346263, 0.07202275, 1.0408545, 0.17340909) +radius = 0.06 +radial_segments = 32 +material = SubResource("StandardMaterial3D_d4wpw") + +[node name="CSGSphere3D2" type="CSGSphere3D" parent="PotatoDispenser/CSGCombiner3D/CSGCombiner3DPotato/CSGSphere3D2" unique_id=421732580] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.06550818) +radius = 0.053 +radial_segments = 32 +material = SubResource("StandardMaterial3D_d4wpw") + +[node name="CSGSphere3D3" type="CSGSphere3D" parent="PotatoDispenser/CSGCombiner3D/CSGCombiner3DPotato" unique_id=1846822725] +transform = Transform3D(0.915982, 0, 0.4012194, 0, 1, 0, -0.4012194, 0, 0.915982, -0.023129582, 1.0408545, -0.17174377) +radius = 0.06 +radial_segments = 32 +material = SubResource("StandardMaterial3D_d4wpw") + +[node name="CSGSphere3D2" type="CSGSphere3D" parent="PotatoDispenser/CSGCombiner3D/CSGCombiner3DPotato/CSGSphere3D3" unique_id=186002472] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.06550818) +radius = 0.053 +radial_segments = 32 +material = SubResource("StandardMaterial3D_d4wpw") + +[node name="CSGSphere3D4" type="CSGSphere3D" parent="PotatoDispenser/CSGCombiner3D/CSGCombiner3DPotato" unique_id=1463825677] +transform = Transform3D(-0.6086207, 0, 0.79346126, 0, 1, 0, -0.79346126, 0, -0.6086207, -0.06466554, 1.0408545, 0.15114635) +radius = 0.06 +radial_segments = 32 +material = SubResource("StandardMaterial3D_d4wpw") + +[node name="CSGSphere3D2" type="CSGSphere3D" parent="PotatoDispenser/CSGCombiner3D/CSGCombiner3DPotato/CSGSphere3D4" unique_id=1513828324] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.06550818) +radius = 0.053 +radial_segments = 32 +material = SubResource("StandardMaterial3D_d4wpw") + +[node name="CSGSphere3D5" type="CSGSphere3D" parent="PotatoDispenser/CSGCombiner3D/CSGCombiner3DPotato" unique_id=1192971071] +transform = Transform3D(-0.9572301, 0, -0.2893278, 0, 1, 0, 0.2893278, 0, -0.9572301, -0.13095556, 1.0408545, -0.10415963) +radius = 0.06 +radial_segments = 32 +material = SubResource("StandardMaterial3D_d4wpw") + +[node name="CSGSphere3D2" type="CSGSphere3D" parent="PotatoDispenser/CSGCombiner3D/CSGCombiner3DPotato/CSGSphere3D5" unique_id=216752249] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.06550818) +radius = 0.053 +radial_segments = 32 +material = SubResource("StandardMaterial3D_d4wpw") + +[node name="CSGSphere3D" type="CSGSphere3D" parent="PotatoDispenser/CSGCombiner3D" unique_id=502335906] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.15826963, 1.0408545, -0.03307341) +radius = 0.06 +radial_segments = 32 +material = SubResource("StandardMaterial3D_d4wpw") + +[node name="CSGSphere3D2" type="CSGSphere3D" parent="PotatoDispenser/CSGCombiner3D/CSGSphere3D" unique_id=1283597847] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.06550818) +radius = 0.053 +radial_segments = 32 +material = SubResource("StandardMaterial3D_d4wpw") diff --git a/Stations/raw_burger_dispenser.tscn b/Stations/raw_burger_dispenser.tscn index 30ff7d5..2c23c0b 100644 --- a/Stations/raw_burger_dispenser.tscn +++ b/Stations/raw_burger_dispenser.tscn @@ -5,21 +5,28 @@ [ext_resource type="Script" uid="uid://cquqe4f1m1sw6" path="res://addons/godot-xr-tools/objects/snap_zone.gd" id="3_3xuvi"] [ext_resource type="Texture2D" uid="uid://cexxfyw03hr81" path="res://textures/1.png" id="4_1f5le"] [ext_resource type="PackedScene" uid="uid://mpapt5mkbuao" path="res://prefabs/slide_off_dome.tscn" id="5_mep2a"] +[ext_resource type="PackedScene" uid="uid://cvucwxibtol5f" path="res://stations/StationMovement.tscn" id="6_8ou8n"] [sub_resource type="SphereShape3D" id="SphereShape3D_xmbo2"] radius = 0.3 [sub_resource type="CylinderShape3D" id="CylinderShape3D_24d3s"] +height = 1.0 radius = 0.3 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_di04w"] albedo_texture = ExtResource("4_1f5le") -[node name="RawBurgerDispenser" type="StaticBody3D" unique_id=235630131] +[node name="RawBurgerDispenser" type="Node3D" unique_id=383615587] + +[node name="StationMovement" parent="." unique_id=946873975 node_paths=PackedStringArray("station") instance=ExtResource("6_8ou8n")] +station = NodePath("../RawBurgerDispenser") + +[node name="RawBurgerDispenser" type="StaticBody3D" parent="." unique_id=235630131] script = ExtResource("1_gkb3v") item_scene = ExtResource("2_mep2a") -[node name="XRToolsSnapZone" type="Area3D" parent="." unique_id=1523586273] +[node name="XRToolsSnapZone" type="Area3D" parent="RawBurgerDispenser" unique_id=1523586273] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00070536137, 1.0645258, -0.002165556) collision_layer = 65536 collision_mask = 65536 @@ -27,70 +34,73 @@ script = ExtResource("3_3xuvi") snap_mode = 1 metadata/_custom_type_script = "uid://cquqe4f1m1sw6" -[node name="CollisionShape3D" type="CollisionShape3D" parent="XRToolsSnapZone" unique_id=2105824734] +[node name="CollisionShape3D" type="CollisionShape3D" parent="RawBurgerDispenser/XRToolsSnapZone" unique_id=2105824734] shape = SubResource("SphereShape3D_xmbo2") -[node name="SlideOffDome" parent="." unique_id=1427609426 instance=ExtResource("5_mep2a")] +[node name="SlideOffDome" parent="RawBurgerDispenser" unique_id=1427609426 instance=ExtResource("5_mep2a")] -[node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=378049928] +[node name="CollisionShape3D" type="CollisionShape3D" parent="RawBurgerDispenser" unique_id=378049928] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) shape = SubResource("CylinderShape3D_24d3s") -[node name="CSGCombiner3D" type="CSGCombiner3D" parent="." unique_id=1275577257] +[node name="CSGCombiner3D" type="CSGCombiner3D" parent="RawBurgerDispenser" unique_id=1275577257] -[node name="CSGCylinder3D" type="CSGCylinder3D" parent="CSGCombiner3D" unique_id=1973748218] +[node name="CSGCylinder3D" type="CSGCylinder3D" parent="RawBurgerDispenser/CSGCombiner3D" unique_id=1973748218] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) radius = 0.3 +height = 1.0 sides = 32 -[node name="CSGCylinder3D2" type="CSGCylinder3D" parent="CSGCombiner3D" unique_id=590219609] +[node name="CSGCylinder3D2" type="CSGCylinder3D" parent="RawBurgerDispenser/CSGCombiner3D" unique_id=590219609] transform = Transform3D(1, 0, 0, 0, 0.9532462, 0.30219492, 0, -0.30219492, 0.9532462, -0.1276815, 1.0521446, -0.052202225) radius = 0.08300781 height = 0.028435059 sides = 16 material = SubResource("StandardMaterial3D_di04w") -[node name="CSGCylinder3D3" type="CSGCylinder3D" parent="CSGCombiner3D" unique_id=177377476] +[node name="CSGCylinder3D3" type="CSGCylinder3D" parent="RawBurgerDispenser/CSGCombiner3D" unique_id=177377476] transform = Transform3D(1, 0, 0, 0, 0.9694763, 0.245185, 0, -0.245185, 0.9694763, 0.08106685, 1.0391599, -0.119440794) radius = 0.08300781 height = 0.03 sides = 16 material = SubResource("StandardMaterial3D_di04w") -[node name="CSGCylinder3D4" type="CSGCylinder3D" parent="CSGCombiner3D" unique_id=622291452] +[node name="CSGCylinder3D4" type="CSGCylinder3D" parent="RawBurgerDispenser/CSGCombiner3D" unique_id=622291452] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.19005477, 1.0198405, 0.049397707) radius = 0.08300781 height = 0.03 sides = 16 material = SubResource("StandardMaterial3D_di04w") -[node name="CSGCylinder3D5" type="CSGCylinder3D" parent="CSGCombiner3D" unique_id=703594207] +[node name="CSGCylinder3D5" type="CSGCylinder3D" parent="RawBurgerDispenser/CSGCombiner3D" unique_id=703594207] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.026051283, 1.0175319, 0.0042250156) radius = 0.08300781 height = 0.03 sides = 16 material = SubResource("StandardMaterial3D_di04w") -[node name="CSGCylinder3D6" type="CSGCylinder3D" parent="CSGCombiner3D" unique_id=955808722] +[node name="CSGCylinder3D6" type="CSGCylinder3D" parent="RawBurgerDispenser/CSGCombiner3D" unique_id=955808722] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.05739355, 1.0197641, 0.13219571) radius = 0.08300781 height = 0.03 sides = 16 material = SubResource("StandardMaterial3D_di04w") -[node name="CSGCylinder3D7" type="CSGCylinder3D" parent="CSGCombiner3D" unique_id=1066788957] +[node name="CSGCylinder3D7" type="CSGCylinder3D" parent="RawBurgerDispenser/CSGCombiner3D" unique_id=1066788957] transform = Transform3D(0.9111114, 0.40515354, 0.075673, -0.41123694, 0.8813372, 0.2326565, 0.027568169, -0.24309555, 0.9696106, 0.14799988, 1.0345665, 0.11710405) radius = 0.08300781 height = 0.03 sides = 16 material = SubResource("StandardMaterial3D_di04w") -[node name="CSGCylinder3D8" type="CSGCylinder3D" parent="CSGCombiner3D" unique_id=553053058] +[node name="CSGCylinder3D8" type="CSGCylinder3D" parent="RawBurgerDispenser/CSGCombiner3D" unique_id=553053058] transform = Transform3D(0.9541017, 0.29948288, 0, -0.29948288, 0.9541017, 0, 0, 0, 1, 0.041060925, 1.0337045, 0.18304396) radius = 0.08300781 height = 0.03 sides = 16 material = SubResource("StandardMaterial3D_di04w") -[node name="CSGCylinder3D9" type="CSGCylinder3D" parent="CSGCombiner3D" unique_id=980376661] +[node name="CSGCylinder3D9" type="CSGCylinder3D" parent="RawBurgerDispenser/CSGCombiner3D" unique_id=980376661] transform = Transform3D(0.8510151, 0.22759955, 0.47325662, -0.16729629, 0.97174567, -0.16649997, -0.49778044, 0.06251989, 0.8650468, 0.2036674, 1.0335208, -0.024382353) radius = 0.08300781 height = 0.03 diff --git a/Stations/sink.tscn b/Stations/sink.tscn index f828ef8..2e5a36d 100644 --- a/Stations/sink.tscn +++ b/Stations/sink.tscn @@ -191,11 +191,11 @@ station = NodePath("../Sink") script = ExtResource("1_7hh4b") [node name="CollisionShape3D" type="CollisionShape3D" parent="Sink" unique_id=964735164] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0012329221, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.507675, 0) shape = SubResource("BoxShape3D_l02yb") [node name="XRToolsSnapZone" type="Area3D" parent="Sink" unique_id=1762550988 groups=["station"]] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.44614658, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9525887, 0) collision_layer = 65536 collision_mask = 65540 script = ExtResource("2_3ocod") @@ -210,6 +210,7 @@ shape = SubResource("BoxShape3D_ai6d4") [node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="Sink/XRToolsSnapZone" unique_id=1926328538] [node name="CSGCombiner3D" type="CSGCombiner3D" parent="Sink" unique_id=311064646] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.50644207, 0) [node name="CSGBox3D" type="CSGBox3D" parent="Sink/CSGCombiner3D" unique_id=1147823280] size = Vector3(0.6, 1, 0.6) @@ -244,9 +245,10 @@ size = Vector3(1, 1.2053223, 0.352417) replication_config = SubResource("SceneReplicationConfig_np_sink") [node name="ProgressBar3D" parent="Sink" unique_id=654673176 instance=ExtResource("4_1pinr")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.8164611, -0.035980098) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.3229032, -0.035980098) [node name="bubbles" type="CSGCombiner3D" parent="Sink" unique_id=1624244242] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.50644207, 0) visible = false [node name="CSGSphere3D" type="CSGSphere3D" parent="Sink/bubbles" unique_id=1363004819] @@ -265,6 +267,7 @@ radius = 0.08 material = SubResource("StandardMaterial3D_0gbf8") [node name="water" type="CSGCombiner3D" parent="Sink" unique_id=1050686091] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.50644207, 0) visible = false [node name="CSGBox3D" type="CSGBox3D" parent="Sink/water" unique_id=1224655006] @@ -279,7 +282,7 @@ libraries/ = SubResource("AnimationLibrary_u2x8c") stream = SubResource("AudioStreamWAV_ai6d4") [node name="GPUParticles3D" type="GPUParticles3D" parent="Sink" unique_id=1688415718] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0002603531, 0.6479259, -0.03759767) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0002603531, 1.154368, -0.03759767) visible = false process_material = SubResource("ParticleProcessMaterial_hrheb") draw_pass_1 = SubResource("SphereMesh_bvwq1") diff --git a/Stations/station_movement.gd b/Stations/station_movement.gd index 406533f..6df2148 100644 --- a/Stations/station_movement.gd +++ b/Stations/station_movement.gd @@ -1,7 +1,5 @@ extends Node -@export var snap_grid_size: float = 0.6 - @export var move_handle: XRToolsPickable @export var move_ghost: Area3D @export var station: StaticBody3D @@ -138,6 +136,11 @@ func _is_move_position_valid() -> bool: continue if body == station: continue + # If body is a pickable that is held by a snapzone that is part of this station + 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(): diff --git a/Stations/table.tscn b/Stations/table.tscn index 87b6325..8a83e47 100644 --- a/Stations/table.tscn +++ b/Stations/table.tscn @@ -8,7 +8,7 @@ [ext_resource type="PackedScene" uid="uid://bxbocxdaayvwx" path="res://UI/progress_bar.tscn" id="3_kjf1i"] [sub_resource type="BoxShape3D" id="BoxShape3D_24d3s"] -size = Vector3(0.99146974, 0.060000002, 1.0059766) +size = Vector3(0.7983472, 0.060000002, 0.59873295) [sub_resource type="SphereShape3D" id="SphereShape3D_dlkho"] radius = 0.6 @@ -40,14 +40,15 @@ script = ExtResource("1_2vcpj") money_sound = ExtResource("2_jslhm") [node name="CollisionShape3D" type="CollisionShape3D" parent="Table" unique_id=228053941] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.50155246, 0) shape = SubResource("BoxShape3D_24d3s") [node name="CollisionShape3D2" type="CollisionShape3D" parent="Table" unique_id=276384063] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0017700791, 0.47, -0.0042381883) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.094791204, 0.9715525, 0.0012244582) shape = SubResource("BoxShape3D_24d3s") [node name="XRToolsSnapZone" type="Area3D" parent="Table" unique_id=1947858647 groups=["station"]] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.31874347, 0.5270121, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.0285525, 0) collision_layer = 65536 collision_mask = 65540 script = ExtResource("1_8j1nt") @@ -62,82 +63,31 @@ shape = SubResource("SphereShape3D_dlkho") [node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="Table/XRToolsSnapZone" unique_id=2135860710] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.013531357, -0.015141487, 0.012176305) -[node name="XRToolsSnapZone2" type="Area3D" parent="Table" unique_id=694448387 groups=["station"]] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.34755045, 0.5270121, 0) -collision_layer = 65536 -collision_mask = 65540 -script = ExtResource("1_8j1nt") -stash_sound = ExtResource("3_0s6ir") -snap_mode = 1 -metadata/_custom_type_script = "uid://cquqe4f1m1sw6" - -[node name="CollisionShape3D2" type="CollisionShape3D" parent="Table/XRToolsSnapZone2" unique_id=650960099] -transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, -0.000975132, 0) -shape = SubResource("SphereShape3D_dlkho") - -[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="Table/XRToolsSnapZone2" unique_id=709529410] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.013531357, -0.015141487, 0.012176305) - -[node name="XRToolsSnapZone3" type="Area3D" parent="Table" unique_id=1734026785 groups=["station"]] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.012355864, 0.5270121, 0.33038777) -collision_layer = 65536 -collision_mask = 65540 -script = ExtResource("1_8j1nt") -stash_sound = ExtResource("3_0s6ir") -snap_mode = 1 -metadata/_custom_type_script = "uid://cquqe4f1m1sw6" - -[node name="CollisionShape3D2" type="CollisionShape3D" parent="Table/XRToolsSnapZone3" unique_id=1271210642] -transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, -0.000975132, 0) -shape = SubResource("SphereShape3D_dlkho") - -[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="Table/XRToolsSnapZone3" unique_id=2000860662] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.013531357, -0.015141487, 0.012176305) - -[node name="XRToolsSnapZone4" type="Area3D" parent="Table" unique_id=1358457948 groups=["station"]] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.022546828, 0.5270121, -0.36528283) -collision_layer = 65536 -collision_mask = 65540 -script = ExtResource("1_8j1nt") -stash_sound = ExtResource("3_0s6ir") -snap_mode = 1 -metadata/_custom_type_script = "uid://cquqe4f1m1sw6" - -[node name="CollisionShape3D2" type="CollisionShape3D" parent="Table/XRToolsSnapZone4" unique_id=1880499470] -transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, -0.000975132, 0) -shape = SubResource("SphereShape3D_dlkho") - -[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="Table/XRToolsSnapZone4" unique_id=790672192] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.013531357, -0.015141487, 0.012176305) - [node name="CSGCombiner3D" type="CSGCombiner3D" parent="Table" unique_id=2085635675] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.50155246, 0) [node name="CSGBox3D" type="CSGBox3D" parent="Table/CSGCombiner3D" unique_id=411048765] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.46137518, 0) -size = Vector3(1, 0.077, 1) +size = Vector3(0.6, 0.077, 0.6) material = SubResource("StandardMaterial3D_24d3s") [node name="CSGBox3D2" type="CSGBox3D" parent="Table/CSGCombiner3D" unique_id=2093582402] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.27815637, 0) -size = Vector3(0.1, 0.31586915, 0.1) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.02685462, 0) +size = Vector3(0.1, 0.9258911, 0.1) material = SubResource("StandardMaterial3D_24d3s") -[node name="CSGBox3D3" type="CSGBox3D" parent="Table/CSGCombiner3D" unique_id=839228683] -transform = Transform3D(0.86602545, 0.50000006, 0, -0.50000006, 0.86602545, 0, 0, 0, 1, -0.21657634, -0.106895894, 0) -size = Vector3(0.1, 0.8768555, 0.1) +[node name="CSGBox3D4" type="CSGBox3D" parent="Table/CSGCombiner3D" unique_id=345709075] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.41408914, 0) +size = Vector3(0.1, 0.15142211, 0.5341797) material = SubResource("StandardMaterial3D_24d3s") -[node name="CSGBox3D4" type="CSGBox3D" parent="Table/CSGCombiner3D" unique_id=1028598922] -transform = Transform3D(-0.45971727, -0.2654179, 0.8474747, -0.50000006, 0.86602545, 0, -0.73393464, -0.4237374, -0.53083575, 0.10796261, -0.106895894, 0.16580808) -size = Vector3(0.1, 0.8768555, 0.1) -material = SubResource("StandardMaterial3D_24d3s") - -[node name="CSGBox3D5" type="CSGBox3D" parent="Table/CSGCombiner3D" unique_id=892392906] -transform = Transform3D(-0.38498235, -0.12489955, -0.9144338, -0.5286442, 0.8420017, 0.107556336, 0.756521, 0.5248176, -0.39018327, 0.059352398, -0.106895894, -0.2290039) -size = Vector3(0.1, 0.8768555, 0.1) +[node name="CSGBox3D5" type="CSGBox3D" parent="Table/CSGCombiner3D" unique_id=550923256] +transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 0, -0.41408914, 0) +size = Vector3(0.1, 0.15142211, 0.5341797) material = SubResource("StandardMaterial3D_24d3s") [node name="Customers" type="Node3D" parent="Table" unique_id=2147179512] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.50155246, 0) [node name="Customer" type="Node3D" parent="Table/Customers" unique_id=1265943831] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.016780734, -0.08218986, 0) @@ -154,6 +104,7 @@ transform = Transform3D(0.9999998, 0, 0, 0, 1.7476468, 0, 0, 0, 0.9999998, -0.73 radius = 0.17520222 [node name="Seats" type="Node3D" parent="Table" unique_id=1101423789] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.50155246, 0) [node name="Seat" type="Node3D" parent="Table/Seats" unique_id=1951252898] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.9079602, -0.37259835, 0) @@ -189,14 +140,14 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.33084005, 0.18746406, -0.15 size = Vector3(0.05, 0.6713196, 0.05) [node name="Label3D" type="Label3D" parent="Table" unique_id=662960977] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.3247777, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.8263302, 0) billboard = 2 text = "table state" vertical_alignment = 0 line_spacing = -15.0 [node name="Label3DTime" type="Label3D" parent="Table" unique_id=1534849507] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.513246, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.0147986, 0) pixel_size = 0.003 billboard = 2 text = "20.1s" @@ -205,13 +156,15 @@ text = "20.1s" replication_config = SubResource("SceneReplicationConfig_np_table") [node name="ProgressBar3D" parent="Table" unique_id=654673176 instance=ExtResource("3_kjf1i")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.3676775, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.8692299, 0) y_billboard = true [node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="Table" unique_id=724610642] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.2935008, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.7950532, 0) [node name="PlayerDetectArea3D" type="Area3D" parent="Table" unique_id=913445150] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.50155246, 0) +collision_layer = 0 collision_mask = 524288 [node name="CollisionShape3D" type="CollisionShape3D" parent="Table/PlayerDetectArea3D" unique_id=1538221021] diff --git a/Textures/shop/burger_buns.png b/Textures/shop/burger_buns.png new file mode 100644 index 0000000..658deed Binary files /dev/null and b/Textures/shop/burger_buns.png differ diff --git a/Textures/shop/burger_buns.png.import b/Textures/shop/burger_buns.png.import new file mode 100644 index 0000000..87ab96e --- /dev/null +++ b/Textures/shop/burger_buns.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bmomecu0058xg" +path="res://.godot/imported/burger_buns.png-1d188acf1114db952605e27ec3a22b7d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://textures/shop/burger_buns.png" +dest_files=["res://.godot/imported/burger_buns.png-1d188acf1114db952605e27ec3a22b7d.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Textures/shop/plates.png b/Textures/shop/plates.png new file mode 100644 index 0000000..ed69225 Binary files /dev/null and b/Textures/shop/plates.png differ diff --git a/Textures/shop/plates.png.import b/Textures/shop/plates.png.import new file mode 100644 index 0000000..70ba7e5 --- /dev/null +++ b/Textures/shop/plates.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cjrwhtsjjhtu7" +path="res://.godot/imported/plates.png-604fb64dc490ce3d61a68949e43933ce.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://textures/shop/plates.png" +dest_files=["res://.godot/imported/plates.png-604fb64dc490ce3d61a68949e43933ce.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Textures/shop/potatoes.png b/Textures/shop/potatoes.png new file mode 100644 index 0000000..879a8a8 Binary files /dev/null and b/Textures/shop/potatoes.png differ diff --git a/Textures/shop/potatoes.png.import b/Textures/shop/potatoes.png.import new file mode 100644 index 0000000..5ffb085 --- /dev/null +++ b/Textures/shop/potatoes.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://blekcmdjkxs0q" +path="res://.godot/imported/potatoes.png-348ae4010ffc422d20b1b18ef1c047b7.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://textures/shop/potatoes.png" +dest_files=["res://.godot/imported/potatoes.png-348ae4010ffc422d20b1b18ef1c047b7.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Textures/shop/raw_burger.png b/Textures/shop/raw_burger.png new file mode 100644 index 0000000..a93deca Binary files /dev/null and b/Textures/shop/raw_burger.png differ diff --git a/Textures/shop/raw_burger.png.import b/Textures/shop/raw_burger.png.import new file mode 100644 index 0000000..a9b7655 --- /dev/null +++ b/Textures/shop/raw_burger.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dpaqhbpmk7exf" +path="res://.godot/imported/raw_burger.png-281cd44e6d7ec4dca89ef14be14b45df.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://textures/shop/raw_burger.png" +dest_files=["res://.godot/imported/raw_burger.png-281cd44e6d7ec4dca89ef14be14b45df.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Textures/shop/table.png b/Textures/shop/table.png new file mode 100644 index 0000000..eefcd98 Binary files /dev/null and b/Textures/shop/table.png differ diff --git a/Textures/shop/table.png.import b/Textures/shop/table.png.import new file mode 100644 index 0000000..6c5fd22 --- /dev/null +++ b/Textures/shop/table.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cv3grgonwlakt" +path="res://.godot/imported/table.png-329a7e7d913d8d0d73e07611b7f10c21.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://textures/shop/table.png" +dest_files=["res://.godot/imported/table.png-329a7e7d913d8d0d73e07611b7f10c21.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/UI/shop.tscn b/UI/shop.tscn index a8d24a3..6958e3a 100644 --- a/UI/shop.tscn +++ b/UI/shop.tscn @@ -8,6 +8,16 @@ [ext_resource type="Texture2D" uid="uid://ejby14dl1svr" path="res://textures/shop/hob.png" id="5_2k6ie"] [ext_resource type="PackedScene" uid="uid://dvrk268s7gkxh" path="res://stations/sink.tscn" id="6_rktus"] [ext_resource type="Texture2D" uid="uid://ecdu0qqhib4" path="res://textures/shop/sink.png" id="7_4titf"] +[ext_resource type="PackedScene" uid="uid://caf0xanmxbshy" path="res://stations/table.tscn" id="9_84wnh"] +[ext_resource type="PackedScene" uid="uid://cwnwo4i28upap" path="res://stations/raw_burger_dispenser.tscn" id="9_vl3v4"] +[ext_resource type="Texture2D" uid="uid://dpaqhbpmk7exf" path="res://textures/shop/raw_burger.png" id="10_rkek4"] +[ext_resource type="Texture2D" uid="uid://cv3grgonwlakt" path="res://textures/shop/table.png" id="10_sb5p3"] +[ext_resource type="PackedScene" uid="uid://c6rift56ql3f8" path="res://stations/BurgerBunsDispenser.tscn" id="11_4m5wg"] +[ext_resource type="Texture2D" uid="uid://bmomecu0058xg" path="res://textures/shop/burger_buns.png" id="12_84wnh"] +[ext_resource type="PackedScene" uid="uid://ck5tuftqmyiue" path="res://stations/plate_dispenser.tscn" id="13_4m5wg"] +[ext_resource type="Texture2D" uid="uid://cjrwhtsjjhtu7" path="res://textures/shop/plates.png" id="14_84wnh"] +[ext_resource type="PackedScene" uid="uid://sc6i0i1f0o48" path="res://stations/potato_dispenser.tscn" id="17_pdan6"] +[ext_resource type="Texture2D" uid="uid://blekcmdjkxs0q" path="res://textures/shop/potatoes.png" id="18_6lkkh"] [sub_resource type="LabelSettings" id="LabelSettings_vlqg6"] font_size = 35 @@ -49,15 +59,14 @@ offset_left = 20.0 offset_top = 80.0 offset_right = -20.0 offset_bottom = -20.0 -current_tab = 1 +current_tab = 0 [node name="Stations" type="GridContainer" parent="TabContainer" unique_id=189446761] -visible = false layout_mode = 2 columns = 6 metadata/_tab_index = 0 -[node name="StationButton" parent="TabContainer/Stations" unique_id=2079583080 instance=ExtResource("1_pogqh")] +[node name="Panel1" parent="TabContainer/Stations" unique_id=2079583080 instance=ExtResource("1_pogqh")] layout_mode = 2 station_scene = ExtResource("2_35otv") icon_texture = ExtResource("3_74fni") @@ -69,226 +78,52 @@ layout_mode = 2 station_scene = ExtResource("4_l3qkl") icon_texture = ExtResource("5_2k6ie") station_name = "Hob" -cost = 50 +cost = 60 [node name="Panel3" parent="TabContainer/Stations" unique_id=1096388793 instance=ExtResource("1_pogqh")] layout_mode = 2 station_scene = ExtResource("6_rktus") icon_texture = ExtResource("7_4titf") station_name = "Sink" -cost = 40 - -[node name="StationButton2" parent="TabContainer/Stations" unique_id=1037758002 instance=ExtResource("1_pogqh")] -layout_mode = 2 -station_scene = ExtResource("2_35otv") -icon_texture = ExtResource("3_74fni") -station_name = "Counter" cost = 30 -[node name="Panel4" parent="TabContainer/Stations" unique_id=1667497770 instance=ExtResource("1_pogqh")] +[node name="Panel4" parent="TabContainer/Stations" unique_id=699590599 instance=ExtResource("1_pogqh")] layout_mode = 2 -station_scene = ExtResource("4_l3qkl") -icon_texture = ExtResource("5_2k6ie") -station_name = "Hob" +station_scene = ExtResource("9_84wnh") +icon_texture = ExtResource("10_sb5p3") +station_name = "Table" cost = 50 -[node name="Panel5" parent="TabContainer/Stations" unique_id=1982065975 instance=ExtResource("1_pogqh")] +[node name="Panel5" parent="TabContainer/Stations" unique_id=387664331 instance=ExtResource("1_pogqh")] layout_mode = 2 -station_scene = ExtResource("6_rktus") -icon_texture = ExtResource("7_4titf") -station_name = "Sink" -cost = 40 - -[node name="StationButton3" parent="TabContainer/Stations" unique_id=1301410231 instance=ExtResource("1_pogqh")] -layout_mode = 2 -station_scene = ExtResource("2_35otv") -icon_texture = ExtResource("3_74fni") -station_name = "Counter" -cost = 30 - -[node name="Panel6" parent="TabContainer/Stations" unique_id=1995120839 instance=ExtResource("1_pogqh")] -layout_mode = 2 -station_scene = ExtResource("4_l3qkl") -icon_texture = ExtResource("5_2k6ie") -station_name = "Hob" -cost = 50 - -[node name="Panel7" parent="TabContainer/Stations" unique_id=761089034 instance=ExtResource("1_pogqh")] -layout_mode = 2 -station_scene = ExtResource("6_rktus") -icon_texture = ExtResource("7_4titf") -station_name = "Sink" -cost = 40 - -[node name="StationButton4" parent="TabContainer/Stations" unique_id=1417297413 instance=ExtResource("1_pogqh")] -layout_mode = 2 -station_scene = ExtResource("2_35otv") -icon_texture = ExtResource("3_74fni") -station_name = "Counter" -cost = 30 - -[node name="Panel8" parent="TabContainer/Stations" unique_id=1691237963 instance=ExtResource("1_pogqh")] -layout_mode = 2 -station_scene = ExtResource("4_l3qkl") -icon_texture = ExtResource("5_2k6ie") -station_name = "Hob" -cost = 50 - -[node name="Panel9" parent="TabContainer/Stations" unique_id=1365829405 instance=ExtResource("1_pogqh")] -layout_mode = 2 -station_scene = ExtResource("6_rktus") -icon_texture = ExtResource("7_4titf") -station_name = "Sink" -cost = 40 - -[node name="StationButton5" parent="TabContainer/Stations" unique_id=2041495798 instance=ExtResource("1_pogqh")] -layout_mode = 2 -station_scene = ExtResource("2_35otv") -icon_texture = ExtResource("3_74fni") -station_name = "Counter" -cost = 30 - -[node name="Panel10" parent="TabContainer/Stations" unique_id=1193707247 instance=ExtResource("1_pogqh")] -layout_mode = 2 -station_scene = ExtResource("4_l3qkl") -icon_texture = ExtResource("5_2k6ie") -station_name = "Hob" -cost = 50 - -[node name="Panel11" parent="TabContainer/Stations" unique_id=1812217593 instance=ExtResource("1_pogqh")] -layout_mode = 2 -station_scene = ExtResource("6_rktus") -icon_texture = ExtResource("7_4titf") -station_name = "Sink" -cost = 40 - -[node name="StationButton6" parent="TabContainer/Stations" unique_id=495155208 instance=ExtResource("1_pogqh")] -layout_mode = 2 -station_scene = ExtResource("2_35otv") -icon_texture = ExtResource("3_74fni") -station_name = "Counter" -cost = 30 - -[node name="Panel12" parent="TabContainer/Stations" unique_id=773081956 instance=ExtResource("1_pogqh")] -layout_mode = 2 -station_scene = ExtResource("4_l3qkl") -icon_texture = ExtResource("5_2k6ie") -station_name = "Hob" -cost = 50 - -[node name="Panel13" parent="TabContainer/Stations" unique_id=1722465236 instance=ExtResource("1_pogqh")] -layout_mode = 2 -station_scene = ExtResource("6_rktus") -icon_texture = ExtResource("7_4titf") -station_name = "Sink" -cost = 40 - -[node name="StationButton7" parent="TabContainer/Stations" unique_id=920721283 instance=ExtResource("1_pogqh")] -layout_mode = 2 -station_scene = ExtResource("2_35otv") -icon_texture = ExtResource("3_74fni") -station_name = "Counter" -cost = 30 - -[node name="Panel14" parent="TabContainer/Stations" unique_id=280005981 instance=ExtResource("1_pogqh")] -layout_mode = 2 -station_scene = ExtResource("4_l3qkl") -icon_texture = ExtResource("5_2k6ie") -station_name = "Hob" -cost = 50 - -[node name="Panel15" parent="TabContainer/Stations" unique_id=1032476128 instance=ExtResource("1_pogqh")] -layout_mode = 2 -station_scene = ExtResource("6_rktus") -icon_texture = ExtResource("7_4titf") -station_name = "Sink" -cost = 40 - -[node name="StationButton8" parent="TabContainer/Stations" unique_id=1596739090 instance=ExtResource("1_pogqh")] -layout_mode = 2 -station_scene = ExtResource("2_35otv") -icon_texture = ExtResource("3_74fni") -station_name = "Counter" -cost = 30 - -[node name="Panel16" parent="TabContainer/Stations" unique_id=1045125889 instance=ExtResource("1_pogqh")] -layout_mode = 2 -station_scene = ExtResource("4_l3qkl") -icon_texture = ExtResource("5_2k6ie") -station_name = "Hob" -cost = 50 - -[node name="Panel17" parent="TabContainer/Stations" unique_id=85646771 instance=ExtResource("1_pogqh")] -layout_mode = 2 -station_scene = ExtResource("6_rktus") -icon_texture = ExtResource("7_4titf") -station_name = "Sink" -cost = 40 - -[node name="StationButton9" parent="TabContainer/Stations" unique_id=883484649 instance=ExtResource("1_pogqh")] -layout_mode = 2 -station_scene = ExtResource("2_35otv") -icon_texture = ExtResource("3_74fni") -station_name = "Counter" -cost = 30 - -[node name="Panel18" parent="TabContainer/Stations" unique_id=259381012 instance=ExtResource("1_pogqh")] -layout_mode = 2 -station_scene = ExtResource("4_l3qkl") -icon_texture = ExtResource("5_2k6ie") -station_name = "Hob" -cost = 50 - -[node name="Panel19" parent="TabContainer/Stations" unique_id=1701937266 instance=ExtResource("1_pogqh")] -layout_mode = 2 -station_scene = ExtResource("6_rktus") -icon_texture = ExtResource("7_4titf") -station_name = "Sink" -cost = 40 - -[node name="StationButton10" parent="TabContainer/Stations" unique_id=381125476 instance=ExtResource("1_pogqh")] -layout_mode = 2 -station_scene = ExtResource("2_35otv") -icon_texture = ExtResource("3_74fni") -station_name = "Counter" -cost = 30 - -[node name="Panel20" parent="TabContainer/Stations" unique_id=1573978940 instance=ExtResource("1_pogqh")] -layout_mode = 2 -station_scene = ExtResource("4_l3qkl") -icon_texture = ExtResource("5_2k6ie") -station_name = "Hob" -cost = 50 - -[node name="Panel21" parent="TabContainer/Stations" unique_id=555544070 instance=ExtResource("1_pogqh")] -layout_mode = 2 -station_scene = ExtResource("6_rktus") -icon_texture = ExtResource("7_4titf") -station_name = "Sink" -cost = 40 +station_scene = ExtResource("13_4m5wg") +icon_texture = ExtResource("14_84wnh") +station_name = "Plates" +cost = 80 [node name="Food" type="GridContainer" parent="TabContainer" unique_id=422899445] +visible = false layout_mode = 2 columns = 6 metadata/_tab_index = 1 -[node name="StationButton" parent="TabContainer/Food" unique_id=586692243 instance=ExtResource("1_pogqh")] +[node name="Panel1" parent="TabContainer/Food" unique_id=586692243 instance=ExtResource("1_pogqh")] layout_mode = 2 -station_scene = ExtResource("2_35otv") -icon_texture = ExtResource("3_74fni") -station_name = "Counter" -cost = 30 +station_scene = ExtResource("9_vl3v4") +icon_texture = ExtResource("10_rkek4") +station_name = "Raw Burgers" +cost = 60 [node name="Panel2" parent="TabContainer/Food" unique_id=918076583 instance=ExtResource("1_pogqh")] layout_mode = 2 -station_scene = ExtResource("4_l3qkl") -icon_texture = ExtResource("5_2k6ie") -station_name = "Hob" -cost = 50 +station_scene = ExtResource("11_4m5wg") +icon_texture = ExtResource("12_84wnh") +station_name = "Burger Buns" +cost = 60 -[node name="Panel3" parent="TabContainer/Food" unique_id=387664331 instance=ExtResource("1_pogqh")] +[node name="Panel3" parent="TabContainer/Food" unique_id=370542353 instance=ExtResource("1_pogqh")] layout_mode = 2 -station_scene = ExtResource("6_rktus") -icon_texture = ExtResource("7_4titf") -station_name = "Sink" -cost = 40 +station_scene = ExtResource("17_pdan6") +icon_texture = ExtResource("18_6lkkh") +station_name = "Potatos" +cost = 60 diff --git a/UI/shop_station_button.gd b/UI/shop_station_button.gd index c6a8ddd..682900e 100644 --- a/UI/shop_station_button.gd +++ b/UI/shop_station_button.gd @@ -21,15 +21,16 @@ func _on_button_pressed() -> void: print("ShopStationButton buy ", station_name) _buy_station() + func _buy_station() -> void: GameManager.money -= cost var transform = Helper.get_snapped_transform(XRHelpers.get_xr_origin(self).get_node_or_null("PlayerBody")) var forward: Vector3 = -transform.basis.z.normalized() - # TODO: Don't move up. Fix scenes. - transform.origin += (forward * 0.6) + Vector3(0, 0.5, 0) + transform.origin += (forward * 0.6) var instance = NetworkManager.spawn_item(station_scene.resource_path, transform) Signals.station_bought.emit(instance) + func _process(_delta: float) -> void: button.disabled = GameManager.money < cost diff --git a/content/static_resturants/resturant.tscn b/content/static_resturants/resturant.tscn index a0fec43..d0ad701 100644 --- a/content/static_resturants/resturant.tscn +++ b/content/static_resturants/resturant.tscn @@ -1,10 +1,10 @@ [gd_scene format=3 uid="uid://bu6jt26pq2y0k"] -[ext_resource type="PackedScene" uid="uid://q37nqadkibbp" path="res://scenes/door.tscn" id="1_hgrxd"] +[ext_resource type="PackedScene" uid="uid://q37nqadkibbp" path="res://environment/door.tscn" id="1_hgrxd"] [ext_resource type="PackedScene" uid="uid://j7caslh27nor" path="res://stations/Hob.tscn" id="1_p8umn"] [ext_resource type="PackedScene" uid="uid://caf0xanmxbshy" path="res://stations/table.tscn" id="2_d63j6"] [ext_resource type="PackedScene" uid="uid://dlw5geheupgpt" path="res://stations/hatch.tscn" id="3_d63j6"] -[ext_resource type="PackedScene" uid="uid://da6yrsnxvsrif" path="res://scenes/wall.tscn" id="4_41vpv"] +[ext_resource type="PackedScene" uid="uid://da6yrsnxvsrif" path="res://environment/wall.tscn" id="4_41vpv"] [ext_resource type="PackedScene" uid="uid://efaec6ymgabo" path="res://stations/Counter.tscn" id="6_orihb"] [ext_resource type="PackedScene" uid="uid://ck5tuftqmyiue" path="res://stations/plate_dispenser.tscn" id="7_pfjwm"] [ext_resource type="PackedScene" uid="uid://dvrk268s7gkxh" path="res://stations/sink.tscn" id="8_sov4h"] diff --git a/documentation/Notes.md b/documentation/Notes.md index 851b2f2..fbfe3b6 100644 --- a/documentation/Notes.md +++ b/documentation/Notes.md @@ -59,3 +59,6 @@ Shared INventory + +## Modifiers +- Disposable plates. no washing. much less money \ No newline at end of file diff --git a/Scenes/door.tscn b/environment/door.tscn similarity index 100% rename from Scenes/door.tscn rename to environment/door.tscn diff --git a/Scenes/wall.tscn b/environment/wall.tscn similarity index 100% rename from Scenes/wall.tscn rename to environment/wall.tscn diff --git a/global/GameManager.gd b/global/GameManager.gd index 854128e..3f0d3ae 100644 --- a/global/GameManager.gd +++ b/global/GameManager.gd @@ -1,7 +1,7 @@ class_name GameManager extends Node -static var money: int = 100 +static var money: int = 1000 static var meals_in_play: Array[String] static var sides_in_play: Array[String] diff --git a/global/helper.gd b/global/helper.gd index 71a2271..267155c 100644 --- a/global/helper.gd +++ b/global/helper.gd @@ -22,6 +22,20 @@ static func find_first_child_of_type(node: Node, type: Variant) -> Node: return nested return null +# Returns true if decendant is a decendant node of root, false otherwise. Returns false if either node is null. +static func is_node_decendant_of(decendant: Node, root: Node) -> bool: + if not decendant or not root: + print("Helper.is_node_decendant_of: decendant or root is null") + return false + var current: Node = decendant + while current: + if current == root: + print("Helper.is_node_decendant_of: decendant %s is a descendant of root %s" % [decendant.name, root.name]) + return true + current = current.get_parent() + print("Helper.is_node_decendant_of: decendant %s is NOT a descendant of root %s" % [decendant.name, root.name]) + return false + # Returns a transform with position snapped to the 0.6 grid and rotation snapped to 90 degrees. static func get_snapped_transform(node: Node3D) -> Transform3D: diff --git a/recipes.yaml.uid b/recipes.yaml.uid new file mode 100644 index 0000000..26c7014 --- /dev/null +++ b/recipes.yaml.uid @@ -0,0 +1 @@ +uid://be8o8m6xpp3kc diff --git a/test/multiPlayerTest.tscn b/test/multiPlayerTest.tscn index ce0e892..7f0495b 100644 --- a/test/multiPlayerTest.tscn +++ b/test/multiPlayerTest.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://bodj8op527o2c"] -[ext_resource type="Script" uid="uid://d1cefhe3yyyds" path="res://scenes/multiplayer_world.gd" id="1_6uucx"] +[ext_resource type="Script" uid="uid://d1cefhe3yyyds" path="res://Net/multiplayer_world.gd" id="1_6uucx"] [ext_resource type="PackedScene" uid="uid://j5s5wus7tuhb" path="res://prefabs/XROrigin.tscn" id="2_j7vd1"] [ext_resource type="Material" uid="uid://cmia50cfqxxo4" path="res://textures/dev_material_3d.tres" id="3_ssbaf"] [ext_resource type="Sky" uid="uid://c1abtpwhdm2d5" path="res://textures/sky/NightSkyHDRI009_16K.tres" id="4_081u3"] @@ -34,7 +34,6 @@ size = Vector3(15, 20, 0.1) [node name="Main" type="Node3D" unique_id=1312265607] script = ExtResource("1_6uucx") -populate_from_layout = true [node name="XROrigin3D" parent="." unique_id=2055526621 groups=["local_xr_origin"] instance=ExtResource("2_j7vd1")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.36171648, 0, 0.81835127) @@ -85,10 +84,10 @@ transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 7.50 shape = SubResource("BoxShape3D_arao0") [node name="Hob" parent="." unique_id=1687971542 instance=ExtResource("5_t1fa7")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.014911681, 0) [node name="Sink" parent="." unique_id=2055277359 instance=ExtResource("6_6jhmh")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0.5, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0.014911681, 0) [node name="Plate" parent="." unique_id=190487773 instance=ExtResource("7_bowes")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.4050963, 1.1702834, 0.049627244) @@ -106,7 +105,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.28692234, 1.0149999, 1.1) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.40037438, 1.0094403, 1.1) [node name="Counter" parent="." unique_id=1487893288 instance=ExtResource("12_j5uvh")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0.5, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0.014911681, 0) [node name="Counter2" parent="." unique_id=860178119 instance=ExtResource("12_j5uvh")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 0.5, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 0.014911681, 0) diff --git a/Scenes/testworldLoad.gd b/test/testworldLoad.gd similarity index 100% rename from Scenes/testworldLoad.gd rename to test/testworldLoad.gd diff --git a/Scenes/testworldLoad.gd.uid b/test/testworldLoad.gd.uid similarity index 100% rename from Scenes/testworldLoad.gd.uid rename to test/testworldLoad.gd.uid