~talya/tahetriiv

kina gaaaaminggggggg ·
👀
 rust
👀
 bevy
r/o

03cbca54608f8f7c157aeb71e9b2dd0953e5de91 parent 99efc5be

tree view
authored by Asherah Connor <ashe@kivikakk.ee> 6 months ago
committed by Asherah Connor <ashe@kivikakk.ee> 6 months ago

ow!

assets/{ship-damage.mp3 => ship_damage.mp3} | Bin 11933 -> 11933 bytes
src/main.rs | 2 ++
src/sound.rs | 2 +-
4 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/assets/ship-damage.mp3 b/assets/ship_damage.mp3
similarity index 100%
rename from assets/ship-damage.mp3
rename to assets/ship_damage.mp3
Binary files a/assets/ship-damage.mp3 and b/assets/ship_damage.mp3 differ
diff --git a/assets/ship-damage.ogg b/assets/ship_damage.ogg
similarity index 100%
rename from assets/ship-damage.ogg
rename to assets/ship_damage.ogg
Binary files a/assets/ship-damage.ogg and b/assets/ship_damage.ogg differ
diff --git a/src/main.rs b/src/main.rs
index 5b70938..4cf488e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -135,6 +135,7 @@ fn check_collisions(
player_bullet_query: Query<(&player::PlayerBullet, Entity, &Transform)>,
mut player_query: Query<(&player::Player, &Transform, &mut Health)>,
enemy_query: Query<(Entity, &Transform), With<Enemy>>,
+ mut sound_events: EventWriter<sound::SoundEvent>,
) {
for (player_bullet, player_bullet_entity, player_bullet_transform) in &player_bullet_query {
for (enemy_entity, enemy_transform) in &enemy_query {
@@ -160,6 +161,7 @@ fn check_collisions(
{
commands.entity(player_bullet_entity).despawn();
other_player_health.current -= player_bullet.damage;
+ sound_events.write(sound::SoundEvent(sound::SoundKind::ShipDamage));
}
}
}
diff --git a/src/sound.rs b/src/sound.rs
index d9b9337..e0bee73 100644
--- a/src/sound.rs
+++ b/src/sound.rs
@@ -4,7 +4,7 @@ use itertools::Itertools;
#[derive(Event, Hash, PartialEq, Eq)]
pub(crate) struct SoundEvent(pub(crate) SoundKind);
-#[derive(Hash, PartialEq, Eq, Copy, Clone)]
+#[derive(Hash, PartialEq, Eq, Copy, Clone, Debug)]
pub(crate) enum SoundKind {
Tahetriiv,
PlayerFire,