Reviewed-on: #44 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>
This commit was merged in pull request #44.
This commit is contained in:
@@ -20,6 +20,8 @@ pub enum FighterCommands {
|
||||
Jump,
|
||||
Shield,
|
||||
Attack,
|
||||
SmashMoveUp,
|
||||
SmashMoveDown,
|
||||
SmashMoveLeft,
|
||||
SmashMoveRight,
|
||||
}
|
||||
@@ -60,6 +62,8 @@ impl FighterAttackCommandType {
|
||||
pub struct FighterCommandLifetimes {
|
||||
smash_move_left: u8,
|
||||
smash_move_right: u8,
|
||||
smash_move_down: u8,
|
||||
smash_move_up: u8,
|
||||
jump: u8,
|
||||
shield: u8,
|
||||
attack: u8,
|
||||
@@ -72,6 +76,8 @@ impl Index<FighterCommands> for FighterCommandLifetimes {
|
||||
match command {
|
||||
FighterCommands::SmashMoveLeft => &self.smash_move_left,
|
||||
FighterCommands::SmashMoveRight => &self.smash_move_right,
|
||||
FighterCommands::SmashMoveDown => &self.smash_move_down,
|
||||
FighterCommands::SmashMoveUp => &self.smash_move_up,
|
||||
FighterCommands::Jump => &self.jump,
|
||||
FighterCommands::Shield => &self.shield,
|
||||
FighterCommands::Attack => &self.attack,
|
||||
@@ -84,6 +90,8 @@ impl IndexMut<FighterCommands> for FighterCommandLifetimes {
|
||||
match command {
|
||||
FighterCommands::SmashMoveLeft => &mut self.smash_move_left,
|
||||
FighterCommands::SmashMoveRight => &mut self.smash_move_right,
|
||||
FighterCommands::SmashMoveDown => &mut self.smash_move_down,
|
||||
FighterCommands::SmashMoveUp => &mut self.smash_move_up,
|
||||
FighterCommands::Jump => &mut self.jump,
|
||||
FighterCommands::Shield => &mut self.shield,
|
||||
FighterCommands::Attack => &mut self.attack,
|
||||
@@ -221,6 +229,19 @@ pub fn postprocess_input(
|
||||
let mut x_flick_detected =
|
||||
x_abs >= axis_threshold && input.frames_in_x_flick_deadzone <= frame_threshold;
|
||||
|
||||
if y_flick_detected {
|
||||
input.clear_command(FighterCommands::SmashMoveUp);
|
||||
input.clear_command(FighterCommands::SmashMoveDown);
|
||||
|
||||
let command_to_set = if input.current_frame.movement.y > 0.0 {
|
||||
FighterCommands::SmashMoveUp
|
||||
} else {
|
||||
FighterCommands::SmashMoveDown
|
||||
};
|
||||
|
||||
input.set_lifetime(command_to_set, game_settings.input_common.input_buffer_size);
|
||||
}
|
||||
|
||||
// if both flicks are detected, only one wins
|
||||
|
||||
if x_flick_detected && y_flick_detected {
|
||||
|
||||
Reference in New Issue
Block a user