Updatd crafting station to have the output be right on the table on one of the slots. Also added a ready state to the crafting station

This commit is contained in:
akshay committed 2022-08-19 20:24:29 -04:00
1 parent 373838d3e7
commit dfd6fe9bb4
9 files changed
+107 -99

No files matched your search

+11 -33
View File
@@ -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/crafting_station/crafting_station.gd" type="Script" id=2]
@@ -7,43 +7,15 @@
[ext_resource path="res://scenes/status_light.tscn" type="PackedScene" id=5]
[ext_resource path="res://item_types/ore.tres" type="Resource" id=7]
[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="crafting_station" type="Spatial" groups=["damageable"]]
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="progress_text" type="Label3D" parent="MeshInstance"]
unique_name_in_owner = true
transform = Transform( -8.74228e-08, 0, 2, 0, 2, 0, -2, 0, -8.74228e-08, -0.455111, 1.28108, 1.98935e-08 )
modulate = Color( 0, 0, 0, 1 )
text = "Progress: 20%"
[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="item_slot_1" parent="." groups=["crafting_item_slots"] instance=ExtResource( 1 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 2.16895 )
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.553907, -0.287795, 4.17596 )
[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, 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, -2.36294 )
add_enabled = false
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.553907, -0.287795, 2.17596 )
[node name="coin_machine" parent="." instance=ExtResource( 3 )]
unique_name_in_owner = true
@@ -60,9 +32,15 @@ item_count_0 = 6
[node name="status_light" parent="." instance=ExtResource( 5 )]
unique_name_in_owner = true
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 1.1, 0, 0 )
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.627, 0.786, 0 )
[node name="progress_text" type="Label3D" parent="."]
unique_name_in_owner = true
transform = Transform( -8.74228e-08, 0, 2, 0, 2, 0, -2, 0, -8.74228e-08, -0.455111, 1.65317, 1.98935e-08 )
visible = false
modulate = Color( 0, 0, 0, 1 )
text = "Progress: 20%"
[connection signal="item_changed" from="item_holder" to="." method="_on_item_holder_item_changed"]
[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"]
[connection signal="item_dump_completed" from="item_dump" to="." method="_on_item_dump_item_dump_completed"]
+4 -1
View File
@@ -84,6 +84,9 @@ adjustment_contrast = 1.97
[node name="main" type="Spatial"]
[node name="Level" parent="." instance=ExtResource( 1 )]
__meta__ = {
"_edit_group_": true
}
[node name="Player" parent="." instance=ExtResource( 3 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 4.35996 )
@@ -304,7 +307,7 @@ 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 )
transform = Transform( 0, 0, -0.999999, 0, 1, 0, 0.999999, 0, 0, 3.43733, 0.789991, -9.25881 )
recipes = ExtResource( 20 )
gen_time = 20.0