Proyecto-Titulo
/
alai
2
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Merge pull request 'develop' (#38) from develop into master 

Reviewed-on: #38
This commit is contained in:
Chris Cromer 2022-08-28 20:47:38 -04:00
parent f8cc1548e6 e5d92c8267
commit e972ed4c99
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
godot/characters/player/Player.tscn
View File

@ -52,3 +52,4 @@ collision_mask = 24
[node name="Jump" type="AudioStreamPlayer" parent="Sounds"]
stream = ExtResource( 8 )
volume_db = -45.0

1
godot/levels/Level2.tscn
View File

@ -45,4 +45,5 @@ script = ExtResource( 1 )
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
pause_mode = 2
stream = ExtResource( 5 )
volume_db = -35.0
script = ExtResource( 6 )

3
src/player/Player.cpp
View File

@ -2,6 +2,7 @@
#include "Event.h"
#include <AudioStreamPlayer.hpp>
#include <Camera2D.hpp>
#include <KinematicCollision2D.hpp>
#include <RayCast2D.hpp>
@ -129,6 +130,8 @@ void alai::player::Player::_physics_process(float delta)
WARN_PRINT("Enemies not found!");
dup->queue_free();
}*/
auto jump_sound = get_parent()->get_node<godot::AudioStreamPlayer>("Sounds/Jump");
jump_sound->play();
velocity.y = -get_bounce_force();
}
else if (collider->is_in_group("enemy") && (collider->is_in_group("rideable") && godot::Vector2::DOWN.dot(collision->get_normal()) > 0))