Deduplicate fighter state lifecycle policies
CI / build-and-test (pull_request) Successful in 11m6s

This commit is contained in:
2026-09-16 20:16:26 +02:00
parent 26e149cb0a
commit 23773defcd
12 changed files with 86 additions and 240 deletions
+3 -32
View File
@@ -3,11 +3,7 @@ use crate::fighter::{
state::{
CollisionContext, EnterContext, FighterState, FighterStateImpl, InterruptContext,
UpdateContext, dash,
fall::FallState,
ground::{
self, GroundedMotionResult, GroundedStateCommon,
grounded_movement_standstill_common_interrupts,
},
ground::{self, GroundedStateCommon, grounded_movement_standstill_common_interrupts},
walk,
},
};
@@ -53,39 +49,14 @@ impl FighterStateImpl for LandingState {
}
fn update(&mut self, state_context: &mut UpdateContext) {
let friction =
if state_context.velocity.x.abs() > state_context.fighter_attributes.max_walk_vel {
state_context.fighter_attributes.ground_friction
* state_context
.game_settings
.fighter_common
.ground_friction_over_walk_speed_multiplier
} else {
state_context.fighter_attributes.ground_friction
};
let ground_velocity = state_context.velocity.x;
state_context.velocity.x += ground::apply_grounded_friction(friction, ground_velocity);
ground::apply_grounded_motion(
state_context.velocity,
state_context.translation,
state_context.prev_translation,
);
ground::update_friction_motion(state_context);
}
fn check_collision_interrupt(
&mut self,
state_context: &mut CollisionContext,
) -> Option<FighterState> {
if let GroundedMotionResult::InAir =
ground::collide_with_stage_grounded(state_context, &mut self.grounded_common, true)
{
Some(FighterState::Fall(FallState))
} else {
None
}
ground::collision_interrupt(state_context, &mut self.grounded_common, true)
}
fn on_enter(&mut self, state_context: &mut EnterContext) {