Implement NAir and initial work on aerials
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
use super::{CollisionContext, EnterContext, FighterStateImpl, InterruptContext, UpdateContext};
|
||||
use crate::fighter::animation::AnimKind;
|
||||
use crate::fighter::state::air::AirborneStateCommon;
|
||||
use crate::fighter::state::{FighterState, air, jump};
|
||||
use crate::fighter::state::{FighterState, air, air_attack, jump};
|
||||
|
||||
#[derive(Debug, Clone, Copy, Hash, Default)]
|
||||
pub struct FallState {
|
||||
@@ -20,7 +20,7 @@ impl FighterStateImpl for FallState {
|
||||
const NAME: &'static str = "Fall";
|
||||
|
||||
fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
|
||||
jump::check_input_double_jump(state_context)
|
||||
jump::check_input_double_jump(state_context).or_else(|| air_attack::check_interrupt(state_context, &self.airborne_state_common))
|
||||
}
|
||||
|
||||
fn on_enter(&mut self, state_context: &mut EnterContext) {
|
||||
|
||||
Reference in New Issue
Block a user