alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-23 08:11:33 +11:00
Code Issues Packages Projects Releases Wiki Activity

emit sword hit

Browse source
This commit is contained in:
Corwin 2023-07-25 20:39:06 +01:00
parent b806fa8e66
commit c461b581b5
No known key found for this signature in database
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
examples/the-dungeon-puzzlers-lament/src/game/simulation/entity.rs
View file

@ -151,6 +151,7 @@ impl EntityMap {
let mut can_move = true; let mut can_move = true;
let mut explicit_stay_put = false; let mut explicit_stay_put = false;
let mut fake_out_effect = None;
for (other, resolution) in resolutions { for (other, resolution) in resolutions {
match resolution { match resolution {
@ -161,6 +162,10 @@ impl EntityMap {
} }
MoveAttemptResolution::Kill => { MoveAttemptResolution::Kill => {
hero_has_died |= self.kill_entity(other, &mut animations); hero_has_died |= self.kill_entity(other, &mut animations);
fake_out_effect = self
.map
.get(entity_key)
.and_then(|x| x.kill_sound_effect());
can_move = false; can_move = false;
} }
MoveAttemptResolution::Die => { MoveAttemptResolution::Die => {
@ -266,7 +271,9 @@ impl EntityMap {
.get(entity_key) .get(entity_key)
.and_then(|e| e.fake_out_wall_effect()) .and_then(|e| e.fake_out_wall_effect())
} else { } else {
self.map.get(entity_key).and_then(|e| e.fake_out_effect()) fake_out_effect.or_else(|| {
self.map.get(entity_key).and_then(|e| e.fake_out_effect())
})
}, },
)); ));
} }
@ -579,7 +586,10 @@ impl Entity {
} }
fn kill_sound_effect(&self) -> Option<SoundEffect> { fn kill_sound_effect(&self) -> Option<SoundEffect> {
None match self.holding() {
Some(EntityType::Item(Item::Sword)) => Some(SoundEffect::SwordKill),
_ => None,
}
} }
fn change_effect(&self) -> Option<SoundEffect> { fn change_effect(&self) -> Option<SoundEffect> {