valter/kroz-rs
valter/kroz-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases 4 Wiki Activity

Allow input to fall through flashing messages

Browse source 
This is for parity with the original game
This commit is contained in:
Alex Page 2022-02-03 19:19:00 -05:00
parent 550713aaf8
commit 094d8e8617
2 changed files with 66 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

109
src/input/mod.rs
View file

@ -5,7 +5,7 @@ use crate::resources::{flashing_message::FlashingMessageIntent, *};
mod player; mod player;
pub fn handle_intent(bterm: &mut BTerm, world: &mut World, resources: &mut Resources) { pub fn handle_intent(bterm: &mut BTerm, _world: &mut World, resources: &mut Resources) {
if let Some(key) = bterm.key { if let Some(key) = bterm.key {
if let Some(flashing_message) = &resources.flashing_message { if let Some(flashing_message) = &resources.flashing_message {
if let Some(intent) = &flashing_message.intent { if let Some(intent) = &flashing_message.intent {
@ -25,61 +25,56 @@ pub fn handle_intent(bterm: &mut BTerm, world: &mut World, resources: &mut Resou
} }
pub fn handle(world: &mut World, resources: &mut Resources, bterm: &mut BTerm) { pub fn handle(world: &mut World, resources: &mut Resources, bterm: &mut BTerm) {
if resources.flashing_message.is_some() { if resources.flashing_message.is_some() && bterm.key.is_some() {
if bterm.key.is_some() { handle_intent(bterm, world, resources);
handle_intent(bterm, world, resources); resources.flashing_message = None;
resources.flashing_message = None; }
}
} else { match bterm.key {
match bterm.key { None => {}
None => {} Some(key) => match key {
Some(key) => match key { VirtualKeyCode::Left | VirtualKeyCode::J => {
VirtualKeyCode::Left | VirtualKeyCode::J => { player::try_move(-1, 0, world, resources);
player::try_move(-1, 0, world, resources); }
} VirtualKeyCode::U | VirtualKeyCode::Home => player::try_move(-1, -1, world, resources),
VirtualKeyCode::U | VirtualKeyCode::Home => { VirtualKeyCode::Up | VirtualKeyCode::I => {
player::try_move(-1, -1, world, resources) player::try_move(0, -1, world, resources);
} }
VirtualKeyCode::Up | VirtualKeyCode::I => { VirtualKeyCode::O | VirtualKeyCode::PageUp => player::try_move(1, -1, world, resources),
player::try_move(0, -1, world, resources); VirtualKeyCode::Right | VirtualKeyCode::K => {
} player::try_move(1, 0, world, resources);
VirtualKeyCode::O | VirtualKeyCode::PageUp => { }
player::try_move(1, -1, world, resources) VirtualKeyCode::Comma | VirtualKeyCode::PageDown => {
} player::try_move(1, 1, world, resources)
VirtualKeyCode::Right | VirtualKeyCode::K => { }
player::try_move(1, 0, world, resources); VirtualKeyCode::Down | VirtualKeyCode::M => {
} player::try_move(0, 1, world, resources);
VirtualKeyCode::Comma | VirtualKeyCode::PageDown => { }
player::try_move(1, 1, world, resources) VirtualKeyCode::N | VirtualKeyCode::End => player::try_move(-1, 1, world, resources),
} VirtualKeyCode::W => {
VirtualKeyCode::Down | VirtualKeyCode::M => { player::whip(world, resources);
player::try_move(0, 1, world, resources); }
} VirtualKeyCode::D => {
VirtualKeyCode::N | VirtualKeyCode::End => { resources.show_debug_info = !resources.show_debug_info;
player::try_move(-1, 1, world, resources) }
} VirtualKeyCode::Escape | VirtualKeyCode::Q => {
VirtualKeyCode::W => { resources.flashing_message = Some(FlashingMessage::new(
player::whip(world, resources); " Are you sure you want to quit (Y/N)? ",
} Some(FlashingMessageIntent::Quit),
VirtualKeyCode::D => { ));
resources.show_debug_info = !resources.show_debug_info; }
} VirtualKeyCode::P => {
VirtualKeyCode::Escape | VirtualKeyCode::Q => { resources
resources.flashing_message = Some(FlashingMessage::new( .sound_output
" Are you sure you want to quit (Y/N)? ", .play_sound(resources.sound_effects.pause.clone());
Some(FlashingMessageIntent::Quit), resources.flashing_message =
)); Some(FlashingMessage::from(" Press any key to resume game. "));
} }
VirtualKeyCode::P => { _ => {
resources.flashing_message = resources
Some(FlashingMessage::from(" Press any key to resume game. ")); .sound_output
} .play_sound(resources.sound_effects.bad_key.clone());
_ => { }
resources },
.sound_output
.play_sound(resources.sound_effects.bad_key.clone());
}
},
}
} }
} }

14
src/resources/sound_effects.rs
View file

@ -38,6 +38,7 @@ pub struct SoundEffects {
pub slow_hit: SoundSamples, pub slow_hit: SoundSamples,
pub medium_hit: SoundSamples, pub medium_hit: SoundSamples,
pub fast_hit: SoundSamples, pub fast_hit: SoundSamples,
pub pause: SoundSamples,
rng: RandomNumberGenerator, rng: RandomNumberGenerator,
} }
@ -153,6 +154,19 @@ impl SoundEffects {
duration: Duration::from_millis(25), duration: Duration::from_millis(25),
}], }],
}), }),
pause: sound_output.render_sound_effect(&SoundEffect {
sounds: {
let mut sounds = vec![Sound {
sound_type: SoundType::Tone(500),
duration: Duration::from_millis(100),
}];
sounds.extend((100..=200).rev().step_by(10).map(|x| Sound {
sound_type: SoundType::Tone(x),
duration: Duration::from_millis(20),
}));
sounds
},
}),
rng: RandomNumberGenerator::new(), rng: RandomNumberGenerator::new(),
} }
} }