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:
@@ -2,16 +2,10 @@ use bevy::prelude::*;
|
||||
|
||||
use crate::{
|
||||
fighter::{
|
||||
animation::AnimKind,
|
||||
state::{
|
||||
CollisionContext, EnterContext, FighterState, FighterStateImpl, InterruptContext,
|
||||
UpdateContext, air,
|
||||
air_dodge::{self, AirDodgeState},
|
||||
ground::{self, GroundedStateCommon},
|
||||
animation::AnimKind, state::{
|
||||
CollisionContext, EnterContext, FighterState, FighterStateImpl, InterruptContext, UpdateContext, air::{self, AirborneStateCommon}, air_dodge::{self, AirDodgeState}, ground::{self, GroundedStateCommon},
|
||||
},
|
||||
},
|
||||
input::FighterCommands,
|
||||
math::{int::FGi32, vec::FGVec2},
|
||||
}, input::FighterCommands, math::{int::FGi32, vec::FGVec2},
|
||||
};
|
||||
#[derive(Debug, Hash, Clone, Copy)]
|
||||
pub enum JumpType {
|
||||
@@ -23,6 +17,7 @@ pub enum JumpType {
|
||||
#[derive(Debug, Clone, Hash)]
|
||||
pub struct JumpState {
|
||||
jump_type: JumpType,
|
||||
airborne_state_common: AirborneStateCommon,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Hash)]
|
||||
@@ -74,7 +69,7 @@ impl FighterStateImpl for JumpSquatState {
|
||||
} else {
|
||||
JumpType::ShortHop
|
||||
};
|
||||
Some(FighterState::Jump(JumpState { jump_type }))
|
||||
Some(FighterState::Jump(JumpState { jump_type, airborne_state_common: AirborneStateCommon::default() }))
|
||||
} else {
|
||||
None
|
||||
}
|
||||
@@ -110,6 +105,7 @@ impl FighterStateImpl for JumpState {
|
||||
if state_context.input.has_command(FighterCommands::Jump) {
|
||||
Some(FighterState::Jump(JumpState {
|
||||
jump_type: JumpType::DoubleJump,
|
||||
airborne_state_common: AirborneStateCommon::default()
|
||||
}))
|
||||
} else {
|
||||
air_dodge::check_input(state_context)
|
||||
@@ -117,7 +113,7 @@ impl FighterStateImpl for JumpState {
|
||||
}
|
||||
|
||||
fn update(&mut self, state_context: &mut UpdateContext) {
|
||||
air::update_standard_motion(state_context);
|
||||
air::update_standard_motion(state_context, &mut self.airborne_state_common);
|
||||
}
|
||||
|
||||
fn on_enter(&mut self, state_context: &mut EnterContext) {
|
||||
@@ -205,6 +201,7 @@ pub fn check_input_double_jump(state_context: &InterruptContext) -> Option<Fight
|
||||
.then(|| {
|
||||
FighterState::Jump(JumpState {
|
||||
jump_type: JumpType::DoubleJump,
|
||||
airborne_state_common: AirborneStateCommon::default()
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user