From 1534a9a216ade8151412f87bfc100b371dff8ef8 Mon Sep 17 00:00:00 2001 From: akshay Date: Fri, 19 Aug 2022 22:34:25 -0400 Subject: [PATCH] Updated item generator to match the asset and updated main scene --- scenes/item.tscn | 2 +- scenes/item_generator.tscn | 35 +++++++++++++++++++---------------- scenes/main.tscn | 20 ++++++++++++-------- 3 files changed, 32 insertions(+), 25 deletions(-) diff --git a/scenes/item.tscn b/scenes/item.tscn index dc2884b..8194a76 100644 --- a/scenes/item.tscn +++ b/scenes/item.tscn @@ -8,5 +8,5 @@ script = ExtResource( 1 ) [node name="visual" type="Spatial" parent="."] [node name="ItemLabel" type="Label3D" parent="."] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0275149, 0.721019, 1.58046 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.881756, 0 ) billboard = 1 diff --git a/scenes/item_generator.tscn b/scenes/item_generator.tscn index 6c454e5..4015638 100644 --- a/scenes/item_generator.tscn +++ b/scenes/item_generator.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://scenes/coin_machine.tscn" type="PackedScene" id=1] [ext_resource path="res://scenes/item_holder.tscn" type="PackedScene" id=2] @@ -8,26 +8,16 @@ [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="CylinderMesh" id=1] - [node name="item_generator" type="Spatial"] +transform = Transform( 1, 0, 3.57628e-07, 0, 1, 0, -3.57628e-07, 0, 1, 0.330428, 0, -8.57503 ) script = ExtResource( 3 ) -start_broken = true - -[node name="MeshInstance" type="MeshInstance" parent="."] -mesh = SubResource( 1 ) - -[node name="progress_text" type="Label3D" parent="MeshInstance"] -unique_name_in_owner = true -transform = Transform( 2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 2.11515, -0.712185 ) -modulate = Color( 0, 0, 0, 1 ) -text = "Progress: 20%" +gen_item = ExtResource( 7 ) [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.16595, 0, 0 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 2.42151, 0.596, -1.399 ) [node name="item_slot_2" parent="." groups=["conveyor_item_slots"] instance=ExtResource( 2 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 4.04889, 0, 0 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 4.30446, 0.596, -1.399 ) [node name="coin_machine" parent="." instance=ExtResource( 1 )] unique_name_in_owner = true @@ -43,7 +33,20 @@ item_type_1 = ExtResource( 7 ) [node name="status_light" parent="." instance=ExtResource( 5 )] unique_name_in_owner = true -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1.13718 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.16106, 0.276903 ) + +[node name="Machine_Label" type="Label3D" parent="."] +transform = Transform( 3, 0, 0, 0, 3, 0, 0, 0, 3, 1.88, 3, -1.043 ) +visible = false +modulate = Color( 0, 0, 0, 1 ) +text = "VNDG MACHINE" + +[node name="progress_text" type="Label3D" parent="."] +unique_name_in_owner = true +transform = Transform( 2, 0, 0, 0, 2, 0, 0, 0, 2, -2.98023e-08, 2.11515, -0.712185 ) +visible = false +modulate = Color( 0, 0, 0, 1 ) +text = "Progress: 20%" [connection signal="coin_requirement_met" from="coin_machine" to="." method="_on_coin_machine_coin_requirement_met"] [connection signal="timeout" from="gen_timer" to="." method="_on_gen_timer_timeout"] diff --git a/scenes/main.tscn b/scenes/main.tscn index c638dca..f9ef8eb 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -18,7 +18,7 @@ [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://scenes/status_light.tscn" type="PackedScene" id=19] [ext_resource path="res://recipes/all_recipes.tres" type="Resource" id=20] [ext_resource path="res://scenes/rover_station.tscn" type="PackedScene" id=21] @@ -256,24 +256,23 @@ transform = Transform( 0.734891, 0, -0.678185, 0, 1, 0, 0.678185, 0, 0.734891, 6 [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 ) +visible = false 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 ) -[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="status_light" parent="Ore_Conveyor_Room" instance=ExtResource( 19 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 3.5684, 1.79682, -10.1376 ) +omni_range = 2.39 +omni_attenuation = 2.54912 [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 ) +visible = false modulate = Color( 0, 0, 0, 1 ) text = "Storage" @@ -303,6 +302,7 @@ transform = Transform( -0.668793, 0, -0.743448, 0, 1, 0, 0.743448, 0, -0.668793, [node name="Room_Label" type="Label3D" parent="Crafting_Room"] transform = Transform( 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 4.309, 0 ) +visible = false modulate = Color( 0, 0, 0, 1 ) text = "Crafting" @@ -313,6 +313,7 @@ gen_time = 20.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 ) +visible = false modulate = Color( 0, 0, 0, 1 ) text = "TRANSFORMATRON" @@ -321,6 +322,7 @@ transform = Transform( -0.999913, 0, 0.0131247, 0, 1, 0, -0.0131247, 0, -0.99991 [node name="Room_Label" type="Label3D" parent="Bed_Room"] transform = Transform( 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 4.309, 0 ) +visible = false modulate = Color( 0, 0, 0, 1 ) text = "Snoozer" @@ -334,6 +336,7 @@ transform = Transform( 0.999685, 0, 0.0250777, 0, 1, 0, -0.0250777, 0, 0.999685, [node name="Room_Label" type="Label3D" parent="Galley_Room"] transform = Transform( 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 4.309, 0 ) +visible = false modulate = Color( 0, 0, 0, 1 ) text = "Galley" @@ -349,6 +352,7 @@ transform = Transform( 0.690862, 0.000404371, 0.722986, -0.000832856, 1, 0.00023 [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 ) +visible = false modulate = Color( 0, 0, 0, 1 ) text = "Hydroponics"