diff --git a/assets/book/Books_MAT.material b/assets/book/Books_MAT.material new file mode 100644 index 0000000..0560c10 --- /dev/null +++ b/assets/book/Books_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5983b14a659d229beacdd6e4506ef584f731f77a14ce5d6497fde094923ca5f2 +size 3148741 diff --git a/assets/book/book.glb b/assets/book/book.glb index 9d03f75..2c9691a 100644 --- a/assets/book/book.glb +++ b/assets/book/book.glb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f82ca41a3111611d3c5a3dc0027c09c0a39deca9197e6ca282d49a0221e8243a -size 4216 +oid sha256:92a22500f3d37283456bf4d798e8983ceec59434b86533158ae3c23f7f4ea871 +size 75928 diff --git a/assets/book/lambert1.material b/assets/book/lambert1.material index 853f483..daee355 100644 --- a/assets/book/lambert1.material +++ b/assets/book/lambert1.material @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d83b213724711fe4bec047883c019f4ed41d04555d2cc07251a3fe70c210f1da -size 1683 +oid sha256:645b60a21971d4c79408ae0b8c461c8d892a7e4c9849163fd824412195ceafa6 +size 756 diff --git a/assets/level/BeddingMAT.material b/assets/level/BeddingMAT.material new file mode 100644 index 0000000..b1d2d37 --- /dev/null +++ b/assets/level/BeddingMAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a3a2869f32890d75fe4618111226474f3cd60ec9cd7e74afbc2e492d968c8af +size 2361887 diff --git a/assets/level/Books_MAT.material b/assets/level/Books_MAT.material new file mode 100644 index 0000000..37b32f5 --- /dev/null +++ b/assets/level/Books_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4cbe9b2cca78cde86e169163310f232047896e7c61a085ab17f01f746c037156 +size 3148742 diff --git a/assets/level/Calendar_MAT.material b/assets/level/Calendar_MAT.material new file mode 100644 index 0000000..ad2765b --- /dev/null +++ b/assets/level/Calendar_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e521fb97a75d641386014b0cff37eea3b17b705662c182963524da50b21e71d +size 2361891 diff --git a/assets/level/Chair_MAT.material b/assets/level/Chair_MAT.material new file mode 100644 index 0000000..f93aa8a --- /dev/null +++ b/assets/level/Chair_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e26c335ced727958b11f49b2da3c1040818294d477feaa20c6df48e3d874b33 +size 2361885 diff --git a/assets/level/CubeL02_MAT.material b/assets/level/CubeL02_MAT.material new file mode 100644 index 0000000..454ced1 --- /dev/null +++ b/assets/level/CubeL02_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04e79ee72d88deaaf6e1977e9106a44b76a487d1e4780fad9187be146cf81f18 +size 3148746 diff --git a/assets/level/CubeS01_MAT.material b/assets/level/CubeS01_MAT.material new file mode 100644 index 0000000..08d21a6 --- /dev/null +++ b/assets/level/CubeS01_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48a26a5518677257c2c8ed754f71dfe885eb9599c1ffa0b3956fa0f8c83129a2 +size 3148746 diff --git a/assets/level/Desk_MAT.material b/assets/level/Desk_MAT.material new file mode 100644 index 0000000..33732ba --- /dev/null +++ b/assets/level/Desk_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:995acd4d438ea41e5be63239de022a90b62b38670191913fa6c39f82a8b27a3b +size 3148740 diff --git a/assets/level/Dish01_MAT.material b/assets/level/Dish01_MAT.material new file mode 100644 index 0000000..30a2861 --- /dev/null +++ b/assets/level/Dish01_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60219205225c41c819016c1c7af8bf169470b6701ff1b2f633d9a45ae01eedd2 +size 1575158 diff --git a/assets/level/Dish02_MAT.material b/assets/level/Dish02_MAT.material new file mode 100644 index 0000000..7c0d1a1 --- /dev/null +++ b/assets/level/Dish02_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c90c21ebe8a43804b62ec748776d7964fd39719ae05d01a7c6b765ed360f3dd +size 1575158 diff --git a/assets/level/Level.glb b/assets/level/Level.glb index 9d80cf5..d58467a 100644 --- a/assets/level/Level.glb +++ b/assets/level/Level.glb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:017deffe0d53b677fd92d53d093c232160c9b6ec2dc6d69c31a53d4768767038 -size 12437440 +oid sha256:48ccdf8427fce5f43e83c8a50cba04f6f06cf75b198b2e7a6557fb3311b1a318 +size 17087256 diff --git a/assets/level/Material.material b/assets/level/Material.material new file mode 100644 index 0000000..b8db168 --- /dev/null +++ b/assets/level/Material.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24938514120f16752a856f630b662785c43a5f6da6b4a2fa961fc215c82594d9 +size 3148740 diff --git a/assets/level/PotandPan_MAT.material b/assets/level/PotandPan_MAT.material new file mode 100644 index 0000000..cb1fa01 --- /dev/null +++ b/assets/level/PotandPan_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0b670987a2404fd6701908e80b312b84b1e27b7817030aa4d3044dad52266de +size 2361893 diff --git a/assets/level/RTGScreen_MAT.material b/assets/level/RTGScreen_MAT.material new file mode 100644 index 0000000..d6f9895 --- /dev/null +++ b/assets/level/RTGScreen_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:080a6aea5e17c9425afe94a1901f9a5e854be935ab38c168c828a79389d05d15 +size 3148750 diff --git a/assets/level/RTG_MAT.material b/assets/level/RTG_MAT.material new file mode 100644 index 0000000..8d443b8 --- /dev/null +++ b/assets/level/RTG_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:885898ebc4e6c19d9e01c4d1596155244607425ab0b4270a3e555fd94547d6fb +size 2361881 diff --git a/assets/level/RoverStation_MAT.material b/assets/level/RoverStation_MAT.material new file mode 100644 index 0000000..9095a81 --- /dev/null +++ b/assets/level/RoverStation_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cfad91ed695a4858e1211c55a3f5561519e76a6a039fcbc832f2dced3b8eca56 +size 3148756 diff --git a/assets/level/Rug_MAT.material b/assets/level/Rug_MAT.material new file mode 100644 index 0000000..075f8d8 --- /dev/null +++ b/assets/level/Rug_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34ad8e0d0d005c5db769a408f1ba408cd89690256c375a64027f10159e9d2b69 +size 1575152 diff --git a/assets/level/ShelfSmall_MAT.material b/assets/level/ShelfSmall_MAT.material new file mode 100644 index 0000000..f6829be --- /dev/null +++ b/assets/level/ShelfSmall_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0dfe7cc8fc466977c40bd7b424905879d2da6492c6515f54382b8be4bfae693f +size 2361895 diff --git a/assets/level/Stool01_MAT.material b/assets/level/Stool01_MAT.material new file mode 100644 index 0000000..29faa57 --- /dev/null +++ b/assets/level/Stool01_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9db86d2caa71f0579de48becb42a125a7a2bab90ed52f9802e5f3ba8794ebd28 +size 2361889 diff --git a/assets/level/Stool02_MAT.material b/assets/level/Stool02_MAT.material new file mode 100644 index 0000000..7da3844 --- /dev/null +++ b/assets/level/Stool02_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bfc772d2ba10ffe170f5373b91d04f1c137d1fa7c08548d7646d4d04a7b24ab5 +size 2361889 diff --git a/assets/level/Succulent_MAT.material b/assets/level/Succulent_MAT.material new file mode 100644 index 0000000..c2b4ad5 --- /dev/null +++ b/assets/level/Succulent_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c54dc8ddc999cb55a64904b9141a9ca3ea759730682660515e56cbef2f65a17b +size 2361893 diff --git a/assets/level/WallBox_MAT.material b/assets/level/WallBox_MAT.material new file mode 100644 index 0000000..4008969 --- /dev/null +++ b/assets/level/WallBox_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c0b72bd6cce1bb73921783a9e85bde20582e3b1b2192a7efcd31619b33a03597 +size 3148746 diff --git a/assets/level/WallCables_MAT.material b/assets/level/WallCables_MAT.material new file mode 100644 index 0000000..e6a8ee8 --- /dev/null +++ b/assets/level/WallCables_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:468ea60ab30c9dbdfb5032a2dce92c887216e75f2404c7de312e8b271dfa6196 +size 2361895 diff --git a/assets/level/WasteBin_MAT.material b/assets/level/WasteBin_MAT.material new file mode 100644 index 0000000..62adb78 --- /dev/null +++ b/assets/level/WasteBin_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6158bd17caf96b5b7f4391dce12d1c1dc38aa41a8815c00787930306cdfa4c5 +size 2361891 diff --git a/scenes/main.tscn b/scenes/main.tscn index f8ea927..d609c53 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=31 format=2] +[gd_scene load_steps=34 format=2] [ext_resource path="res://assets/level/Level.tscn" type="PackedScene" id=1] [ext_resource path="res://scripts/cameras.gd" type="Script" id=2] @@ -23,6 +23,11 @@ [ext_resource path="res://scenes/rover_station.tscn" type="PackedScene" id=21] [ext_resource path="res://item_types/geode.tres" type="Resource" id=22] [ext_resource path="res://assets/book/book.tscn" type="PackedScene" id=23] +[ext_resource path="res://shaders/circle_timer.gdshader" type="Shader" id=24] + +[sub_resource type="CylinderShape" id=12] +height = 7.665 +radius = 2.825 [sub_resource type="CylinderShape" id=1] height = 5.22615 @@ -83,6 +88,12 @@ dof_blur_far_enabled = true dof_blur_near_enabled = true adjustment_contrast = 1.97 +[sub_resource type="ShaderMaterial" id=11] +resource_local_to_scene = true +shader = ExtResource( 24 ) +shader_param/albedo = Color( 0, 1, 0.416667, 1 ) +shader_param/percent = 0.0 + [node name="main" type="Spatial"] [node name="game_manager" parent="." instance=ExtResource( 7 )] @@ -99,6 +110,11 @@ transform = Transform( 1, 0, -7.45058e-09, 0, 1, 0, 0, 0, 1, -0.0327864, -5.7220 [node name="Wall_Slightly Shorter0173" parent="Level/Wall_Slightly Shorter_With Moulding002" index="2"] transform = Transform( 1, 0, -7.45058e-09, 0, 1, 0, 0, 0, 0.2, 0, 0, 0 ) +[node name="StaticBody" type="StaticBody" parent="Level"] + +[node name="CollisionShape" type="CollisionShape" parent="Level/StaticBody"] +shape = SubResource( 12 ) + [node name="Player" parent="." instance=ExtResource( 3 )] transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 1.39596e-08, 0, 29.1651 ) hunger_tick_time = 75.0 @@ -352,6 +368,9 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0548649, -0.115891, 4.6198 [node name="item_slot_2" parent="Crafting_Room/crafting_station" index="1"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0999622, -0.115891, 2.03473 ) +[node name="circle_timer" parent="Crafting_Room/crafting_station" index="7"] +material_override = SubResource( 11 ) + [node name="Machine_Label" type="Label3D" parent="Crafting_Room/crafting_station"] transform = Transform( -1.3411e-07, 0, 3, 0, 3, 0, -3, 0, -1.3411e-07, -1.295, 3, 1.998 ) visible = false