Reviewed-on: #30 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>
This commit was merged in pull request #30.
This commit is contained in:
@@ -2,9 +2,9 @@ use crate::{
|
||||
fighter::{
|
||||
animation::AnimKind,
|
||||
attack::FighterHitReaction,
|
||||
collision,
|
||||
state::{
|
||||
FighterState, FighterStateContext, FighterStateImpl, air,
|
||||
CollisionContext, EnterContext, ExitContext, FighterState, FighterStateImpl,
|
||||
InterruptContext, UpdateContext, air,
|
||||
fall::FallState,
|
||||
ground::{GroundedMotionResult, GroundedStateCommon, collide_with_stage_grounded},
|
||||
land::{LandingState, LandingType},
|
||||
@@ -43,7 +43,7 @@ impl FighterStateImpl for HitstunState {
|
||||
format!("Hitstun ({hitstop_kind}, {hit_reaction_type})")
|
||||
}
|
||||
|
||||
fn check_interrupt(&self, state_context: &mut FighterStateContext) -> Option<FighterState> {
|
||||
fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
|
||||
if state_context.get_current_animation_frame() > self.hit_reaction.hitstun_frames {
|
||||
match &self.hitstop_kind {
|
||||
HitstopStateKind::Grounded(grounded_state_common) => {
|
||||
@@ -58,8 +58,8 @@ impl FighterStateImpl for HitstunState {
|
||||
}
|
||||
}
|
||||
|
||||
fn update(&mut self, ctx: &mut FighterStateContext) {
|
||||
air::integrate_gravity(ctx.velocity, &ctx.fighter_manifest.attributes);
|
||||
fn update(&mut self, ctx: &mut UpdateContext) {
|
||||
air::integrate_gravity(ctx.velocity, ctx.fighter_attributes);
|
||||
|
||||
let speed = ctx.knockback_velocity.length();
|
||||
let next_speed = speed
|
||||
@@ -71,7 +71,7 @@ impl FighterStateImpl for HitstunState {
|
||||
ctx.translation.0 += ctx.velocity.0 + ctx.knockback_velocity.0;
|
||||
}
|
||||
|
||||
fn on_enter(&mut self, state_context: &mut FighterStateContext) {
|
||||
fn on_enter(&mut self, state_context: &mut EnterContext) {
|
||||
let animation = match self.hitstop_kind {
|
||||
HitstopStateKind::Grounded(_) => AnimKind::FlinchGround,
|
||||
HitstopStateKind::Airborne => AnimKind::FlinchAir,
|
||||
@@ -80,11 +80,11 @@ impl FighterStateImpl for HitstunState {
|
||||
state_context.knockback_velocity.0 = self.hit_reaction.launch_velocity;
|
||||
}
|
||||
|
||||
fn on_exit(&mut self, _state_context: &mut FighterStateContext) {}
|
||||
fn on_exit(&mut self, _state_context: &mut ExitContext) {}
|
||||
|
||||
fn check_collision_interrupt(
|
||||
&mut self,
|
||||
state_context: &mut FighterStateContext,
|
||||
state_context: &mut CollisionContext,
|
||||
) -> Option<FighterState> {
|
||||
match &mut self.hitstop_kind {
|
||||
HitstopStateKind::Grounded(grounded_state_common) => {
|
||||
@@ -97,7 +97,7 @@ impl FighterStateImpl for HitstunState {
|
||||
}
|
||||
}
|
||||
HitstopStateKind::Airborne => {
|
||||
if let Some(res) = collision::air_collide_with_stage(state_context) {
|
||||
if let Some(res) = state_context.air_collide_with_stage() {
|
||||
// Adjust translation
|
||||
state_context.translation.0 =
|
||||
res.hit_position - state_context.ecb.get_bottom_point();
|
||||
|
||||
Reference in New Issue
Block a user