Make dashback more lenient

2026-08-29 11:36:13 +02:00
parent dc8e4e93a5
commit 07834dcb08
10 changed files with 159 additions and 59 deletions
@@ -18,20 +18,18 @@ pub struct WaitState {
 impl FighterStateImpl for WaitState {
    const NAME: &'static str = "Wait";
    fn check_interrupt(&self, state_context: &mut FighterStateContext) -> Option<FighterState> {
-        if let Some(state) = ground::grounded_movement_standstill_common_interrupts(
+        if let Some(state) = ground::grounded_movement_common_interrupts(state_context, &self.grounded_common) {
+            Some(state)
+        } else if let Some(state) = ground::grounded_movement_standstill_common_interrupts(
            state_context,
-            &self.grounded_common,
-        ) {
-            // Prevent transitioning into myself
+            &self.grounded_common)
+        {
+            // Don't transition into yourself
            if let FighterState::Wait(_) = state {
                None
            } else {
                Some(state)
            }
-        } else if let Some(state) =
-            ground::grounded_movement_common_interrupts(state_context, &self.grounded_common)
-        {
-            Some(state)
        } else {
            None
        }