diff --git a/Items/BurgerBuns.tscn b/Items/BurgerBuns.tscn index e479e36..f42f0d0 100644 --- a/Items/BurgerBuns.tscn +++ b/Items/BurgerBuns.tscn @@ -8,7 +8,7 @@ [ext_resource type="Animation" uid="uid://bediglpx0rj7i" path="res://addons/godot-xr-tools/hands/animations/left/Grip 5.res" id="6_ftab3"] [ext_resource type="PackedScene" uid="uid://3lr2dhy62rhk" path="res://Prefabs/combinable_item.tscn" id="7_wb51u"] [ext_resource type="PackedScene" uid="uid://bfj80jh13t6e5" path="res://Prefabs/food_item.tscn" id="8_t9y3x"] -[ext_resource type="Script" path="res://Net/net_pickable.gd" id="20_netpk"] +[ext_resource type="Script" uid="uid://bwd0pe2udb5xo" path="res://Net/net_pickable.gd" id="20_netpk"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_vlqg6"] height = 0.10708985 @@ -85,7 +85,6 @@ type = 2 [node name="CombinableItem" parent="." index="5" unique_id=996936271 instance=ExtResource("7_wb51u")] -[node name="NetPickable" type="MultiplayerSynchronizer" parent="."] -root_path = NodePath("..") +[node name="NetPickable" type="MultiplayerSynchronizer" parent="." index="6" unique_id=2086885420] replication_config = SubResource("SceneReplicationConfig_np_buns") script = ExtResource("20_netpk") diff --git a/Prefabs/combinable_item.tscn b/Prefabs/combinable_item.tscn index 2bc8948..2d44d93 100644 --- a/Prefabs/combinable_item.tscn +++ b/Prefabs/combinable_item.tscn @@ -2,8 +2,8 @@ [ext_resource type="Script" uid="uid://dounic663dn5q" path="res://Prefabs/combinable_item.gd" id="1_q21ti"] -[sub_resource type="BoxShape3D" id="BoxShape3D_combine"] -size = Vector3(0.16, 0.16, 0.16) +[sub_resource type="SphereShape3D" id="SphereShape3D_o1b3t"] +radius = 0.2 [node name="CombinableItem" type="Node3D" unique_id=996936271] script = ExtResource("1_q21ti") @@ -11,4 +11,4 @@ script = ExtResource("1_q21ti") [node name="Area3d" type="Area3D" parent="." unique_id=1514178016] [node name="CollisionShape3D" type="CollisionShape3D" parent="Area3d" unique_id=706892516] -shape = SubResource("BoxShape3D_combine") +shape = SubResource("SphereShape3D_o1b3t") diff --git a/Sounds/220175__gameaudio__pop-click.wav b/Sounds/220175__gameaudio__pop-click.wav new file mode 100644 index 0000000..c21fa27 Binary files /dev/null and b/Sounds/220175__gameaudio__pop-click.wav differ diff --git a/Sounds/220175__gameaudio__pop-click.wav.import b/Sounds/220175__gameaudio__pop-click.wav.import new file mode 100644 index 0000000..a9417c0 --- /dev/null +++ b/Sounds/220175__gameaudio__pop-click.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://mmasxwqyqmib" +path="res://.godot/imported/220175__gameaudio__pop-click.wav-1330523e09eacb15d341a14b80e4481e.sample" + +[deps] + +source_file="res://Sounds/220175__gameaudio__pop-click.wav" +dest_files=["res://.godot/imported/220175__gameaudio__pop-click.wav-1330523e09eacb15d341a14b80e4481e.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/Sounds/220178__gameaudio__click.wav b/Sounds/220178__gameaudio__click.wav new file mode 100644 index 0000000..b808cf5 Binary files /dev/null and b/Sounds/220178__gameaudio__click.wav differ diff --git a/Sounds/220178__gameaudio__click.wav.import b/Sounds/220178__gameaudio__click.wav.import new file mode 100644 index 0000000..3a17a60 --- /dev/null +++ b/Sounds/220178__gameaudio__click.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://ecva70pect61" +path="res://.godot/imported/220178__gameaudio__click.wav-ca46bf33c1c48e1e526f04c43ca7d450.sample" + +[deps] + +source_file="res://Sounds/220178__gameaudio__click.wav" +dest_files=["res://.godot/imported/220178__gameaudio__click.wav-ca46bf33c1c48e1e526f04c43ca7d450.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/Sounds/220179__gameaudio__click-metal-ting.wav b/Sounds/220179__gameaudio__click-metal-ting.wav new file mode 100644 index 0000000..008499e Binary files /dev/null and b/Sounds/220179__gameaudio__click-metal-ting.wav differ diff --git a/Sounds/220179__gameaudio__click-metal-ting.wav.import b/Sounds/220179__gameaudio__click-metal-ting.wav.import new file mode 100644 index 0000000..a53e857 --- /dev/null +++ b/Sounds/220179__gameaudio__click-metal-ting.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://b3wxawyrvuc6s" +path="res://.godot/imported/220179__gameaudio__click-metal-ting.wav-b01c457287fe42298a36c3de7c536c68.sample" + +[deps] + +source_file="res://Sounds/220179__gameaudio__click-metal-ting.wav" +dest_files=["res://.godot/imported/220179__gameaudio__click-metal-ting.wav-b01c457287fe42298a36c3de7c536c68.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/Sounds/220180__gameaudio__click-pop.wav b/Sounds/220180__gameaudio__click-pop.wav new file mode 100644 index 0000000..f498cac Binary files /dev/null and b/Sounds/220180__gameaudio__click-pop.wav differ diff --git a/Sounds/220180__gameaudio__click-pop.wav.import b/Sounds/220180__gameaudio__click-pop.wav.import new file mode 100644 index 0000000..ae51e42 --- /dev/null +++ b/Sounds/220180__gameaudio__click-pop.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://b7sr2sb1ks5en" +path="res://.godot/imported/220180__gameaudio__click-pop.wav-9e467150046193d705dd830885c89cd1.sample" + +[deps] + +source_file="res://Sounds/220180__gameaudio__click-pop.wav" +dest_files=["res://.godot/imported/220180__gameaudio__click-pop.wav-9e467150046193d705dd830885c89cd1.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/Sounds/220187__gameaudio__loosedeny-casual-1.wav b/Sounds/220187__gameaudio__loosedeny-casual-1.wav new file mode 100644 index 0000000..798dd04 Binary files /dev/null and b/Sounds/220187__gameaudio__loosedeny-casual-1.wav differ diff --git a/Sounds/220187__gameaudio__loosedeny-casual-1.wav.import b/Sounds/220187__gameaudio__loosedeny-casual-1.wav.import new file mode 100644 index 0000000..a847b10 --- /dev/null +++ b/Sounds/220187__gameaudio__loosedeny-casual-1.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://1ccsqbju32ey" +path="res://.godot/imported/220187__gameaudio__loosedeny-casual-1.wav-cb0e560d42c6026ded2d2e240e614433.sample" + +[deps] + +source_file="res://Sounds/220187__gameaudio__loosedeny-casual-1.wav" +dest_files=["res://.godot/imported/220187__gameaudio__loosedeny-casual-1.wav-cb0e560d42c6026ded2d2e240e614433.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/Sounds/220194__gameaudio__click-heavy.wav b/Sounds/220194__gameaudio__click-heavy.wav new file mode 100644 index 0000000..9c8b11d Binary files /dev/null and b/Sounds/220194__gameaudio__click-heavy.wav differ diff --git a/Sounds/220194__gameaudio__click-heavy.wav.import b/Sounds/220194__gameaudio__click-heavy.wav.import new file mode 100644 index 0000000..a99b102 --- /dev/null +++ b/Sounds/220194__gameaudio__click-heavy.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://bdnsgt7xt3261" +path="res://.godot/imported/220194__gameaudio__click-heavy.wav-aca40ed286d93eb365d527a162fd3129.sample" + +[deps] + +source_file="res://Sounds/220194__gameaudio__click-heavy.wav" +dest_files=["res://.godot/imported/220194__gameaudio__click-heavy.wav-aca40ed286d93eb365d527a162fd3129.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/Sounds/220195__gameaudio__click-wooden-1.wav b/Sounds/220195__gameaudio__click-wooden-1.wav new file mode 100644 index 0000000..3acdee8 Binary files /dev/null and b/Sounds/220195__gameaudio__click-wooden-1.wav differ diff --git a/Sounds/220195__gameaudio__click-wooden-1.wav.import b/Sounds/220195__gameaudio__click-wooden-1.wav.import new file mode 100644 index 0000000..57569f4 --- /dev/null +++ b/Sounds/220195__gameaudio__click-wooden-1.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://daiv8ubwdbidf" +path="res://.godot/imported/220195__gameaudio__click-wooden-1.wav-9368ef861eabf2cf1d5bd0db33c616c8.sample" + +[deps] + +source_file="res://Sounds/220195__gameaudio__click-wooden-1.wav" +dest_files=["res://.godot/imported/220195__gameaudio__click-wooden-1.wav-9368ef861eabf2cf1d5bd0db33c616c8.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/Sounds/220196__gameaudio__click-wooden-2.wav b/Sounds/220196__gameaudio__click-wooden-2.wav new file mode 100644 index 0000000..5be8aa4 Binary files /dev/null and b/Sounds/220196__gameaudio__click-wooden-2.wav differ diff --git a/Sounds/220196__gameaudio__click-wooden-2.wav.import b/Sounds/220196__gameaudio__click-wooden-2.wav.import new file mode 100644 index 0000000..5207b69 --- /dev/null +++ b/Sounds/220196__gameaudio__click-wooden-2.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://qed775b4j1gg" +path="res://.godot/imported/220196__gameaudio__click-wooden-2.wav-45bb63efefaf817b60155beec9343d74.sample" + +[deps] + +source_file="res://Sounds/220196__gameaudio__click-wooden-2.wav" +dest_files=["res://.godot/imported/220196__gameaudio__click-wooden-2.wav-45bb63efefaf817b60155beec9343d74.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/Sounds/220197__gameaudio__click-basic.wav b/Sounds/220197__gameaudio__click-basic.wav new file mode 100644 index 0000000..85601bb Binary files /dev/null and b/Sounds/220197__gameaudio__click-basic.wav differ diff --git a/Sounds/220197__gameaudio__click-basic.wav.import b/Sounds/220197__gameaudio__click-basic.wav.import new file mode 100644 index 0000000..4136eac --- /dev/null +++ b/Sounds/220197__gameaudio__click-basic.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://bqtk1adk8umbx" +path="res://.godot/imported/220197__gameaudio__click-basic.wav-9f173e2b7206278e95710ab077d62c32.sample" + +[deps] + +source_file="res://Sounds/220197__gameaudio__click-basic.wav" +dest_files=["res://.godot/imported/220197__gameaudio__click-basic.wav-9f173e2b7206278e95710ab077d62c32.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/Sounds/220198__gameaudio__click-with-two-parts.wav b/Sounds/220198__gameaudio__click-with-two-parts.wav new file mode 100644 index 0000000..50ee53d Binary files /dev/null and b/Sounds/220198__gameaudio__click-with-two-parts.wav differ diff --git a/Sounds/220198__gameaudio__click-with-two-parts.wav.import b/Sounds/220198__gameaudio__click-with-two-parts.wav.import new file mode 100644 index 0000000..8a4c740 --- /dev/null +++ b/Sounds/220198__gameaudio__click-with-two-parts.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://ysgfx76jkx2q" +path="res://.godot/imported/220198__gameaudio__click-with-two-parts.wav-089977567529b37b0fd9cd019eb7b3c2.sample" + +[deps] + +source_file="res://Sounds/220198__gameaudio__click-with-two-parts.wav" +dest_files=["res://.godot/imported/220198__gameaudio__click-with-two-parts.wav-089977567529b37b0fd9cd019eb7b3c2.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/Sounds/220199__gameaudio__click-higher.wav b/Sounds/220199__gameaudio__click-higher.wav new file mode 100644 index 0000000..0bad8d3 Binary files /dev/null and b/Sounds/220199__gameaudio__click-higher.wav differ diff --git a/Sounds/220199__gameaudio__click-higher.wav.import b/Sounds/220199__gameaudio__click-higher.wav.import new file mode 100644 index 0000000..a031b89 --- /dev/null +++ b/Sounds/220199__gameaudio__click-higher.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://dtyh22ccebiv5" +path="res://.godot/imported/220199__gameaudio__click-higher.wav-d1c1550d99a0cc873012c4010877005b.sample" + +[deps] + +source_file="res://Sounds/220199__gameaudio__click-higher.wav" +dest_files=["res://.godot/imported/220199__gameaudio__click-higher.wav-d1c1550d99a0cc873012c4010877005b.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/Sounds/220208__gameaudio__click-pop-two-part.wav b/Sounds/220208__gameaudio__click-pop-two-part.wav new file mode 100644 index 0000000..2676ba4 Binary files /dev/null and b/Sounds/220208__gameaudio__click-pop-two-part.wav differ diff --git a/Sounds/220208__gameaudio__click-pop-two-part.wav.import b/Sounds/220208__gameaudio__click-pop-two-part.wav.import new file mode 100644 index 0000000..46dfa62 --- /dev/null +++ b/Sounds/220208__gameaudio__click-pop-two-part.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://cywjbbeintjew" +path="res://.godot/imported/220208__gameaudio__click-pop-two-part.wav-04cb5eb3e0b3459771dbab42bbd24be9.sample" + +[deps] + +source_file="res://Sounds/220208__gameaudio__click-pop-two-part.wav" +dest_files=["res://.godot/imported/220208__gameaudio__click-pop-two-part.wav-04cb5eb3e0b3459771dbab42bbd24be9.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/Sounds/220212__gameaudio__ping-bing.wav b/Sounds/220212__gameaudio__ping-bing.wav new file mode 100644 index 0000000..3a1fe6d Binary files /dev/null and b/Sounds/220212__gameaudio__ping-bing.wav differ diff --git a/Sounds/220212__gameaudio__ping-bing.wav.import b/Sounds/220212__gameaudio__ping-bing.wav.import new file mode 100644 index 0000000..8ac3beb --- /dev/null +++ b/Sounds/220212__gameaudio__ping-bing.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://claw3d2wnyr6a" +path="res://.godot/imported/220212__gameaudio__ping-bing.wav-2a1049829e71a0034c7e8d18745663f1.sample" + +[deps] + +source_file="res://Sounds/220212__gameaudio__ping-bing.wav" +dest_files=["res://.godot/imported/220212__gameaudio__ping-bing.wav-2a1049829e71a0034c7e8d18745663f1.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/Stations/Counter.tscn b/Stations/Counter.tscn index 2d85625..d94614d 100644 --- a/Stations/Counter.tscn +++ b/Stations/Counter.tscn @@ -1,12 +1,13 @@ [gd_scene format=3 uid="uid://efaec6ymgabo"] [ext_resource type="Script" uid="uid://cquqe4f1m1sw6" path="res://addons/godot-xr-tools/objects/snap_zone.gd" id="1_dlkho"] +[ext_resource type="AudioStream" uid="uid://claw3d2wnyr6a" path="res://Sounds/220212__gameaudio__ping-bing.wav" id="2_0aadn"] [sub_resource type="BoxShape3D" id="BoxShape3D_24d3s"] size = Vector3(1, 1, 1.0517578) -[sub_resource type="SphereShape3D" id="SphereShape3D_dlkho"] -radius = 0.3 +[sub_resource type="BoxShape3D" id="BoxShape3D_1ntq7"] +size = Vector3(0.6, 0.12802735, 0.6) [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_24d3s"] albedo_color = Color(0.49, 0.3854667, 0.29400003, 1) @@ -26,14 +27,15 @@ shape = SubResource("BoxShape3D_24d3s") [node name="XRToolsSnapZone" type="Area3D" parent="." unique_id=1647380272 groups=["station"]] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5608841, 0) collision_layer = 65536 -collision_mask = 65536 +collision_mask = 65540 script = ExtResource("1_dlkho") +stash_sound = ExtResource("2_0aadn") snap_mode = 1 metadata/_custom_type_script = "uid://cquqe4f1m1sw6" [node name="CollisionShape3D2" type="CollisionShape3D" parent="XRToolsSnapZone" unique_id=969340130] -transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, -0.000975132, 0) -shape = SubResource("SphereShape3D_dlkho") +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.002, 0) +shape = SubResource("BoxShape3D_1ntq7") [node name="CSGCombiner3D" type="CSGCombiner3D" parent="." unique_id=451757283] use_collision = true diff --git a/Stations/Hob.tscn b/Stations/Hob.tscn index 8f0337a..d0ed6d2 100644 --- a/Stations/Hob.tscn +++ b/Stations/Hob.tscn @@ -6,8 +6,8 @@ [sub_resource type="BoxShape3D" id="BoxShape3D_kdxnr"] -[sub_resource type="SphereShape3D" id="SphereShape3D_vlqg6"] -radius = 0.3 +[sub_resource type="BoxShape3D" id="BoxShape3D_7uuqv"] +size = Vector3(0.6, 0.12802735, 0.6) [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_gkb3v"] @@ -28,14 +28,14 @@ shape = SubResource("BoxShape3D_kdxnr") [node name="XRToolsSnapZone" type="Area3D" parent="." unique_id=538157739] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5270121, 0) collision_layer = 65536 -collision_mask = 65536 +collision_mask = 65540 script = ExtResource("2_er1dp") snap_mode = 1 metadata/_custom_type_script = "uid://cquqe4f1m1sw6" [node name="CollisionShape3D2" type="CollisionShape3D" parent="XRToolsSnapZone" unique_id=370920392] -transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, -0.000975132, 0) -shape = SubResource("SphereShape3D_vlqg6") +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.000975132, 0) +shape = SubResource("BoxShape3D_7uuqv") [node name="CSGCombiner3D" type="CSGCombiner3D" parent="." unique_id=70901698] diff --git a/Stations/dirt_station.tscn b/Stations/dirt_station.tscn index 6587c79..97301df 100644 --- a/Stations/dirt_station.tscn +++ b/Stations/dirt_station.tscn @@ -33,7 +33,7 @@ text = "Dirt" [node name="XRToolsSnapZone" type="Area3D" parent="." unique_id=333161027 groups=["station"]] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5270121, 0) collision_layer = 65536 -collision_mask = 65536 +collision_mask = 65540 script = ExtResource("2_v0ytd") snap_mode = 1 metadata/_custom_type_script = "uid://cquqe4f1m1sw6" diff --git a/Stations/sink.tscn b/Stations/sink.tscn index 7e9cde7..bed6899 100644 --- a/Stations/sink.tscn +++ b/Stations/sink.tscn @@ -4,10 +4,10 @@ [ext_resource type="Script" uid="uid://cquqe4f1m1sw6" path="res://addons/godot-xr-tools/objects/snap_zone.gd" id="2_3ocod"] [ext_resource type="PackedScene" uid="uid://bxbocxdaayvwx" path="res://UI/progress_bar.tscn" id="4_1pinr"] -[sub_resource type="BoxShape3D" id="BoxShape3D_24d3s"] +[sub_resource type="BoxShape3D" id="BoxShape3D_l02yb"] -[sub_resource type="SphereShape3D" id="SphereShape3D_dlkho"] -radius = 0.3 +[sub_resource type="BoxShape3D" id="BoxShape3D_ai6d4"] +size = Vector3(0.6, 0.12802735, 0.6) [sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_np_sink"] properties/0/path = NodePath(".:progress") @@ -18,19 +18,19 @@ properties/0/replication_mode = 1 script = ExtResource("1_7hh4b") [node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=964735164] -shape = SubResource("BoxShape3D_24d3s") +shape = SubResource("BoxShape3D_l02yb") [node name="XRToolsSnapZone" type="Area3D" parent="." unique_id=1762550988 groups=["station"]] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5163779, 0) collision_layer = 65536 -collision_mask = 65536 +collision_mask = 65540 script = ExtResource("2_3ocod") snap_mode = 1 metadata/_custom_type_script = "uid://cquqe4f1m1sw6" [node name="CollisionShape3D2" type="CollisionShape3D" parent="XRToolsSnapZone" unique_id=860566355] -transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, -0.000975132, 0) -shape = SubResource("SphereShape3D_dlkho") +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.000975132, 0) +shape = SubResource("BoxShape3D_ai6d4") [node name="CSGCombiner3D" type="CSGCombiner3D" parent="." unique_id=311064646] diff --git a/Stations/table.gd b/Stations/table.gd index 8b588f3..cf413f5 100644 --- a/Stations/table.gd +++ b/Stations/table.gd @@ -172,11 +172,9 @@ func _refresh_display() -> void: progress_bar.set_bar_visible(false) label_3d_time.text = "%.1f" % _state_time - print("_state_duration = ", _state_duration) progress_bar.set_progress(clampf(float(_state_time) / _state_duration, 0.0, 1.0)) - func _set_state(value: TableState) -> void: _state = value _refresh_display() diff --git a/Stations/table.tscn b/Stations/table.tscn index c76a42a..8ad9cce 100644 --- a/Stations/table.tscn +++ b/Stations/table.tscn @@ -7,7 +7,7 @@ [sub_resource type="BoxShape3D" id="BoxShape3D_24d3s"] [sub_resource type="SphereShape3D" id="SphereShape3D_dlkho"] -radius = 0.3 +radius = 0.6 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_24d3s"] albedo_color = Color(0.31, 0.21576, 0.1333, 1) @@ -32,7 +32,7 @@ shape = SubResource("BoxShape3D_24d3s") [node name="XRToolsSnapZone" type="Area3D" parent="." unique_id=1947858647 groups=["station"]] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.31874347, 0.5270121, 0) collision_layer = 65536 -collision_mask = 65536 +collision_mask = 65540 script = ExtResource("1_8j1nt") snap_mode = 1 metadata/_custom_type_script = "uid://cquqe4f1m1sw6" @@ -44,7 +44,7 @@ shape = SubResource("SphereShape3D_dlkho") [node name="XRToolsSnapZone2" type="Area3D" parent="." 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 = 65536 +collision_mask = 65540 script = ExtResource("1_8j1nt") snap_mode = 1 metadata/_custom_type_script = "uid://cquqe4f1m1sw6" @@ -56,7 +56,7 @@ shape = SubResource("SphereShape3D_dlkho") [node name="XRToolsSnapZone3" type="Area3D" parent="." 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 = 65536 +collision_mask = 65540 script = ExtResource("1_8j1nt") snap_mode = 1 metadata/_custom_type_script = "uid://cquqe4f1m1sw6" @@ -68,7 +68,7 @@ shape = SubResource("SphereShape3D_dlkho") [node name="XRToolsSnapZone4" type="Area3D" parent="." 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 = 65536 +collision_mask = 65540 script = ExtResource("1_8j1nt") snap_mode = 1 metadata/_custom_type_script = "uid://cquqe4f1m1sw6" diff --git a/UI/progress_bar_3d.gd b/UI/progress_bar_3d.gd index 6ed0966..93d99c8 100644 --- a/UI/progress_bar_3d.gd +++ b/UI/progress_bar_3d.gd @@ -14,7 +14,6 @@ func _ready() -> void: $Sprite3D.billboard = BaseMaterial3D.BillboardMode.BILLBOARD_FIXED_Y func set_progress(value: float) -> void: - print("ProgressBar set_progress: ", value) progress_bar.value = clamp(value, 0.0, 1.0) * 100 diff --git a/kanban_tasks_data.kanban b/kanban_tasks_data.kanban index 1e0e235..a3b3aed 100644 --- a/kanban_tasks_data.kanban +++ b/kanban_tasks_data.kanban @@ -17,7 +17,10 @@ "784d5cd3-333a-40a9-b35f-3d0c73f00761", "21bc19f1-ee3c-4bbb-ab9a-07ec6123a823", "d93a31cd-d475-4c5a-87fc-983174b2594f", - "9d7ecbc4-db2a-4d09-9f40-ceed3cf98c00" + "9d7ecbc4-db2a-4d09-9f40-ceed3cf98c00", + "0dd511cd-592c-4334-afd8-c511bd36b7d0", + "7883d015-f065-4b18-a2ab-e2a0daa9dc81", + "caf459e5-bb88-47dd-bf15-254a3d70c30f" ] }, { @@ -250,6 +253,27 @@ "description": "", "category": "bf4ec62e-526e-4027-876f-0b22bd17f79a", "steps": [] + }, + { + "uuid": "0dd511cd-592c-4334-afd8-c511bd36b7d0", + "title": "Plates should snap onto Meals in a station", + "description": "Trowing a plate onto a hamburger on a hob should result in a plated hamburger", + "category": "bf4ec62e-526e-4027-876f-0b22bd17f79a", + "steps": [] + }, + { + "uuid": "7883d015-f065-4b18-a2ab-e2a0daa9dc81", + "title": "Snap_zones should abosrb any item in range", + "description": "", + "category": "bf4ec62e-526e-4027-876f-0b22bd17f79a", + "steps": [] + }, + { + "uuid": "caf459e5-bb88-47dd-bf15-254a3d70c30f", + "title": "Station Snap_zones should cover the whole station", + "description": "", + "category": "bf4ec62e-526e-4027-876f-0b22bd17f79a", + "steps": [] } ], "layout": {