From db7ecf5ed1597edac7ececcb269e2e22411806b2 Mon Sep 17 00:00:00 2001 From: akshay Date: Fri, 19 Aug 2022 00:15:03 -0400 Subject: [PATCH] Updated main scene with all the stations --- scenes/crafting_station.tscn | 9 +- scenes/dev-akshay.tscn | 39 +++-- scenes/hydroponics_station.tscn | 27 +--- scenes/item_generator.tscn | 8 +- scenes/item_holder.tscn | 1 + scenes/main.tscn | 148 ++++++++++++++++++- scenes/oven.tscn | 5 +- scripts/crafting_station/crafting_station.gd | 4 +- scripts/hydroponics_station/state/growing.gd | 3 +- 9 files changed, 191 insertions(+), 53 deletions(-) diff --git a/scenes/crafting_station.tscn b/scenes/crafting_station.tscn index 8fe2d44..cf4aedc 100644 --- a/scenes/crafting_station.tscn +++ b/scenes/crafting_station.tscn @@ -36,14 +36,14 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.372095, 0 ) shape = SubResource( 2 ) [node name="item_slot_1" parent="." groups=["crafting_item_slots"] instance=ExtResource( 1 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 3 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 2.16895 ) [node name="item_slot_2" parent="." groups=["crafting_item_slots"] instance=ExtResource( 1 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 6 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 4.09219 ) [node name="item_holder" parent="." instance=ExtResource( 1 )] unique_name_in_owner = true -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -3 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -2.36294 ) add_enabled = false [node name="coin_machine" parent="." instance=ExtResource( 3 )] @@ -57,9 +57,8 @@ one_shot = true unique_name_in_owner = true transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.366242, 0, 0 ) item_type_0 = ExtResource( 6 ) -item_count_0 = 1 item_type_1 = ExtResource( 7 ) -item_count_1 = 2 +item_count_1 = 8 [node name="status_light" parent="." instance=ExtResource( 5 )] unique_name_in_owner = true diff --git a/scenes/dev-akshay.tscn b/scenes/dev-akshay.tscn index ca792d2..81606fb 100644 --- a/scenes/dev-akshay.tscn +++ b/scenes/dev-akshay.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=28 format=2] +[gd_scene load_steps=27 format=2] [ext_resource path="res://scenes/player.tscn" type="PackedScene" id=1] [ext_resource path="res://scripts/dof_focus.gd" type="Script" id=2] @@ -20,7 +20,6 @@ [ext_resource path="res://scenes/comm_station.tscn" type="PackedScene" id=18] [ext_resource path="res://assets/level/Level.tscn" type="PackedScene" id=19] [ext_resource path="res://scenes/bed.tscn" type="PackedScene" id=20] -[ext_resource path="res://item_types/repair_kit.tres" type="Resource" id=21] [sub_resource type="CylinderShape" id=8] height = 5.22615 @@ -74,9 +73,7 @@ ssao_enabled = true ssao_radius = 3.86 ssao_intensity = 0.69 dof_blur_far_enabled = true -dof_blur_far_amount = 0.15 dof_blur_near_enabled = true -dof_blur_near_amount = 0.15 adjustment_contrast = 1.97 [node name="dev_akshay" type="Spatial"] @@ -230,7 +227,8 @@ modulate = Color( 0, 0, 0, 1 ) text = "Ore Conveyor" [node name="item_generator" parent="Ore_Conveyor_Room" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 3.27826e-07, 0, 1, 0, -3.27826e-07, 0, 1, -1.69954, 0, -7.67125 ) +transform = Transform( 1, 0, 3.57628e-07, 0, 1, 0, -3.57628e-07, 0, 1, -1.69954, 0, -9.67913 ) +start_broken = false gen_item = ExtResource( 6 ) gen_time = 2.0 @@ -248,15 +246,25 @@ modulate = Color( 0, 0, 0, 1 ) text = "Storage" [node name="item_holder" parent="Storage_Room" instance=ExtResource( 17 )] -transform = Transform( 0.0379867, 0, 0.999278, 0, 1, 0, -0.999278, 0, 0.0379867, -0.0128546, 0, -8.17408 ) -start_with_item = ExtResource( 21 ) +transform = Transform( 0.0379867, 0, 0.999278, 0, 1, 0, -0.999278, 0, 0.0379867, 0.595228, 1.14717, -8.87313 ) [node name="item_holder2" parent="Storage_Room" instance=ExtResource( 17 )] -transform = Transform( 0.0379867, 0, 0.999278, 0, 1, 0, -0.999278, 0, 0.0379867, -2.64011, 0, -8.27395 ) -start_with_item = ExtResource( 6 ) +transform = Transform( 0.0379867, 0, 0.999278, 0, 1, 0, -0.999278, 0, 0.0379867, 3.18382, 0.988555, -8.65995 ) [node name="item_holder3" parent="Storage_Room" instance=ExtResource( 17 )] -transform = Transform( 0.0379867, 0, 0.999278, 0, 1, 0, -0.999278, 0, 0.0379867, 2.23318, 0, -8.0887 ) +transform = Transform( 0.0379867, 0, 0.999278, 0, 1, 0, -0.999278, 0, 0.0379867, -4.36385, 0.909436, -9.93777 ) + +[node name="item_holder4" parent="Storage_Room" instance=ExtResource( 17 )] +transform = Transform( 0.0379867, 0, 0.999278, 0, 1, 0, -0.999278, 0, 0.0379867, -4.17989, 1.15542, -5.03403 ) + +[node name="item_holder5" parent="Storage_Room" instance=ExtResource( 17 )] +transform = Transform( 0.0379867, 0, 0.999278, 0, 1, 0, -0.999278, 0, 0.0379867, 4.6338, 1.01416, -9.90946 ) + +[node name="item_holder6" parent="Storage_Room" instance=ExtResource( 17 )] +transform = Transform( 0.0379867, 0, 0.999278, 0, 1, 0, -0.999278, 0, 0.0379867, 3.84102, 0.99789, -4.52361 ) + +[node name="item_holder7" parent="Storage_Room" instance=ExtResource( 17 )] +transform = Transform( 0.0341881, 0, 0.89935, 0, 0.9, 0, -0.89935, 0, 0.0341881, -2.50595, 1.21779, -9.91222 ) [node name="Crafting_Room" type="Spatial" parent="."] transform = Transform( -0.668793, 0, -0.743448, 0, 1, 0, 0.743448, 0, -0.668793, 6.10625, 0, 6.11932 ) @@ -267,7 +275,7 @@ modulate = Color( 0, 0, 0, 1 ) text = "Crafting" [node name="crafting_station" parent="Crafting_Room" instance=ExtResource( 4 )] -transform = Transform( -2.98023e-08, 0, -0.999999, 0, 1, 0, 0.999999, 0, -2.98023e-08, 1.01718, 0, -7.486 ) +transform = Transform( 0, 0, -0.999999, 0, 1, 0, 0.999999, 0, 0, 1.01718, 0, -9.07657 ) recipes = ExtResource( 7 ) gen_time = 2.0 @@ -313,13 +321,16 @@ modulate = Color( 0, 0, 0, 1 ) text = "Hydroponics" [node name="hydroponics_station" parent="Hydroponics_Room" instance=ExtResource( 13 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.62981e-09, -7.671 ) +transform = Transform( 0.502127, 0, 0.487718, 5.82077e-11, 0.7, -1.36424e-12, -0.487718, 5.82077e-11, 0.502127, -2.28553, 0.00222371, -7.72658 ) [node name="hydroponics_station2" parent="Hydroponics_Room" instance=ExtResource( 13 )] -transform = Transform( 1, 0, 0, 0, 1, 5.82077e-11, 0, 0, 1, 1.96066, -2.56114e-09, -7.67101 ) +transform = Transform( 0.502127, 2.91038e-11, 0.487718, 5.82077e-11, 0.7, -5.45697e-12, -0.487718, 2.03727e-10, 0.502127, -0.870331, 0.00222371, -9.10117 ) [node name="hydroponics_station3" parent="Hydroponics_Room" instance=ExtResource( 13 )] -transform = Transform( 1, 0, 0, 0, 1, 5.82077e-11, 0, 0, 1, -1.9892, -3.0268e-09, -7.67101 ) +transform = Transform( 0.502127, 3.7835e-10, 0.487718, 5.82077e-11, 0.700001, -1.04592e-10, -0.487718, 2.61934e-10, 0.502128, 1.79792, 0.00590622, -8.91695 ) + +[node name="hydroponics_station4" parent="Hydroponics_Room" instance=ExtResource( 13 )] +transform = Transform( 0.502127, 3.7835e-10, 0.487718, 5.82077e-11, 0.700001, -2.37378e-10, -0.487718, 3.7835e-10, 0.502128, 3.28563, 0.006777, -7.36006 ) [node name="Communications" type="Spatial" parent="."] transform = Transform( -0.0426527, 0.000404372, 0.999089, -0.000747618, 1, -0.000436656, -0.999089, -0.000765564, -0.0426524, -8.66408, 0.00565405, 0.343818 ) diff --git a/scenes/hydroponics_station.tscn b/scenes/hydroponics_station.tscn index 05253db..2e953e2 100644 --- a/scenes/hydroponics_station.tscn +++ b/scenes/hydroponics_station.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://scenes/item_holder.tscn" type="PackedScene" id=1] [ext_resource path="res://scripts/hydroponics_station/hydroponics_station.gd" type="Script" id=2] @@ -7,32 +7,15 @@ [ext_resource path="res://scenes/item_dump.tscn" type="PackedScene" id=5] [ext_resource path="res://item_types/repair_kit.tres" type="Resource" id=6] -[sub_resource type="CylinderMesh" id=1] -height = 0.936 -radial_segments = 8 - -[sub_resource type="ConvexPolygonShape" id=2] -points = PoolVector3Array( -0.0608763, 0.449247, 0.974783, -0.0608763, -0.464612, -0.974783, -0.0608763, 0.449247, -0.974783, 0.974783, -0.464612, -0.0608763, -0.974783, -0.464612, 0.0608763, 0.974783, 0.449247, 0.0608763, 0.0606902, -0.464648, 0.97486, -0.974783, 0.449247, -0.0608763, 0.7071, 0.453517, -0.7071, -0.705748, -0.468, -0.705748, -0.7071, 0.453517, 0.7071, 0.7071, 0.453517, 0.7071, 0.705748, -0.468, 0.705748, -0.705748, -0.468, 0.705748, 0.705748, -0.468, -0.705748, -0.7071, 0.453517, -0.7071, 0.0606902, -0.464648, -0.97486, -0.974783, -0.464612, -0.0608763, 0.974783, -0.464612, 0.0608763, -0.0608763, -0.464612, 0.974783, 0.0606902, 0.449283, 0.97486, 0.0606902, 0.449283, -0.97486, 0.974783, 0.449247, -0.0608763, -0.974783, 0.449247, 0.0608763, -0.642208, -0.46642, 0.73398, -0.642208, -0.46642, -0.73398, 0.578116, -0.464071, -0.760529, 0.578116, -0.464071, 0.760529, 0.760589, -0.464107, 0.577971, -0.760589, -0.464107, 0.577971, -0.760589, -0.464107, -0.577971, 0.760589, -0.464107, -0.577971 ) - [node name="hydroponics_station" type="Spatial"] script = ExtResource( 2 ) start_broken = true -[node name="MeshInstance" type="MeshInstance" parent="."] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.372095, 0 ) -mesh = SubResource( 1 ) - -[node name="status_label" type="Label3D" parent="MeshInstance"] +[node name="status_label" type="Label3D" parent="."] unique_name_in_owner = true -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.737837, 0 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.10993, 0 ) billboard = 1 -[node name="StaticBody" type="StaticBody" parent="."] - -[node name="CollisionShape2" type="CollisionShape" parent="StaticBody"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.372095, 0 ) -shape = SubResource( 2 ) - [node name="coin_machine" parent="." instance=ExtResource( 3 )] transform = Transform( 0.540026, 0, 0, 0, 0.571038, 0, 0, 0, 0.497953, 0, 0.418593, 0 ) @@ -44,12 +27,12 @@ one_shot = true [node name="status_light" parent="." instance=ExtResource( 4 )] unique_name_in_owner = true -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 1.0767, -0.147681, 0 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.88956, 0 ) [node name="item_dump" parent="." instance=ExtResource( 5 )] unique_name_in_owner = true item_type_0 = ExtResource( 6 ) -item_count_0 = 1 +item_count_1 = 2 [connection signal="coin_requirement_met" from="coin_machine" to="." method="_on_coin_machine_coin_requirement_met"] [connection signal="item_changed" from="item_holder" to="." method="_on_item_holder_item_changed"] diff --git a/scenes/item_generator.tscn b/scenes/item_generator.tscn index 2785977..6c454e5 100644 --- a/scenes/item_generator.tscn +++ b/scenes/item_generator.tscn @@ -24,12 +24,10 @@ modulate = Color( 0, 0, 0, 1 ) text = "Progress: 20%" [node name="item_slot_1" parent="." groups=["conveyor_item_slots"] instance=ExtResource( 2 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 2.5, 0, 0 ) -start_with_item = ExtResource( 7 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 2.16595, 0, 0 ) [node name="item_slot_2" parent="." groups=["conveyor_item_slots"] instance=ExtResource( 2 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 0, 0 ) -start_with_item = ExtResource( 7 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 4.04889, 0, 0 ) [node name="coin_machine" parent="." instance=ExtResource( 1 )] unique_name_in_owner = true @@ -41,9 +39,7 @@ one_shot = true [node name="item_dump" parent="." instance=ExtResource( 4 )] unique_name_in_owner = true item_type_0 = ExtResource( 6 ) -item_count_0 = 1 item_type_1 = ExtResource( 7 ) -item_count_1 = 2 [node name="status_light" parent="." instance=ExtResource( 5 )] unique_name_in_owner = true diff --git a/scenes/item_holder.tscn b/scenes/item_holder.tscn index 17e8a63..4dbf084 100644 --- a/scenes/item_holder.tscn +++ b/scenes/item_holder.tscn @@ -4,6 +4,7 @@ [ext_resource path="res://scripts/item_holder.gd" type="Script" id=2] [sub_resource type="SphereShape" id=4] +radius = 0.8 [node name="item_holder" type="Area"] collision_layer = 8 diff --git a/scenes/main.tscn b/scenes/main.tscn index 1398790..0100c7e 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=15 format=2] +[gd_scene load_steps=27 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] @@ -8,6 +8,18 @@ [ext_resource path="res://scripts/tracking_camera.gd" type="Script" id=6] [ext_resource path="res://scenes/game_manager.tscn" type="PackedScene" id=7] [ext_resource path="res://scripts/dof_focus.gd" type="Script" id=8] +[ext_resource path="res://scenes/item_generator.tscn" type="PackedScene" id=9] +[ext_resource path="res://scenes/bed.tscn" type="PackedScene" id=10] +[ext_resource path="res://scenes/hydroponics_station.tscn" type="PackedScene" id=11] +[ext_resource path="res://scenes/crafting_station.tscn" type="PackedScene" id=12] +[ext_resource path="res://scenes/comm_station.tscn" type="PackedScene" id=13] +[ext_resource path="res://scenes/power_station.tscn" type="PackedScene" id=14] +[ext_resource path="res://scenes/dinner_table.tscn" type="PackedScene" id=15] +[ext_resource path="res://scenes/oven.tscn" type="PackedScene" id=16] +[ext_resource path="res://scenes/item_holder.tscn" type="PackedScene" id=17] +[ext_resource path="res://scenes/cheat_menu.tscn" type="PackedScene" id=18] +[ext_resource path="res://item_types/ore.tres" type="Resource" id=19] +[ext_resource path="res://recipes/all_recipes.tres" type="Resource" id=20] [sub_resource type="CylinderShape" id=1] height = 5.22615 @@ -203,6 +215,140 @@ size = 4.0 [node name="game_manager" parent="." instance=ExtResource( 7 )] +[node name="power_station" parent="." instance=ExtResource( 14 )] +transform = Transform( 2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 1, 0 ) +time_to_generate = 5.0 +current_holding = 1 + +[node name="Ore_Conveyor_Room" type="Spatial" parent="."] +transform = Transform( 0.734891, 0, -0.678185, 0, 1, 0, 0.678185, 0, 0.734891, 6.26237, 0, -5.87466 ) + +[node name="Room_Label" type="Label3D" parent="Ore_Conveyor_Room"] +transform = Transform( 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 4.309, 0 ) +modulate = Color( 0, 0, 0, 1 ) +text = "Ore Conveyor" + +[node name="item_generator" parent="Ore_Conveyor_Room" instance=ExtResource( 9 )] +transform = Transform( 1, 0, 3.57628e-07, 0, 1, 0, -3.57628e-07, 0, 1, -1.69954, 0, -9.67913 ) +start_broken = false +gen_item = ExtResource( 19 ) +gen_time = 2.0 + +[node name="Machine_Label" type="Label3D" parent="Ore_Conveyor_Room/item_generator"] +transform = Transform( 3, 0, 0, 0, 3, 0, 0, 0, 3, 1.88, 3, -1.043 ) +modulate = Color( 0, 0, 0, 1 ) +text = "VNDG MACHINE" + +[node name="Storage_Room" type="Spatial" parent="."] +transform = Transform( 0.0379867, 0, -0.999278, 0, 1, 0, 0.999278, 0, 0.0379867, 8.64656, 0, 0.323352 ) + +[node name="Room_Label" type="Label3D" parent="Storage_Room"] +transform = Transform( 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 4.309, 0 ) +modulate = Color( 0, 0, 0, 1 ) +text = "Storage" + +[node name="item_holder" parent="Storage_Room" instance=ExtResource( 17 )] +transform = Transform( 0.0379867, 0, 0.999278, 0, 1, 0, -0.999278, 0, 0.0379867, 0.595228, 1.14717, -8.87313 ) + +[node name="item_holder2" parent="Storage_Room" instance=ExtResource( 17 )] +transform = Transform( 0.0379867, 0, 0.999278, 0, 1, 0, -0.999278, 0, 0.0379867, 3.18382, 0.988555, -8.65995 ) + +[node name="item_holder3" parent="Storage_Room" instance=ExtResource( 17 )] +transform = Transform( 0.0379867, 0, 0.999278, 0, 1, 0, -0.999278, 0, 0.0379867, -4.36385, 0.909436, -9.93777 ) + +[node name="item_holder4" parent="Storage_Room" instance=ExtResource( 17 )] +transform = Transform( 0.0379867, 0, 0.999278, 0, 1, 0, -0.999278, 0, 0.0379867, -4.17989, 1.15542, -5.03403 ) + +[node name="item_holder5" parent="Storage_Room" instance=ExtResource( 17 )] +transform = Transform( 0.0379867, 0, 0.999278, 0, 1, 0, -0.999278, 0, 0.0379867, 4.6338, 1.01416, -9.90946 ) + +[node name="item_holder6" parent="Storage_Room" instance=ExtResource( 17 )] +transform = Transform( 0.0379867, 0, 0.999278, 0, 1, 0, -0.999278, 0, 0.0379867, 3.84102, 0.99789, -4.52361 ) + +[node name="item_holder7" parent="Storage_Room" instance=ExtResource( 17 )] +transform = Transform( 0.0341881, 0, 0.89935, 0, 0.9, 0, -0.89935, 0, 0.0341881, -2.50595, 1.21779, -9.91222 ) + +[node name="Crafting_Room" type="Spatial" parent="."] +transform = Transform( -0.668793, 0, -0.743448, 0, 1, 0, 0.743448, 0, -0.668793, 6.10625, 0, 6.11932 ) + +[node name="Room_Label" type="Label3D" parent="Crafting_Room"] +transform = Transform( 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 4.309, 0 ) +modulate = Color( 0, 0, 0, 1 ) +text = "Crafting" + +[node name="crafting_station" parent="Crafting_Room" instance=ExtResource( 12 )] +transform = Transform( 0, 0, -0.999999, 0, 1, 0, 0.999999, 0, 0, 1.01718, 0, -9.07657 ) +recipes = ExtResource( 20 ) +gen_time = 2.0 + +[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 ) +modulate = Color( 0, 0, 0, 1 ) +text = "TRANSFORMATRON" + +[node name="Bed_Room" type="Spatial" parent="."] +transform = Transform( -0.999913, 0, 0.0131247, 0, 1, 0, -0.0131247, 0, -0.999913, -0.0536704, 0, 8.64287 ) + +[node name="Room_Label" type="Label3D" parent="Bed_Room"] +transform = Transform( 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 4.309, 0 ) +modulate = Color( 0, 0, 0, 1 ) +text = "Snoozer" + +[node name="bed_hop_position" type="Spatial" parent="Bed_Room"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.216576, 0, -8.63037 ) + +[node name="bed" parent="Bed_Room/bed_hop_position" instance=ExtResource( 10 )] + +[node name="Galley_Room" type="Spatial" parent="."] +transform = Transform( 0.999685, 0, 0.0250777, 0, 1, 0, -0.0250777, 0, 0.999685, 0.13933, 0, -8.55076 ) + +[node name="Room_Label" type="Label3D" parent="Galley_Room"] +transform = Transform( 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 4.309, 0 ) +modulate = Color( 0, 0, 0, 1 ) +text = "Galley" + +[node name="dinner_table" parent="Galley_Room" instance=ExtResource( 15 )] +transform = Transform( 1, 0, -1.11759e-08, 0, 1, 0, 1.11759e-08, 0, 1, 1.77669, 0, -8.88646 ) + +[node name="oven" parent="Galley_Room" instance=ExtResource( 16 )] +transform = Transform( 1.00001, 0, 3.72529e-09, 0, 1, 0, -3.72529e-09, 0, 1.00001, -2.828, 0, -10.6561 ) +start_broken = true + +[node name="Hydroponics_Room" type="Spatial" parent="."] +transform = Transform( 0.690862, 0.000404371, 0.722986, -0.000832856, 1, 0.000236545, -0.722985, -0.000765563, 0.690862, -6.25959, -7.15916e-05, -5.86512 ) + +[node name="Room_Label" type="Label3D" parent="Hydroponics_Room"] +transform = Transform( 4, 0, 0, 0, 4, 2.32831e-10, 0, 0, 4, 0, 4.309, 0 ) +modulate = Color( 0, 0, 0, 1 ) +text = "Hydroponics" + +[node name="hydroponics_station" parent="Hydroponics_Room" instance=ExtResource( 11 )] +transform = Transform( 0.502127, 0, 0.487718, 5.82077e-11, 0.7, -1.36424e-12, -0.487718, 5.82077e-11, 0.502127, -2.28553, 0.00222371, -7.72658 ) + +[node name="hydroponics_station2" parent="Hydroponics_Room" instance=ExtResource( 11 )] +transform = Transform( 0.502127, 2.91038e-11, 0.487718, 5.82077e-11, 0.7, -5.45697e-12, -0.487718, 2.03727e-10, 0.502127, -0.870331, 0.00222371, -9.10117 ) + +[node name="hydroponics_station3" parent="Hydroponics_Room" instance=ExtResource( 11 )] +transform = Transform( 0.502127, 3.7835e-10, 0.487718, 5.82077e-11, 0.700001, -1.04592e-10, -0.487718, 2.61934e-10, 0.502128, 1.79792, 0.00590622, -8.91695 ) + +[node name="hydroponics_station4" parent="Hydroponics_Room" instance=ExtResource( 11 )] +transform = Transform( 0.502127, 3.7835e-10, 0.487718, 5.82077e-11, 0.700001, -2.37378e-10, -0.487718, 3.7835e-10, 0.502128, 3.28563, 0.006777, -7.36006 ) + +[node name="Communications" type="Spatial" parent="."] +transform = Transform( -0.0426527, 0.000404372, 0.999089, -0.000747618, 1, -0.000436656, -0.999089, -0.000765564, -0.0426524, -8.66408, 0.00565405, 0.343818 ) + +[node name="Room_Label" type="Label3D" parent="Communications"] +transform = Transform( 4, 0, 0, 0, 4, 2.32831e-10, 0, 0, 4, 0, 4.309, 0 ) +modulate = Color( 0, 0, 0, 1 ) +text = "Communications" + +[node name="comm_station" parent="Communications" instance=ExtResource( 13 )] +transform = Transform( 1, 3.49246e-10, -2.23517e-08, -3.49246e-10, 1, 1.60071e-10, 2.23517e-08, 1.78261e-10, 1, 0.664039, 5.58794e-09, -7.58252 ) + +[node name="CanvasLayer" type="CanvasLayer" parent="."] + +[node name="cheat_menu" parent="CanvasLayer" instance=ExtResource( 18 )] + [connection signal="player_entered" from="cameras/camera_room_center" to="cameras" method="_on_camera_room_player_entered"] [connection signal="player_exited" from="cameras/camera_room_center" to="cameras" method="_on_camera_room_player_exited"] [connection signal="area_entered" from="cameras/camera_room_center/hitbox" to="cameras/camera_room_center" method="_on_hitbox_area_entered"] diff --git a/scenes/oven.tscn b/scenes/oven.tscn index b8bea67..ca7e3bf 100644 --- a/scenes/oven.tscn +++ b/scenes/oven.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=9 format=2] [ext_resource path="res://scenes/item_holder.tscn" type="PackedScene" id=1] [ext_resource path="res://scripts/oven/oven.gd" type="Script" id=2] @@ -6,6 +6,7 @@ [ext_resource path="res://scenes/item_dump.tscn" type="PackedScene" id=4] [ext_resource path="res://scenes/status_light.tscn" type="PackedScene" id=5] [ext_resource path="res://item_types/repair_kit.tres" type="Resource" id=6] +[ext_resource path="res://item_types/ore.tres" type="Resource" id=7] [sub_resource type="BoxShape" id=4] extents = Vector3( 0.648623, 1, 0.516904 ) @@ -21,6 +22,8 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.733121, 0 ) collision_mask = 0 item_type_0 = ExtResource( 6 ) item_count_0 = 1 +item_type_1 = ExtResource( 7 ) +item_count_1 = 4 [node name="item_holder" parent="." instance=ExtResource( 1 )] unique_name_in_owner = true diff --git a/scripts/crafting_station/crafting_station.gd b/scripts/crafting_station/crafting_station.gd index a86e60b..3f0cdc9 100644 --- a/scripts/crafting_station/crafting_station.gd +++ b/scripts/crafting_station/crafting_station.gd @@ -39,8 +39,8 @@ func _ready(): state.enter_from(null) print("crafting_station: NULL -> ", state.NAME) - if start_broken: - item_holder.spawn_item(RepairKit) + #if start_broken: + # item_holder.spawn_item(RepairKit) func _process(delta): state.update(delta) diff --git a/scripts/hydroponics_station/state/growing.gd b/scripts/hydroponics_station/state/growing.gd index 0c819a6..e848807 100644 --- a/scripts/hydroponics_station/state/growing.gd +++ b/scripts/hydroponics_station/state/growing.gd @@ -14,12 +14,11 @@ func enter_from(state): ctx.get_node("item_holder").add_enabled = false ctx.get_node("item_holder").remove_enabled = false ctx.get_node("grow_timer").start() - ctx.get_node("MeshInstance").set_surface_material(0, mat) ctx.status_light.activate() ctx.item_dump.enabled = false func exit_to(state): - ctx.get_node("MeshInstance").set_surface_material(0, null) + pass func on_coin_machine_coin_requirement_met(player): assert(false, "coin machine should be disabled while growing")