From 6c55b7bb86469f220592c29b2d6f16ff181cb4a9 Mon Sep 17 00:00:00 2001
From: alan <masteralan2001@gmail.com>
Date: Sun, 28 Jan 2024 16:05:33 -0500
Subject: [PATCH] Tweaks and improvements

---
 assets/props/blake3/mat_arrow.tres |   1 +
 main.gd                            |  12 +-
 main.tscn                          | 278 ++++++++++++++---------------
 project.godot                      |  15 +-
 props/explosion/explosion.tscn     |   1 +
 props/explosion/nuke_blast.tscn    |   9 +-
 props/items/item_bagel.tscn        |   2 +
 props/items/item_bloaf.tscn        |   8 +-
 props/items/item_fish.tscn         |  10 +-
 props/items/item_metalrod.tscn     |   9 +-
 props/items/item_pizzahut.tscn     |   4 +-
 props/items/item_redarrow.tscn     |  15 +-
 props/items/item_rock.tscn         |   3 +-
 props/items/item_umbrella.tscn     |   8 +-
 props/shelves/shelf.tscn           |   1 +
 15 files changed, 203 insertions(+), 173 deletions(-)

diff --git a/assets/props/blake3/mat_arrow.tres b/assets/props/blake3/mat_arrow.tres
index 598db3a..2ee71ec 100644
--- a/assets/props/blake3/mat_arrow.tres
+++ b/assets/props/blake3/mat_arrow.tres
@@ -6,6 +6,7 @@
 transparency = 2
 alpha_scissor_threshold = 0.5
 alpha_antialiasing_mode = 0
+shading_mode = 0
 albedo_texture = ExtResource("1_uf5ww")
 billboard_mode = 1
 billboard_keep_scale = true
diff --git a/main.gd b/main.gd
index 10c69e9..72b8000 100644
--- a/main.gd
+++ b/main.gd
@@ -48,8 +48,9 @@ const BOX = preload("res://props/box/box.tscn")
 
 func _ready() -> void:
 	update_conveyor()
-	#$events/bezos_cooldown.start(randf_range(bezos_cooldown_min, bezos_cooldown_max))
-	$events/bezos_cooldown.start(2)
+	bezos.visible = false
+	$events/bezos_cooldown.start(randf_range(bezos_cooldown_min, bezos_cooldown_max))
+	#$events/bezos_cooldown.start(2)
 	
 	get_node('%arm_ik').start()
 	CameraRumble.grab.connect(anim_grab)
@@ -136,12 +137,14 @@ func update_conveyor():
 	var shade: ShaderMaterial = conveyor_mesh.get_surface_override_material(1)
 	shade.set_shader_parameter("speed", conveyor_speed)
 
+## PACKAGE VALIDATION (was it packed properly?)
 func _on_box_entered(body_rid: RID, body: Node3D, body_shape_index: int, local_shape_index: int) -> void:
 	if body is Package:
 		if body.counted: return
 		body.counted = true
 		# print("box has: ", body.items.size())
-		if not body.items.size() == 1:
+		# Ensure package is loaded, but don't penalize overloaded packages (players tend to do that when conveyor is slow)
+		if not body.items.size() > 0:
 			do_penalty()
 			boxes_in_row = 0
 		else:
@@ -165,6 +168,7 @@ func do_penalty():
 func _on_trash(body_rid: RID, body: Node3D, body_shape_index: int, local_shape_index: int) -> void:
 	body.queue_free()
 
+## QUICKTIME EVENT
 @onready var bezos_timer: float = 0
 func quicktime_start():
 	bezos.visible = true
@@ -173,7 +177,7 @@ func quicktime_start():
 	qt.set_ease(Tween.EASE_OUT)
 	qt.set_trans(Tween.TRANS_QUAD)
 	var newPos: Vector3 = bezos.position * Vector3(1,0,1)
-	qt.tween_property(bezos, 'position', newPos + Vector3(0,2,0), bezos_timer)
+	qt.tween_property(bezos, 'position', newPos + Vector3(0,2.5,0), bezos_timer)
 	qt.tween_callback(quicktime_run)
 	quicktime_timer = bezos_timer + rock_throw_time
 	$events/bezos_cooldown.start(bezos_timer * 2 + rock_throw_time + randf_range(bezos_cooldown_min, bezos_cooldown_max))
diff --git a/main.tscn b/main.tscn
index ae6dcc7..17d57e5 100644
--- a/main.tscn
+++ b/main.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=86 format=3 uid="uid://d2ftoqr7ydi38"]
+[gd_scene load_steps=87 format=3 uid="uid://d2ftoqr7ydi38"]
 
 [ext_resource type="Script" path="res://main.gd" id="1_bcqi1"]
 [ext_resource type="Material" uid="uid://cgkuu3oelkm7o" path="res://assets/materials/garage_floor/mat_floor.tres" id="2_c6dsy"]
@@ -54,6 +54,7 @@
 [ext_resource type="PackedScene" uid="uid://d3w07g7udw5ig" path="res://assets/bezos/BALLZ.glb" id="36_w1osm"]
 [ext_resource type="PackedScene" uid="uid://bdccq5y56ruro" path="res://props/shelves/shelf.tscn" id="38_f3pj2"]
 [ext_resource type="AudioStream" uid="uid://b0x23gtshoo2c" path="res://assets/audio/oof.wav" id="40_bym4i"]
+[ext_resource type="Material" uid="uid://bdk2p7q54ftfv" path="res://assets/props/blake3/mat_arrow.tres" id="53_slbh8"]
 
 [sub_resource type="Gradient" id="Gradient_qqc4q"]
 colors = PackedColorArray(0.08, 0.0608, 0.0752, 1, 1, 1, 1, 1)
@@ -78,13 +79,15 @@ reflected_light_source = 2
 tonemap_mode = 3
 tonemap_exposure = 0.84
 tonemap_white = 0.9
+ssao_enabled = true
 ssil_enabled = true
+ssil_intensity = 2.0
 glow_enabled = true
 adjustment_enabled = true
 adjustment_contrast = 1.5
 adjustment_color_correction = SubResource("GradientTexture1D_y6d2o")
 
-[sub_resource type="AnimationLibrary" id="AnimationLibrary_nadsl"]
+[sub_resource type="AnimationLibrary" id="AnimationLibrary_tvr6b"]
 _data = {
 "GRAB": ExtResource("20_mcvde"),
 "HOLD": ExtResource("21_dwwlq"),
@@ -109,17 +112,14 @@ plane = Plane(0, -1, 0, 0)
 [sub_resource type="WorldBoundaryShape3D" id="WorldBoundaryShape3D_1dk4b"]
 plane = Plane(0, 0, 1, 0)
 
-[sub_resource type="WorldBoundaryShape3D" id="WorldBoundaryShape3D_gfgqo"]
+[sub_resource type="WorldBoundaryShape3D" id="WorldBoundaryShape3D_ankuu"]
 plane = Plane(-1, 0, 0, 0)
 
 [sub_resource type="WorldBoundaryShape3D" id="WorldBoundaryShape3D_25vmt"]
 plane = Plane(0, 0, -1, 0)
 
-[sub_resource type="BoxShape3D" id="BoxShape3D_76f5p"]
-size = Vector3(1, 10.2551, 5.56396)
-
-[sub_resource type="BoxShape3D" id="BoxShape3D_cmf8m"]
-size = Vector3(1, 7.9024, 5.56396)
+[sub_resource type="WorldBoundaryShape3D" id="WorldBoundaryShape3D_gfgqo"]
+plane = Plane(1, 0, 0, 0)
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_xf4t7"]
 size = Vector3(20, 1, 1)
@@ -132,7 +132,11 @@ plane = Plane(1, 0, 0, 0)
 
 [sub_resource type="PlaneMesh" id="PlaneMesh_osd5l"]
 
-[sub_resource type="Animation" id="Animation_brp58"]
+[sub_resource type="QuadMesh" id="QuadMesh_4uram"]
+material = ExtResource("53_slbh8")
+size = Vector2(1.5, 3)
+
+[sub_resource type="Animation" id="Animation_k8s4x"]
 resource_name = "GRAB"
 length = 0.291667
 tracks/0/type = "position_3d"
@@ -864,7 +868,7 @@ tracks/103/interp = 1
 tracks/103/loop_wrap = true
 tracks/103/keys = PackedFloat32Array(0, 1, -0.0472625, -0.141197, -0.121214)
 
-[sub_resource type="Animation" id="Animation_xo4ti"]
+[sub_resource type="Animation" id="Animation_vqxyr"]
 resource_name = "HOLD"
 length = 0.25
 tracks/0/type = "position_3d"
@@ -1596,7 +1600,7 @@ tracks/103/interp = 1
 tracks/103/loop_wrap = true
 tracks/103/keys = PackedFloat32Array(0, 1, 0.135625, -9.08356e-08, 0.99076, 8.59226e-09)
 
-[sub_resource type="Animation" id="Animation_s2o7k"]
+[sub_resource type="Animation" id="Animation_2rsit"]
 resource_name = "Idle"
 length = 1.5
 loop_mode = 1
@@ -2329,7 +2333,7 @@ tracks/103/interp = 1
 tracks/103/loop_wrap = true
 tracks/103/keys = PackedFloat32Array(0, 1, -0.0472625, -0.141197, -0.121214)
 
-[sub_resource type="Animation" id="Animation_16il2"]
+[sub_resource type="Animation" id="Animation_oe46f"]
 resource_name = "rigAction_001"
 length = 0.25
 tracks/0/type = "position_3d"
@@ -3061,7 +3065,7 @@ tracks/103/interp = 1
 tracks/103/loop_wrap = true
 tracks/103/keys = PackedFloat32Array(0, 1, 0.135625, -9.08356e-08, 0.99076, 8.59226e-09)
 
-[sub_resource type="Animation" id="Animation_fp21s"]
+[sub_resource type="Animation" id="Animation_aj1hp"]
 resource_name = "STONE-TOSS"
 length = 2.45833
 tracks/0/type = "position_3d"
@@ -3793,7 +3797,7 @@ tracks/103/interp = 1
 tracks/103/loop_wrap = true
 tracks/103/keys = PackedFloat32Array(0, 1, -0.0472625, -0.141197, -0.121214)
 
-[sub_resource type="Animation" id="Animation_wntgo"]
+[sub_resource type="Animation" id="Animation_ku7ib"]
 resource_name = "Stun"
 length = 0.291667
 tracks/0/type = "position_3d"
@@ -4525,7 +4529,7 @@ tracks/103/interp = 1
 tracks/103/loop_wrap = true
 tracks/103/keys = PackedFloat32Array(0, 1, 0.135625, -9.08356e-08, 0.99076, 8.59226e-09)
 
-[sub_resource type="Animation" id="Animation_scxwl"]
+[sub_resource type="Animation" id="Animation_g1tfr"]
 resource_name = "bezoball_low_final"
 length = 22.6667
 tracks/0/type = "position_3d"
@@ -5257,15 +5261,15 @@ tracks/103/interp = 1
 tracks/103/loop_wrap = true
 tracks/103/keys = PackedFloat32Array(0, 1, 1, 1, 1)
 
-[sub_resource type="AnimationLibrary" id="AnimationLibrary_w3xcp"]
+[sub_resource type="AnimationLibrary" id="AnimationLibrary_k1wx6"]
 _data = {
-"GRAB": SubResource("Animation_brp58"),
-"HOLD": SubResource("Animation_xo4ti"),
-"Idle": SubResource("Animation_s2o7k"),
-"STONE-TOSS": SubResource("Animation_fp21s"),
-"Stun": SubResource("Animation_wntgo"),
-"bezoball_low_final": SubResource("Animation_scxwl"),
-"rigAction_001": SubResource("Animation_16il2")
+"GRAB": SubResource("Animation_k8s4x"),
+"HOLD": SubResource("Animation_vqxyr"),
+"Idle": SubResource("Animation_2rsit"),
+"STONE-TOSS": SubResource("Animation_aj1hp"),
+"Stun": SubResource("Animation_ku7ib"),
+"bezoball_low_final": SubResource("Animation_g1tfr"),
+"rigAction_001": SubResource("Animation_oe46f")
 }
 
 [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_xsp1s"]
@@ -5279,7 +5283,6 @@ fadein_time = 0.05
 fadeout_time = 0.05
 
 [sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_c1xvk"]
-graph_offset = Vector2(-474.289, 77.8926)
 nodes/Animation/node = SubResource("AnimationNodeAnimation_fnfd8")
 nodes/Animation/position = Vector2(-200, 140)
 "nodes/Animation 2/node" = SubResource("AnimationNodeAnimation_xsp1s")
@@ -5292,7 +5295,7 @@ node_connections = [&"output", 0, &"shot_attack", &"shot_attack", 0, &"Animation
 script = ExtResource("1_bcqi1")
 wage_penalty = 0.1
 conveyor_speed = 0.7
-convery_accel = 0.01
+convery_accel = 0.008
 prop_spawn_dist = 1.3
 dodge_timer_max = 0.8
 rock_throw_time = 1.2
@@ -5329,6 +5332,7 @@ transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819,
 
 [node name="light" type="SpotLight3D" parent="world/light_parent"]
 light_energy = 7.853
+shadow_enabled = true
 spot_range = 12.0
 
 [node name="hand_target" type="Node3D" parent="world"]
@@ -5347,33 +5351,31 @@ bones/2/scale = Vector3(1.01115, 1.01115, 1.01115)
 bones/3/rotation = Quaternion(0.52569, 0.289474, 0.105462, 0.792927)
 bones/3/scale = Vector3(0.731301, 0.731302, 0.731301)
 bones/4/rotation = Quaternion(0.0791671, 0.591145, 0.0117835, 0.802584)
-bones/5/rotation = Quaternion(-0.116892, 0.029535, 0.0552058, 0.991169)
-bones/6/rotation = Quaternion(0.0324016, -0.0222076, -0.0100348, 0.999178)
-bones/7/rotation = Quaternion(-0.0177517, 0.00672679, -0.00108908, 0.999819)
-bones/8/rotation = Quaternion(0.00929686, 0.82787, 0.555929, 0.0740865)
+bones/5/rotation = Quaternion(0.0450107, 0.0380777, 0.0497003, 0.997023)
+bones/6/rotation = Quaternion(0.136122, -0.0231303, -0.00767077, 0.990392)
+bones/7/rotation = Quaternion(0.0863067, 0.00657699, -0.00178286, 0.996245)
+bones/8/rotation = Quaternion(0.0208786, 0.871177, 0.484602, 0.0760052)
 bones/8/scale = Vector3(1, 1, 1)
-bones/9/rotation = Quaternion(-0.0354241, -0.0186859, -0.00417323, 0.999189)
-bones/10/rotation = Quaternion(-0.237608, -0.000628744, -0.0162105, 0.971226)
+bones/9/rotation = Quaternion(0.0922261, -0.0135893, -0.00227439, 0.995643)
+bones/10/rotation = Quaternion(-0.111863, -0.00269012, -0.0159975, 0.993591)
 bones/10/scale = Vector3(1, 1, 1)
 bones/11/rotation = Quaternion(0.00106178, 0.584364, -0.0154954, 0.811343)
-bones/11/scale = Vector3(1, 1, 1)
-bones/12/rotation = Quaternion(-0.0501211, 0.018404, 0.0269521, 0.99821)
-bones/13/rotation = Quaternion(-0.0016758, -0.0376098, 0.0345082, 0.998695)
+bones/12/rotation = Quaternion(0.120747, 0.0227284, 0.0234212, 0.992147)
+bones/13/rotation = Quaternion(0.107615, -0.0336076, 0.0384173, 0.992882)
 bones/13/scale = Vector3(1, 1, 1)
-bones/14/rotation = Quaternion(-0.0482693, -0.00597633, -0.0116552, 0.998748)
-bones/14/scale = Vector3(1, 1, 1)
+bones/14/rotation = Quaternion(0.0613068, -0.00721559, -0.0109309, 0.998033)
 bones/15/rotation = Quaternion(-0.0611887, 0.573124, -0.0421539, 0.816093)
-bones/16/rotation = Quaternion(-0.0112893, -0.0227007, 0.0333381, 0.999123)
+bones/16/rotation = Quaternion(0.169863, -0.0162869, 0.0368985, 0.984642)
 bones/16/scale = Vector3(1, 1, 1)
-bones/17/rotation = Quaternion(0.0208708, -0.0061338, 0.0306114, 0.999295)
+bones/17/rotation = Quaternion(0.137001, -0.00253015, 0.0311178, 0.990079)
 bones/17/scale = Vector3(1, 1, 1)
-bones/18/rotation = Quaternion(-0.0080455, -0.0298959, 0.0238082, 0.999237)
+bones/18/rotation = Quaternion(0.108275, -0.0269229, 0.0271236, 0.993386)
 bones/18/scale = Vector3(1, 1, 1)
 bones/19/rotation = Quaternion(-0.15484, 0.544614, -0.0238322, 0.823925)
-bones/20/rotation = Quaternion(0.0958329, -0.0121307, 0.0181177, 0.995159)
-bones/21/rotation = Quaternion(0.0244358, 0.00135145, -0.0268913, 0.999339)
+bones/20/rotation = Quaternion(0.250584, -0.00914195, 0.0197953, 0.967849)
+bones/21/rotation = Quaternion(0.136664, -0.00168099, -0.0268728, 0.990251)
 bones/21/scale = Vector3(1, 1, 1)
-bones/22/rotation = Quaternion(0.0265398, -0.0158544, 0.06976, 0.997085)
+bones/22/rotation = Quaternion(0.1385, -0.00790934, 0.0711001, 0.987775)
 bones/22/scale = Vector3(1, 1, 1)
 
 [node name="Main_Body" parent="world/Armondo/rig/Skeleton3D" index="0"]
@@ -5388,7 +5390,7 @@ target_node = NodePath("../../../../hand_target")
 
 [node name="AnimationTree" type="AnimationTree" parent="world/Armondo"]
 libraries = {
-"": SubResource("AnimationLibrary_nadsl")
+"": SubResource("AnimationLibrary_tvr6b")
 }
 tree_root = ExtResource("25_asp1p")
 anim_player = NodePath("../AnimationPlayer")
@@ -5477,7 +5479,6 @@ texture_albedo = ExtResource("14_icb2l")
 cull_mask = 2
 
 [node name="Decal2" type="Decal" parent="world/env/mesh_floor2"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0)
 layers = 2
 size = Vector3(8, 1, 4)
 texture_albedo = ExtResource("30_cprtx")
@@ -5508,23 +5509,17 @@ shape = SubResource("WorldBoundaryShape3D_1dk4b")
 
 [node name="right_wall" type="CollisionShape3D" parent="world/env/level"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10, 0, -1)
-shape = SubResource("WorldBoundaryShape3D_gfgqo")
+shape = SubResource("WorldBoundaryShape3D_ankuu")
 
 [node name="player_wall" type="CollisionShape3D" parent="world/env/level"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.26339e-07, 0, 3.55485)
 shape = SubResource("WorldBoundaryShape3D_25vmt")
 
-[node name="left_wall" type="CollisionShape3D" parent="world/env/level"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8, 4.9342, -2.71802)
-shape = SubResource("BoxShape3D_76f5p")
+[node name="left_wall" type="StaticBody3D" parent="world/env"]
 
-[node name="left_wall2" type="CollisionShape3D" parent="world/env/level"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8, 4.9342, 4.59032)
-shape = SubResource("BoxShape3D_76f5p")
-
-[node name="left_wall3" type="CollisionShape3D" parent="world/env/level"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8, 6.14761, 0.59032)
-shape = SubResource("BoxShape3D_cmf8m")
+[node name="left_wall2" type="CollisionShape3D" parent="world/env/left_wall"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10, 0, -1)
+shape = SubResource("WorldBoundaryShape3D_gfgqo")
 
 [node name="conveyor_bg" type="Node3D" parent="world/env"]
 transform = Transform3D(1, 0, -1.74846e-07, 0, 1, 0, 1.74846e-07, 0, 1, 0, 0.191378, -2.65908)
@@ -5642,28 +5637,12 @@ transform = Transform3D(-4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, 0, 0,
 visible = false
 mesh = SubResource("PlaneMesh_osd5l")
 
-[node name="trash2" type="Area3D" parent="world"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.77576, 1.34206, 0.994239)
-collision_layer = 0
-collision_mask = 6
-monitorable = false
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="world/trash2"]
-shape = SubResource("WorldBoundaryShape3D_ftubs")
-
-[node name="MeshInstance3D" type="MeshInstance3D" parent="world/trash2"]
-transform = Transform3D(-4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, 0, 0, 0)
-mesh = SubResource("PlaneMesh_osd5l")
-
-[node name="Camera3D2" type="Camera3D" parent="world"]
-transform = Transform3D(0.898242, 0, 0.4395, -0.120973, 0.961372, 0.247243, -0.422523, -0.275251, 0.863545, 6, 2.23388, 4)
-
 [node name="bezos" type="Node3D" parent="world"]
 unique_name_in_owner = true
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 10, -9.63019)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 10, -10.11)
 
 [node name="BALLZ" parent="world/bezos" instance=ExtResource("36_w1osm")]
-transform = Transform3D(3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0)
+transform = Transform3D(4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0)
 
 [node name="Skeleton3D" parent="world/bezos/BALLZ/rig" index="0"]
 bones/0/position = Vector3(7.45058e-09, 2.23517e-08, 0)
@@ -5683,7 +5662,6 @@ bones/11/rotation = Quaternion(-2.20577e-08, 0.159268, -9.42441e-08, 0.987235)
 bones/11/scale = Vector3(1.04435, 1.04435, 1.04435)
 bones/12/rotation = Quaternion(-2.27243e-07, 1.67638e-08, 5.97676e-07, 1)
 bones/13/rotation = Quaternion(-0.371751, -1.03112e-08, -0.582827, 0.722574)
-bones/13/scale = Vector3(1, 1, 1)
 bones/15/rotation = Quaternion(0.425072, 0.681026, -0.545161, 0.24149)
 bones/15/scale = Vector3(1, 1, 1)
 bones/16/rotation = Quaternion(0.0513881, 8.01997e-08, 6.31806e-08, 0.998679)
@@ -5711,106 +5689,99 @@ bones/28/scale = Vector3(1.00001, 0.999972, 1.00001)
 bones/29/rotation = Quaternion(0.137653, 0.129111, 0.0826848, 0.978542)
 bones/29/scale = Vector3(0.979536, 1.0413, 0.981311)
 bones/30/rotation = Quaternion(0.024349, 0.587802, 0.0762459, 0.805036)
-bones/31/rotation = Quaternion(0.145548, 0.042473, 0.0292001, 0.988008)
-bones/32/rotation = Quaternion(0.0718243, -0.0207538, 0.00405096, 0.997193)
+bones/31/rotation = Quaternion(-0.0167865, 0.0371689, 0.0357078, 0.99853)
+bones/32/rotation = Quaternion(-0.032619, -0.0210634, 0.00186326, 0.999244)
 bones/32/scale = Vector3(1, 1, 1)
-bones/33/rotation = Quaternion(0.121449, 0.00591413, -0.00873404, 0.992542)
-bones/34/rotation = Quaternion(-0.14971, 0.714238, 0.41303, 0.544847)
-bones/35/rotation = Quaternion(0.0922455, -0.0125152, -0.00957093, 0.995612)
-bones/36/rotation = Quaternion(-0.108884, -0.000307915, 0.0263661, 0.993705)
-bones/37/rotation = Quaternion(0.145548, 0.042473, 0.0292001, 0.988008)
-bones/38/rotation = Quaternion(0.0718243, -0.0207538, 0.00405096, 0.997193)
+bones/33/rotation = Quaternion(0.0172205, 0.00679305, -0.00806877, 0.999796)
+bones/34/rotation = Quaternion(-0.199375, 0.679463, 0.469348, 0.527534)
+bones/35/rotation = Quaternion(-0.0357779, -0.0167047, -0.01128, 0.999157)
+bones/36/rotation = Quaternion(-0.235074, -0.00367766, 0.0261094, 0.97162)
+bones/37/rotation = Quaternion(-0.0167865, 0.0371689, 0.0357078, 0.99853)
+bones/38/rotation = Quaternion(-0.032619, -0.0210634, 0.00186326, 0.999244)
 bones/38/scale = Vector3(1, 1, 1)
-bones/39/rotation = Quaternion(0.121449, 0.00591413, -0.00873404, 0.992542)
-bones/40/rotation = Quaternion(0.145549, 0.0424731, 0.0291999, 0.988008)
-bones/40/scale = Vector3(1, 0.933084, 1)
-bones/41/rotation = Quaternion(-0.14971, 0.714238, 0.41303, 0.544847)
-bones/42/rotation = Quaternion(0.0922455, -0.0125152, -0.00957093, 0.995612)
-bones/43/rotation = Quaternion(-0.108884, -0.000307915, 0.0263661, 0.993705)
-bones/44/rotation = Quaternion(-0.143845, 0.706457, 0.415111, 0.554896)
-bones/44/scale = Vector3(1, 1.01648, 1)
-bones/46/rotation = Quaternion(0.14555, 0.0424719, 0.0292001, 0.988008)
+bones/39/rotation = Quaternion(0.0172205, 0.00679305, -0.00806877, 0.999796)
+bones/40/rotation = Quaternion(-0.0167865, 0.037169, 0.035708, 0.99853)
+bones/40/scale = Vector3(1, 0.999633, 1)
+bones/41/rotation = Quaternion(-0.199375, 0.679463, 0.469348, 0.527534)
+bones/42/rotation = Quaternion(-0.0357779, -0.0167047, -0.01128, 0.999157)
+bones/43/rotation = Quaternion(-0.235074, -0.00367766, 0.0261094, 0.97162)
+bones/44/rotation = Quaternion(-0.190104, 0.668955, 0.473179, 0.540797)
+bones/44/scale = Vector3(1, 1.09812, 1)
+bones/46/rotation = Quaternion(-0.0167856, 0.0371677, 0.0357081, 0.99853)
 bones/46/scale = Vector3(1, 1, 1)
-bones/48/rotation = Quaternion(0.071825, -0.0207554, 0.00405151, 0.997193)
+bones/48/rotation = Quaternion(-0.0326179, -0.0210648, 0.0018637, 0.999244)
 bones/48/scale = Vector3(1, 1, 1)
-bones/50/rotation = Quaternion(0.121447, 0.00591616, -0.00873328, 0.992542)
+bones/50/rotation = Quaternion(0.0172189, 0.00679512, -0.00806831, 0.999796)
 bones/50/scale = Vector3(1, 1, 1)
-bones/52/rotation = Quaternion(-0.0755315, -4.23148e-08, 0.997143, -8.45749e-09)
+bones/52/rotation = Quaternion(-0.0755315, -6.17047e-08, 0.997143, 3.98341e-09)
 bones/52/scale = Vector3(1, 1, 1)
-bones/55/rotation = Quaternion(0.145548, 0.042473, 0.0292001, 0.988008)
-bones/56/rotation = Quaternion(-0.143845, 0.706457, 0.415111, 0.554896)
-bones/56/scale = Vector3(1, 1, 1)
-bones/58/rotation = Quaternion(0.0921012, 0.00157205, -0.0108621, 0.995689)
+bones/55/rotation = Quaternion(-0.0167865, 0.0371689, 0.0357078, 0.99853)
+bones/56/rotation = Quaternion(-0.190103, 0.668954, 0.473179, 0.540797)
+bones/58/rotation = Quaternion(-0.0359924, 0.00294827, -0.0105718, 0.999292)
 bones/58/scale = Vector3(1, 1, 1)
-bones/60/rotation = Quaternion(-0.108884, -0.000310538, 0.0263674, 0.993705)
-bones/60/scale = Vector3(1, 1, 1)
+bones/60/rotation = Quaternion(-0.235074, -0.00368006, 0.0261111, 0.97162)
 bones/62/rotation = Quaternion(0.884812, 3.32611e-06, 0.465948, -1.29939e-06)
-bones/65/rotation = Quaternion(-0.14971, 0.714238, 0.41303, 0.544847)
+bones/65/rotation = Quaternion(-0.199375, 0.679463, 0.469348, 0.527534)
 bones/66/rotation = Quaternion(-0.0150627, 0.584674, 0.0037911, 0.811119)
-bones/67/rotation = Quaternion(0.12283, 0.0227364, 0.022997, 0.991901)
+bones/67/rotation = Quaternion(-0.0486244, 0.0184682, 0.0265464, 0.998294)
 bones/67/scale = Vector3(1, 1, 1)
-bones/68/rotation = Quaternion(0.152677, -0.0330764, 0.0268566, 0.987357)
+bones/68/rotation = Quaternion(0.0433346, -0.0358254, 0.0230619, 0.998152)
 bones/68/scale = Vector3(1, 1, 1)
-bones/69/rotation = Quaternion(0.168176, -0.0109143, -0.042821, 0.984766)
-bones/70/rotation = Quaternion(0.12283, 0.0227364, 0.022997, 0.991901)
+bones/69/rotation = Quaternion(0.0590244, -0.00614597, -0.0437613, 0.997278)
+bones/70/rotation = Quaternion(-0.0486244, 0.0184682, 0.0265464, 0.998294)
 bones/70/scale = Vector3(1, 1, 1)
-bones/71/rotation = Quaternion(0.152677, -0.0330764, 0.0268566, 0.987357)
+bones/71/rotation = Quaternion(0.0433346, -0.0358254, 0.0230619, 0.998152)
 bones/71/scale = Vector3(1, 1, 1)
-bones/72/rotation = Quaternion(0.168176, -0.0109143, -0.042821, 0.984766)
-bones/73/rotation = Quaternion(0.122831, 0.0227364, 0.0229967, 0.991901)
-bones/73/scale = Vector3(1, 0.921283, 1)
-bones/75/rotation = Quaternion(0.122832, 0.0227355, 0.0229968, 0.991901)
+bones/72/rotation = Quaternion(0.0590244, -0.00614597, -0.0437613, 0.997278)
+bones/73/rotation = Quaternion(-0.0486244, 0.0184682, 0.0265465, 0.998294)
+bones/73/scale = Vector3(1, 0.99133, 1)
+bones/75/rotation = Quaternion(-0.0486236, 0.0184673, 0.0265464, 0.998294)
 bones/75/scale = Vector3(1, 1, 1)
-bones/77/rotation = Quaternion(0.152679, -0.0330785, 0.0268566, 0.987357)
+bones/77/rotation = Quaternion(0.0433365, -0.0358275, 0.023062, 0.998152)
 bones/77/scale = Vector3(1, 1, 1)
-bones/79/rotation = Quaternion(0.168179, -0.0109174, -0.0428225, 0.984765)
+bones/79/rotation = Quaternion(0.0590273, -0.00614916, -0.0437623, 0.997278)
 bones/80/rotation = Quaternion(-3.08873e-06, 3.24659e-06, 8.01869e-07, 1)
-bones/81/rotation = Quaternion(0.028989, 1.70642e-10, 0.99958, 2.23859e-09)
+bones/81/rotation = Quaternion(0.0289889, 2.7215e-09, 0.99958, 4.63454e-10)
 bones/81/scale = Vector3(1, 1, 1)
-bones/84/rotation = Quaternion(0.12283, 0.0227364, 0.022997, 0.991901)
+bones/84/rotation = Quaternion(-0.0486244, 0.0184682, 0.0265464, 0.998294)
 bones/84/scale = Vector3(1, 1, 1)
 bones/85/rotation = Quaternion(-0.0536367, 0.572428, -0.051421, 0.816581)
 bones/85/scale = Vector3(1, 1, 1)
-bones/86/rotation = Quaternion(0.16979, -0.0162729, 0.0370076, 0.984651)
-bones/87/rotation = Quaternion(0.180972, -0.00300535, 0.016064, 0.983353)
-bones/88/rotation = Quaternion(0.198287, -0.0282484, -0.00733365, 0.97971)
-bones/89/rotation = Quaternion(0.16979, -0.0162729, 0.0370076, 0.984651)
-bones/90/rotation = Quaternion(0.180972, -0.00300535, 0.016064, 0.983353)
-bones/91/rotation = Quaternion(0.198287, -0.0282484, -0.00733365, 0.97971)
-bones/92/rotation = Quaternion(0.16979, -0.0162729, 0.0370075, 0.984651)
-bones/92/scale = Vector3(1, 0.903165, 1)
-bones/94/rotation = Quaternion(0.16979, -0.0162731, 0.0370079, 0.984651)
+bones/86/rotation = Quaternion(-0.0119806, -0.0227274, 0.0334339, 0.999111)
+bones/87/rotation = Quaternion(0.0649279, -0.00486025, 0.015603, 0.997756)
+bones/88/rotation = Quaternion(0.0825498, -0.0271993, -0.0105809, 0.99616)
+bones/89/rotation = Quaternion(-0.0119806, -0.0227274, 0.0334339, 0.999111)
+bones/90/rotation = Quaternion(0.0649279, -0.00486025, 0.015603, 0.997756)
+bones/91/rotation = Quaternion(0.0825498, -0.0271993, -0.0105809, 0.99616)
+bones/92/rotation = Quaternion(-0.0119805, -0.0227274, 0.0334339, 0.999111)
+bones/92/scale = Vector3(1, 0.97766, 1)
+bones/94/rotation = Quaternion(-0.0119802, -0.0227277, 0.0334343, 0.999111)
 bones/95/rotation = Quaternion(-2.952e-07, 2.49594e-07, -2.64961e-07, 1)
-bones/96/rotation = Quaternion(0.180973, -0.00300623, 0.0160634, 0.983352)
-bones/98/rotation = Quaternion(0.198284, -0.0282457, -0.00733207, 0.97971)
+bones/96/rotation = Quaternion(0.0649287, -0.00486107, 0.0156025, 0.997756)
+bones/98/rotation = Quaternion(0.082547, -0.0271964, -0.0105796, 0.99616)
 bones/98/scale = Vector3(1, 1, 1)
-bones/100/rotation = Quaternion(0.135625, -8.98008e-08, 0.99076, 4.53048e-09)
-bones/100/scale = Vector3(1, 1, 1)
-bones/103/rotation = Quaternion(0.16979, -0.0162729, 0.0370076, 0.984651)
+bones/100/rotation = Quaternion(0.135625, -9.38363e-08, 0.99076, 9.56959e-10)
+bones/103/rotation = Quaternion(-0.0119806, -0.0227274, 0.0334339, 0.999111)
 bones/104/rotation = Quaternion(-0.0646238, 0.533247, -0.142714, 0.831327)
 bones/104/scale = Vector3(1, 1, 1)
-bones/105/rotation = Quaternion(0.142257, -0.00174529, 0.0603055, 0.987989)
-bones/105/scale = Vector3(1, 1, 1)
-bones/106/rotation = Quaternion(0.166271, -0.00433609, -0.0380937, 0.985335)
+bones/105/rotation = Quaternion(-0.0148521, -0.0112053, 0.059281, 0.998068)
+bones/106/rotation = Quaternion(0.0540234, -9.55639e-06, -0.0383402, 0.997803)
 bones/106/scale = Vector3(1, 1, 1)
-bones/107/rotation = Quaternion(0.228413, -0.00517077, 0.0337807, 0.972965)
-bones/108/rotation = Quaternion(0.142257, -0.00174529, 0.0603055, 0.987989)
-bones/108/scale = Vector3(1, 1, 1)
-bones/109/rotation = Quaternion(0.166271, -0.00433609, -0.0380937, 0.985335)
+bones/107/rotation = Quaternion(0.117164, -0.00894962, 0.0329822, 0.992524)
+bones/108/rotation = Quaternion(-0.0148521, -0.0112053, 0.059281, 0.998068)
+bones/109/rotation = Quaternion(0.0540234, -9.55639e-06, -0.0383402, 0.997803)
 bones/109/scale = Vector3(1, 1, 1)
-bones/110/rotation = Quaternion(0.228413, -0.00517077, 0.0337807, 0.972965)
-bones/111/rotation = Quaternion(0.142257, -0.00174525, 0.0603054, 0.98799)
-bones/111/scale = Vector3(1.00187, 0.895115, 1.00187)
+bones/110/rotation = Quaternion(0.117164, -0.00894962, 0.0329822, 0.992524)
+bones/111/rotation = Quaternion(-0.014852, -0.0112052, 0.0592809, 0.998068)
+bones/111/scale = Vector3(1.01238, 0.967104, 1.01238)
 bones/112/rotation = Quaternion(2.7474e-08, 3.72529e-09, -1.86265e-09, 1)
-bones/113/rotation = Quaternion(0.142257, -0.00174561, 0.0603054, 0.987989)
+bones/113/rotation = Quaternion(-0.0148515, -0.0112056, 0.0592809, 0.998068)
 bones/113/scale = Vector3(1, 1, 1)
-bones/115/rotation = Quaternion(0.166273, -0.00433833, -0.0380952, 0.985334)
-bones/117/rotation = Quaternion(0.228409, -0.00516787, 0.0337808, 0.972965)
+bones/115/rotation = Quaternion(0.054026, -1.19493e-05, -0.0383414, 0.997803)
+bones/117/rotation = Quaternion(0.11716, -0.00894668, 0.0329819, 0.992525)
 bones/118/rotation = Quaternion(3.45754e-06, -3.00538e-06, 5.0338e-07, 1)
 bones/119/rotation = Quaternion(0.164736, 2.91293e-07, 0.986338, 7.60808e-07)
-bones/119/scale = Vector3(1, 1, 1)
-bones/122/rotation = Quaternion(0.142257, -0.00174529, 0.0603055, 0.987989)
-bones/122/scale = Vector3(1, 1, 1)
+bones/122/rotation = Quaternion(-0.0148521, -0.0112053, 0.059281, 0.998068)
 bones/123/rotation = Quaternion(-0.0646238, 0.533247, -0.142714, 0.831327)
 bones/123/scale = Vector3(1, 1, 1)
 bones/124/rotation = Quaternion(0.707107, 0, 0, 0.707107)
@@ -5832,8 +5803,10 @@ surface_material_override/0 = ExtResource("29_hasci")
 
 [node name="bezoball_low_final" parent="world/bezos/BALLZ/rig/Skeleton3D/bezoball_low_final" index="1"]
 visible = false
+gi_mode = 0
 
 [node name="Main_Body" parent="world/bezos/BALLZ/rig/Skeleton3D" index="1"]
+gi_mode = 0
 surface_material_override/0 = ExtResource("20_7dsa8")
 
 [node name="throwable" type="BoneAttachment3D" parent="world/bezos/BALLZ/rig/Skeleton3D" index="2"]
@@ -5842,9 +5815,21 @@ transform = Transform3D(-0.368534, -0.0897011, -0.925276, -0.82225, 0.495803, 0.
 bone_name = "ORG-hand.L"
 bone_idx = 3
 
+[node name="red_arrow" type="MeshInstance3D" parent="world/bezos/BALLZ/rig" index="1"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.289688, 0.537988, 0.13412)
+mesh = SubResource("QuadMesh_4uram")
+
+[node name="Timer" type="Timer" parent="world/bezos/BALLZ/rig/red_arrow"]
+wait_time = 0.1
+autostart = true
+
+[node name="Timer2" type="Timer" parent="world/bezos/BALLZ/rig/red_arrow"]
+wait_time = 0.2
+autostart = true
+
 [node name="AnimationTree" type="AnimationTree" parent="world/bezos/BALLZ"]
 libraries = {
-"": SubResource("AnimationLibrary_w3xcp")
+"": SubResource("AnimationLibrary_k1wx6")
 }
 tree_root = SubResource("AnimationNodeBlendTree_c1xvk")
 anim_player = NodePath("../AnimationPlayer")
@@ -5919,7 +5904,8 @@ one_shot = true
 stream = ExtResource("40_bym4i")
 
 [connection signal="body_shape_entered" from="world/box_collector" to="." method="_on_box_entered"]
-[connection signal="body_shape_entered" from="world/trash2" to="." method="_on_trash"]
+[connection signal="timeout" from="world/bezos/BALLZ/rig/red_arrow/Timer" to="world/bezos/BALLZ/rig/red_arrow" method="set_visible" binds= [true]]
+[connection signal="timeout" from="world/bezos/BALLZ/rig/red_arrow/Timer2" to="world/bezos/BALLZ/rig/red_arrow" method="set_visible" binds= [false]]
 [connection signal="timeout" from="events/rock_timer" to="." method="quicktime_check"]
 [connection signal="timeout" from="events/bezos_cooldown" to="." method="quicktime_start"]
 
diff --git a/project.godot b/project.godot
index 01d40a0..95dfdb6 100644
--- a/project.godot
+++ b/project.godot
@@ -10,9 +10,12 @@ config_version=5
 
 [application]
 
-config/name="Envision Jam 2024"
+config/name="Armazon"
+config/description="Pack boxes safely and efficiently to maximize customer satisfaction."
 run/main_scene="res://main.tscn"
 config/features=PackedStringArray("4.2", "Forward Plus")
+boot_splash/bg_color=Color(0.415686, 0.333333, 0.227451, 1)
+boot_splash/image="res://assets/env/logo.png"
 config/icon="res://icon.svg"
 
 [autoload]
@@ -26,6 +29,16 @@ quicktime_dodge={
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":32,"echo":false,"script":null)
 ]
 }
+exit={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194305,"key_label":0,"unicode":0,"echo":false,"script":null)
+]
+}
+fullscreen={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194342,"key_label":0,"unicode":0,"echo":false,"script":null)
+]
+}
 
 [layer_names]
 
diff --git a/props/explosion/explosion.tscn b/props/explosion/explosion.tscn
index 8b58989..fefd3a8 100644
--- a/props/explosion/explosion.tscn
+++ b/props/explosion/explosion.tscn
@@ -34,5 +34,6 @@ bus = &"Explosion"
 [node name="light" type="OmniLight3D" parent="."]
 light_color = Color(0.85098, 0.658824, 0.443137, 1)
 light_energy = 8.325
+omni_range = 8.0
 
 [connection signal="timeout" from="Timer" to="." method="queue_free"]
diff --git a/props/explosion/nuke_blast.tscn b/props/explosion/nuke_blast.tscn
index 41851dc..e586810 100644
--- a/props/explosion/nuke_blast.tscn
+++ b/props/explosion/nuke_blast.tscn
@@ -31,7 +31,12 @@ autoplay = true
 bus = &"Explosion"
 
 [node name="light" type="OmniLight3D" parent="."]
-light_color = Color(0.85098, 0.658824, 0.443137, 1)
-light_energy = 8.325
+light_color = Color(0.980392, 0.941176, 0.717647, 1)
+light_energy = 16.0
+light_indirect_energy = 2.0
+light_specular = 2.0
+light_bake_mode = 0
+shadow_enabled = true
+omni_range = 15.0
 
 [connection signal="timeout" from="Timer" to="." method="queue_free"]
diff --git a/props/items/item_bagel.tscn b/props/items/item_bagel.tscn
index 345b727..73b3965 100644
--- a/props/items/item_bagel.tscn
+++ b/props/items/item_bagel.tscn
@@ -15,8 +15,10 @@ contact_monitor = true
 script = ExtResource("1_gkl7e")
 
 [node name="MeshInstance3D" type="MeshInstance3D" parent="."]
+transform = Transform3D(0.8, 0, 0, 0, 0.8, 0, 0, 0, 0.8, 0, 0, 0)
 mesh = ExtResource("2_he4b4")
 surface_material_override/0 = ExtResource("3_44q53")
 
 [node name="CollisionShape3D2" type="CollisionShape3D" parent="."]
+transform = Transform3D(0.8, 0, 0, 0, 0.8, 0, 0, 0, 0.8, 0, 0, 0)
 shape = SubResource("ConvexPolygonShape3D_6wcur")
diff --git a/props/items/item_bloaf.tscn b/props/items/item_bloaf.tscn
index 8d503a6..ebdb6ff 100644
--- a/props/items/item_bloaf.tscn
+++ b/props/items/item_bloaf.tscn
@@ -16,18 +16,18 @@ contact_monitor = true
 script = ExtResource("1_4p15j")
 
 [node name="MeshInstance3D" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.112726, 0, 0.0697789)
+transform = Transform3D(0.593076, 0, 0.593076, 0, 0.838736, 0, -0.593076, 0, 0.593076, 0.092981, -4.80603e-09, -0.0205021)
 material_override = ExtResource("2_lnk4q")
 mesh = ExtResource("2_osfds")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
-transform = Transform3D(0.999586, -0.0287591, -1.2571e-09, 0, -4.37114e-08, 1, -0.0287591, -0.999586, -4.36933e-08, 0.108896, 0, 0.228878)
+transform = Transform3D(0.575774, -0.609887, -2.6659e-08, 0, -3.66623e-08, 0.838736, -0.609887, -0.575774, -2.51679e-08, 0.185067, -4.80603e-09, 0.0761272)
 shape = SubResource("CapsuleShape3D_xfsaa")
 
 [node name="CollisionShape3D2" type="CollisionShape3D" parent="."]
-transform = Transform3D(0.0977739, -0.995209, -4.3502e-08, 1.10976e-16, -4.37114e-08, 1, -0.995209, -0.0977739, -4.27383e-09, -0.247271, -5.96046e-08, -0.168745)
+transform = Transform3D(-0.532247, -0.648222, -2.83347e-08, 0, -3.66623e-08, 0.838736, -0.648222, 0.532247, 2.32653e-08, -0.261987, -5.47986e-08, 0.0515407)
 shape = SubResource("CapsuleShape3D_xfsaa")
 
 [node name="CollisionShape3D3" type="CollisionShape3D" parent="."]
-transform = Transform3D(0.692848, -0.721084, -3.15196e-08, 2.05575e-16, -4.37114e-08, 1, -0.721084, -0.692848, -3.02854e-08, 0.000426196, -5.96046e-08, -0.0443084)
+transform = Transform3D(-0.016746, -0.838569, -3.6655e-08, 0, -3.66623e-08, 0.838736, -0.838569, 0.016746, 7.31993e-10, -0.0412838, -5.47986e-08, -0.0215623)
 shape = SubResource("CapsuleShape3D_xfsaa")
diff --git a/props/items/item_fish.tscn b/props/items/item_fish.tscn
index f0dcfcf..87bd5a9 100644
--- a/props/items/item_fish.tscn
+++ b/props/items/item_fish.tscn
@@ -5,7 +5,7 @@
 [ext_resource type="AudioStream" uid="uid://bmisffsu4isig" path="res://assets/audio/SPLAT_rand.tres" id="3_784hx"]
 [ext_resource type="Material" uid="uid://dj0su71vbjjj0" path="res://assets/props/fishe/mat_fish.tres" id="3_o2b7q"]
 
-[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_bsrte"]
+[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_2g3yi"]
 points = PackedVector3Array(-0.0889626, -3.59267e-05, -0.352568, -0.0832467, 0.05139, -0.340715, -0.0433272, 0.05139, -0.324438, -0.048029, -3.59267e-05, -0.334025, -0.0433272, -0.0514259, -0.324438, -0.0832467, -0.0514259, -0.340715, -0.342862, -3.59267e-05, -0.185632, -0.0876719, 0.068496, -0.295781, -0.066191, 0.068496, -0.305105, -0.0294983, 0.068496, -0.295781, -0.337975, 0.0380573, -0.17046, -0.351436, 0.05139, -0.144069, -0.319998, 0.068496, -0.134481, 0.526424, 0.0376261, -0.0320756, 0.526424, -3.59267e-05, -0.0561494, -0.0294983, -0.068532, -0.295781, 0.526424, -0.037662, -0.0320756, -0.066191, -0.068532, -0.305105, -0.0876719, -0.068532, -0.295781, -0.319998, -0.068532, -0.134481, -0.351436, -0.0514259, -0.144069, -0.337975, -0.0380933, -0.17046, -0.361946, -3.59267e-05, -0.147229, 0.00802422, 0.183566, 0.0437278, -0.372271, -3.59267e-05, -0.0915489, -0.359456, 0.0575352, -0.0895998, 0.526424, 0.0376261, 0.0320334, 0.566159, -3.59267e-05, -0.0320756, 0.00802422, -0.183566, 0.0437278, 0.526424, -0.037662, 0.0320334, -0.359456, -0.0575712, -0.0895998, 0.122989, 0.05139, 0.15019, -0.359456, 0.0575352, 0.0895576, -0.319998, 0.068496, 0.134386, -0.314835, 0.05139, 0.169575, -0.375682, -3.59267e-05, -0.0438228, -0.363513, 0.05139, -0.0438228, 0.49554, 0.0278872, 0.0498385, 0.526424, -3.59267e-05, 0.0561071, 0.566159, -3.59267e-05, 0.0320334, 0.122989, -0.0514259, 0.15019, -0.314835, -0.0514259, 0.169575, -0.319998, -0.068532, 0.134386, -0.359456, -0.0575712, 0.0895576, 0.49554, -0.0279231, 0.0498385, -0.363513, -0.0514259, -0.0438228, 0.117365, -3.59267e-05, 0.159145, 0.159866, -3.59267e-05, 0.15019, -0.342862, -3.59267e-05, 0.185589, -0.363513, 0.05139, 0.0437278, -0.375682, -3.59267e-05, 0.0437278, -0.372271, -3.59267e-05, 0.0915067, -0.351436, 0.05139, 0.143974, -0.337975, 0.0380573, 0.170418, -0.337975, -0.0380933, 0.170418, -0.351436, -0.0514259, 0.143974, -0.363513, -0.0514259, 0.0437278, -0.361946, -3.59267e-05, 0.147187)
 
 [node name="ItemCylinder" type="RigidBody3D"]
@@ -16,13 +16,13 @@ contact_monitor = true
 script = ExtResource("1_pselh")
 
 [node name="MeshInstance3D" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0.00282395, 0, 0)
+transform = Transform3D(0.75, 0, 0, 0, -3.27835e-08, -0.75, 0, 0.75, -3.27835e-08, 0.00282395, 0, 0)
 mesh = ExtResource("2_1m6jf")
 surface_material_override/0 = ExtResource("3_o2b7q")
 
-[node name="CollisionShape3D2" type="CollisionShape3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0.00282395, 0, 0)
-shape = SubResource("ConvexPolygonShape3D_bsrte")
+[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+transform = Transform3D(0.75, 0, 0, 0, -3.27835e-08, -0.75, 0, 0.75, -3.27835e-08, 0.00282395, 0, 0)
+shape = SubResource("ConvexPolygonShape3D_2g3yi")
 
 [node name="sfx_fish" type="AudioStreamPlayer3D" parent="."]
 stream = ExtResource("3_784hx")
diff --git a/props/items/item_metalrod.tscn b/props/items/item_metalrod.tscn
index 7af83ba..5533d5d 100644
--- a/props/items/item_metalrod.tscn
+++ b/props/items/item_metalrod.tscn
@@ -17,18 +17,21 @@ contact_monitor = true
 script = ExtResource("1_780i5")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0866055, 0)
+transform = Transform3D(0.819232, 0.196045, 0, -0.185111, 0.773541, 0.277386, 0.0645567, -0.269769, 0.795381, 0.0547767, 0.0233308, -0.0753758)
 shape = SubResource("CylinderShape3D_eg501")
 
 [node name="MeshInstance3D" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.472212, 0)
+transform = Transform3D(0.819232, 0.196045, 0, -0.185111, 0.773541, 0.277386, 0.0645567, -0.269769, 0.795381, -0.0547767, -0.408937, 0.0753758)
 mesh = ExtResource("2_2xydg")
 surface_material_override/0 = ExtResource("3_ype28")
 
 [node name="metal_rod" type="AudioStreamPlayer3D" parent="."]
 stream = ExtResource("3_dbvmh")
-max_db = -5.0
+attenuation_model = 2
+volume_db = -7.0
+max_db = -7.0
 bus = &"Reverb"
 attenuation_filter_cutoff_hz = 20500.0
+doppler_tracking = 2
 
 [connection signal="collide" from="." to="metal_rod" method="play"]
diff --git a/props/items/item_pizzahut.tscn b/props/items/item_pizzahut.tscn
index cdc7ac6..93713f3 100644
--- a/props/items/item_pizzahut.tscn
+++ b/props/items/item_pizzahut.tscn
@@ -18,12 +18,12 @@ script = ExtResource("1_g6joe")
 explosion = ExtResource("2_52gpd")
 
 [node name="MeshInstance3D" type="MeshInstance3D" parent="."]
-transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 0)
+transform = Transform3D(-3.7215e-08, 0, 0.851379, 0, 0.851379, 0, -0.851379, 0, -3.7215e-08, 0, 0, 0)
 mesh = ExtResource("2_q2nuj")
 surface_material_override/0 = ExtResource("3_a1p7w")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
-transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 0)
+transform = Transform3D(-3.7215e-08, 0, 0.851379, 0, 0.851379, 0, -0.851379, 0, -3.7215e-08, 0, 0, 0)
 shape = SubResource("ConvexPolygonShape3D_k3hgf")
 
 [node name="tacobell" type="AudioStreamPlayer3D" parent="."]
diff --git a/props/items/item_redarrow.tscn b/props/items/item_redarrow.tscn
index df9a889..4575020 100644
--- a/props/items/item_redarrow.tscn
+++ b/props/items/item_redarrow.tscn
@@ -5,12 +5,15 @@
 [ext_resource type="AudioStream" uid="uid://jayxq7lbhlkq" path="res://assets/audio/alarm.wav" id="3_d2li2"]
 
 [sub_resource type="SphereShape3D" id="SphereShape3D_pj2o1"]
-radius = 0.35
+radius = 0.27
 
 [sub_resource type="QuadMesh" id="QuadMesh_1rwqu"]
 
 [node name="ItemCylinder" type="RigidBody3D"]
 collision_layer = 5
+axis_lock_angular_x = true
+axis_lock_angular_y = true
+axis_lock_angular_z = true
 mass = 0.3
 max_contacts_reported = 2
 contact_monitor = true
@@ -28,4 +31,14 @@ surface_material_override/0 = ExtResource("2_qssty")
 stream = ExtResource("3_d2li2")
 max_db = -1.0
 
+[node name="show" type="Timer" parent="."]
+wait_time = 0.1
+autostart = true
+
+[node name="hide" type="Timer" parent="."]
+wait_time = 0.2
+
 [connection signal="touched" from="." to="alarm" method="play"]
+[connection signal="touched" from="." to="hide" method="start"]
+[connection signal="timeout" from="show" to="." method="set_visible" binds= [true]]
+[connection signal="timeout" from="hide" to="." method="set_visible" binds= [false]]
diff --git a/props/items/item_rock.tscn b/props/items/item_rock.tscn
index ed52b20..717c85b 100644
--- a/props/items/item_rock.tscn
+++ b/props/items/item_rock.tscn
@@ -17,9 +17,10 @@ script = ExtResource("1_0qvuu")
 explosion = ExtResource("2_3hltn")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
-transform = Transform3D(0.707107, 0.707107, 0, -0.707107, 0.707107, 0, 0, 0, 1, 0.08345, 0.0185398, -0.0201019)
+transform = Transform3D(0.563933, 0.563933, 0, -0.563933, 0.563933, 0, 0, 0, 0.797522, 0.0750016, 0.0166628, -0.0180668)
 shape = SubResource("BoxShape3D_38mc6")
 
 [node name="MeshInstance3D" type="MeshInstance3D" parent="."]
+transform = Transform3D(0.797522, 0, 0, 0, 0.797522, 0, 0, 0, 0.797522, 0.00844839, 0.00187695, -0.0020351)
 mesh = ExtResource("2_3odon")
 surface_material_override/0 = ExtResource("3_tgia3")
diff --git a/props/items/item_umbrella.tscn b/props/items/item_umbrella.tscn
index 8bb3618..d416f7e 100644
--- a/props/items/item_umbrella.tscn
+++ b/props/items/item_umbrella.tscn
@@ -4,9 +4,9 @@
 [ext_resource type="ArrayMesh" uid="uid://bo0skqtvd28lp" path="res://assets/props/umbrella/umbrella.obj" id="2_4wo8n"]
 [ext_resource type="Material" uid="uid://rdjg70p22dno" path="res://assets/props/umbrella/mat_umbrella.tres" id="3_5ie2h"]
 
-[sub_resource type="CylinderShape3D" id="CylinderShape3D_eg501"]
-height = 0.729558
-radius = 0.0129056
+[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_iimwi"]
+radius = 0.02
+height = 0.73
 
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_u2gao"]
 height = 0.0371674
@@ -23,7 +23,7 @@ script = ExtResource("1_7xjfk")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0788734, 0)
-shape = SubResource("CylinderShape3D_eg501")
+shape = SubResource("CapsuleShape3D_iimwi")
 
 [node name="CollisionShape3D2" type="CollisionShape3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.306674, 0)
diff --git a/props/shelves/shelf.tscn b/props/shelves/shelf.tscn
index a546be8..ff6f7ba 100644
--- a/props/shelves/shelf.tscn
+++ b/props/shelves/shelf.tscn
@@ -11,6 +11,7 @@ mass = 100.0
 
 [node name="Shelves" type="MeshInstance3D" parent="."]
 transform = Transform3D(1.5, 0, 0, 0, 1.5, 0, 0, 0, 1.5, 0, 0, 0)
+gi_mode = 0
 mesh = ExtResource("1_bh5mi")
 surface_material_override/0 = ExtResource("2_2kntf")