Made crates able to be stood on, fixed player character collision issues but now the character seems small..?

noticed bugs: killing an enemy as you die crashes the game, ear wind needs to be inaudible when standing still, recoil camera still sucks
This commit is contained in:
Derek
2024-10-05 00:36:55 -05:00
parent e0c0687c4f
commit 21b82f3d5c
4 changed files with 12 additions and 16 deletions

View File

@@ -355,7 +355,7 @@ transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 5.16314, 0.0475518, -4.92484)
jump_amount = 30 jump_amount = 30
[node name="Player" parent="." instance=ExtResource("9_3usor")] [node name="Player" parent="." instance=ExtResource("9_3usor")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.239871, 0.713594, 15.0454) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.239871, 1.58906, 15.0454)
[node name="vendingmachine" parent="." instance=ExtResource("10_8qgs0")] [node name="vendingmachine" parent="." instance=ExtResource("10_8qgs0")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.42198, 0.0803966, 8.69362) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.42198, 0.0803966, 8.69362)

View File

@@ -49,7 +49,7 @@ shadow_mesh = SubResource("ArrayMesh_1l8qq")
size = Vector3(2.20142, 2.09351, 2.20142) size = Vector3(2.20142, 2.09351, 2.20142)
[node name="Crate1" type="RigidBody3D" groups=["scene_rigidbody"]] [node name="Crate1" type="RigidBody3D" groups=["scene_rigidbody"]]
collision_layer = 32 collision_layer = 33
collision_mask = 125 collision_mask = 125
[node name="Crate1" type="MeshInstance3D" parent="."] [node name="Crate1" type="MeshInstance3D" parent="."]

View File

@@ -41,9 +41,8 @@ radius = 7.0
[node name="Player" type="CharacterBody3D" node_paths=PackedStringArray("weapon_holder") groups=["player"]] [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, 0, 0, 1, 0, 0, 0, 1, 0, 1.11359, 0)
collision_layer = 14 collision_layer = 11
collision_mask = 11 collision_mask = 11
safe_margin = 0.5
script = ExtResource("1_x7wms") script = ExtResource("1_x7wms")
dead_player = ExtResource("2_4hoys") dead_player = ExtResource("2_4hoys")
SENSITIVITY = 0.008 SENSITIVITY = 0.008
@@ -64,7 +63,7 @@ mesh = SubResource("CapsuleMesh_n7uf3")
shape = SubResource("CapsuleShape3D_ko22d") shape = SubResource("CapsuleShape3D_ko22d")
[node name="Head" type="Node3D" parent="."] [node name="Head" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.894364, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.889, 0)
[node name="ItemHolder" type="Node3D" parent="Head"] [node name="ItemHolder" type="Node3D" parent="Head"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.25, -0.85, -1.501) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.25, -0.85, -1.501)
@@ -183,6 +182,7 @@ volume_db = -5.0
[node name="EarWind" type="AudioStreamPlayer" parent="Audio"] [node name="EarWind" type="AudioStreamPlayer" parent="Audio"]
stream = ExtResource("11_he7p5") stream = ExtResource("11_he7p5")
autoplay = true
[node name="Hurt" type="AudioStreamPlayer" parent="Audio"] [node name="Hurt" type="AudioStreamPlayer" parent="Audio"]
stream = ExtResource("12_f51u4") stream = ExtResource("12_f51u4")

View File

@@ -130,14 +130,13 @@ func _physics_process(delta):
if !dead: if !dead:
# Add the gravity. # Add the gravity.
if not is_on_floor(): if is_on_floor():
velocity.y -= gravity * delta
if velocity.y >= .1:
moving_fast = true
else:
ear_wind.stop()
double_jump = true double_jump = true
air_dash = MAX_AIR_DASH air_dash = MAX_AIR_DASH
else:
velocity.y -= gravity * delta
if abs(velocity.y) >= .1:
moving_fast = true
# Handle jump. # Handle jump.
if Input.is_action_just_pressed("jump") and is_on_floor() and !is_climbing: if Input.is_action_just_pressed("jump") and is_on_floor() and !is_climbing:
@@ -194,12 +193,10 @@ func _physics_process(delta):
health_indicator.color = lerp(Color(0.471, 0, 0, 0), Color(0.471, 0, 0, .25),health_opacity) health_indicator.color = lerp(Color(0.471, 0, 0, 0), Color(0.471, 0, 0, .25),health_opacity)
# Moving Fast Sound # Moving Fast Sound
#initiate fast movement #initiate fast movement -- may be done with this block
if velocity.y >= (JUMP_VELOCITY * 1.1) and !is_climbing:
ear_wind.play()
#change sounds with speed #change sounds with speed
if moving_fast: if moving_fast:
var wind_volume = clamp( velocity.length() - 20 ,-20,0) var wind_volume = clamp( velocity.length() - 20 ,-20,10)
ear_wind.volume_db = wind_volume ear_wind.volume_db = wind_volume
#reset at apex #reset at apex
@@ -213,7 +210,6 @@ func _physics_process(delta):
var land_volume = clamp( moving_fast_top_speed - 20 ,-10,0) var land_volume = clamp( moving_fast_top_speed - 20 ,-10,0)
land_sound.volume_db = land_volume land_sound.volume_db = land_volume
land_sound.play() land_sound.play()
ear_wind.stop()
moving_fast_top_speed = 0.0 moving_fast_top_speed = 0.0
moving_fast = false moving_fast = false