tweaks to crouch etc

This commit is contained in:
Derek
2024-12-05 23:12:48 -06:00
parent 5d9bac5292
commit d0b247d2c0
11 changed files with 92 additions and 43 deletions

View File

@@ -13,7 +13,7 @@ dest_files=["res://.godot/imported/footsteps-tennis-shoes-walk-1.wav-fce690a551b
[params]
force/8_bit=false
force/mono=false
force/mono=true
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false

View File

@@ -1269,7 +1269,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.100218, 24.4327, 46.4567)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.100218, 28.3013, 46.4567)
[node name="LadderCollisionCheck2" parent="." instance=ExtResource("14_gijx0")]
transform = Transform3D(1, 0, 0, 0, 1.88048, 0, 0, 0, 1, -0.0459655, 17.4816, 46.7744)
transform = Transform3D(1, 0, 0, 0, 1.88048, 0, 0, 0, 0.180683, -0.0459655, 17.4816, 46.5358)
[node name="pistol1_pickup" parent="." instance=ExtResource("17_buv6l")]
transform = Transform3D(0.558498, -0.829506, 0, 0.829506, 0.558498, 0, 0, 0, 1, 35.2023, 17.3708, 122.41)

View File

@@ -21,7 +21,7 @@ stream_3/stream = ExtResource("6_qbbeb")
[node name="casing" type="RigidBody3D" groups=["scene_rigidbody", "spawned"]]
collision_layer = 0
collision_mask = 165
collision_mask = 37
mass = 0.1
continuous_cd = true
contact_monitor = true
@@ -44,6 +44,7 @@ autostart = true
[node name="DropSound" type="AudioStreamPlayer3D" parent="."]
stream = SubResource("AudioStreamRandomizer_kdfna")
volume_db = -2.0
unit_size = 1.0
bus = &"SFX"

File diff suppressed because one or more lines are too long

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=30 format=3 uid="uid://drwae3loscbw7"]
[gd_scene load_steps=33 format=3 uid="uid://drwae3loscbw7"]
[ext_resource type="Script" path="res://scripts/player.gd" id="1_x7wms"]
[ext_resource type="Script" path="res://scripts/recoil.gd" id="3_405jc"]
@@ -21,6 +21,7 @@
[ext_resource type="AudioStream" uid="uid://dqj4cx05f25jj" path="res://assets/Audio/punch-body-hard-SBA-300156881.wav" id="19_6jglu"]
[ext_resource type="AudioStream" uid="uid://n3e7s3xucsi1" path="res://assets/Audio/Foley Inventory and Interactions/Foley Inventory and Interactions/Drop Item/Drop Jewelery B.wav" id="20_rvr83"]
[ext_resource type="AudioStream" uid="uid://ig4e5tgbh87m" path="res://assets/Audio/Player Character SFX/footsteps-tennis-shoes-walk-1.wav" id="21_fsjho"]
[ext_resource type="AudioStream" uid="uid://c7bwilypn74lc" path="res://assets/Audio/Foley Sports/Hockey/Ball Hit Leg.wav" id="22_c88rq"]
[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_l5ga0"]
blend_mode = 1
@@ -31,6 +32,10 @@ blend_mode = 1
radius = 0.509802
height = 2.03547
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_rw673"]
radius = 0.509802
height = 1.19106
[sub_resource type="LabelSettings" id="LabelSettings_n0odj"]
font = ExtResource("3_mbuvp")
font_size = 115
@@ -72,8 +77,13 @@ random_pitch = 2.0
streams_count = 1
stream_0/stream = ExtResource("21_fsjho")
[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_u5cxn"]
random_pitch = 1.1
streams_count = 1
stream_0/stream = ExtResource("22_c88rq")
[node name="Player" type="CharacterBody3D" node_paths=PackedStringArray("weapon_holder") groups=["player"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.11359, 0)
transform = Transform3D(1, 0.000164476, 0.000583754, -0.000165075, 0.999999, 0.00104027, -0.000583585, -0.00104036, 0.999999, 0, 1.11359, 0)
collision_layer = 6
collision_mask = 11
script = ExtResource("1_x7wms")
@@ -90,9 +100,17 @@ color = Color(0.470588, 0, 0, 0)
visible = false
mesh = SubResource("CapsuleMesh_n7uf3")
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
[node name="StandingCollision" type="CollisionShape3D" parent="."]
shape = SubResource("CapsuleShape3D_ko22d")
[node name="CrouchingCollision" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.421329, 0)
shape = SubResource("CapsuleShape3D_rw673")
[node name="CrouchCheck" type="RayCast3D" parent="CrouchingCollision"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.589976, 0)
target_position = Vector3(0, 0.9, 0)
[node name="Head" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.889, 0)
@@ -257,6 +275,11 @@ pitch_scale = 1.5
[node name="FootstepSound" type="AudioStreamPlayer3D" parent="Audio"]
stream = SubResource("AudioStreamRandomizer_pxyjg")
volume_db = 6.0
[node name="HitHead" type="AudioStreamPlayer3D" parent="Audio"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.42626, 0)
stream = SubResource("AudioStreamRandomizer_u5cxn")
[connection signal="tree_entered" from="." to="." method="_on_tree_entered"]
[connection signal="body_entered" from="pick_up_detection" to="." method="_on_pick_up_detection_body_entered"]