diff --git a/assets/book/Books_MAT.material b/assets/book/Books_MAT.material new file mode 100644 index 0000000..a58a7a1 Binary files /dev/null and b/assets/book/Books_MAT.material differ diff --git a/assets/book/book.glb b/assets/book/book.glb index 01ca5b4..d8ce2f7 100644 Binary files a/assets/book/book.glb and b/assets/book/book.glb differ diff --git a/assets/book/lambert1.material b/assets/book/lambert1.material index 250b50c..7e908b8 100644 Binary files a/assets/book/lambert1.material and b/assets/book/lambert1.material differ diff --git a/assets/level/BeddingMAT.material b/assets/level/BeddingMAT.material new file mode 100644 index 0000000..8a5fc5d Binary files /dev/null and b/assets/level/BeddingMAT.material differ diff --git a/assets/level/Books_MAT.material b/assets/level/Books_MAT.material new file mode 100644 index 0000000..0885fbc Binary files /dev/null and b/assets/level/Books_MAT.material differ diff --git a/assets/level/Calendar_MAT.material b/assets/level/Calendar_MAT.material new file mode 100644 index 0000000..02555d1 Binary files /dev/null and b/assets/level/Calendar_MAT.material differ diff --git a/assets/level/Chair_MAT.material b/assets/level/Chair_MAT.material new file mode 100644 index 0000000..ab075d8 Binary files /dev/null and b/assets/level/Chair_MAT.material differ diff --git a/assets/level/CubeL02_MAT.material b/assets/level/CubeL02_MAT.material new file mode 100644 index 0000000..844c4fc Binary files /dev/null and b/assets/level/CubeL02_MAT.material differ diff --git a/assets/level/CubeS01_MAT.material b/assets/level/CubeS01_MAT.material new file mode 100644 index 0000000..d32b0b1 Binary files /dev/null and b/assets/level/CubeS01_MAT.material differ diff --git a/assets/level/Desk_MAT.material b/assets/level/Desk_MAT.material new file mode 100644 index 0000000..46aca3e Binary files /dev/null and b/assets/level/Desk_MAT.material differ diff --git a/assets/level/Dish01_MAT.material b/assets/level/Dish01_MAT.material new file mode 100644 index 0000000..9d5b045 Binary files /dev/null and b/assets/level/Dish01_MAT.material differ diff --git a/assets/level/Dish02_MAT.material b/assets/level/Dish02_MAT.material new file mode 100644 index 0000000..9f0d559 Binary files /dev/null and b/assets/level/Dish02_MAT.material differ diff --git a/assets/level/Level.glb b/assets/level/Level.glb index 3021292..31075f2 100644 Binary files a/assets/level/Level.glb and b/assets/level/Level.glb differ diff --git a/assets/level/Material.material b/assets/level/Material.material new file mode 100644 index 0000000..18c187d Binary files /dev/null and b/assets/level/Material.material differ diff --git a/assets/level/PotandPan_MAT.material b/assets/level/PotandPan_MAT.material new file mode 100644 index 0000000..0b692c1 Binary files /dev/null and b/assets/level/PotandPan_MAT.material differ diff --git a/assets/level/RTGScreen_MAT.material b/assets/level/RTGScreen_MAT.material new file mode 100644 index 0000000..f9a85ed Binary files /dev/null and b/assets/level/RTGScreen_MAT.material differ diff --git a/assets/level/RTG_MAT.material b/assets/level/RTG_MAT.material new file mode 100644 index 0000000..015c788 Binary files /dev/null and b/assets/level/RTG_MAT.material differ diff --git a/assets/level/RoverStation_MAT.material b/assets/level/RoverStation_MAT.material new file mode 100644 index 0000000..2f89fca Binary files /dev/null and b/assets/level/RoverStation_MAT.material differ diff --git a/assets/level/Rug_MAT.material b/assets/level/Rug_MAT.material new file mode 100644 index 0000000..86cef88 Binary files /dev/null and b/assets/level/Rug_MAT.material differ diff --git a/assets/level/ShelfSmall_MAT.material b/assets/level/ShelfSmall_MAT.material new file mode 100644 index 0000000..35f88ef Binary files /dev/null and b/assets/level/ShelfSmall_MAT.material differ diff --git a/assets/level/Stool01_MAT.material b/assets/level/Stool01_MAT.material new file mode 100644 index 0000000..c6a9a72 Binary files /dev/null and b/assets/level/Stool01_MAT.material differ diff --git a/assets/level/Stool02_MAT.material b/assets/level/Stool02_MAT.material new file mode 100644 index 0000000..b51a020 Binary files /dev/null and b/assets/level/Stool02_MAT.material differ diff --git a/assets/level/Succulent_MAT.material b/assets/level/Succulent_MAT.material new file mode 100644 index 0000000..118fbe9 Binary files /dev/null and b/assets/level/Succulent_MAT.material differ diff --git a/assets/level/WallBox_MAT.material b/assets/level/WallBox_MAT.material new file mode 100644 index 0000000..64da18d Binary files /dev/null and b/assets/level/WallBox_MAT.material differ diff --git a/assets/level/WallCables_MAT.material b/assets/level/WallCables_MAT.material new file mode 100644 index 0000000..700099e Binary files /dev/null and b/assets/level/WallCables_MAT.material differ diff --git a/assets/level/WasteBin_MAT.material b/assets/level/WasteBin_MAT.material new file mode 100644 index 0000000..c83e8fd Binary files /dev/null and b/assets/level/WasteBin_MAT.material differ 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