teascade/skullball
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move local hit sound from kill to take_damage

Browse Source
This commit is contained in:
Sofia 2026-07-28 21:16:05 +03:00
parent 927a904c72
commit bea1b29bc7
4 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rust/src/game_manager.rs
View File

@ -1125,14 +1125,6 @@ impl Game {
.record_event(ReplayEvent::Death(source, player_id)); .record_event(ReplayEvent::Death(source, player_id));
} }
if let DamageSource::Player(source_player_id) = source
&& let Some(player) = self.find_player(source_player_id)
&& let Some(character) = player.character.clone()
&& let Ok(mut local_player) = character.try_cast::<LocalPlayer>()
{
local_player.bind_mut().play_local_hit_sound();
}
let total_prev_kills: u16 = self.players.iter().map(|p| p.data.kills).sum(); let total_prev_kills: u16 = self.players.iter().map(|p| p.data.kills).sum();
if let Some(chat) = &mut Chat::singleton() { if let Some(chat) = &mut Chat::singleton() {
@ -1221,6 +1213,14 @@ impl Game {
.record_event(ReplayEvent::TakeDamage(player_id, source, damage)); .record_event(ReplayEvent::TakeDamage(player_id, source, damage));
} }
if let DamageSource::Player(source_player_id) = source
&& let Some(player) = self.find_player(source_player_id)
&& let Some(character) = player.character.clone()
&& let Ok(mut local_player) = character.try_cast::<LocalPlayer>()
{
local_player.bind_mut().play_local_hit_sound();
}
if let Some(player) = self.find_player_mut(player_id) { if let Some(player) = self.find_player_mut(player_id) {
if let Some(character) = &mut player.character { if let Some(character) = &mut player.character {
character.dyn_bind_mut().take_damage(source, damage, false); character.dyn_bind_mut().take_damage(source, damage, false);
@ -1248,6 +1248,14 @@ impl Game {
)); ));
} }
if let DamageSource::Player(source_player_id) = source
&& let Some(player) = self.find_player(source_player_id)
&& let Some(character) = player.character.clone()
&& let Ok(mut local_player) = character.try_cast::<LocalPlayer>()
{
local_player.bind_mut().play_local_hit_sound();
}
if let Some(peer) = &mut NetworkManager::singleton().bind_mut().peer { if let Some(peer) = &mut NetworkManager::singleton().bind_mut().peer {
if let PeerKind::Server(peer, _) = peer { if let PeerKind::Server(peer, _) = peer {
peer.broadcast_reliable(TakeDamage(source, target_player_id, damage)); peer.broadcast_reliable(TakeDamage(source, target_player_id, damage));

6
rust/src/player/effects.rs
View File

@ -37,6 +37,12 @@ impl PlayerEffects {
} }
} }
pub fn hit(&mut self) {
if let Some(sfx) = &mut self.hit_sound {
sfx.play();
}
}
pub fn walk(&mut self) { pub fn walk(&mut self) {
if self.walk_sfx_cd_remaining > 0. { if self.walk_sfx_cd_remaining > 0. {
return; return;

4
rust/src/player/local_player.rs
View File

@ -238,6 +238,10 @@ impl IPlayer for LocalPlayer {
s.health -= damage; s.health -= damage;
if kill && s.health <= 0 { if kill && s.health <= 0 {
s.kill(source); s.kill(source);
} else {
if let Some(effects) = &mut s.effects {
effects.bind_mut().hit();
}
} }
} }
}); });

4
rust/src/player/remote_player.rs
View File

@ -180,6 +180,10 @@ impl IPlayer for RemotePlayer {
s.health -= damage; s.health -= damage;
if kill && s.health <= 0 { if kill && s.health <= 0 {
s.kill(source); s.kill(source);
} else {
if let Some(effects) = &mut s.effects {
effects.bind_mut().hit();
}
} }
} }
s.update_health_bar(); s.update_health_bar();