Revert "minor tweaks"

This reverts commit 574e261fa2.

assets/Models/money_pickup.blend.import

@@ -1,50 +0,0 @@
-[remap]
-
-importer="scene"
-importer_version=1
-type="PackedScene"
-uid="uid://bvhgdvk2s5kfm"
-path="res://.godot/imported/money_pickup.blend-d502a76026c00143e053f5666583717e.scn"
-
-[deps]
-
-source_file="res://assets/Models/money_pickup.blend"
-dest_files=["res://.godot/imported/money_pickup.blend-d502a76026c00143e053f5666583717e.scn"]
-
-[params]
-
-nodes/root_type=""
-nodes/root_name=""
-nodes/apply_root_scale=true
-nodes/root_scale=1.0
-meshes/ensure_tangents=true
-meshes/generate_lods=true
-meshes/create_shadow_meshes=true
-meshes/light_baking=1
-meshes/lightmap_texel_size=0.2
-meshes/force_disable_compression=false
-skins/use_named_skins=true
-animation/import=true
-animation/fps=30
-animation/trimming=false
-animation/remove_immutable_tracks=true
-import_script/path=""
-_subresources={}
-gltf/naming_version=1
-gltf/embedded_image_handling=1
-blender/nodes/visible=0
-blender/nodes/punctual_lights=true
-blender/nodes/cameras=true
-blender/nodes/custom_properties=true
-blender/nodes/modifiers=1
-blender/meshes/colors=false
-blender/meshes/uvs=true
-blender/meshes/normals=true
-blender/meshes/tangents=true
-blender/meshes/skins=2
-blender/meshes/export_bones_deforming_mesh_only=false
-blender/materials/unpack_enabled=true
-blender/materials/export_materials=1
-blender/animation/limit_playback=true
-blender/animation/always_sample=true
-blender/animation/group_tracks=true

assets/boombox_broken.tscn

@@ -1,6 +1,5 @@
-[gd_scene load_steps=47 format=3 uid="uid://ccnnxudjaptb4"]
+[gd_scene load_steps=46 format=3 uid="uid://ccnnxudjaptb4"]
 
-[ext_resource type="Script" path="res://scripts/broken_object_spawn.gd" id="1_b554y"]
 [ext_resource type="AudioStream" uid="uid://cpno72fej708i" path="res://assets/Audio/electric-chair-2-SBA-300021018.wav" id="1_ct6g4"]
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_6ce8u"]
@@ -556,14 +555,7 @@ shadow_mesh = SubResource("ArrayMesh_5m3do")
 [sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_hp35l"]
 points = PackedVector3Array(0.0232605, 0.0442351, -0.010081, 0.011892, 0.0439651, -0.00243215, 0.0114977, 0.0270315, 0.0347546, 0.24038, -0.00987622, -0.0269458, 0.0505976, 0.0390113, -0.0156751, -0.0846419, 0.0442351, -0.010081, -0.0838205, 0.0439651, -0.00243215, 0.0227348, 0.0214347, 0.0399813, -0.0818819, 0.0270315, 0.0347546, 0.240018, -0.0268257, 0.0102334, -0.0763619, -0.0197363, -0.0314377, 0.230194, -0.00453337, -0.032285, 0.205485, 0.00250841, -0.0322925, 0.0500061, 0.0137895, 0.0397113, 0.20496, -0.0227292, 0.0230864, -0.0763619, -0.00627198, -0.0362969, -0.0859233, 0.0390113, -0.0156751, -0.0941047, -0.00627198, -0.0362969, -0.0951561, -0.0140759, -0.0366268, -0.0820462, 0.0214347, 0.0399813, 0.229701, -0.0273417, 0.0177622, -0.0763619, -0.0368683, 0.0134279, -0.0763619, -0.0366699, 0.00574908, -0.0763619, -0.0140759, -0.0366268, -0.0952876, -0.0197363, -0.0314377, -0.0830647, 0.0137895, 0.0397113, -0.0763619, -0.0314937, 0.019097, -0.0933819, -0.0366699, 0.00574908, -0.0925276, -0.0368683, 0.0134279, -0.0912133, -0.0314937, 0.019097)
 
-[node name="Boombox_broken" type="Node3D" node_paths=PackedStringArray("timer", "sound")]
-script = ExtResource("1_b554y")
-timer = NodePath("Timer")
-sound = NodePath("BrokenSound")
-pitch_scale_amt = 0.2
-
-[node name="Timer" type="Timer" parent="."]
-wait_time = 60.0
+[node name="Boombox_broken" type="Node3D"]
 
 [node name="part1" type="RigidBody3D" parent="."]
 collision_layer = 2
@@ -749,5 +741,4 @@ shape = SubResource("ConvexPolygonShape3D_hp35l")
 
 [node name="BrokenSound" type="AudioStreamPlayer3D" parent="."]
 stream = ExtResource("1_ct6g4")
-volume_db = -7.0
 autoplay = true

assets/mac_10.tscn

@@ -394,7 +394,6 @@ _data = {
 [node name="mac10" node_paths=PackedStringArray("flare_light", "anim_player", "barrel_raycast", "casing_ejector", "mag_ejector", "audio_fire", "audio_empty", "audio_reload") instance=ExtResource("1_nb4p5")]
 script = ExtResource("2_6i1l4")
 gun_name = "Mac 10"
-recoil_amount = 0.4
 max_ammo = 30
 bullet_drop = 0.05
 random_spread_amt = 0.3

assets/revolver_1.tscn

@@ -128,7 +128,7 @@ tracks/1/keys = {
 
 [sub_resource type="Animation" id="Animation_21rul"]
 resource_name = "inspect"
-length = 4.0
+length = 3.0
 step = 0.01
 tracks/0/type = "value"
 tracks/0/imported = false
@@ -137,10 +137,10 @@ tracks/0/path = NodePath("revolver1:position")
 tracks/0/interp = 2
 tracks/0/loop_wrap = true
 tracks/0/keys = {
-"times": PackedFloat32Array(0, 0.51, 1.25, 1.66, 2.19, 2.69, 3.99),
+"times": PackedFloat32Array(0, 0.51, 0.99, 1.4, 1.9, 2.4, 3),
 "transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1),
 "update": 0,
-"values": [Vector3(0, 0, -0.073), Vector3(-0.574, 0.208, 0.2), Vector3(-0.574, 0.366, 0.2), Vector3(-0.573651, 0.302831, -0.190018), Vector3(-0.386, 0.303, 0.4), Vector3(-0.386, 0.303, 0.4), Vector3(0, 0, -0.073)]
+"values": [Vector3(0, 0, -0.073), Vector3(-0.574, 0.208, 0.4), Vector3(-0.574, 0.366, 0.4), Vector3(-0.573651, 0.302831, -0.190018), Vector3(-0.386, 0.303, 0.4), Vector3(-0.386, 0.303, 0.4), Vector3(0, 0, -0.073)]
 }
 tracks/1/type = "value"
 tracks/1/imported = false
@@ -149,7 +149,7 @@ tracks/1/path = NodePath("revolver1:rotation")
 tracks/1/interp = 2
 tracks/1/loop_wrap = true
 tracks/1/keys = {
-"times": PackedFloat32Array(0, 0.51, 1.25, 1.66, 2.19, 2.69, 3.99),
+"times": PackedFloat32Array(0, 0.51, 0.99, 1.4, 1.9, 2.4, 3),
 "transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1),
 "update": 0,
 "values": [Vector3(0, 0, -1.5708), Vector3(0.14619, 0.995226, -2.05295), Vector3(0.14619, 0.812874, -2.05295), Vector3(0.14619, 1.0641, -2.05295), Vector3(0.54766, -0.269512, -0.540009), Vector3(0.54766, -0.269512, -0.540009), Vector3(0, 0, -1.5708)]
@@ -161,7 +161,7 @@ tracks/2/path = NodePath("revolver1/Chamber:position")
 tracks/2/interp = 1
 tracks/2/loop_wrap = true
 tracks/2/keys = {
-"times": PackedFloat32Array(0.24, 0.45, 2.95, 3.13),
+"times": PackedFloat32Array(0.24, 0.45, 2.66, 2.84),
 "transitions": PackedFloat32Array(1, 1, 1, 1),
 "update": 0,
 "values": [Vector3(-0.0143475, 0, -0.0849619), Vector3(-0.014, -0.3, -0.085), Vector3(-0.014, -0.3, -0.085), Vector3(-0.0143475, 0, -0.0849619)]

scenes/test_level_2v2.tscn

@@ -653,19 +653,19 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.7227, 43.775, -30.187)
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3, 44, 28)
 
 [node name="bottle1" parent="." instance=ExtResource("15_3iv0j")]
-transform = Transform3D(0.440644, 0, 0.897682, 0, 1, 0, -0.897682, 0, 0.440644, -4.88146, 0.608878, 12.1473)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.88146, 0.608878, 12.1473)
 
 [node name="bottle2" parent="." instance=ExtResource("15_3iv0j")]
-transform = Transform3D(-0.23036, 0.000708596, -0.973105, -0.000390637, 1, 0.000820648, 0.973105, 0.000569168, -0.23036, -4.36049, 0.608878, 12.1525)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.36049, 0.608878, 12.1525)
 
 [node name="bottle3" parent="." instance=ExtResource("15_3iv0j")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.64453, 0.608878, 11.7534)
 
 [node name="bottle4" parent="." instance=ExtResource("15_3iv0j")]
-transform = Transform3D(0.14724, 0, 0.989101, 0, 1, 0, -0.989101, 0, 0.14724, -4.60098, 1.79509, 12.0165)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.60098, 1.79509, 12.0165)
 
 [node name="bottle5" parent="." instance=ExtResource("15_3iv0j")]
-transform = Transform3D(-0.219676, 0, -0.975573, 0, 1, 0, 0.975573, 0, -0.219676, -3.60763, 1.16757, 11.4412)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.60763, 1.16757, 11.4412)
 
 [node name="bottle6" parent="." instance=ExtResource("15_3iv0j")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.69462, 1.16757, 11.2398)

scripts/bullet.gd

@@ -39,7 +39,7 @@ func _process(delta):
 	position += transform.basis * Vector3(0, 0, -bullet_speed) * delta
 	rotation.x = clamp(rotation.x - delta * bullet_drop,deg_to_rad(-90),deg_to_rad(90))
 	
-	await get_tree().create_timer(.02 * (bullet_speed/150)).timeout
+	await get_tree().create_timer(.02 * Engine.time_scale * (150/bullet_speed)).timeout
 	visible = true