Merge branch 'main' of github.com:outfrost/godot-wild-jam-66

scene/Factory.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=92 format=3 uid="uid://8064wgu24krk"]
+[gd_scene load_steps=94 format=3 uid="uid://8064wgu24krk"]
 
 [ext_resource type="Script" path="res://scene/Room.gd" id="1_f4j7u"]
 [ext_resource type="Material" uid="uid://bds1x6y461w0y" path="res://material/mat_floor.tres" id="1_g3vbl"]
@@ -48,7 +48,9 @@
 [ext_resource type="PackedScene" uid="uid://dys3uk8nmj4fn" path="res://character/PropForklift.tscn" id="39_tfo4o"]
 [ext_resource type="Material" uid="uid://dlx3r2noa2mnd" path="res://material/mat_genericbuilding3.tres" id="39_uhiec"]
 [ext_resource type="Material" uid="uid://ouym0oi35t88" path="res://material/mut_mud.tres" id="40_crwaq"]
+[ext_resource type="PackedScene" uid="uid://dqkikt4fwevre" path="res://character/PropBucket.tscn" id="40_iv1q4"]
 [ext_resource type="PackedScene" uid="uid://dr0fywxv7c0c" path="res://npc/FullEmployee.tscn" id="41_mvnva"]
+[ext_resource type="PackedScene" uid="uid://geqglufr04vr" path="res://character/PropPalletWithBoxes.tscn" id="41_t0v4l"]
 [ext_resource type="Material" uid="uid://br8pwbfn1s673" path="res://material/mat_baydoor.tres" id="43_rtajf"]
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_lhqas"]
@@ -204,7 +206,7 @@ size = Vector3(4.35, 0.3, 1.2)
 
 [node name="Factory" type="Node3D" node_paths=PackedStringArray("prop_order", "finish_area")]
 script = ExtResource("1_f4j7u")
-prop_order = [NodePath("Props/PropCoffee"), NodePath("Props/PropScrewdriver"), NodePath("Props/PropPropane"), NodePath("Props/PropForklift")]
+prop_order = [NodePath("Props/PropCoffee"), NodePath("Props/PropScrewdriver"), NodePath("Props/PropPropane"), NodePath("Props/PropBucket"), NodePath("Props/PropPalletWithBoxes"), NodePath("Props/PropForklift")]
 finish_area = NodePath("FinishArea")
 
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
@@ -1885,16 +1887,25 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.65, 0, -13.5)
 [node name="PropCoffee" parent="Props" instance=ExtResource("30_pm1nv")]
 transform = Transform3D(0.382684, 0, 0.92388, 0, 1, 0, -0.92388, 0, 0.382684, 11.3559, 1.05046, 12.5756)
 speed = 1.25
-jump_speed = 5.0
+jump_speed = 4.75
 
 [node name="PropScrewdriver" parent="Props" instance=ExtResource("33_gsmpt")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.49495, 1.10997, 14.6708)
-speed = 1.5
+speed = 1.6
+jump_speed = 2.75
 
 [node name="PropPropane" parent="Props" instance=ExtResource("33_wqunp")]
 transform = Transform3D(1, 0, -2.13163e-14, 0, 1, 0, 2.13163e-14, 0, 1, -9.75, 0, 6.7)
 speed = 1.25
-jump_speed = 5.0
+jump_speed = 4.5
+
+[node name="PropBucket" parent="Props" instance=ExtResource("40_iv1q4")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.3758, 0.336618, 5.57597)
+speed = 1.5
+jump_speed = 4.75
+
+[node name="PropPalletWithBoxes" parent="Props" instance=ExtResource("41_t0v4l")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.971, 0, -1.953)
 
 [node name="PropForklift" parent="Props" instance=ExtResource("39_tfo4o")]
 transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 8.12643, 0, -4.27068)