Shut up warnings

Reviewed-on: #44
Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>

.cargo/config.toml

@@ -1,7 +1,7 @@
 # for Linux
 [target.x86_64-unknown-linux-gnu]
 linker = "clang"
-rustflags = ["-C", "link-arg=-fuse-ld=/usr/bin/mold", "-Zshare-generics=y", ]
+rustflags = ["-C", "link-arg=-fuse-ld=/usr/bin/mold", "-Zshare-generics=y", "-D", "warnings", ]
 
 [unstable]
 codegen-backend = true

.gitea/workflows/ci.yml

@@ -23,8 +23,9 @@ jobs:
           "$HOME/.cargo/bin/rustup" toolchain install nightly-2026-09-14 --profile minimal
 
       - name: Cache Rust dependencies and build artifacts
-        uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+        uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
         with:
+          prefix-key: v2-rust
           shared-key: linux-nightly
           cache-bin: false
 
@@ -45,7 +46,7 @@ jobs:
             pkg-config
 
       - name: Build
-        run: RUSTFLAGS="-D warnings" cargo build --locked -j 4
+        run: cargo build --locked -j 4
 
       - name: Run unit tests
         run: cargo test --locked --lib -j 4

Cargo.lock

@@ -2096,14 +2096,6 @@ dependencies = [
  "thread_local",
 ]
 
-[[package]]
-name = "bevy_wind_waker_shader"
-version = "0.6.0"
-source = "git+https://github.com/lavaeater/bevy_wind_waker_shader.git#1b017c3ef6a4fbdaff115df9ec5ae4954b2fb6ba"
-dependencies = [
- "bevy",
-]
-
 [[package]]
 name = "bevy_window"
 version = "0.19.0"
@@ -2232,32 +2224,6 @@ dependencies = [
  "varinteger",
 ]
 
-[[package]]
-name = "bitfields"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca5a55e8cbc3b75d1f002a3b62261ab67954755f7e7866f079b8aa63a409b549"
-dependencies = [
- "bitfields-impl",
-]
-
-[[package]]
-name = "bitfields-impl"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "797cb6b6e8d5e8c2ecbb5ef52b7c273596d58ce1ab79ef2a6c38fa8dca0817c5"
-dependencies = [
- "derive_more",
- "getset",
- "proc-macro2",
- "quote",
- "rustversion",
- "strum",
- "strum_macros",
- "syn 2.0.119",
- "thiserror 2.0.19",
-]
-
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -3468,9 +3434,9 @@ dependencies = [
 
 [[package]]
 name = "gc-adapter-neo"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd350c081bf33e501e9a5a11732294dfe266683d6b58a366b097146f3e633cb5"
+checksum = "120a5b3858ae854c4674ae41a38173e8ea04b814fb3212fd3bdd1b04d414a9d7"
 dependencies = [
  "binread",
  "modular-bitfield",
@@ -3523,17 +3489,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "getset"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cf442baaabe4213ce7d1239afc26c039180b6456da2cededa316ae2c8a77a77"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.119",
-]
-
 [[package]]
 name = "ggrs"
 version = "0.13.0"
@@ -6170,9 +6125,7 @@ dependencies = [
  "bevy_asset_loader",
  "bevy_egui",
  "bevy_ggrs",
- "bevy_wind_waker_shader",
  "bincode",
- "bitfields",
  "clap",
  "enum_cycling",
  "enum_cycling_derive",

Cargo.toml

@@ -22,15 +22,13 @@ serde_json = "1.0.145"
 bincode = "1.3.3"
 gltf = "1.4.1"
 ron = "0.12.0"
-bitfields = "3.0.0"
 clap = { version = "4.6.6", features = ["derive"] }
-bevy_wind_waker_shader = { git = "https://github.com/lavaeater/bevy_wind_waker_shader.git" }
 fixed = { version = "1.31.0", features = ["serde", "serde-str"] }
 strum = "0.28.0"
 strum_macros = "0.28.0"
 bevy_asset_loader = "0.27.0"
 ron_asset_manager = "0.9.0"
-gc-adapter-neo = { version = "1.0.0", features = ["libusb"] }
+gc-adapter-neo = { version = "1.1.0", features = ["libusb"] }
 rhai = "1.26.0"
 enum_cycling = "0.2.1"
 enum_cycling_derive = "0.2.1"

README.md

@@ -1,12 +1,15 @@
-# Game Test
+# Shinespark
 
-A Bevy game, editable in the [jackdaw](https://github.com/jbuehler23/jackdaw) editor.
+Fancy heavily advanced platform fighting game
 
-- `cargo run` plays the game standalone; no editor required.
-- Open the folder in jackdaw to author scenes, then hit Play. The
-  editor builds its own artifacts into `.jackdaw/` (gitignored) and
-  never modifies your manifest or lockfile.
-- Gameplay lives in `src/lib.rs` (`GamePlugin`); authored scenes live
-  in `assets/*.bsn`.
-- Components you derive `Reflect` on appear in the editor's inspector
-  automatically; no registration code is needed.
+## Direct P2P Debugging
+
+```text
+# Process 1 owns player 0 and listens on 7000.
+cargo run -- --debug-match --players 2 --local-port 7000 \
+  --net-player 0=local --net-player 1=127.0.0.1:7001
+
+# Process 2 owns player 1 and listens on 7001.
+cargo run -- --debug-match --players 2 --local-port 7001 \
+  --net-player 0=127.0.0.1:7000 --net-player 1=local
+```

assets/fighters/test/test.fighter.ron

@@ -22,7 +22,8 @@
         air_jump_horizontal_velocity: "0.96",
         air_jump_multiplier: "1.0",
         dash_initial_velocity: "1.4",
-        terminal_velocity: "1.6",
+        terminal_velocity: "3.0",
+        fast_fall_speed: "3.5",
         gravity: "0.084",
         weight: "100.0",
         jumpsquat_duration: 5,

assets/game_settings.ron

@@ -17,7 +17,15 @@
         knockback_decay_per_frame: "0.051",
         knockback_launch_velocity_multiplier: "0.03",
         hitstun_frames_per_unit_knockback: "0.4",
-
+        tumble_bounce_hitstop_threshold: 32,
+        attack_ground_to_airborne_transition_vertical_angle_threshold: "90.0",
+        meteor_angle_threshold: "10.0",
+        visual_shake_frames_per_hitstop_frame: "1.2",
+        visual_shake_table: [
+            -3.0, -1.5, 1.5, 3.0
+        ],
+        attacker_visual_shake_multiplier: 0.4,
+        di_max_angle: "18.0"
     ),
     stage_manifest_paths: [
         "stages/battlefield/test.stage.ron"

launch_localtest.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+FIRST="cargo run -- --debug-match --players 2 --local-port 7000 \
+  --net-player 0=local --net-player 1=127.0.0.1:7001"
+SECOND="cargo run -- --debug-match --players 2 --local-port 7001 \
+--net-player 0=127.0.0.1:7000 --net-player 1=local"
+
+(trap 'kill 0' SIGINT; $FIRST & $SECOND)

src/args.rs

@@ -1,5 +1,6 @@
 use bevy::prelude::*;
 use clap::Parser;
+use std::net::SocketAddr;
 use std::path::PathBuf;
 
 #[derive(Parser, Debug, Clone, Resource)]
@@ -15,6 +16,12 @@ pub struct Args {
     pub check_distance: usize,
     #[clap(long, default_value_t = 1)]
     pub players: usize,
+    /// UDP port to bind for a direct peer-to-peer session.
+    #[clap(long, default_value_t = 6969)]
+    pub local_port: u16,
+    /// Player ownership declarations in the form HANDLE=local or HANDLE=ADDRESS.
+    #[clap(long = "net-player", value_name = "HANDLE=local|ADDRESS")]
+    pub net_players: Vec<String>,
     /// Record a replay to this path.
     #[clap(long, conflicts_with = "play_replay")]
     pub record_replay: Option<PathBuf>,
@@ -25,3 +32,41 @@ pub struct Args {
     #[clap(long, value_enum, default_value_t = crate::replay::ReplayFormat::Binary)]
     pub replay_format: crate::replay::ReplayFormat,
 }
+
+pub fn parse_socket_addr(value: &str) -> Result<SocketAddr, String> {
+    let address = value
+        .parse::<SocketAddr>()
+        .map_err(|_| format!("invalid socket address: {value}"))?;
+    if address.port() == 0 {
+        return Err(format!("socket address must use a nonzero port: {value}"));
+    }
+    Ok(address)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn parses_network_options() {
+        let args = Args::try_parse_from([
+            "game",
+            "--local-port",
+            "7000",
+            "--net-player",
+            "0=local",
+            "--net-player",
+            "1=127.0.0.1:7001",
+        ])
+        .unwrap();
+
+        assert_eq!(args.local_port, 7000);
+        assert_eq!(args.net_players, ["0=local", "1=127.0.0.1:7001"]);
+    }
+
+    #[test]
+    fn rejects_invalid_socket_addresses() {
+        assert!(parse_socket_addr("127.0.0.1:0").is_err());
+        assert!(parse_socket_addr("not-an-address").is_err());
+    }
+}

src/debug_tools.rs

@@ -14,6 +14,8 @@ use enum_cycling_derive::EnumCycle;
 
 use crate::{AppState, player::Player, replay::StopReplayRecording};
 
+mod save_state;
+
 pub const PLAYER_DEBUG_ROW_COUNT: usize = 6;
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Reflect)]
@@ -378,6 +380,9 @@ impl Plugin for DebugToolsPlugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<DebugSettings>()
             .init_resource::<FrameStepState>()
+            .init_resource::<save_state::DebugSaveState>()
+            .add_systems(OnEnter(AppState::InMatch), save_state::clear)
+            .add_systems(OnExit(AppState::InMatch), save_state::clear)
             .add_systems(
                 PreUpdate,
                 prepare_frame_step
@@ -385,6 +390,13 @@ impl Plugin for DebugToolsPlugin {
                     .before(RunGgrsSystems)
                     .run_if(in_state(AppState::InMatch)),
             )
+            .add_systems(
+                PreUpdate,
+                save_state::save_or_restore
+                    .after(InputSystems)
+                    .before(RunGgrsSystems)
+                    .run_if(in_state(AppState::InMatch)),
+            )
             .add_systems(PreUpdate, restore_frame_step_time.after(RunGgrsSystems))
             .add_systems(
                 Update,

src/debug_tools/save_state.rs

@@ -0,0 +1,190 @@
+use bevy::prelude::*;
+
+use crate::{
+    camera::MatchCamera, fighter::{
+        FighterECB, FighterFacingDirection, FighterHitboxes, FighterHitstop, FighterHitstopShake, FighterPreviousFacingDirection, FighterPreviousTranslation, FighterTranslation, FighterVelocity, Grounded, animation::FighterAnimationFrame, attack::{
+            FighterDamage, FighterKnockbackVelocity, FighterPendingHitReaction, FighterPendingHits,
+            FighterSolvedHurtboxes, FighterStaleMoveQueue,
+        }, baked_animation::FighterBoneMatrices, state::FighterState,
+    }, input::FighterInput, player::Player, stage::line::StageCollision,
+};
+
+#[derive(Resource, Default)]
+pub(super) struct DebugSaveState {
+    checkpoint: Option<Checkpoint>,
+}
+
+#[derive(Clone)]
+struct Checkpoint {
+    fighters: Vec<FighterCheckpoint>,
+    stage_collision: StageCollision,
+    pending_hits: FighterPendingHits,
+}
+
+#[derive(Clone)]
+struct FighterCheckpoint {
+    entity: Entity,
+    handle: usize,
+    ecb: FighterECB,
+    previous_ecb: crate::fighter::ecb::FighterPreviousECB,
+    velocity: FighterVelocity,
+    translation: FighterTranslation,
+    previous_translation: FighterPreviousTranslation,
+    facing: FighterFacingDirection,
+    previous_facing: FighterPreviousFacingDirection,
+    animation: FighterAnimationFrame,
+    state: FighterState,
+    input: FighterInput,
+    damage: FighterDamage,
+    pending_hit_reaction: FighterPendingHitReaction,
+    hitstop: FighterHitstop,
+    hitstop_shake: FighterHitstopShake,
+    knockback_velocity: FighterKnockbackVelocity,
+    stale_moves: FighterStaleMoveQueue,
+    hitboxes: FighterHitboxes,
+    solved_hurtboxes: FighterSolvedHurtboxes,
+    bone_matrices: FighterBoneMatrices,
+    grounded: bool,
+}
+
+pub(super) fn save_or_restore(world: &mut World) {
+    if world.resource::<super::DebugSettings>().menu_open {
+        return;
+    }
+
+    let left = world
+        .query::<&Gamepad>()
+        .iter(world)
+        .any(|gamepad| gamepad.just_pressed(GamepadButton::DPadLeft));
+    let right = world
+        .query::<&Gamepad>()
+        .iter(world)
+        .any(|gamepad| gamepad.just_pressed(GamepadButton::DPadRight));
+
+    if left == right {
+        return;
+    }
+
+    let Some(roster) = world
+        .get_resource::<crate::fighter::FighterRoster>()
+        .map(|roster| roster.0.clone())
+    else {
+        return;
+    };
+    if roster.len() != 1 {
+        warn!("Save states are only available in single-player matches");
+        return;
+    }
+
+    if left {
+        let Some(stage_collision) = world.get_resource::<StageCollision>().cloned() else {
+            return;
+        };
+        let mut checkpoint_fighters = Vec::with_capacity(roster.len());
+        for entity in roster.iter().copied() {
+            let Some(checkpoint) = capture_fighter(world, entity) else {
+                warn!("Could not save the current fighter state");
+                return;
+            };
+            checkpoint_fighters.push(checkpoint);
+        }
+        let pending_hits = world.resource::<FighterPendingHits>().clone();
+        world.resource_mut::<DebugSaveState>().checkpoint = Some(Checkpoint {
+            fighters: checkpoint_fighters,
+            stage_collision,
+            pending_hits,
+        });
+        info!("Saved debug game state");
+        return;
+    }
+
+    let Some(checkpoint) = world.resource::<DebugSaveState>().checkpoint.clone() else {
+        warn!("No debug game state has been saved");
+        return;
+    };
+    if checkpoint.fighters.len() != roster.len()
+        || checkpoint
+            .fighters
+            .iter()
+            .zip(roster.iter())
+            .any(|(saved, current)| saved.entity != *current)
+    {
+        warn!("Saved debug game state belongs to another match");
+        return;
+    }
+
+    for saved in &checkpoint.fighters {
+        let Some(player) = world.entity(saved.entity).get::<Player>() else {
+            warn!("Could not restore the saved fighter state");
+            return;
+        };
+        if player.handle != saved.handle {
+            warn!("Saved debug game state belongs to another match");
+            return;
+        }
+
+        let mut entity = world.entity_mut(saved.entity);
+        entity.insert(saved.ecb);
+        entity.insert(saved.previous_ecb);
+        entity.insert(saved.velocity);
+        entity.insert(saved.translation);
+        entity.insert(saved.previous_translation);
+        entity.insert(saved.facing);
+        entity.insert(saved.previous_facing);
+        entity.insert(saved.animation);
+        entity.insert(saved.state.clone());
+        entity.insert(saved.input);
+        entity.insert(saved.damage);
+        entity.insert(saved.pending_hit_reaction.clone());
+        entity.insert(saved.hitstop);
+        entity.insert(saved.hitstop_shake);
+        entity.insert(saved.knockback_velocity);
+        entity.insert(saved.stale_moves.clone());
+        entity.insert(saved.hitboxes.clone());
+        entity.insert(saved.solved_hurtboxes.clone());
+        entity.insert(saved.bone_matrices.clone());
+        if saved.grounded {
+            entity.insert(Grounded);
+        } else {
+            entity.remove::<Grounded>();
+        }
+    }
+    world.insert_resource(checkpoint.pending_hits.clone());
+    world.insert_resource(checkpoint.stage_collision);
+    for mut match_camera in world.query::<&mut MatchCamera>().iter_mut(world) {
+        match_camera.needs_snap = true;
+    }
+    info!("Restored debug game state");
+}
+
+fn capture_fighter(world: &World, entity: Entity) -> Option<FighterCheckpoint> {
+    let fighter = world.entity(entity);
+    Some(FighterCheckpoint {
+        entity,
+        handle: fighter.get::<Player>()?.handle,
+        ecb: *fighter.get::<FighterECB>()?,
+        previous_ecb: *fighter.get::<crate::fighter::ecb::FighterPreviousECB>()?,
+        velocity: *fighter.get::<FighterVelocity>()?,
+        translation: *fighter.get::<FighterTranslation>()?,
+        previous_translation: *fighter.get::<FighterPreviousTranslation>()?,
+        facing: *fighter.get::<FighterFacingDirection>()?,
+        previous_facing: *fighter.get::<FighterPreviousFacingDirection>()?,
+        animation: *fighter.get::<FighterAnimationFrame>()?,
+        state: fighter.get::<FighterState>()?.clone(),
+        input: *fighter.get::<FighterInput>()?,
+        damage: *fighter.get::<FighterDamage>()?,
+        pending_hit_reaction: fighter.get::<FighterPendingHitReaction>()?.clone(),
+        hitstop: *fighter.get::<FighterHitstop>()?,
+        hitstop_shake: *fighter.get::<FighterHitstopShake>()?,
+        knockback_velocity: *fighter.get::<FighterKnockbackVelocity>()?,
+        stale_moves: fighter.get::<FighterStaleMoveQueue>()?.clone(),
+        hitboxes: fighter.get::<FighterHitboxes>()?.clone(),
+        solved_hurtboxes: fighter.get::<FighterSolvedHurtboxes>()?.clone(),
+        bone_matrices: fighter.get::<FighterBoneMatrices>()?.clone(),
+        grounded: fighter.contains::<Grounded>(),
+    })
+}
+
+pub(super) fn clear(mut save_state: ResMut<DebugSaveState>) {
+    save_state.checkpoint = None;
+}

src/fighter/attack/directional_influence.rs

@@ -0,0 +1,69 @@
+use fixed::traits::ToFixed;
+use fixed_math::SinCos;
+
+use crate::math::{
+    int::{FGWide, FGi32},
+    vec::FGVec2,
+};
+
+/// Applies DI to a given attack direction
+pub fn apply_directional_influence(
+    receiver_stick: FGVec2,
+    attack_angle: FGi32,
+    di_max_angle: FGi32,
+) -> FGVec2 {
+    let (sin, cos) = attack_angle.sin_cos();
+    let base_launch_direction = FGVec2::new(cos, sin);
+
+    let Some(base_launch_direction) = base_launch_direction.normalize() else {
+        return FGVec2::ZERO;
+    };
+
+    if receiver_stick.length_squared().is_zero() {
+        return base_launch_direction;
+    }
+
+    let normal = FGVec2::new(-base_launch_direction.y, base_launch_direction.x);
+    let di_amount = receiver_stick.dot(normal);
+    let angle_change = di_amount * di_max_angle.to_fixed::<FGWide>();
+    let angle_change = angle_change.clamp(
+        -di_max_angle.to_fixed::<FGWide>(),
+        di_max_angle.to_fixed::<FGWide>(),
+    );
+    let (sin, cos) = (attack_angle + angle_change.to_fixed::<FGi32>()).sin_cos();
+    FGVec2::new(cos, sin).normalize_or_zero()
+}
+
+#[cfg(test)]
+mod test {
+    use crate::{
+        fighter::attack::directional_influence::apply_directional_influence,
+        math::{int::FGi32, vec::FGVec2},
+    };
+
+    #[test]
+    fn di_zero_passes_unmodified() {
+        let di = apply_directional_influence(FGVec2::ZERO, FGi32::lit("0.0"), FGi32::lit("18.0"));
+        const EPSILON: FGi32 = FGi32::from_bits(4);
+        assert!(di.x.abs_diff(FGi32::ONE) < EPSILON);
+        assert!(di.y.abs_diff(FGi32::ZERO) < EPSILON);
+    }
+
+    #[test]
+    fn di_applies_on_the_correct_side() {
+        let di = apply_directional_influence(
+            FGVec2::lit("0.0", "1.0"),
+            FGi32::lit("0.0"),
+            FGi32::lit("18.0"),
+        );
+        assert!(di.x > FGi32::ZERO);
+        assert!(di.y > FGi32::ZERO);
+        let di = apply_directional_influence(
+            FGVec2::lit("0.0", "-1.0"),
+            FGi32::lit("0.0"),
+            FGi32::lit("18.0"),
+        );
+        assert!(di.x > FGi32::ZERO);
+        assert!(di.y < FGi32::ZERO);
+    }
+}

src/fighter/attack/mod.rs

@@ -1,18 +1,20 @@
 use std::collections::{HashMap, VecDeque};
 
+mod reaction;
+pub mod directional_influence;
+
+use bevy::ecs::entity::{EntityMapper, MapEntities};
 use bevy::prelude::*;
-use bevy_ggrs::{Rollback, prelude::GgrsSchedule};
-use fixed_math::SinCos;
+use bevy_ggrs::{Rollback, RollbackApp, prelude::GgrsSchedule};
 use serde::{Deserialize, Serialize};
 
 use crate::{
     fighter::{
-        Fighter, FighterAttributes, FighterFacingDirection, FighterHitboxes, FighterHitstop,
+        Fighter, FighterAttributes, FighterFacingDirection, FighterHitboxes,
         FighterPreviousFacingDirection, FighterPreviousTranslation, FighterRoster,
         FighterTranslation,
         animation::{AnimKind, FighterAnimationFrame},
         baked_animation::{FighterBoneIndexMap, FighterBoneMatrices, FixedMat4},
-        errors::FighterErrors,
         hurtbox::{FixedAffineCapsule, FixedCapsule},
         manifest::FighterManifest,
     },
@@ -30,9 +32,15 @@ use crate::{
 #[derive(Deref, Component, Default, Hash, Debug, Copy, Clone)]
 pub struct FighterKnockbackVelocity(pub FGVec2);
 
-#[derive(Debug, Default, Clone, Copy, Serialize, Deserialize, Component, Hash)]
+#[derive(Debug, Default, Clone, Copy, Serialize, Deserialize, Component, Hash, PartialEq)]
 pub struct FighterDamage(FGi32);
 
+impl std::fmt::Display for FighterDamage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{:.2}", self.0)
+    }
+}
+
 #[derive(Debug, Hash, Clone)]
 pub enum HitReactionKind {
     Flinch,
@@ -41,10 +49,12 @@ pub enum HitReactionKind {
 
 #[derive(Debug, Hash, Clone)]
 pub struct FighterHitReaction {
-    pub launch_velocity: FGVec2,
+    pub launch_velocity: FGi32,
+    pub launch_angle: FGi32,
     pub hitstop_frames: HitStop,
     pub hitstun_frames: u32,
     pub kind: HitReactionKind,
+    pub damage: FighterDamage,
 }
 
 #[derive(Component, DerefMut, Deref, Debug, Default, Hash, Clone)]
@@ -61,10 +71,13 @@ pub struct FighterLastAttackDebug {
     pub trajectory_points: Vec<Vec3>,
 }
 
-#[derive(Debug, Default, Clone, Deref, DerefMut, Hash)]
+#[derive(Debug, Default, Clone, Deref, DerefMut, Hash, PartialEq, PartialOrd)]
 pub struct HitStop(u32);
 
 impl HitStop {
+    pub fn new(hitstop: u32) -> Self {
+        HitStop(hitstop)
+    }
     pub fn calculate(attack_damage_stalled: FighterDamage, crouch_cancelling: bool) -> Self {
         let a = (attack_damage_stalled.0 / FGi32::lit("3.0") + FGi32::lit("4.0")).round_to_zero();
         let crouch_cancelling_factor = if crouch_cancelling {
@@ -77,6 +90,10 @@ impl HitStop {
 
         Self(frames)
     }
+
+    pub fn calculate_shake_frames(&self, game_settings: &GameSettings) -> u32 {
+        (FGi32::from_num(self.0) * game_settings.fighter_common.visual_shake_frames_per_hitstop_frame).floor().to_num()
+    }
 }
 
 #[derive(Clone, Copy, Debug, Serialize, Deserialize)]
@@ -432,15 +449,26 @@ pub struct FighterAttackScriptAssets {
 #[derive(Component, Clone, Debug, Default, Hash)]
 pub struct FighterSolvedHurtboxes(pub Vec<FighterSolvedHurtbox>);
 
-#[derive(Component, Clone, Debug, Default, Hash, DerefMut, Deref)]
-pub struct FighterReceivedAttacks(
-    pub  Vec<(
-        /* attacker */ Entity,
-        Handle<FighterAttackScript>,
-        AttackKind,
-        /* hitbox_idx */ usize,
-    )>,
-);
+#[derive(Clone, Debug, Hash)]
+pub struct FighterHit {
+    pub attacker: Entity,
+    pub defender: Entity,
+    pub attack_script: Handle<FighterAttackScript>,
+    pub attack_kind: AttackKind,
+    pub hitbox_index: usize,
+}
+
+#[derive(Resource, Clone, Debug, Default, Hash)]
+pub struct FighterPendingHits(pub Vec<FighterHit>);
+
+impl MapEntities for FighterPendingHits {
+    fn map_entities<M: EntityMapper>(&mut self, entity_mapper: &mut M) {
+        for hit in &mut self.0 {
+            hit.attacker = entity_mapper.get_mapped(hit.attacker);
+            hit.defender = entity_mapper.get_mapped(hit.defender);
+        }
+    }
+}
 
 pub fn solve_hurtboxes(
     mut query: Query<(
@@ -498,19 +526,14 @@ pub fn intersect_attacks_with_hurtboxes(
         &Player,
         &FighterStaleMoveQueue,
     )>,
-    mut query_attacked: Query<(
-        Entity,
-        &FighterSolvedHurtboxes,
-        &Player,
-        &Fighter,
-        &mut FighterReceivedAttacks,
-    )>,
+    query_attacked: Query<(Entity, &FighterSolvedHurtboxes)>,
+    mut pending_hits: ResMut<FighterPendingHits>,
     attack_scripts: Res<Assets<FighterAttackScript>>,
 ) {
+    pending_hits.0.clear();
+
     for &entity_receiving in &roster.0 {
-        let Ok((_, hurtboxes, _, _receiving_fighter, mut received_attacks)) =
-            query_attacked.get_mut(entity_receiving)
-        else {
+        let Ok((_, hurtboxes)) = query_attacked.get(entity_receiving) else {
             continue;
         };
 
@@ -551,12 +574,13 @@ pub fn intersect_attacks_with_hurtboxes(
                 continue;
             };
 
-            received_attacks.push((
-                entity_hurting,
-                active_attack.script.clone(),
-                active_attack.kind,
-                hitting_hitbox_idx,
-            ));
+            pending_hits.0.push(FighterHit {
+                attacker: entity_hurting,
+                defender: entity_receiving,
+                attack_script: active_attack.script.clone(),
+                attack_kind: active_attack.kind,
+                hitbox_index: hitting_hitbox_idx,
+            });
             info!("Hit by hitbox {}!!!!", hitting_hitbox_idx);
 
             active_attack.hit_fighters.push(entity_receiving);
@@ -564,140 +588,21 @@ pub fn intersect_attacks_with_hurtboxes(
     }
 }
 
-pub fn calculate_received_attacks_trajectories(
-    mut attacker: Query<(
-        &mut FighterStaleMoveQueue,
-        &FighterFacingDirection,
-        &FighterHitboxes,
-        &Player,
-        &mut FighterHitstop,
-    )>,
-    receiver: Query<(
-        &mut FighterReceivedAttacks,
-        &mut FighterDamage,
-        &Fighter,
-        &mut FighterPendingHitReaction,
-    )>,
-    attack_scripts: Res<Assets<FighterAttackScript>>,
-    game_settings: Res<GameSettings>,
-    fighter_manifests: Res<Assets<FighterManifest>>,
-) -> Result {
-    for (mut received_attacks, mut receiver_damage, fighter, mut pending_reactions) in receiver {
-        if received_attacks.is_empty() {
-            continue;
-        }
-
-        // we got attacked, time to calculate the total damage
-
-        let damage_data = received_attacks
-            .iter()
-            .filter_map(|(from_entity, attack_script, attack_kind, hitbox_idx)| {
-                let Ok((stale_move_queue, facing_dir, _hitboxes, player, _attacker_hitstop)) =
-                    attacker.get(*from_entity)
-                else {
-                    return None;
-                };
-
-                let Some(attack_script) = attack_scripts.get(attack_script) else {
-                    return None;
-                };
-
-                let hitbox = &attack_script.hitboxes[*hitbox_idx];
-
-                let damage_received =
-                    stale_move_queue.get_attack_damage_multiplier(*attack_kind) * hitbox.damage.0;
-
-                Some((
-                    from_entity,
-                    damage_received,
-                    hitbox,
-                    attack_script,
-                    matches!(facing_dir, FighterFacingDirection::Left),
-                    player.handle,
-                ))
-            })
-            .collect::<Vec<_>>();
-
-        let total_damage_received_this_frame = damage_data
-            .iter()
-            .map(|(_, damage, ..)| damage)
-            .sum::<FGi32>();
-
-        let fighter_manifest = fighter_manifests
-            .get(&fighter.manifest)
-            .ok_or(FighterErrors::FighterManifestNotFound)?;
-
-        let mut reactions = vec![];
-
-        for (attacker_entity, attack_damage, hitbox, _attack_script, facing_left, attacker_slot) in
-            damage_data
-        {
-            let knockback = hitbox.calculate_knockback(
-                &fighter_manifest.attributes,
-                *receiver_damage,
-                FighterDamage(total_damage_received_this_frame),
-                false,
-                false,
-            );
-
-            let angle = match &hitbox.angle {
-                AttackAngle::Normal(angle) => *angle,
-                AttackAngle::Sakurai => FGi32::lit("32.0"),
-            };
-
-            let launch_angle = if facing_left {
-                FGi32::lit("180.0") - angle
-            } else {
-                angle
-            };
-            let (sin, cos) = launch_angle.sin_cos();
-            let launch_direction = FGVec2::new(cos, sin);
-            let hitstop = HitStop::calculate(FighterDamage(attack_damage), false);
-            reactions.push((
-                *attacker_entity,
-                attacker_slot,
-                FighterHitReaction {
-                    launch_velocity: launch_direction * knockback.get_launch_speed(&game_settings),
-                    hitstun_frames: knockback.get_hitstun_frames(&game_settings),
-                    hitstop_frames: hitstop,
-                    kind: HitReactionKind::Flinch,
-                },
-            ));
-        }
-
-        receiver_damage.0 += total_damage_received_this_frame;
-
-        for (attacker_entity, _, reaction) in reactions.iter() {
-            let Ok((.., mut hitstop)) = attacker.get_mut(*attacker_entity) else {
-                continue;
-            };
-
-            hitstop.remaining_frames = reaction.hitstop_frames.max(hitstop.remaining_frames);
-        }
-
-        // Pick attack by port priority
-        pending_reactions.0 = reactions
-            .into_iter()
-            .min_by(|(_, port_a, _), (_, port_b, _)| port_a.cmp(port_b))
-            .map(|(_, _, reaction)| reaction);
-
-        received_attacks.clear();
-    }
-
-    Ok(())
-}
-
 pub struct FighterAttackPlugin;
 
 impl Plugin for FighterAttackPlugin {
     fn build(&self, app: &mut App) {
+        app.init_resource::<FighterPendingHits>()
+            .add_plugins(reaction::FighterReactionPlugin)
+            .rollback_resource_with_clone::<FighterPendingHits>()
+            .update_resource_with_map_entities::<FighterPendingHits>()
+            .checksum_resource_with_hash::<FighterPendingHits>();
         app.add_systems(
             GgrsSchedule,
             (
                 solve_hurtboxes,
                 solve_hitboxes,
                 intersect_attacks_with_hurtboxes,
-                calculate_received_attacks_trajectories,
             )
                 .chain()
                 .after(crate::fighter::baked_animation::update_fighter_bone_matrices)

src/fighter/attack/reaction.rs

@@ -0,0 +1,165 @@
+use bevy::prelude::*;
+use bevy_ggrs::prelude::GgrsSchedule;
+
+use super::*;
+use crate::{
+    fighter::{
+        Fighter, FighterFacingDirection, FighterHitboxes, FighterHitstop, FighterHitstopShake, FighterHitstopShakeKind, FighterHitstopShakeRole, FighterPendingHitReaction, FighterStaleMoveQueue, errors::FighterErrors, manifest::FighterManifest, state::FighterState,
+    }, game_settings::GameSettings, math::{int::FGi32}, player::Player, schedule::GameplaySet, scripting::FighterAttackScript,
+};
+
+pub fn resolve_fighter_hits(
+    mut pending_hits: ResMut<FighterPendingHits>,
+    mut attacker: Query<(
+        &mut FighterStaleMoveQueue,
+        &FighterFacingDirection,
+        &mut FighterHitboxes,
+        &Player,
+        &mut FighterHitstop,
+        &mut FighterHitstopShake,
+    )>,
+    mut receiver: Query<(&mut FighterDamage, &Fighter, &mut FighterPendingHitReaction, &FighterState)>,
+    attack_scripts: Res<Assets<FighterAttackScript>>,
+    game_settings: Res<GameSettings>,
+    fighter_manifests: Res<Assets<FighterManifest>>,
+) -> Result {
+    let hits = std::mem::take(&mut pending_hits.0);
+    let mut hit_offset = 0;
+
+    while hit_offset < hits.len() {
+        let defender = hits[hit_offset].defender;
+        let next_defender = hits[hit_offset..]
+            .iter()
+            .position(|hit| hit.defender != defender)
+            .map_or(hits.len(), |offset| hit_offset + offset);
+
+        let Ok((mut receiver_damage, fighter, mut pending_reaction, receiver_state)) = receiver.get_mut(defender)
+        else {
+            hit_offset = next_defender;
+            continue;
+        };
+
+        let damage_data = hits[hit_offset..next_defender]
+            .iter()
+            .filter_map(|hit| {
+                let Ok((stale_move_queue, facing_dir, _, player, _, _)) =
+                    attacker.get(hit.attacker)
+                else {
+                    return None;
+                };
+                let attack_script = attack_scripts.get(&hit.attack_script)?;
+                let hitbox = attack_script.hitboxes.get(hit.hitbox_index)?;
+                let damage_received = stale_move_queue
+                    .get_attack_damage_multiplier(hit.attack_kind)
+                    * hitbox.damage.0;
+                Some((
+                    hit.attacker,
+                    damage_received,
+                    hitbox,
+                    matches!(facing_dir, FighterFacingDirection::Left),
+                    player.handle,
+                ))
+            })
+            .collect::<Vec<_>>();
+
+        let total_damage_received_this_frame = damage_data
+            .iter()
+            .map(|(_, damage, ..)| damage)
+            .sum::<FGi32>();
+        let fighter_manifest = fighter_manifests
+            .get(&fighter.manifest)
+            .ok_or(FighterErrors::FighterManifestNotFound)?;
+        let mut reactions = Vec::with_capacity(damage_data.len());
+
+        for (attacker_entity, attack_damage, hitbox, facing_left, attacker_slot) in damage_data {
+            let knockback = hitbox.calculate_knockback(
+                &fighter_manifest.attributes,
+                *receiver_damage,
+                FighterDamage(total_damage_received_this_frame),
+                false,
+                false,
+            );
+            let angle = match &hitbox.angle {
+                AttackAngle::Normal(angle) => *angle,
+                AttackAngle::Sakurai => FGi32::lit("32.0"),
+            };
+            let launch_angle = if facing_left {
+                FGi32::lit("180.0") - angle
+            } else {
+                angle
+            };
+
+            // Attacker hitstop and data
+            let hitstop = HitStop::calculate(FighterDamage(attack_damage), false);
+            reactions.push((
+                attacker_entity,
+                attacker_slot,
+                FighterHitReaction {
+                    launch_velocity: knockback.get_launch_speed(&game_settings),
+                    launch_angle,
+                    hitstun_frames: knockback.get_hitstun_frames(&game_settings),
+                    hitstop_frames: hitstop,
+                    kind: HitReactionKind::Flinch,
+                    damage: FighterDamage(attack_damage)
+                },
+            ));
+        }
+
+        receiver_damage.0 += total_damage_received_this_frame;
+
+        for (attacker_entity, _, reaction) in &reactions {
+            let Ok((.., _, mut hitstop, mut hitstop_shake)) = attacker.get_mut(*attacker_entity) else {
+                continue;
+            };
+
+            if hitstop.remaining_frames < reaction.hitstop_frames.0 {
+                let shake_kind = if receiver_state.is_visually_grounded() {
+                    FighterHitstopShakeKind::Horizontal
+                } else {
+                    FighterHitstopShakeKind::Vertical
+                };
+                hitstop.remaining_frames = reaction.hitstop_frames.0;
+                let shake_frames = reaction.hitstop_frames.calculate_shake_frames(&game_settings);
+                hitstop_shake.total_frames = shake_frames;
+                hitstop_shake.remaining_frames = shake_frames;
+                hitstop_shake.kind = shake_kind;
+                hitstop_shake.role = FighterHitstopShakeRole::Attacker;
+            }
+        }
+
+        pending_reaction.0 = reactions
+            .into_iter()
+            .min_by(|(_, port_a, _), (_, port_b, _)| port_a.cmp(port_b))
+            .map(|(_, _, reaction)| reaction);
+
+        hit_offset = next_defender;
+    }
+
+    for hit in hits {
+        let Ok((mut stale_move_queue, _facing_direction, mut hitboxes, ..)) = attacker.get_mut(hit.attacker) else {
+            continue;
+        };
+
+        if let Some(ref mut hitbox) = hitboxes.0 {
+            if !hitbox.stalled {
+                hitbox.stalled = true;
+                stale_move_queue.push(hitbox.kind);
+            }
+        }
+    }
+
+    Ok(())
+}
+
+pub struct FighterReactionPlugin;
+
+impl Plugin for FighterReactionPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_systems(
+            GgrsSchedule,
+            resolve_fighter_hits
+                .in_set(GameplaySet::Attacks)
+                .after(super::intersect_attacks_with_hurtboxes),
+        );
+    }
+}

src/fighter/attributes.rs

@@ -37,6 +37,7 @@ pub struct FighterAttributes {
     pub ground_friction: FGi32,
     pub terminal_velocity: FGi32,
     pub gravity: FGi32,
+    pub fast_fall_speed: FGi32,
     pub weight: FGi32,
     pub air_friction: FGi32,
 

src/fighter/baked_animation/asset_baking.rs

@@ -0,0 +1,456 @@
+use super::{
+    BAKED_ANIMATION_FPS,
+    runtime::{BakedAnimationClip, BakedFighterAnimations},
+};
+use crate::math::fixed_transform::FixedMat4;
+use crate::fighter::{animation::AnimKind, manifest::FighterManifest};
+use bevy::{
+    asset::{
+        AssetLoader, AssetPath, AsyncWriteExt, LoadContext,
+        io::{Reader, Writer},
+        processor::LoadTransformAndSave,
+        saver::{AssetSaver, SavedAsset},
+        transformer::{AssetTransformer, TransformedAsset},
+    },
+    prelude::*,
+    reflect::TypePath,
+};
+use serde::Deserialize;
+use std::{collections::HashMap, io, path::Path};
+
+#[derive(Deserialize)]
+struct FighterBakeDeclaration {
+    manifest_path: String,
+}
+#[derive(Asset, TypePath)]
+struct FighterBakeSource {
+    model_bytes: Vec<u8>,
+    buffers: Vec<Vec<u8>>,
+    animations: HashMap<AnimKind, String>,
+}
+#[derive(Default, TypePath)]
+struct FighterBakeSourceLoader;
+
+impl AssetLoader for FighterBakeSourceLoader {
+    type Asset = FighterBakeSource;
+    type Settings = ();
+    type Error = io::Error;
+    async fn load(
+        &self,
+        reader: &mut dyn Reader,
+        _: &Self::Settings,
+        load_context: &mut LoadContext<'_>,
+    ) -> Result<Self::Asset, Self::Error> {
+        let mut declaration = Vec::new();
+        reader.read_to_end(&mut declaration).await?;
+        let declaration: FighterBakeDeclaration = ron::de::from_bytes(&declaration)
+            .map_err(|error| io::Error::new(io::ErrorKind::InvalidData, error))?;
+        let manifest_bytes = load_context
+            .read_asset_bytes(&declaration.manifest_path)
+            .await
+            .map_err(|error| io::Error::other(error.to_string()))?;
+        let manifest: FighterManifest = ron::de::from_bytes(&manifest_bytes)
+            .map_err(|error| io::Error::new(io::ErrorKind::InvalidData, error))?;
+        let model_bytes = load_context
+            .read_asset_bytes(&manifest.model_path)
+            .await
+            .map_err(|error| io::Error::other(error.to_string()))?;
+        let gltf = gltf::Gltf::from_slice(&model_bytes)
+            .map_err(|error| io::Error::new(io::ErrorKind::InvalidData, error))?;
+        let mut buffers = Vec::with_capacity(gltf.buffers().len());
+        for buffer in gltf.buffers() {
+            let bytes = match buffer.source() {
+                gltf::buffer::Source::Uri(uri) => load_context
+                    .read_asset_bytes(AssetPath::from_path_buf(
+                        Path::new(&manifest.model_path)
+                            .parent()
+                            .unwrap_or_else(|| Path::new(""))
+                            .join(uri),
+                    ))
+                    .await
+                    .map_err(|error| io::Error::other(error.to_string()))?,
+                gltf::buffer::Source::Bin => gltf.blob.clone().ok_or_else(|| {
+                    io::Error::new(io::ErrorKind::InvalidData, "missing glTF binary blob")
+                })?,
+            };
+            buffers.push(bytes);
+        }
+        Ok(FighterBakeSource {
+            model_bytes,
+            buffers,
+            animations: manifest.animations,
+        })
+    }
+    fn extensions(&self) -> &[&str] {
+        &["fighterbake"]
+    }
+}
+
+#[derive(Default, TypePath)]
+struct BakedFighterAnimationsLoader;
+impl AssetLoader for BakedFighterAnimationsLoader {
+    type Asset = BakedFighterAnimations;
+    type Settings = ();
+    type Error = io::Error;
+    async fn load(
+        &self,
+        reader: &mut dyn Reader,
+        _: &Self::Settings,
+        _: &mut LoadContext<'_>,
+    ) -> Result<Self::Asset, Self::Error> {
+        let mut bytes = Vec::new();
+        reader.read_to_end(&mut bytes).await?;
+        bincode::deserialize(&bytes)
+            .map_err(|error| io::Error::new(io::ErrorKind::InvalidData, error))
+    }
+    fn extensions(&self) -> &[&str] {
+        &["fighterbake"]
+    }
+}
+
+#[derive(Default, TypePath)]
+struct FighterBakeTransformer;
+impl AssetTransformer for FighterBakeTransformer {
+    type AssetInput = FighterBakeSource;
+    type AssetOutput = BakedFighterAnimations;
+    type Settings = ();
+    type Error = io::Error;
+    async fn transform<'a>(
+        &'a self,
+        source: TransformedAsset<Self::AssetInput>,
+        _: &'a Self::Settings,
+    ) -> Result<TransformedAsset<Self::AssetOutput>, Self::Error> {
+        let baked = bake_gltf(&source.model_bytes, &source.buffers, &source.animations)?;
+        Ok(source.replace_asset(baked))
+    }
+}
+
+#[derive(Default, TypePath)]
+struct BakedFighterAnimationsSaver;
+impl AssetSaver for BakedFighterAnimationsSaver {
+    type Asset = BakedFighterAnimations;
+    type Settings = ();
+    type OutputLoader = BakedFighterAnimationsLoader;
+    type Error = io::Error;
+    async fn save(
+        &self,
+        writer: &mut Writer,
+        asset: SavedAsset<'_, '_, Self::Asset>,
+        _: &Self::Settings,
+        _: AssetPath<'_>,
+    ) -> Result<(), Self::Error> {
+        let bytes = bincode::serialize(&*asset)
+            .map_err(|error| io::Error::new(io::ErrorKind::InvalidData, error))?;
+        writer.write_all(&bytes).await
+    }
+}
+type FighterBakeProcessor = LoadTransformAndSave<
+    FighterBakeSourceLoader,
+    FighterBakeTransformer,
+    BakedFighterAnimationsSaver,
+>;
+
+pub struct BakedAnimationPlugin;
+impl Plugin for BakedAnimationPlugin {
+    fn build(&self, app: &mut App) {
+        app.init_asset::<BakedFighterAnimations>()
+            .register_asset_loader(FighterBakeSourceLoader)
+            .register_asset_loader(BakedFighterAnimationsLoader)
+            .register_asset_processor(FighterBakeProcessor::new(
+                FighterBakeTransformer,
+                BakedFighterAnimationsSaver,
+            ))
+            .set_default_asset_processor::<FighterBakeProcessor>("fighterbake")
+            .add_systems(
+                bevy_ggrs::prelude::GgrsSchedule,
+                super::runtime::update_fighter_bone_matrices
+                    .in_set(crate::schedule::GameplaySet::Animation),
+            )
+            .add_systems(
+                Update,
+                super::visual_binding::apply_baked_fighter_visual_pose,
+            )
+            .add_observer(super::visual_binding::bind_fighter_visual_bones);
+    }
+}
+
+fn bake_gltf(
+    bytes: &[u8],
+    buffer_bytes: &[Vec<u8>],
+    animations: &HashMap<AnimKind, String>,
+) -> io::Result<BakedFighterAnimations> {
+    let gltf = gltf::Gltf::from_slice(bytes)
+        .map_err(|error| io::Error::new(io::ErrorKind::InvalidData, error))?;
+    let buffers = gltf
+        .buffers()
+        .zip(buffer_bytes)
+        .map(|(buffer, bytes)| {
+            if bytes.len() < buffer.length() {
+                return Err(io::Error::new(
+                    io::ErrorKind::InvalidData,
+                    format!(
+                        "glTF buffer {} is too short: expected {}, got {}",
+                        buffer.index(),
+                        buffer.length(),
+                        bytes.len()
+                    ),
+                ));
+            }
+            Ok(gltf::buffer::Data(bytes.clone()))
+        })
+        .collect::<io::Result<Vec<_>>>()?;
+    if buffers.len() != gltf.buffers().len() {
+        return Err(io::Error::new(
+            io::ErrorKind::InvalidData,
+            "glTF buffer data is incomplete",
+        ));
+    }
+    bake_gltf_document(gltf.document, buffers, animations)
+}
+
+pub(super) fn bake_gltf_document(
+    document: gltf::Document,
+    buffers: Vec<gltf::buffer::Data>,
+    animations: &HashMap<AnimKind, String>,
+) -> io::Result<BakedFighterAnimations> {
+    let nodes: Vec<_> = document.nodes().collect();
+    if nodes.is_empty() {
+        return Err(io::Error::new(
+            io::ErrorKind::InvalidData,
+            "fighter model has no nodes",
+        ));
+    }
+    let mut parents = vec![None; nodes.len()];
+    for node in &nodes {
+        for child in node.children() {
+            parents[child.index()] = Some(node.index());
+        }
+    }
+    let names = nodes
+        .iter()
+        .map(|node| {
+            node.name().map(str::to_owned).ok_or_else(|| {
+                io::Error::new(
+                    io::ErrorKind::InvalidData,
+                    format!("node {} has no name", node.index()),
+                )
+            })
+        })
+        .collect::<io::Result<Vec<_>>>()?;
+    let mut pending = HashMap::<&str, Vec<AnimKind>>::new();
+    for (kind, name) in animations {
+        pending.entry(name).or_default().push(*kind);
+    }
+    let mut clips = Vec::with_capacity(pending.len());
+    let mut clip_indices = HashMap::with_capacity(animations.len());
+    for animation in document.animations() {
+        let name = animation.name().ok_or_else(|| {
+            io::Error::new(
+                io::ErrorKind::InvalidData,
+                format!("animation {} has no name", animation.index()),
+            )
+        })?;
+        let Some(kinds) = pending.remove(name) else {
+            continue;
+        };
+        let channels = animation
+            .channels()
+            .map(|channel| read_channel(channel, &buffers))
+            .collect::<io::Result<Vec<_>>>()?;
+        let duration = channels
+            .iter()
+            .filter_map(Channel::duration)
+            .fold(0.0_f32, f32::max);
+        let frame_count = baked_frame_count(duration, BAKED_ANIMATION_FPS);
+        let mut frames = Vec::with_capacity(frame_count);
+        for frame in 0..frame_count {
+            let time = (frame as f32 / BAKED_ANIMATION_FPS as f32).min(duration);
+            frames.push(
+                nodes
+                    .iter()
+                    .map(|node| local_transform(node.clone(), &channels, time))
+                    .collect::<io::Result<Vec<_>>>()?,
+            );
+        }
+        let index = clips.len();
+        clips.push(BakedAnimationClip { frames });
+        for kind in kinds {
+            clip_indices.insert(kind, index);
+        }
+    }
+    if clips.is_empty() {
+        return Err(io::Error::new(
+            io::ErrorKind::InvalidData,
+            "fighter model has no animations",
+        ));
+    }
+    if !pending.is_empty() {
+        let mut missing = pending.keys().copied().collect::<Vec<_>>();
+        missing.sort_unstable();
+        return Err(io::Error::new(
+            io::ErrorKind::InvalidData,
+            format!(
+                "fighter model has no animations named {}",
+                missing.join(", ")
+            ),
+        ));
+    }
+    Ok(BakedFighterAnimations {
+        frame_rate: BAKED_ANIMATION_FPS,
+        bone_names: names,
+        parents,
+        clips,
+        clip_indices,
+    })
+}
+
+pub(super) fn baked_frame_count(duration: f32, frame_rate: u32) -> usize {
+    let frame = duration as f64 * frame_rate as f64;
+    let nearest_frame = frame.round();
+    let last_frame = if (frame - nearest_frame).abs() < 0.0001 {
+        nearest_frame
+    } else {
+        frame.ceil()
+    };
+    last_frame as usize + 1
+}
+
+#[derive(Clone)]
+pub(super) struct Channel {
+    pub(super) node: usize,
+    pub(super) property: gltf::animation::Property,
+    pub(super) interpolation: gltf::animation::Interpolation,
+    pub(super) times: Vec<f32>,
+    pub(super) values: ChannelValues,
+}
+impl Channel {
+    fn duration(&self) -> Option<f32> {
+        self.times.last().copied()
+    }
+}
+#[derive(Clone)]
+pub(super) enum ChannelValues {
+    Vec3(Vec<[f32; 3]>),
+    Rotation(Vec<[f32; 4]>),
+}
+
+fn read_channel(
+    channel: gltf::animation::Channel<'_>,
+    buffers: &[gltf::buffer::Data],
+) -> io::Result<Channel> {
+    let reader = channel.reader(|buffer| Some(&buffers[buffer.index()].0));
+    let times = reader
+        .read_inputs()
+        .ok_or_else(|| {
+            io::Error::new(io::ErrorKind::InvalidData, "animation channel has no input")
+        })?
+        .collect();
+    let values = match reader.read_outputs().ok_or_else(|| {
+        io::Error::new(
+            io::ErrorKind::InvalidData,
+            "animation channel has no output",
+        )
+    })? {
+        gltf::animation::util::ReadOutputs::Translations(values)
+        | gltf::animation::util::ReadOutputs::Scales(values) => {
+            ChannelValues::Vec3(values.collect())
+        }
+        gltf::animation::util::ReadOutputs::Rotations(values) => {
+            ChannelValues::Rotation(values.into_f32().collect())
+        }
+        gltf::animation::util::ReadOutputs::MorphTargetWeights(_) => {
+            return Err(io::Error::new(
+                io::ErrorKind::InvalidData,
+                "morph target animation is not supported for bone baking",
+            ));
+        }
+    };
+    if channel.sampler().interpolation() == gltf::animation::Interpolation::CubicSpline {
+        return Err(io::Error::new(
+            io::ErrorKind::InvalidData,
+            "cubic spline animation is not supported for bone baking",
+        ));
+    }
+    Ok(Channel {
+        node: channel.target().node().index(),
+        property: channel.target().property(),
+        interpolation: channel.sampler().interpolation(),
+        times,
+        values,
+    })
+}
+
+fn local_transform(node: gltf::Node<'_>, channels: &[Channel], time: f32) -> io::Result<FixedMat4> {
+    let (mut translation, mut rotation, mut scale) = match node.transform() {
+        gltf::scene::Transform::Decomposed {
+            translation,
+            rotation,
+            scale,
+        } => (
+            Vec3::from(translation),
+            Quat::from_array(rotation),
+            Vec3::from(scale),
+        ),
+        gltf::scene::Transform::Matrix { matrix } => {
+            return FixedMat4::from_mat4(Mat4::from_cols_array_2d(&matrix));
+        }
+    };
+    for channel in channels
+        .iter()
+        .filter(|channel| channel.node == node.index())
+    {
+        match (&channel.values, channel.property) {
+            (ChannelValues::Vec3(values), gltf::animation::Property::Translation) => {
+                translation = Vec3::from(sample_vec3(channel, values, time))
+            }
+            (ChannelValues::Vec3(values), gltf::animation::Property::Scale) => {
+                scale = Vec3::from(sample_vec3(channel, values, time))
+            }
+            (ChannelValues::Rotation(values), gltf::animation::Property::Rotation) => {
+                rotation = Quat::from_array(sample_rotation(channel, values, time))
+            }
+            _ => {
+                return Err(io::Error::new(
+                    io::ErrorKind::InvalidData,
+                    "animation property does not match its values",
+                ));
+            }
+        }
+    }
+    FixedMat4::from_mat4(Mat4::from_scale_rotation_translation(
+        scale,
+        rotation,
+        translation,
+    ))
+}
+fn sample_index(channel: &Channel, time: f32) -> (usize, usize, f32) {
+    let next = channel.times.partition_point(|key| *key <= time);
+    if next == 0 {
+        return (0, 0, 0.0);
+    }
+    if next == channel.times.len() {
+        let last = next - 1;
+        return (last, last, 0.0);
+    }
+    let previous = next - 1;
+    let factor = (time - channel.times[previous]) / (channel.times[next] - channel.times[previous]);
+    (previous, next, factor)
+}
+pub(super) fn sample_vec3(channel: &Channel, values: &[[f32; 3]], time: f32) -> [f32; 3] {
+    let (from, to, factor) = sample_index(channel, time);
+    if channel.interpolation == gltf::animation::Interpolation::Step {
+        return values[from];
+    }
+    Vec3::from(values[from])
+        .lerp(Vec3::from(values[to]), factor)
+        .to_array()
+}
+fn sample_rotation(channel: &Channel, values: &[[f32; 4]], time: f32) -> [f32; 4] {
+    let (from, to, factor) = sample_index(channel, time);
+    if channel.interpolation == gltf::animation::Interpolation::Step {
+        return values[from];
+    }
+    Quat::from_array(values[from])
+        .slerp(Quat::from_array(values[to]), factor)
+        .to_array()
+}

src/fighter/baked_animation/mod.rs

@@ -0,0 +1,250 @@
+//! Deterministic, fighter-local skeletal animation samples for gameplay and rendering.
+
+mod asset_baking;
+mod runtime;
+mod visual_binding;
+
+pub use asset_baking::BakedAnimationPlugin;
+pub use crate::math::fixed_transform::FixedMat4;
+pub use runtime::{
+    BakedAnimationClip, BakedFighterAnimations, FighterBoneIndexMap, FighterBoneMatrices,
+    update_fighter_bone_matrices,
+};
+
+pub const BAKED_ANIMATION_FPS: u32 = 60;
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::fighter::{animation::AnimKind, manifest::FighterManifest};
+    use crate::math::{int::FGi32, vec3::FGVec3};
+    use asset_baking::{
+        Channel, ChannelValues, bake_gltf_document, baked_frame_count, sample_vec3,
+    };
+    use std::collections::HashMap;
+
+    #[test]
+    fn configured_fighter_clips_bake_to_fixed_point_frames() {
+        let manifest: FighterManifest = ron::from_str(include_str!(
+            "../../../assets/fighters/test/test.fighter.ron"
+        ))
+        .unwrap();
+        let (document, buffers, _) = gltf::import(concat!(
+            env!("CARGO_MANIFEST_DIR"),
+            "/assets/fighters/test/test_fighter.gltf"
+        ))
+        .unwrap();
+        let baked = bake_gltf_document(document, buffers, &manifest.animations).unwrap();
+
+        assert_eq!(baked.frame_rate, BAKED_ANIMATION_FPS);
+        assert_eq!(baked.frame_count(AnimKind::Wait), Some(121));
+        assert_eq!(baked.frame_count(AnimKind::Walk), Some(33));
+        assert_eq!(baked.frame_count(AnimKind::Run), Some(33));
+        assert_eq!(baked.frame_count(AnimKind::Dash), Some(21));
+        assert_eq!(baked.frame_count(AnimKind::Landing), Some(9));
+        assert_eq!(baked.frame_count(AnimKind::JumpBack), Some(57));
+        assert_eq!(baked.clip_indices.len(), manifest.animations.len());
+        assert_eq!(
+            baked.clip(AnimKind::Wait).unwrap().frames[0].len(),
+            baked.bone_names.len()
+        );
+        assert_eq!(baked.parents.len(), baked.bone_names.len());
+    }
+
+    #[test]
+    fn pose_sampling_wraps_repeating_frames_and_clamps_finished_frames() {
+        let first = FixedMat4::IDENTITY;
+        let mut second = FixedMat4::IDENTITY;
+        second.translate(FGVec3::lit("2", "0", "0"));
+        let mut terminal = FixedMat4::IDENTITY;
+        terminal.translate(FGVec3::lit("4", "0", "0"));
+        let baked = BakedFighterAnimations {
+            frame_rate: BAKED_ANIMATION_FPS,
+            bone_names: vec!["root".into()],
+            parents: vec![None],
+            clips: vec![BakedAnimationClip {
+                frames: vec![vec![first], vec![second], vec![terminal]],
+            }],
+            clip_indices: HashMap::from([(AnimKind::Wait, 0)]),
+        };
+        let repeating = crate::fighter::animation::FighterAnimationFrame {
+            kind: AnimKind::Wait,
+            frame: 3,
+            repeat: true,
+        };
+        let finished = crate::fighter::animation::FighterAnimationFrame {
+            kind: AnimKind::Wait,
+            frame: 4,
+            repeat: false,
+        };
+        assert_eq!(baked.sample_pose(&repeating), Some(&[second][..]));
+        assert_eq!(baked.sample_pose(&finished), Some(&[terminal][..]));
+    }
+
+    #[test]
+    fn frame_count_snaps_source_frame_rounding_error_to_the_bake_grid() {
+        assert_eq!(baked_frame_count(0.533333361, 60), 33);
+        assert_eq!(baked_frame_count(0.333333343, 60), 21);
+        assert_eq!(baked_frame_count(0.133333340, 60), 9);
+        assert_eq!(baked_frame_count(2.0, 60), 121);
+    }
+
+    #[test]
+    fn linear_source_channel_is_resampled_between_thirty_hz_keys() {
+        let channel = Channel {
+            node: 0,
+            property: gltf::animation::Property::Translation,
+            interpolation: gltf::animation::Interpolation::Linear,
+            times: vec![0.0, 1.0 / 30.0],
+            values: ChannelValues::Vec3(vec![[0.0, 0.0, 0.0], [2.0, 0.0, 0.0]]),
+        };
+        let ChannelValues::Vec3(values) = &channel.values else {
+            unreachable!()
+        };
+        assert_eq!(sample_vec3(&channel, values, 1.0 / 60.0), [1.0, 0.0, 0.0]);
+    }
+
+    #[test]
+    fn presentation_pose_interpolates_previous_and_current_local_transforms() {
+        let mut previous = FixedMat4::IDENTITY;
+        previous.translate(FGVec3::lit("2", "0", "0"));
+        let mut current = FixedMat4::IDENTITY;
+        current.translate(FGVec3::lit("6", "0", "0"));
+        let transform = runtime::interpolate_transform(previous, current, 0.25);
+        assert_eq!(
+            transform.translation,
+            bevy::prelude::Vec3::new(3.0, 0.0, 0.0)
+        );
+    }
+
+    #[test]
+    fn bone_matrix_component_keeps_names_aligned_with_the_current_pose() {
+        let first = FixedMat4::IDENTITY;
+        let mut second = FixedMat4::IDENTITY;
+        second.translate(FGVec3::lit("0", "3", "0"));
+        let mut matrices = FighterBoneMatrices::default();
+        matrices.set_pose(
+            &["root".into(), "hand".into()],
+            &[None, Some(0)],
+            &[first, second],
+            FGi32::ONE,
+        );
+        assert_eq!(matrices.get_current("hand"), Some(second));
+        assert_eq!(
+            matrices.iter().collect::<Vec<_>>(),
+            vec![("root", first), ("hand", second)]
+        );
+    }
+
+    #[test]
+    fn local_pose_reconstructs_model_space_for_gameplay() {
+        let mut root = FixedMat4::IDENTITY;
+        root.translate(FGVec3::lit("10", "0", "0"));
+        let mut hand = FixedMat4::IDENTITY;
+        hand.translate(FGVec3::lit("0", "3", "0"));
+        let mut matrices = FighterBoneMatrices::default();
+        matrices.set_pose(
+            &["root".into(), "hand".into()],
+            &[None, Some(0)],
+            &[root, hand],
+            FGi32::ONE,
+        );
+        assert_eq!(matrices.local(1), Some(hand));
+        assert_eq!(
+            matrices.get_current("hand").unwrap().get_translation(),
+            FGVec3::lit("10", "3", "0")
+        );
+        assert_eq!(
+            matrices
+                .local(1)
+                .unwrap()
+                .to_mat4()
+                .transform_point3(bevy::prelude::Vec3::ZERO),
+            bevy::prelude::Vec3::new(0.0, 3.0, 0.0)
+        );
+    }
+
+    #[test]
+    fn model_scale_affects_gameplay_bones_without_changing_visual_locals() {
+        let mut root = FixedMat4::IDENTITY;
+        root.translate(FGVec3::lit("1", "0", "0"));
+        let mut hand = FixedMat4::IDENTITY;
+        hand.translate(FGVec3::lit("0", "2", "0"));
+        let mut matrices = FighterBoneMatrices::default();
+        matrices.set_pose(
+            &["root".into(), "hand".into()],
+            &[None, Some(0)],
+            &[root, hand],
+            FGi32::lit("10"),
+        );
+        assert_eq!(matrices.local(1), Some(hand));
+        assert_eq!(
+            matrices.get_current("hand").unwrap().get_translation(),
+            FGVec3::lit("10", "20", "0")
+        );
+    }
+
+    #[test]
+    fn fixed_matrix_transforms_points() {
+        let transform = FixedMat4 {
+            cols: [
+                [FGi32::lit("2"), FGi32::ZERO, FGi32::ZERO, FGi32::ZERO],
+                [FGi32::ZERO, FGi32::lit("3"), FGi32::ZERO, FGi32::ZERO],
+                [FGi32::ZERO, FGi32::ZERO, FGi32::lit("4"), FGi32::ZERO],
+                [
+                    FGi32::lit("10"),
+                    FGi32::lit("-5"),
+                    FGi32::lit("1.5"),
+                    FGi32::ONE,
+                ],
+            ],
+        };
+        assert_eq!(
+            transform.transform_point(FGVec3::lit("1.25", "-2", "0.5")),
+            FGVec3::lit("12.5", "-11", "3.5")
+        );
+    }
+
+    #[test]
+    fn fixed_matrix_rotates_points_around_y() {
+        let transform = FixedMat4 {
+            cols: [
+                [FGi32::ONE, FGi32::ZERO, FGi32::ZERO, FGi32::ZERO],
+                [FGi32::ZERO, FGi32::ONE, FGi32::ZERO, FGi32::ZERO],
+                [FGi32::ZERO, FGi32::ZERO, FGi32::ONE, FGi32::ZERO],
+                [
+                    FGi32::lit("10"),
+                    FGi32::lit("2"),
+                    FGi32::lit("-3"),
+                    FGi32::ONE,
+                ],
+            ],
+        };
+        assert_eq!(
+            transform
+                .rotate_y(5)
+                .transform_point(FGVec3::lit("1", "0", "0")),
+            FGVec3::lit("10", "2", "-4")
+        );
+    }
+
+    #[test]
+    fn fixed_matrix_builders_set_euler_rotation_and_translation() {
+        let transform = FixedMat4::IDENTITY
+            .with_rotation(FGVec3::lit("0", "0", "1.5707963267948966"))
+            .with_translation(FGVec3::lit("10", "2", "-3"));
+        assert_eq!(
+            transform.transform_point(FGVec3::lit("1", "0", "0")),
+            FGVec3::lit("10", "3", "-3")
+        );
+        assert_eq!(transform.get_translation(), FGVec3::lit("10", "2", "-3"));
+    }
+
+    #[test]
+    fn fixed_matrix_rotation_builder_preserves_translation() {
+        let transform = FixedMat4::IDENTITY
+            .with_translation(FGVec3::lit("4", "5", "6"))
+            .with_rotation(FGVec3::lit("0", "0", "1.5707963267948966"));
+        assert_eq!(transform.get_translation(), FGVec3::lit("4", "5", "6"));
+    }
+}

src/fighter/baked_animation/runtime.rs

@@ -0,0 +1,244 @@
+use std::collections::HashMap;
+
+use bevy::prelude::*;
+use serde::{Deserialize, Serialize};
+
+use super::{BAKED_ANIMATION_FPS};
+
+use crate::{
+    fighter::{
+        Fighter,
+        animation::{AnimKind, FighterAnimationFrame},
+        manifest::FighterManifest,
+        visual::FighterAnimations,
+    },
+    math::int::FGi32,
+    math::fixed_transform::FixedMat4
+};
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct BakedAnimationClip {
+    pub frames: Vec<Vec<FixedMat4>>,
+}
+
+#[derive(Asset, bevy::reflect::TypePath, Clone, Debug, Serialize, Deserialize)]
+#[type_path = "shinespark::fighter::baked_animation"]
+pub struct BakedFighterAnimations {
+    pub frame_rate: u32,
+    pub bone_names: Vec<String>,
+    pub parents: Vec<Option<usize>>,
+    pub(super) clips: Vec<BakedAnimationClip>,
+    pub(super) clip_indices: HashMap<AnimKind, usize>,
+}
+
+impl BakedFighterAnimations {
+    pub fn contains_bone(&self, bone: &str) -> bool {
+        self.bone_names.iter().any(|name| name == bone)
+    }
+    pub fn has_unique_bone_names(&self) -> bool {
+        let mut names = std::collections::HashSet::with_capacity(self.bone_names.len());
+        self.bone_names.iter().all(|name| names.insert(name))
+    }
+    pub fn sample_pose(&self, frame: &FighterAnimationFrame) -> Option<&[FixedMat4]> {
+        let frames = &self.clip(frame.kind)?.frames;
+        let frame_index = if frame.repeat {
+            let loop_frame_count = frames.len().saturating_sub(1).max(1) as u32;
+            frame.frame % loop_frame_count
+        } else {
+            frame.frame
+        };
+        frames
+            .get(frame_index as usize)
+            .or_else(|| frames.last())
+            .map(Vec::as_slice)
+    }
+    pub fn frame_count(&self, kind: AnimKind) -> Option<u32> {
+        self.clip(kind).map(|clip| clip.frames.len() as u32)
+    }
+    pub(super) fn clip(&self, kind: AnimKind) -> Option<&BakedAnimationClip> {
+        self.clip_indices
+            .get(&kind)
+            .and_then(|index| self.clips.get(*index))
+    }
+}
+
+#[derive(Component, Clone, Debug, Default)]
+pub struct FighterBoneMatrices {
+    bone_names: Vec<String>,
+    parents: Vec<Option<usize>>,
+    matrices: Vec<FixedMat4>,
+    previous_frame_matrices: Vec<FixedMat4>,
+    local_matrices: Vec<FixedMat4>,
+    previous_local_matrices: Vec<FixedMat4>,
+}
+
+#[derive(Component, Clone, Debug, Default)]
+pub struct FighterBoneIndexMap(pub HashMap<String, usize>);
+
+impl FighterBoneMatrices {
+    pub fn get(&self, bone: &str) -> Option<(FixedMat4, FixedMat4)> {
+        let index = self.bone_names.iter().position(|name| name == bone)?;
+        Some((
+            *self.previous_frame_matrices.get(index)?,
+            *self.matrices.get(index)?,
+        ))
+    }
+    pub fn get_current(&self, bone: &str) -> Option<FixedMat4> {
+        let index = self.bone_names.iter().position(|name| name == bone)?;
+        self.matrices.get(index).copied()
+    }
+    pub fn get_index(&self, index: usize) -> Option<(FixedMat4, FixedMat4)> {
+        Some((
+            *self.previous_frame_matrices.get(index)?,
+            *self.matrices.get(index)?,
+        ))
+    }
+    pub fn get_current_index(&self, index: usize) -> Option<FixedMat4> {
+        self.matrices.get(index).copied()
+    }
+    pub fn iter(&self) -> impl Iterator<Item = (&str, FixedMat4)> {
+        self.bone_names
+            .iter()
+            .map(String::as_str)
+            .zip(self.matrices.iter().copied())
+    }
+    pub fn local(&self, index: usize) -> Option<FixedMat4> {
+        self.local_matrices.get(index).copied()
+    }
+    pub(super) fn presentation_local(
+        &self,
+        index: usize,
+        overstep_fraction: f32,
+    ) -> Option<Transform> {
+        let current = self.local_matrices.get(index).copied()?;
+        let previous = self
+            .previous_local_matrices
+            .get(index)
+            .copied()
+            .unwrap_or(current);
+        Some(interpolate_transform(previous, current, overstep_fraction))
+    }
+    pub(super) fn set_pose(
+        &mut self,
+        bone_names: &[String],
+        parents: &[Option<usize>],
+        local: &[FixedMat4],
+        model_scale: FGi32,
+    ) {
+        assert_eq!(
+            bone_names.len(),
+            local.len(),
+            "baked animation pose does not match its bone names"
+        );
+        assert_eq!(
+            bone_names.len(),
+            parents.len(),
+            "baked bone parents do not match names"
+        );
+        if self.bone_names.is_empty() {
+            self.bone_names.extend_from_slice(bone_names);
+            self.parents.extend_from_slice(parents);
+        } else {
+            assert_eq!(self.bone_names, bone_names, "baked bone names changed");
+            assert_eq!(self.parents, parents, "baked bone parents changed");
+        }
+        std::mem::swap(&mut self.matrices, &mut self.previous_frame_matrices);
+        std::mem::swap(&mut self.local_matrices, &mut self.previous_local_matrices);
+        self.local_matrices.clear();
+        self.local_matrices.extend_from_slice(local);
+        let mut model = vec![None; local.len()];
+        for index in 0..local.len() {
+            resolve_model_transform(index, parents, local, &mut model)
+                .expect("baked bone hierarchy should be valid");
+        }
+        let model_scale = FixedMat4 {
+            cols: [
+                [model_scale, FGi32::ZERO, FGi32::ZERO, FGi32::ZERO],
+                [FGi32::ZERO, model_scale, FGi32::ZERO, FGi32::ZERO],
+                [FGi32::ZERO, FGi32::ZERO, model_scale, FGi32::ZERO],
+                [FGi32::ZERO, FGi32::ZERO, FGi32::ZERO, FGi32::ONE],
+            ],
+        };
+        self.matrices = model
+            .into_iter()
+            .map(|matrix| model_scale.mul(matrix.expect("baked bone hierarchy should be valid")))
+            .collect();
+    }
+}
+
+pub fn update_fighter_bone_matrices(
+    mut fighters: Query<(
+        &FighterAnimationFrame,
+        &FighterAnimations,
+        &Fighter,
+        &mut FighterBoneMatrices,
+        &mut FighterBoneIndexMap,
+    )>,
+    baked_assets: Res<Assets<BakedFighterAnimations>>,
+    manifests: Res<Assets<FighterManifest>>,
+) {
+    for (frame, animations, fighter, mut matrices, mut bone_indices) in &mut fighters {
+        let baked = baked_assets
+            .get(&animations.baked)
+            .expect("fighter baked animation asset should be loaded before the match starts");
+        assert_eq!(
+            baked.frame_rate, BAKED_ANIMATION_FPS,
+            "fighter baked animation rate does not match the simulation rate"
+        );
+        let pose = baked
+            .sample_pose(frame)
+            .expect("fighter animation frame should select a baked pose");
+        let manifest = manifests
+            .get(&fighter.manifest)
+            .expect("fighter manifest should be loaded before the match starts");
+        matrices.set_pose(
+            &baked.bone_names,
+            &baked.parents,
+            pose,
+            manifest.model_scale,
+        );
+        if bone_indices.0.is_empty() {
+            bone_indices.0.extend(
+                baked
+                    .bone_names
+                    .iter()
+                    .enumerate()
+                    .map(|(index, name)| (name.clone(), index)),
+            );
+        }
+    }
+}
+
+fn resolve_model_transform(
+    index: usize,
+    parents: &[Option<usize>],
+    local: &[FixedMat4],
+    model: &mut [Option<FixedMat4>],
+) -> std::io::Result<FixedMat4> {
+    if let Some(value) = model[index] {
+        return Ok(value);
+    }
+    let value = match parents[index] {
+        Some(parent) => resolve_model_transform(parent, parents, local, model)?.mul(local[index]),
+        None => local[index],
+    };
+    model[index] = Some(value);
+    Ok(value)
+}
+
+pub(super) fn interpolate_transform(
+    previous: FixedMat4,
+    current: FixedMat4,
+    factor: f32,
+) -> Transform {
+    let (previous_scale, previous_rotation, previous_translation) =
+        previous.to_mat4().to_scale_rotation_translation();
+    let (current_scale, current_rotation, current_translation) =
+        current.to_mat4().to_scale_rotation_translation();
+    let factor = factor.clamp(0.0, 1.0);
+    Transform {
+        translation: previous_translation.lerp(current_translation, factor),
+        rotation: previous_rotation.slerp(current_rotation, factor),
+        scale: previous_scale.lerp(current_scale, factor),
+    }
+}

src/fighter/baked_animation/visual_binding.rs

@@ -0,0 +1,107 @@
+use bevy::prelude::*;
+use bevy::world_serialization::{WorldInstanceReady, WorldInstanceSpawner};
+use bevy_ggrs::GgrsFrameTiming;
+use std::collections::{HashMap, HashSet};
+
+use super::{BakedFighterAnimations, FighterBoneMatrices};
+use crate::fighter::visual::FighterAnimations;
+
+#[derive(Component)]
+pub(super) struct BakedFighterBone {
+    fighter: Entity,
+    index: usize,
+}
+
+pub(super) fn bind_fighter_visual_bones(
+    ready: On<WorldInstanceReady>,
+    mut commands: Commands,
+    spawner: Res<WorldInstanceSpawner>,
+    fighters: Query<&FighterAnimations>,
+    baked_assets: Res<Assets<BakedFighterAnimations>>,
+    nodes: Query<(&Name, Option<&ChildOf>)>,
+    animation_players: Query<(), With<AnimationPlayer>>,
+) {
+    let fighter = ready.entity;
+    let Ok(animations) = fighters.get(fighter) else {
+        return;
+    };
+    let baked = baked_assets
+        .get(&animations.baked)
+        .expect("fighter baked animation asset should be loaded before its visual scene");
+    let entities = spawner
+        .iter_instance_entities(ready.instance_id)
+        .collect::<HashSet<_>>();
+    for &entity in &entities {
+        if animation_players.contains(entity) {
+            commands.entity(entity).remove::<AnimationPlayer>();
+        }
+    }
+    let mut indices = HashMap::with_capacity(baked.bone_names.len());
+    for (index, name) in baked.bone_names.iter().enumerate() {
+        let key = (baked.parents[index], name.as_str());
+        assert!(
+            indices.insert(key, index).is_none(),
+            "fighter GLTF has duplicate node names under the same parent"
+        );
+    }
+    let mut assigned = HashMap::new();
+    let mut remaining = entities.iter().copied().collect::<Vec<_>>();
+    while !remaining.is_empty() {
+        let mut next = Vec::new();
+        let mut progress = false;
+        for entity in remaining {
+            let Ok((name, parent)) = nodes.get(entity) else {
+                continue;
+            };
+            let parent = parent.map(ChildOf::parent);
+            let parent_index = match parent {
+                Some(parent) if entities.contains(&parent) => {
+                    if let Some(index) = assigned.get(&parent) {
+                        Some(*index)
+                    } else if nodes.get(parent).ok().is_some_and(|(name, _)| {
+                        baked.bone_names.iter().any(|bone| bone == name.as_str())
+                    }) {
+                        next.push(entity);
+                        continue;
+                    } else {
+                        None
+                    }
+                }
+                _ => None,
+            };
+            if let Some(&index) = indices.get(&(parent_index, name.as_str())) {
+                assigned.insert(entity, index);
+                progress = true;
+            }
+        }
+        if !progress {
+            break;
+        }
+        remaining = next;
+    }
+    if assigned.len() != baked.bone_names.len() {
+        warn!(fighter = ?fighter, bound = assigned.len(), expected = baked.bone_names.len(), "could not bind every baked fighter node to its visual scene");
+    }
+    for (entity, index) in assigned {
+        commands
+            .entity(entity)
+            .insert(BakedFighterBone { fighter, index });
+    }
+}
+
+pub(super) fn apply_baked_fighter_visual_pose(
+    mut nodes: Query<(&mut Transform, &BakedFighterBone)>,
+    fighters: Query<&FighterBoneMatrices>,
+    timing: Res<GgrsFrameTiming>,
+) {
+    let overstep_fraction = timing.overstep_fraction();
+    for (mut transform, bone) in &mut nodes {
+        let Ok(matrices) = fighters.get(bone.fighter) else {
+            continue;
+        };
+        let Some(local) = matrices.presentation_local(bone.index, overstep_fraction) else {
+            continue;
+        };
+        *transform = local;
+    }
+}

src/fighter/collision.rs

@@ -1,9 +1,10 @@
 //! Resolving an integrated fighter position against the stage.
 
-use crate::fighter::state::FighterStateContext;
+use crate::fighter::ecb::FighterPreviousECB;
+use crate::fighter::{FighterECB, FighterPreviousTranslation, FighterTranslation};
 use crate::math::segment::FGSegment2d;
 use crate::math::vec::FGVec2;
-use crate::stage::line::StageLineID;
+use crate::stage::line::{StageCollision, StageLineID};
 /*
 pub fn collide_fighter_with_scene(
     fighters: Query<(&FighterECB, &mut FighterVelocity, &mut FighterTranslation)>,
@@ -38,16 +39,20 @@ pub struct AirCollisionWithStageResult {
 }
 
 pub fn air_collide_with_stage(
-    state_context: &FighterStateContext,
+    prev_translation: &FighterPreviousTranslation,
+    translation: &FighterTranslation,
+    prev_ecb: &FighterPreviousECB,
+    ecb: &FighterECB,
+    stage_collision: &StageCollision,
 ) -> Option<AirCollisionWithStageResult> {
     let ray_segment = FGSegment2d::new(
-        state_context.prev_translation.0 + state_context.prev_ecb.get_bottom_point(),
-        state_context.translation.0 + state_context.ecb.get_bottom_point(),
+        prev_translation.0 + prev_ecb.get_bottom_point(),
+        translation.0 + ecb.get_bottom_point(),
     );
 
     let mut intersect_results = vec![];
 
-    for (poly_idx, poly) in state_context.stage_collision.stage_polys.iter().enumerate() {
+    for (poly_idx, poly) in stage_collision.stage_polys.iter().enumerate() {
         if let Some(intersect_result) = poly.intersect_ray(ray_segment) {
             intersect_results.push((
                 AirCollisionWithStageResult {

src/fighter/debug.rs

@@ -9,7 +9,7 @@ use bevy_egui::{EguiContexts, egui};
 use crate::debug_tools::{DebugSettings, FighterDebugRowKind};
 use crate::fighter::animation::FighterAnimationFrame;
 use crate::fighter::attack::{
-    FighterKnockbackVelocity, FighterLastAttackDebug, FighterPendingHitReaction,
+    self, FighterKnockbackVelocity, FighterLastAttackDebug, FighterPendingHitReaction,
     FighterSolvedHurtboxes,
 };
 use crate::fighter::baked_animation::{BakedFighterAnimations, FighterBoneMatrices};
@@ -382,14 +382,14 @@ pub fn attack_debug_gather(
         &FighterPendingHitReaction,
         &FighterTranslation,
         &Fighter,
+        &FighterInput,
     )>,
     mut commands: Commands,
     manifests: Res<Assets<FighterManifest>>,
     game_settings: Res<GameSettings>,
 ) -> Result {
-    for (entity, reaction, translation, fighter) in query {
+    for (entity, reaction, translation, fighter, input) in query {
         let Some(ref hit) = reaction.0 else {
-            commands.entity(entity).remove::<FighterLastAttackDebug>();
             continue;
         };
 
@@ -397,7 +397,13 @@ pub fn attack_debug_gather(
             .get(&fighter.manifest)
             .ok_or(FighterErrors::FighterManifestNotFound)?;
 
-        let mut knockback_vel = FighterKnockbackVelocity(hit.launch_velocity);
+        let launch_dir = attack::directional_influence::apply_directional_influence(
+            input.get_last_frame().movement,
+            hit.launch_angle,
+            game_settings.fighter_common.di_max_angle,
+        );
+
+        let mut knockback_vel = FighterKnockbackVelocity(launch_dir * hit.launch_velocity);
         let mut fighter_vel = FighterVelocity(FGVec2::ZERO);
         let mut translation = Vec3::new(translation.x.to_num(), translation.y.to_num(), 0.0);
 
@@ -406,7 +412,7 @@ pub fn attack_debug_gather(
         points.reserve(hit.hitstun_frames as usize);
 
         for _ in 1..hit.hitstun_frames {
-            air::integrate_gravity(&mut fighter_vel, &manifest.attributes);
+            air::integrate_gravity(&mut fighter_vel, &manifest.attributes, false);
 
             let vel = knockback_vel.length();
             let new_vel = vel

src/fighter/mod.rs

@@ -36,13 +36,9 @@ use crate::{
     AppState, fighter::{
         attack::{
             AttackKind, FighterAttackPlugin, FighterAttackScriptAssets, FighterDamage,
-            FighterKnockbackVelocity, FighterPendingHitReaction, FighterReceivedAttacks,
-            FighterSolvedHurtboxes, FighterStaleMoveQueue,
-        },
-        baked_animation::{FighterBoneIndexMap, FighterBoneMatrices},
-        manifest::FighterManifest,
-        state::{FighterState, fall::FallState},
-        visual::FighterAnimations,
+            FighterKnockbackVelocity, FighterPendingHitReaction, FighterSolvedHurtboxes,
+            FighterStaleMoveQueue,
+        }, baked_animation::{FighterBoneIndexMap, FighterBoneMatrices}, manifest::FighterManifest, state::{FighterState, air::AirborneStateCommon, fall::FallState}, visual::FighterAnimations,
     }, input::FighterInput, math::{int::FGi32, vec::FGVec2}, player::Player, schedule::GameplaySet, scripting::FighterAttackScript, stage::line::StageCollision,
 };
 use state::state_interrupt_system;
@@ -58,7 +54,30 @@ pub enum FighterFacingDirection {
     Right,
 }
 
+#[derive(Component, Copy, Clone, Hash, Debug, PartialEq, Reflect, Default)]
+pub enum FighterHitstopShakeKind {
+    #[default]
+    Horizontal,
+    Vertical
+}
+
+#[derive(Component, Copy, Clone, Hash, Debug, PartialEq, Reflect, Default)]
+pub enum FighterHitstopShakeRole {
+    #[default]
+    Attacker,
+    Receiver
+}
+
 #[derive(Component, Default, Copy, Clone, Hash)]
+pub struct FighterHitstopShake {
+    pub remaining_frames: u32,
+    pub total_frames: u32,
+    pub kind: FighterHitstopShakeKind,
+    pub role: FighterHitstopShakeRole
+}
+
+#[derive(Component, Default, Copy, Clone, Hash)]
+#[require(FighterHitstopShake)]
 pub struct FighterHitstop {
     pub remaining_frames: u32,
 }
@@ -109,12 +128,12 @@ pub struct FighterVisual;
 
 #[derive(Component)]
 #[require(
-    FighterReceivedAttacks,
     FighterStaleMoveQueue,
     FighterDamage,
     FighterPendingHitReaction,
     FighterHitstop,
-    FighterKnockbackVelocity
+    FighterKnockbackVelocity,
+    FighterTranslation,
 )]
 pub struct Fighter {
     pub manifest: Handle<FighterManifest>,
@@ -192,8 +211,6 @@ impl Plugin for FighterPlugin {
             .checksum_component_with_hash::<FighterHitstop>()
             .rollback_component_with_copy::<FighterKnockbackVelocity>()
             .checksum_component_with_hash::<FighterKnockbackVelocity>()
-            .rollback_component_with_clone::<FighterReceivedAttacks>()
-            .checksum_component_with_hash::<FighterReceivedAttacks>()
             .rollback_resource_with_reflect::<StageCollision>()
             // Debug views.
             .add_systems(
@@ -216,7 +233,8 @@ impl Plugin for FighterPlugin {
                         .after(debug::attack_debug_gather),
                 )
                     .chain()
-                    .run_if(crate::debug_tools::attack_hitboxes_enabled).run_if(in_state(AppState::InMatch)),
+                    .run_if(crate::debug_tools::attack_hitboxes_enabled)
+                    .run_if(in_state(AppState::InMatch)),
             )
             .add_systems(
                 FixedPostUpdate,
@@ -225,6 +243,7 @@ impl Plugin for FighterPlugin {
             .rollback_component_with_clone::<FighterState>()
             .rollback_component_with_clone::<FighterHitboxes>()
             .rollback_component_with_clone::<FighterBoneMatrices>()
+            .rollback_component_with_clone::<FighterHitstopShake>()
             .checksum_component_with_hash::<FighterHitboxes>()
             .rollback_component_with_clone::<FighterSolvedHurtboxes>()
             .checksum_component_with_hash::<FighterSolvedHurtboxes>()
@@ -240,6 +259,7 @@ pub struct FighterActiveAttack {
     pub active_hitboxes: Vec<usize>,
     pub solved_hitboxes: Vec<attack::FighterSolvedHitbox>,
     pub hit_fighters: Vec<Entity>,
+    pub stalled: bool
 }
 
 #[derive(Component, Clone, Debug, Default, Hash)]
@@ -280,7 +300,7 @@ pub fn spawn_fighter(
             visual_root,
             animations,
             attack_scripts,
-            FighterState::Fall(FallState),
+            FighterState::Fall(FallState::new(AirborneStateCommon::default())),
             animation::FighterAnimationFrame::new(animation::AnimKind::Wait, true),
             (
                 baked_animation::FighterBoneMatrices::default(),
@@ -294,8 +314,9 @@ pub fn spawn_fighter(
         .id()
 }
 
-pub fn decay_hitstop(query: Query<&mut FighterHitstop>) {
-    for mut hitstop in query {
+pub fn decay_hitstop(query: Query<(&mut FighterHitstop, &mut FighterHitstopShake)>) {
+    for (mut hitstop, mut hitstop_shake) in query {
         hitstop.remaining_frames = hitstop.remaining_frames.saturating_sub(1);
+        hitstop_shake.remaining_frames = hitstop_shake.remaining_frames.saturating_sub(1);
     }
 }

src/fighter/motion.rs

@@ -5,6 +5,8 @@ use bevy::prelude::*;
 use bevy_ggrs::GgrsFrameTiming;
 
 use crate::debug_tools::PresentationMotionMode;
+use crate::fighter::{FighterHitstopShake};
+use crate::game_settings::GameSettings;
 use crate::{
     fighter::{FighterECB, FighterFacingDirection, baked_animation::FixedMat4},
     math::{int::FGi32, vec::FGVec2, vec3::FGVec3},
@@ -58,13 +60,15 @@ pub fn apply_fighter_translation_to_visuals(
         &FighterTranslation,
         &FighterPreviousTranslation,
         &FighterECB,
+        &FighterHitstopShake,
         &mut Transform,
     )>,
     timing: Res<GgrsFrameTiming>,
     debug_settings: Res<crate::debug_tools::DebugSettings>,
+    game_settings: Res<GameSettings>,
 ) {
     let overstep_fraction = timing.overstep_fraction();
-    for (translation, previous_translation, ecb, mut transform) in query {
+    for (translation, previous_translation, ecb, hitstop_shake, mut transform) in query {
         let translation = sample_presentation_translation(
             *previous_translation,
             *translation,
@@ -77,6 +81,28 @@ pub fn apply_fighter_translation_to_visuals(
             translation.y + bottom.y.to_num::<f32>(),
             0.0,
         );
+
+        if hitstop_shake.remaining_frames > 0 && hitstop_shake.total_frames > 0 && !game_settings.fighter_common.visual_shake_table.is_empty() {
+            let total = hitstop_shake.total_frames as f32;
+            let curr = hitstop_shake.remaining_frames as f32;
+            let elapsed = 1.0 - curr / total;
+
+            
+            let access_index = (hitstop_shake.remaining_frames as usize) % game_settings.fighter_common.visual_shake_table.len();
+            let shake_multiplier = match hitstop_shake.role {
+                super::FighterHitstopShakeRole::Attacker => game_settings.fighter_common.attacker_visual_shake_multiplier,
+                super::FighterHitstopShakeRole::Receiver => 1.0,
+            };
+            let shake_amount: f32 = 1.0 - EaseFunction::QuinticIn.sample(elapsed).unwrap_or_default();
+            let shake_amount = game_settings.fighter_common.visual_shake_table[access_index] * shake_amount * shake_multiplier;
+
+            let shake_offset = match hitstop_shake.kind {
+                super::FighterHitstopShakeKind::Horizontal => Vec3::new(shake_amount, 0.0, 0.0),
+                super::FighterHitstopShakeKind::Vertical => Vec3::new(0.0, shake_amount, 0.0),
+            };
+
+            transform.translation += shake_offset;
+        }
     }
 }
 
@@ -85,22 +111,15 @@ pub fn apply_air_motion(
         &FighterVelocity,
         &mut FighterTranslation,
         &mut FighterPreviousTranslation,
-        &mut Transform,
     )>,
     _time: Res<Time<Fixed>>,
 ) {
-    for (velocity, mut translation, mut prev_translation, _transform) in fighters {
+    for (velocity, mut translation, mut prev_translation) in fighters {
         prev_translation.0 = translation.0;
         translation.0 += velocity.0;
     }
 }
 
-pub fn copy_fighter_transform_to_visuals(fighters: Query<(&FighterTranslation, &mut Transform)>) {
-    for (translation, mut transform) in fighters {
-        transform.translation = Vec3::new(translation.x.to_num(), translation.y.to_num(), 0.0);
-    }
-}
-
 pub fn fighter_movement() {}
 
 pub fn snapshot_fighter_motion(

src/fighter/state/air.rs

@@ -1,8 +1,45 @@
+use crate::fighter::state::ground::GroundedStateCommon;
+use crate::fighter::state::land::{LandingState, LandingType};
+use crate::fighter::state::{CollisionContext, FighterState};
 use crate::fighter::*;
+use crate::input::FighterCommands;
 
-pub fn integrate_gravity(velocity: &mut FighterVelocity, attributes: &FighterAttributes) {
+#[derive(Default, Debug, Clone, Copy, Hash)]
+pub struct AirborneStateCommon {
+    pub is_fast_falling: bool,
+}
+
+pub fn process_fast_fall(
+    airborne_state_common: &mut AirborneStateCommon,
+    input: &mut FighterInput,
+    velocity: &mut FighterVelocity,
+    attributes: &FighterAttributes,
+) {
+    if velocity.y.is_negative() {
+        if input.has_command(FighterCommands::SmashMoveDown) {
+            airborne_state_common.is_fast_falling = true;
+        }
+        input.clear_command(FighterCommands::SmashMoveDown);
+    }
+
+    if airborne_state_common.is_fast_falling {
+        velocity.y = -attributes.fast_fall_speed;
+    }
+}
+
+pub fn integrate_gravity(
+    velocity: &mut FighterVelocity,
+    attributes: &FighterAttributes,
+    fast_fall: bool
+) {
     velocity.y -= attributes.gravity;
-    velocity.y = velocity.y.max(-attributes.terminal_velocity);
+
+    let terminal_vel = if fast_fall {
+        -attributes.fast_fall_speed
+    } else {
+        -attributes.terminal_velocity
+    };
+    velocity.y = velocity.y.max(terminal_vel);
 }
 
 pub fn apply_air_drift(
@@ -53,6 +90,31 @@ pub fn apply_air_motion(
     translation.0 += velocity.0;
 }
 
+pub fn update_standard_motion(
+    ctx: &mut crate::fighter::state::UpdateContext,
+    airborne_common: &mut AirborneStateCommon,
+) {
+    process_fast_fall(airborne_common, ctx.input, &mut ctx.velocity, ctx.fighter_attributes);
+    integrate_gravity(ctx.velocity, ctx.fighter_attributes, airborne_common.is_fast_falling);
+    apply_air_drift(ctx.velocity, ctx.fighter_attributes, ctx.input);
+    apply_air_motion(ctx.velocity, ctx.translation, ctx.prev_translation);
+}
+
+pub fn collision_interrupt(
+    ctx: &mut CollisionContext,
+    landing_type: LandingType,
+) -> Option<FighterState> {
+    let res = ctx.air_collide_with_stage()?;
+    ctx.translation.0 = res.hit_position - ctx.ecb.get_bottom_point();
+    let grounded_common = GroundedStateCommon {
+        current_line_id: res.line_id,
+    };
+    Some(FighterState::Land(LandingState::create(
+        grounded_common,
+        landing_type,
+    )))
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -86,6 +148,7 @@ mod tests {
             air_drift_max: FGi32::lit("1.2"),
             ground_friction: FGi32::ZERO,
             terminal_velocity: FGi32::ZERO,
+            fast_fall_speed: FGi32::ZERO,
             gravity: FGi32::ZERO,
             weight: FGi32::lit("1"),
             air_friction: FGi32::lit("0.001"),

src/fighter/state/air_dodge.rs

@@ -1,16 +1,9 @@
 use crate::{
     fighter::{
-        animation::AnimKind,
-        collision,
-        state::{
-            FighterState, FighterStateContext, FighterStateImpl, air,
-            fall::FallState,
-            ground::GroundedStateCommon,
-            land::{LandingState, LandingType},
+        animation::AnimKind, state::{
+            CollisionContext, EnterContext, FighterState, FighterStateImpl, InterruptContext, UpdateContext, air::{self, AirborneStateCommon}, fall::FallState, land::LandingType,
         },
-    },
-    input,
-    math::vec::FGVec2,
+    }, input, math::vec::FGVec2,
 };
 
 #[derive(Debug, Clone, Hash)]
@@ -21,16 +14,16 @@ pub struct AirDodgeState {
 impl FighterStateImpl for AirDodgeState {
     const NAME: &'static str = "AirDodge";
 
-    fn check_interrupt(&self, state_context: &mut FighterStateContext) -> Option<FighterState> {
+    fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
         if state_context.is_current_animation_finished() {
-            Some(FighterState::Fall(FallState))
+            Some(FighterState::Fall(FallState::new(AirborneStateCommon::default())))
         } else {
             None
         }
     }
 
-    fn update(&mut self, state_context: &mut FighterStateContext) {
-        state_context.velocity.0 *= state_context.fighter_manifest.attributes.air_dodge_decay;
+    fn update(&mut self, state_context: &mut UpdateContext) {
+        state_context.velocity.0 *= state_context.fighter_attributes.air_dodge_decay;
 
         air::apply_air_motion(
             state_context.velocity,
@@ -41,32 +34,26 @@ impl FighterStateImpl for AirDodgeState {
 
     fn check_collision_interrupt(
         &mut self,
-        state_context: &mut FighterStateContext,
+        state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
-        if let Some(res) = collision::air_collide_with_stage(state_context) {
-            // Adjust translation
-            state_context.translation.0 = res.hit_position - state_context.ecb.get_bottom_point();
-            let grounded_common = GroundedStateCommon {
-                current_line_id: res.line_id,
-            };
-            Some(FighterState::Land(LandingState {
-                grounded_common,
-                landing_type: LandingType::Special,
-            }))
-        } else {
-            None
-        }
+        air::collision_interrupt(state_context, LandingType::Special)
     }
 
-    fn on_enter(&mut self, state_context: &mut FighterStateContext) {
+    fn on_enter(&mut self, state_context: &mut EnterContext) {
         state_context.play_animation(AnimKind::AirDodge, false);
 
         state_context.velocity.0 =
-            self.direction * state_context.fighter_manifest.attributes.air_dodge_velocity;
+            self.direction * state_context.fighter_attributes.air_dodge_velocity;
+    }
+    
+    fn is_visually_grounded<'a>(
+        &'a self,
+    ) -> bool {
+        false
     }
 }
 
-pub fn check_input(state_context: &FighterStateContext) -> Option<FighterState> {
+pub fn check_input(state_context: &InterruptContext) -> Option<FighterState> {
     state_context
         .input
         .has_command(input::FighterCommands::Shield)

src/fighter/state/dash.rs

@@ -1,25 +1,19 @@
-use std::hash::Hasher;
-
-use super::{FighterStateContext, FighterStateImpl, ground, run, wait, walk};
+use super::{
+    CollisionContext, EnterContext, FighterStateImpl, InterruptContext, UpdateContext, ground, run,
+    wait, walk,
+};
 use crate::fighter::FighterFacingDirection;
 use crate::fighter::animation::AnimKind;
 use crate::fighter::state::FighterState;
-use crate::fighter::state::fall::FallState;
-use crate::fighter::state::ground::{GroundedMotionResult, GroundedStateCommon};
+use crate::fighter::state::ground::GroundedStateCommon;
 use crate::input::FighterCommands::{SmashMoveLeft, SmashMoveRight};
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Hash)]
 pub struct DashState {
     direction: FighterFacingDirection,
     pub ground_common: GroundedStateCommon,
 }
 
-impl std::hash::Hash for DashState {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.direction.hash(state);
-    }
-}
-
 impl DashState {
     pub fn new(direction: FighterFacingDirection, ground_common: GroundedStateCommon) -> Self {
         Self {
@@ -31,9 +25,9 @@ impl DashState {
 
 impl FighterStateImpl for DashState {
     const NAME: &'static str = "Dash";
-    fn check_interrupt(&self, ctx: &mut FighterStateContext) -> Option<FighterState> {
+    fn check_interrupt(&self, ctx: &mut InterruptContext) -> Option<FighterState> {
         let ground = &self.ground_common;
-        let attributes = ctx.fighter_manifest.attributes;
+        let attributes = ctx.fighter_attributes;
 
         // A reverse dash can interrupt before IASA
         if let Some(direction) =
@@ -62,13 +56,10 @@ impl FighterStateImpl for DashState {
         None
     }
 
-    fn on_enter(&mut self, state_context: &mut FighterStateContext) {
+    fn on_enter(&mut self, state_context: &mut EnterContext) {
         *state_context.facing_direction = self.direction;
-        state_context.velocity.x = state_context
-            .fighter_manifest
-            .attributes
-            .dash_initial_velocity
-            * self.direction.to_sign();
+        state_context.velocity.x =
+            state_context.fighter_attributes.dash_initial_velocity * self.direction.to_sign();
 
         state_context.play_animation(AnimKind::Dash, false);
 
@@ -86,24 +77,20 @@ impl FighterStateImpl for DashState {
         }
     }
 
-    fn update(&mut self, state_context: &mut FighterStateContext) {
+    fn update(&mut self, state_context: &mut UpdateContext) {
         if state_context.get_current_animation_frame()
-            < state_context
-                .fighter_manifest
-                .attributes
-                .dash_acceleration_duration
+            < state_context.fighter_attributes.dash_acceleration_duration
         {}
 
         let last_frame = state_context.input.get_last_frame();
         let (accel, target_vel) = state_context
-            .fighter_manifest
-            .attributes
+            .fighter_attributes
             .get_accel_and_target_dashrun(&last_frame, self.direction.to_sign());
         let accel = ground::compute_ground_accel(
             accel,
             target_vel,
             state_context.velocity.x,
-            &state_context.fighter_manifest.attributes,
+            state_context.fighter_attributes,
             state_context.game_settings,
         );
         state_context.velocity.x += accel;
@@ -117,21 +104,19 @@ impl FighterStateImpl for DashState {
 
     fn check_collision_interrupt(
         &mut self,
-        state_context: &mut FighterStateContext,
+        state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
-        if let GroundedMotionResult::InAir =
-            ground::collide_with_stage_grounded(state_context, &mut self.ground_common, true)
-        {
-            Some(FighterState::Fall(FallState))
-        } else {
-            None
+        ground::collision_interrupt(state_context, &mut self.ground_common, true)
     }
+    
+    fn is_visually_grounded<'a>(
+        &'a self,
+    ) -> bool {
+        true
     }
 }
 
-fn check_smash_input_with_dir(
-    state_context: &FighterStateContext,
-) -> Option<FighterFacingDirection> {
+fn check_smash_input_with_dir(state_context: &InterruptContext) -> Option<FighterFacingDirection> {
     if state_context.input.has_command(SmashMoveLeft) {
         return Some(FighterFacingDirection::Left);
     } else if state_context.input.has_command(SmashMoveRight) {
@@ -142,7 +127,7 @@ fn check_smash_input_with_dir(
 }
 
 pub fn check_input(
-    state_context: &FighterStateContext,
+    state_context: &InterruptContext,
     ground_common: &GroundedStateCommon,
 ) -> Option<FighterState> {
     check_smash_input_with_dir(state_context)

src/fighter/state/fall.rs

@@ -1,65 +1,50 @@
-use super::{FighterStateContext, FighterStateImpl};
+use super::{CollisionContext, EnterContext, FighterStateImpl, InterruptContext, UpdateContext};
 use crate::fighter::animation::AnimKind;
-use crate::fighter::collision;
-use crate::fighter::state::ground::GroundedStateCommon;
-use crate::fighter::state::land::{LandingState, LandingType};
+use crate::fighter::state::air::AirborneStateCommon;
 use crate::fighter::state::{FighterState, air, jump};
 
-#[derive(Debug, Clone, Copy, Hash)]
-pub struct FallState;
+#[derive(Debug, Clone, Copy, Hash, Default)]
+pub struct FallState {
+    airborne_state_common: AirborneStateCommon
+}
+
+impl FallState {
+    pub fn new(airborne_state_common: AirborneStateCommon) -> Self {
+        Self {
+            airborne_state_common
+        }
+    }
+}
 
 impl FighterStateImpl for FallState {
     const NAME: &'static str = "Fall";
-    fn check_interrupt(&self, state_context: &mut FighterStateContext) -> Option<FighterState> {
+    
+    fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
         jump::check_input_double_jump(state_context)
     }
 
-    fn on_enter(&mut self, state_context: &mut super::FighterStateContext) {
+    fn on_enter(&mut self, state_context: &mut EnterContext) {
         state_context.play_animation(AnimKind::Fall, true);
     }
 
-    fn update(&mut self, state_context: &mut super::FighterStateContext) {
-        air::integrate_gravity(
-            state_context.velocity,
-            &state_context.fighter_manifest.attributes,
-        );
-        air::apply_air_drift(
-            state_context.velocity,
-            &state_context.fighter_manifest.attributes,
-            state_context.input,
-        );
-        air::apply_air_motion(
-            state_context.velocity,
-            state_context.translation,
-            state_context.prev_translation,
-        );
+    fn update(&mut self, state_context: &mut UpdateContext) {
+        air::update_standard_motion(state_context, &mut self.airborne_state_common);
     }
 
     fn check_collision_interrupt(
         &mut self,
-        state_context: &mut FighterStateContext,
+        state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
-        if let Some(res) = collision::air_collide_with_stage(state_context) {
-            // Adjust translation
-            state_context.translation.0 = res.hit_position - state_context.ecb.get_bottom_point();
-            let grounded_common = GroundedStateCommon {
-                current_line_id: res.line_id,
-            };
-            Some(FighterState::Land(LandingState::create(
-                grounded_common,
-                LandingType::Normal,
-            )))
-        } else {
-            None
+        air::collision_interrupt(
+            state_context,
+            crate::fighter::state::land::LandingType::Normal,
+        )
     }
+    
+    fn is_visually_grounded<'a>(
+        &'a self,
+    ) -> bool {
+        false
     }
 }
 
-pub fn check_input(state_context: &FighterStateContext) -> Option<FighterState> {
-    let input_frame = state_context.input.get_last_frame();
-
-    if input_frame.movement.x.abs() < state_context.game_settings.input_common.stick_deadzone {
-        return Some(FighterState::Fall(FallState));
-    }
-    None
-}

src/fighter/state/ground.rs

@@ -3,7 +3,7 @@
 //! bit-for-bit deterministic for rollback.
 
 use crate::fighter::state::{
-    FighterState, FighterStateContext, dash, ground_attack, turn, wait, walk,
+    CollisionContext, FighterState, InterruptContext, air, dash, fall, ground_attack, turn, wait, walk,
 };
 use crate::fighter::{
     FighterAttributes, FighterPreviousTranslation, FighterTranslation, FighterVelocity,
@@ -163,14 +163,30 @@ pub fn apply_grounded_motion(
     translation.0 += FGVec2::new(velocity.0.x, FGi32::ZERO);
 }
 
+pub fn update_friction_motion(ctx: &mut crate::fighter::state::UpdateContext) {
+    let friction = if ctx.velocity.x.abs() > ctx.fighter_attributes.max_walk_vel {
+        ctx.fighter_attributes.ground_friction
+            * ctx
+                .game_settings
+                .fighter_common
+                .ground_friction_over_walk_speed_multiplier
+    } else {
+        ctx.fighter_attributes.ground_friction
+    };
+
+    let ground_velocity = ctx.velocity.x;
+    ctx.velocity.x += apply_grounded_friction(friction, ground_velocity);
+    apply_grounded_motion(ctx.velocity, ctx.translation, ctx.prev_translation);
+}
+
 pub fn collide_with_stage_grounded(
-    state_context: &mut FighterStateContext,
+    state_context: &mut CollisionContext,
     ground_common: &mut GroundedStateCommon,
     can_walk_off: bool,
 ) -> GroundedMotionResult {
     let translation = &mut state_context.translation;
-    let ecb = &state_context.ecb;
-    let stage_collision = &state_context.stage_collision;
+    let ecb = state_context.ecb;
+    let stage_collision = state_context.stage_collision;
 
     let stage_poly = stage_collision
         .stage_polys
@@ -210,6 +226,17 @@ pub fn collide_with_stage_grounded(
     }
 }
 
+pub fn collision_interrupt(
+    ctx: &mut CollisionContext,
+    common: &mut GroundedStateCommon,
+    can_walk_off: bool,
+) -> Option<FighterState> {
+    match collide_with_stage_grounded(ctx, common, can_walk_off) {
+        GroundedMotionResult::InGround => None,
+        GroundedMotionResult::InAir => Some(FighterState::Fall(fall::FallState::new(air::AirborneStateCommon::default()))),
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -322,14 +349,14 @@ mod tests {
 }
 
 pub fn grounded_movement_common_interrupts(
-    state_context: &FighterStateContext,
+    state_context: &InterruptContext,
     ground_common: &GroundedStateCommon,
 ) -> Option<FighterState> {
     super::jump::check_input(state_context, ground_common)
 }
 
 pub fn grounded_movement_standstill_common_interrupts(
-    state_context: &FighterStateContext,
+    state_context: &InterruptContext,
     ground_common: &GroundedStateCommon,
 ) -> Option<FighterState> {
     if let Some(state) = ground_attack::check_interrupt(state_context, &ground_common) {

src/fighter/state/ground_attack.rs

@@ -1,6 +1,9 @@
 use crate::fighter::{
     attack::{AttackKind, update_active_hitbox_list},
-    state::{FighterState, FighterStateImpl, ground::GroundedStateCommon, wait::WaitState},
+    state::{
+        CollisionContext, EnterContext, ExitContext, FighterState, FighterStateImpl,
+        InterruptContext, UpdateContext, ground::GroundedStateCommon, wait::WaitState,
+    },
 };
 
 #[derive(Clone, Debug, Hash)]
@@ -12,10 +15,7 @@ pub struct GroundAttackState {
 impl FighterStateImpl for GroundAttackState {
     const NAME: &'static str = "GroundAttack";
 
-    fn check_interrupt(
-        &self,
-        state_context: &mut super::FighterStateContext,
-    ) -> Option<FighterState> {
+    fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
         if state_context.is_current_animation_finished() {
             Some(FighterState::Wait(WaitState {
                 grounded_common: self.grounded_common.clone(),
@@ -25,7 +25,7 @@ impl FighterStateImpl for GroundAttackState {
         }
     }
 
-    fn update(&mut self, state_context: &mut super::FighterStateContext) {
+    fn update(&mut self, state_context: &mut UpdateContext) {
         let animation_frame = state_context.get_current_animation_frame();
         let script = state_context
             .attack_scripts
@@ -44,33 +44,39 @@ impl FighterStateImpl for GroundAttackState {
         }
     }
 
-    fn on_enter(&mut self, state_context: &mut super::FighterStateContext) {
+    fn on_enter(&mut self, state_context: &mut EnterContext) {
         state_context.play_animation(self.attack_kind.get_animation(), false);
         let script = state_context.attack_script_assets.scripts[&self.attack_kind].clone();
-        state_context.stale_move_queue.push(self.attack_kind);
         state_context.hitboxes.0 = Some(crate::fighter::FighterActiveAttack {
             kind: self.attack_kind,
             script,
             active_hitboxes: Vec::new(),
             solved_hitboxes: Vec::new(),
             hit_fighters: Vec::new(),
+            stalled: false
         });
     }
 
-    fn on_exit(&mut self, state_context: &mut super::FighterStateContext) {
+    fn on_exit(&mut self, state_context: &mut ExitContext) {
         state_context.hitboxes.0 = None;
     }
 
     fn check_collision_interrupt(
         &mut self,
-        _state_context: &mut super::FighterStateContext,
+        _state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
         None
     }
+    
+    fn is_visually_grounded<'a>(
+        &'a self,
+    ) -> bool {
+        true
+    }
 }
 
 pub fn check_interrupt(
-    state_context: &super::FighterStateContext,
+    state_context: &InterruptContext,
     grounded_common: &GroundedStateCommon,
 ) -> Option<FighterState> {
     if state_context

src/fighter/state/hitstun.rs

@@ -1,13 +1,14 @@
 use crate::{
     fighter::{
         animation::AnimKind,
-        attack::FighterHitReaction,
-        collision,
+        attack::{self, FighterHitReaction},
         state::{
-            FighterState, FighterStateContext, FighterStateImpl, air,
+            CollisionContext, EnterContext, ExitContext, FighterState, FighterStateImpl,
+            InterruptContext, UpdateContext,
+            air::{self, AirborneStateCommon},
             fall::FallState,
-            ground::{GroundedMotionResult, GroundedStateCommon, collide_with_stage_grounded},
-            land::{LandingState, LandingType},
+            ground::{GroundedStateCommon, collision_interrupt},
+            land::LandingType,
             wait::WaitState,
         },
     },
@@ -24,6 +25,17 @@ pub enum HitstopStateKind {
 pub struct HitstunState {
     pub hit_reaction: FighterHitReaction,
     pub hitstop_kind: HitstopStateKind,
+    knockback_applied: bool,
+}
+
+impl HitstunState {
+    pub fn new(hit_reaction: FighterHitReaction, hitstop_kind: HitstopStateKind) -> Self {
+        Self {
+            hit_reaction,
+            hitstop_kind,
+            knockback_applied: false,
+        }
+    }
 }
 
 impl FighterStateImpl for HitstunState {
@@ -43,7 +55,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) => {
@@ -51,15 +63,33 @@ impl FighterStateImpl for HitstunState {
                         grounded_common: grounded_state_common.clone(),
                     }))
                 }
-                HitstopStateKind::Airborne => Some(FighterState::Fall(FallState)),
+                HitstopStateKind::Airborne => {
+                    Some(FighterState::Fall(FallState::new(AirborneStateCommon::default())))
+                }
             }
         } else {
             None
         }
     }
 
-    fn update(&mut self, ctx: &mut FighterStateContext) {
-        air::integrate_gravity(ctx.velocity, &ctx.fighter_manifest.attributes);
+    fn update(&mut self, ctx: &mut UpdateContext) {
+        if !self.knockback_applied {
+            let launch_direction = attack::directional_influence::apply_directional_influence(
+                ctx.input.get_last_frame().movement,
+                self.hit_reaction.launch_angle,
+                ctx.game_settings.fighter_common.di_max_angle,
+            );
+
+            ctx.knockback_velocity.0 = launch_direction * self.hit_reaction.launch_velocity;
+            self.knockback_applied = true;
+        }
+
+        match self.hitstop_kind {
+            HitstopStateKind::Grounded(_) => {}
+            HitstopStateKind::Airborne => {
+                air::integrate_gravity(ctx.velocity, ctx.fighter_attributes, false);
+            }
+        }
 
         let speed = ctx.knockback_velocity.length();
         let next_speed = speed
@@ -71,47 +101,34 @@ 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,
         };
         state_context.play_animation(animation, false);
-        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) => {
-                if let GroundedMotionResult::InAir =
-                    collide_with_stage_grounded(state_context, grounded_state_common, true)
-                {
-                    Some(FighterState::Fall(FallState {}))
-                } else {
-                    None
-                }
+                collision_interrupt(state_context, grounded_state_common, true)
             }
             HitstopStateKind::Airborne => {
-                if let Some(res) = collision::air_collide_with_stage(state_context) {
-                    // Adjust translation
-                    state_context.translation.0 =
-                        res.hit_position - state_context.ecb.get_bottom_point();
-                    let grounded_common = GroundedStateCommon {
-                        current_line_id: res.line_id,
-                    };
-                    Some(FighterState::Land(LandingState::create(
-                        grounded_common,
-                        LandingType::Normal,
-                    )))
-                } else {
-                    None
+                air::collision_interrupt(state_context, LandingType::Normal)
             }
         }
     }
+
+    fn is_visually_grounded<'a>(&'a self) -> bool {
+        match self.hitstop_kind {
+            HitstopStateKind::Grounded(_) => true,
+            HitstopStateKind::Airborne => false,
+        }
     }
 }

src/fighter/state/jump.rs

@@ -2,18 +2,10 @@ use bevy::prelude::*;
 
 use crate::{
     fighter::{
-        animation::AnimKind,
-        collision,
-        state::{
-            FighterState, FighterStateContext, FighterStateImpl, air,
-            air_dodge::{self, AirDodgeState},
-            fall::FallState,
-            ground::{self, GroundedMotionResult, GroundedStateCommon},
-            land::{LandingState, LandingType},
+        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 {
@@ -25,6 +17,7 @@ pub enum JumpType {
 #[derive(Debug, Clone, Hash)]
 pub struct JumpState {
     jump_type: JumpType,
+    airborne_state_common: AirborneStateCommon,
 }
 
 #[derive(Debug, Clone, Hash)]
@@ -45,7 +38,7 @@ impl JumpSquatState {
 impl FighterStateImpl for JumpSquatState {
     const NAME: &'static str = "JumpSquat";
 
-    fn check_interrupt(&self, state_context: &mut FighterStateContext) -> Option<FighterState> {
+    fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
         // Special handling for wavedash from jump squat
         if state_context.input.has_command(FighterCommands::Shield) {
             // If aiming sideways and in the deadzone, do a perfect wavedash
@@ -69,96 +62,61 @@ impl FighterStateImpl for JumpSquatState {
             Some(FighterState::AirDodge(AirDodgeState {
                 direction: wavedash_dir.normalize_or_zero(),
             }))
-        } else if self.duration_counter
-            >= state_context.fighter_manifest.attributes.jumpsquat_duration
-        {
+        } else if self.duration_counter >= state_context.fighter_attributes.jumpsquat_duration {
             info!("Jump {}", state_context.input.get_last_frame().jump);
             let jump_type = if state_context.input.get_last_frame().jump {
                 JumpType::LongJump
             } else {
                 JumpType::ShortHop
             };
-            Some(FighterState::Jump(JumpState { jump_type }))
+            Some(FighterState::Jump(JumpState { jump_type, airborne_state_common: AirborneStateCommon::default() }))
         } else {
             None
         }
     }
 
-    fn update(&mut self, state_context: &mut FighterStateContext) {
+    fn update(&mut self, state_context: &mut UpdateContext) {
         self.duration_counter += 1;
-
-        let friction = if state_context.velocity.x.abs()
-            > state_context.fighter_manifest.attributes.max_walk_vel
-        {
-            state_context.fighter_manifest.attributes.ground_friction
-                * state_context
-                    .game_settings
-                    .fighter_common
-                    .ground_friction_over_walk_speed_multiplier
-        } else {
-            state_context.fighter_manifest.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 FighterStateContext,
+        state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
-        if let GroundedMotionResult::InAir =
-            ground::collide_with_stage_grounded(state_context, &mut self.grounded_common, false)
-        {
-            Some(FighterState::Fall(FallState))
-        } else {
-            None
-        }
+        ground::collision_interrupt(state_context, &mut self.grounded_common, false)
     }
 
-    fn on_enter(&mut self, state_context: &mut FighterStateContext) {
+    fn on_enter(&mut self, state_context: &mut EnterContext) {
         state_context.play_animation(AnimKind::JumpSquat, false);
         state_context.input.clear_command(FighterCommands::Jump);
     }
+    
+    fn is_visually_grounded<'a>(
+        &'a self,
+    ) -> bool {
+        true
+    }
 }
 
 impl FighterStateImpl for JumpState {
     const NAME: &'static str = "Jump";
-    fn check_interrupt(&self, state_context: &mut FighterStateContext) -> Option<FighterState> {
+    fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
         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)
         }
     }
 
-    fn update(&mut self, state_context: &mut FighterStateContext) {
-        air::integrate_gravity(
-            state_context.velocity,
-            &state_context.fighter_manifest.attributes,
-        );
-        air::apply_air_drift(
-            state_context.velocity,
-            &state_context.fighter_manifest.attributes,
-            state_context.input,
-        );
-        air::apply_air_motion(
-            state_context.velocity,
-            state_context.translation,
-            state_context.prev_translation,
-        );
+    fn update(&mut self, state_context: &mut UpdateContext) {
+        air::update_standard_motion(state_context, &mut self.airborne_state_common);
     }
 
-    fn on_enter(&mut self, state_context: &mut FighterStateContext) {
+    fn on_enter(&mut self, state_context: &mut EnterContext) {
         if let JumpType::DoubleJump = self.jump_type {
             state_context.input.clear_command(FighterCommands::Jump);
         }
@@ -185,42 +143,22 @@ impl FighterStateImpl for JumpState {
         }
 
         let vertical_vel = match self.jump_type {
-            JumpType::ShortHop => {
-                state_context
-                    .fighter_manifest
-                    .attributes
-                    .short_hop_vertical_velocity
-            }
-            JumpType::LongJump => {
-                state_context
-                    .fighter_manifest
-                    .attributes
-                    .full_jump_vertical_velocity
-            }
+            JumpType::ShortHop => state_context.fighter_attributes.short_hop_vertical_velocity,
+            JumpType::LongJump => state_context.fighter_attributes.full_jump_vertical_velocity,
             JumpType::DoubleJump => {
-                state_context
-                    .fighter_manifest
-                    .attributes
-                    .full_jump_vertical_velocity
-                    * state_context
-                        .fighter_manifest
-                        .attributes
-                        .air_jump_multiplier
+                state_context.fighter_attributes.full_jump_vertical_velocity
+                    * state_context.fighter_attributes.air_jump_multiplier
             }
         };
 
         match self.jump_type {
             JumpType::ShortHop | JumpType::LongJump => {
-                state_context.velocity.x += state_context
-                    .fighter_manifest
-                    .attributes
-                    .jump_horizontal_velocity
-                    * movement_stick_x;
+                state_context.velocity.x +=
+                    state_context.fighter_attributes.jump_horizontal_velocity * movement_stick_x;
             }
             JumpType::DoubleJump => {
                 state_context.velocity.x = state_context
-                    .fighter_manifest
-                    .attributes
+                    .fighter_attributes
                     .air_jump_horizontal_velocity
                     * movement_stick_x;
             }
@@ -231,26 +169,23 @@ impl FighterStateImpl for JumpState {
 
     fn check_collision_interrupt(
         &mut self,
-        state_context: &mut FighterStateContext,
+        state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
-        if let Some(res) = collision::air_collide_with_stage(state_context) {
-            // Adjust translation
-            state_context.translation.0 = res.hit_position - state_context.ecb.get_bottom_point();
-            let grounded_common = GroundedStateCommon {
-                current_line_id: res.line_id,
-            };
-            Some(FighterState::Land(LandingState::create(
-                grounded_common,
-                LandingType::Normal,
-            )))
-        } else {
-            None
+        air::collision_interrupt(
+            state_context,
+            crate::fighter::state::land::LandingType::Normal,
+        )
     }
+    
+    fn is_visually_grounded<'a>(
+        &'a self,
+    ) -> bool {
+        false
     }
 }
 
 pub fn check_input(
-    state_context: &FighterStateContext,
+    state_context: &InterruptContext,
     ground_common: &GroundedStateCommon,
 ) -> Option<FighterState> {
     state_context
@@ -259,13 +194,14 @@ pub fn check_input(
         .then(|| FighterState::JumpSquat(JumpSquatState::create(ground_common.clone())))
 }
 
-pub fn check_input_double_jump(state_context: &FighterStateContext) -> Option<FighterState> {
+pub fn check_input_double_jump(state_context: &InterruptContext) -> Option<FighterState> {
     state_context
         .input
         .has_command(FighterCommands::Jump)
         .then(|| {
             FighterState::Jump(JumpState {
                 jump_type: JumpType::DoubleJump,
+                airborne_state_common: AirborneStateCommon::default()
             })
         })
 }

src/fighter/state/land.rs

@@ -1,12 +1,9 @@
 use crate::fighter::{
     animation::AnimKind,
     state::{
-        FighterState, FighterStateContext, FighterStateImpl, dash,
-        fall::FallState,
-        ground::{
-            self, GroundedMotionResult, GroundedStateCommon,
-            grounded_movement_standstill_common_interrupts,
-        },
+        CollisionContext, EnterContext, FighterState, FighterStateImpl, InterruptContext,
+        UpdateContext, dash,
+        ground::{self, GroundedStateCommon, grounded_movement_standstill_common_interrupts},
         walk,
     },
 };
@@ -35,11 +32,11 @@ impl LandingState {
 impl FighterStateImpl for LandingState {
     const NAME: &'static str = "Landing";
 
-    fn check_interrupt(&self, state_context: &mut FighterStateContext) -> Option<FighterState> {
+    fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
         if state_context.is_current_animation_finished() {
             grounded_movement_standstill_common_interrupts(state_context, &self.grounded_common)
         } else if state_context.get_current_animation_frame()
-            >= state_context.fighter_manifest.attributes.landing_iasa
+            >= state_context.fighter_attributes.landing_iasa
             && let LandingType::Normal = self.landing_type
         {
             dash::check_input(state_context, &self.grounded_common).or_else(|| {
@@ -51,44 +48,18 @@ impl FighterStateImpl for LandingState {
         }
     }
 
-    fn update(&mut self, state_context: &mut FighterStateContext) {
-        let friction = if state_context.velocity.x.abs()
-            > state_context.fighter_manifest.attributes.max_walk_vel
-        {
-            state_context.fighter_manifest.attributes.ground_friction
-                * state_context
-                    .game_settings
-                    .fighter_common
-                    .ground_friction_over_walk_speed_multiplier
-        } else {
-            state_context.fighter_manifest.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,
-        );
+    fn update(&mut self, state_context: &mut UpdateContext) {
+        ground::update_friction_motion(state_context);
     }
 
     fn check_collision_interrupt(
         &mut self,
-        state_context: &mut FighterStateContext,
+        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 FighterStateContext) {
+    fn on_enter(&mut self, state_context: &mut EnterContext) {
         match self.landing_type {
             LandingType::Normal => {
                 state_context.play_animation(AnimKind::Landing, false);
@@ -98,4 +69,10 @@ impl FighterStateImpl for LandingState {
             }
         };
     }
+    
+    fn is_visually_grounded<'a>(
+        &'a self,
+    ) -> bool {
+        true
+    }
 }

src/fighter/state/mod.rs

@@ -7,20 +7,20 @@ use bevy::prelude::*;
 
 use crate::fighter::animation::{AnimKind, FighterAnimationFrame};
 use crate::fighter::attack::{
-    FighterAttackScriptAssets, FighterKnockbackVelocity, FighterPendingHitReaction,
-    FighterStaleMoveQueue,
+    FighterAttackScriptAssets, FighterKnockbackVelocity, FighterPendingHitReaction, FighterStaleMoveQueue, HitStop,
 };
+use crate::fighter::attributes::FighterAttributes;
 use crate::fighter::baked_animation::BakedFighterAnimations;
 use crate::fighter::ecb::FighterPreviousECB;
 use crate::fighter::manifest::FighterManifest;
 use crate::fighter::state::hitstun::HitstunState;
 use crate::fighter::visual::FighterAnimations;
 use crate::fighter::{
-    Fighter, FighterECB, FighterFacingDirection, FighterHitboxes, FighterHitstop,
-    FighterPreviousTranslation, FighterTranslation, FighterVelocity,
+    Fighter, FighterECB, FighterFacingDirection, FighterHitboxes, FighterHitstop, FighterHitstopShake, FighterHitstopShakeKind, FighterHitstopShakeRole, FighterPreviousTranslation, FighterTranslation, FighterVelocity,
 };
 use crate::game_settings::GameSettings;
 use crate::input::FighterInput;
+use crate::math::int::FGi32;
 use crate::scripting::FighterAttackScript;
 use crate::stage::line::StageCollision;
 
@@ -47,24 +47,28 @@ macro_rules! fighter_states {
             pub fn name(&self) -> &'static str {
                 match self { $(Self::$variant(_) => <$ty>::NAME),* }
             }
-            pub fn check_interrupt(&self, ctx: &mut FighterStateContext) -> Option<FighterState> {
+            pub fn check_interrupt(&self, ctx: &mut InterruptContext) -> Option<FighterState> {
                 match self { $(Self::$variant(s) => s.check_interrupt(ctx)),* }
             }
 
-            pub fn update(&mut self, ctx: &mut FighterStateContext) {
+            pub fn update(&mut self, ctx: &mut UpdateContext) {
                 match self { $(Self::$variant(s) => s.update(ctx)),* }
             }
-            pub fn on_enter(&mut self, ctx: &mut FighterStateContext) {
+            pub fn on_enter(&mut self, ctx: &mut EnterContext) {
                 match self { $(Self::$variant(s) => s.on_enter(ctx)),* }
             }
 
-            pub fn on_exit(&mut self, ctx: &mut FighterStateContext) {
+            pub fn on_exit(&mut self, ctx: &mut ExitContext) {
                 match self { $(Self::$variant(s) => s.on_exit(ctx)),* }
             }
 
-            pub fn check_collision_interrupt(&mut self, ctx: &mut FighterStateContext) -> Option<FighterState> {
+            pub fn check_collision_interrupt(&mut self, ctx: &mut CollisionContext) -> Option<FighterState> {
                 match self { $(Self::$variant(s) => s.check_collision_interrupt(ctx)),* }
             }
+
+            pub fn is_visually_grounded(&self) -> bool {
+                match self { $(Self::$variant(s) => s.is_visually_grounded()),* }
+            }
         }
 
         $(impl From<$ty> for FighterState {
@@ -75,62 +79,113 @@ macro_rules! fighter_states {
 
 pub trait FighterStateImpl: Sized {
     const NAME: &'static str;
-    fn check_interrupt(&self, state_context: &mut FighterStateContext) -> Option<FighterState>;
+    fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState>;
 
-    fn on_enter(&mut self, _state_context: &mut FighterStateContext) {}
-    fn on_exit(&mut self, _state_context: &mut FighterStateContext) {}
+    fn on_enter(&mut self, _state_context: &mut EnterContext) {}
+    fn on_exit(&mut self, _state_context: &mut ExitContext) {}
     fn name(&self) -> String {
         Self::NAME.to_owned()
     }
-    fn update(&mut self, _state_context: &mut FighterStateContext);
+    fn update(&mut self, _state_context: &mut UpdateContext);
 
     fn check_collision_interrupt(
         &mut self,
-        _state_context: &mut FighterStateContext,
+        _state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
         None
     }
+
+    fn is_visually_grounded<'a>(
+        &'a self,
+    ) -> bool;
 }
 
-pub struct FighterStateContext<'a> {
+pub struct AnimationStatus {
+    pub frame: u32,
+    pub finished: bool,
+}
+
+pub struct InterruptContext<'a> {
+    pub input: &'a FighterInput,
+    pub facing_direction: &'a mut FighterFacingDirection,
+    pub game_settings: &'a GameSettings,
+    pub fighter_attributes: &'a FighterAttributes,
+    pub animation: AnimationStatus,
+}
+
+impl InterruptContext<'_> {
+    pub fn get_current_animation_frame(&self) -> u32 {
+        self.animation.frame
+    }
+
+    pub fn is_current_animation_finished(&self) -> bool {
+        self.animation.finished
+    }
+}
+
+pub struct EnterContext<'a> {
+    pub input: &'a mut FighterInput,
+    pub hitboxes: &'a mut FighterHitboxes,
+    pub velocity: &'a mut FighterVelocity,
+    pub knockback_velocity: &'a mut FighterKnockbackVelocity,
+    pub stale_move_queue: &'a mut FighterStaleMoveQueue,
+    pub facing_direction: &'a mut FighterFacingDirection,
+    pub animation_frame: &'a mut FighterAnimationFrame,
+    pub fighter_attributes: &'a FighterAttributes,
+    pub attack_script_assets: &'a FighterAttackScriptAssets,
+}
+
+impl EnterContext<'_> {
+    pub fn play_animation(&mut self, kind: AnimKind, repeat: bool) {
+        self.animation_frame.reset(kind, repeat);
+    }
+}
+
+pub struct ExitContext<'a> {
+    pub hitboxes: &'a mut FighterHitboxes,
+}
+
+pub struct UpdateContext<'a> {
     pub translation: &'a mut FighterTranslation,
     pub prev_translation: &'a mut FighterPreviousTranslation,
     pub input: &'a mut FighterInput,
     pub hitboxes: &'a mut FighterHitboxes,
     pub velocity: &'a mut FighterVelocity,
     pub knockback_velocity: &'a mut FighterKnockbackVelocity,
-    pub stale_move_queue: &'a mut FighterStaleMoveQueue,
-    pub ecb: &'a mut FighterECB,
-    pub prev_ecb: &'a mut FighterPreviousECB,
-    pub facing_direction: &'a mut FighterFacingDirection,
     pub game_settings: &'a GameSettings,
-    pub stage_collision: &'a StageCollision,
-    pub animations: &'a FighterAnimations,
-    pub animation_frame: &'a mut FighterAnimationFrame,
-    pub baked_animations: &'a Assets<BakedFighterAnimations>,
+    pub animation_frame: u32,
+    pub fighter_attributes: &'a FighterAttributes,
     pub attack_scripts: &'a Assets<FighterAttackScript>,
-    pub fighter_manifest: &'a FighterManifest,
     pub attack_script_assets: &'a FighterAttackScriptAssets,
+    pub facing_direction: &'a FighterFacingDirection,
 }
 
-impl FighterStateContext<'_> {
-    pub fn play_animation(&mut self, kind: AnimKind, repeat: bool) {
-        self.animation_frame.reset(kind, repeat);
-    }
-
+impl UpdateContext<'_> {
     pub fn get_current_animation_frame(&self) -> u32 {
-        self.animation_frame.frame
+        self.animation_frame
     }
+}
 
-    pub fn is_current_animation_finished(&self) -> bool {
-        let anims_data = self
-            .baked_animations
-            .get(&self.animations.baked)
-            .expect("Animation should exist");
-        anims_data
-            .frame_count(self.animation_frame.kind)
-            .expect("Current animation should have baked frames")
-            <= self.animation_frame.frame
+pub struct CollisionContext<'a> {
+    pub translation: &'a mut FighterTranslation,
+    pub prev_translation: &'a FighterPreviousTranslation,
+    pub velocity: &'a mut FighterVelocity,
+    pub ecb: &'a FighterECB,
+    pub prev_ecb: &'a FighterPreviousECB,
+    pub stage_collision: &'a StageCollision,
+}
+
+impl CollisionContext<'_> {
+    pub fn air_collide_with_stage(
+        &self,
+    ) -> Option<crate::fighter::collision::AirCollisionWithStageResult> {
+        crate::fighter::collision::air_collide_with_stage(
+            self.prev_translation,
+            self.translation,
+            self.prev_ecb,
+            self.ecb,
+            self.stage_collision,
+        )
     }
 }
 
@@ -159,43 +214,105 @@ pub struct FighterFrameQuery {
     pub velocity: &'static mut FighterVelocity,
     pub knockback_velocity: &'static mut FighterKnockbackVelocity,
     pub stale_move_queue: &'static mut FighterStaleMoveQueue,
-    pub ecb: &'static mut FighterECB,
-    pub prev_ecb: &'static mut FighterPreviousECB,
+    pub ecb: &'static FighterECB,
+    pub prev_ecb: &'static FighterPreviousECB,
     pub facing_direction: &'static mut FighterFacingDirection,
     pub animation_frame: &'static mut FighterAnimationFrame,
     pub fighter: &'static Fighter,
 }
 
 impl<'w, 's> FighterFrameQueryItem<'w, 's> {
-    fn context<'a>(
+    fn animation_status(
+        &self,
+        animations: &FighterAnimations,
+        baked_animations: &Assets<BakedFighterAnimations>,
+    ) -> AnimationStatus {
+        let baked = baked_animations
+            .get(&animations.baked)
+            .expect("Animation should exist");
+        let frame = self.animation_frame.frame;
+        let finished = baked
+            .frame_count(self.animation_frame.kind)
+            .expect("Current animation should have baked frames")
+            <= frame;
+        AnimationStatus { frame, finished }
+    }
+
+    fn interrupt_context<'a>(
         &'a mut self,
         game_settings: &'a GameSettings,
-        stage_collision: &'a StageCollision,
         animations: &'a FighterAnimations,
         baked_animations: &'a Assets<BakedFighterAnimations>,
+        attributes: &'a FighterAttributes,
+    ) -> InterruptContext<'a> {
+        let animation = self.animation_status(animations, baked_animations);
+        InterruptContext {
+            input: &self.input,
+            facing_direction: &mut self.facing_direction,
+            game_settings,
+            fighter_attributes: attributes,
+            animation,
+        }
+    }
+
+    fn enter_context<'a>(
+        &'a mut self,
+        attributes: &'a FighterAttributes,
+        attack_script_assets: &'a FighterAttackScriptAssets,
+    ) -> EnterContext<'a> {
+        EnterContext {
+            input: &mut self.input,
+            hitboxes: &mut self.hitboxes,
+            velocity: &mut self.velocity,
+            knockback_velocity: &mut self.knockback_velocity,
+            stale_move_queue: &mut self.stale_move_queue,
+            facing_direction: &mut self.facing_direction,
+            animation_frame: &mut self.animation_frame,
+            fighter_attributes: attributes,
+            attack_script_assets,
+        }
+    }
+
+    fn exit_context(&mut self) -> ExitContext<'_> {
+        ExitContext {
+            hitboxes: &mut self.hitboxes,
+        }
+    }
+
+    fn update_context<'a>(
+        &'a mut self,
+        game_settings: &'a GameSettings,
+        attributes: &'a FighterAttributes,
         attack_scripts: &'a Assets<FighterAttackScript>,
         attack_script_assets: &'a FighterAttackScriptAssets,
-        manifest: &'a FighterManifest,
-    ) -> FighterStateContext<'a> {
-        FighterStateContext {
+    ) -> UpdateContext<'a> {
+        UpdateContext {
             translation: &mut self.translation,
             prev_translation: &mut self.prev_translation,
             input: &mut self.input,
             hitboxes: &mut self.hitboxes,
             velocity: &mut self.velocity,
             knockback_velocity: &mut self.knockback_velocity,
-            stale_move_queue: &mut self.stale_move_queue,
-            ecb: &mut self.ecb,
-            prev_ecb: &mut self.prev_ecb,
-            facing_direction: &mut self.facing_direction,
             game_settings,
-            stage_collision,
-            animations,
-            animation_frame: &mut self.animation_frame,
-            baked_animations,
+            animation_frame: self.animation_frame.frame,
+            fighter_attributes: attributes,
             attack_scripts,
             attack_script_assets,
-            fighter_manifest: manifest,
+            facing_direction: &self.facing_direction
+        }
+    }
+
+    fn collision_context<'a>(
+        &'a mut self,
+        stage_collision: &'a StageCollision,
+    ) -> CollisionContext<'a> {
+        CollisionContext {
+            translation: &mut self.translation,
+            prev_translation: &self.prev_translation,
+            velocity: &mut self.velocity,
+            ecb: &self.ecb,
+            prev_ecb: &self.prev_ecb,
+            stage_collision,
         }
     }
 }
@@ -210,13 +327,12 @@ pub struct StatefulFighterQuery {
     pub attack_script_assets: &'static FighterAttackScriptAssets,
     pub pending_hit_reaction: &'static mut FighterPendingHitReaction,
     pub hitstop: &'static mut FighterHitstop,
+    pub hitstop_shake: &'static mut FighterHitstopShake,
 }
 
 pub fn state_update_system(
     mut query: Query<StatefulFighterQuery>,
-    stage_collision: Res<StageCollision>,
     game_settings: Res<GameSettings>,
-    baked_animations: Res<Assets<BakedFighterAnimations>>,
     attack_scripts: Res<Assets<FighterAttackScript>>,
     manifests: Res<Assets<FighterManifest>>,
 ) {
@@ -224,7 +340,6 @@ pub fn state_update_system(
         let StatefulFighterQueryItem {
             mut state,
             mut frame,
-            animations,
             hitstop,
             ..
         } = fighter;
@@ -233,16 +348,14 @@ pub fn state_update_system(
             continue;
         }
 
-        let mut update_ctx = frame.context(
+        let manifest = manifests
+            .get(&fighter.fighter.manifest)
+            .expect("Fighter manifest should be valid");
+        let mut update_ctx = frame.update_context(
             &game_settings,
-            &stage_collision,
-            animations,
-            &baked_animations,
+            &manifest.attributes,
             &attack_scripts,
             &fighter.attack_script_assets,
-            &manifests
-                .get(&(fighter.fighter.manifest))
-                .expect("Fighter manifest should be valid"),
         );
         state.update(&mut update_ctx);
     }
@@ -251,24 +364,24 @@ pub fn state_update_system(
 fn transition_state(
     current: &mut FighterState,
     mut next: FighterState,
-    ctx: &mut FighterStateContext,
+    frame: &mut FighterFrameQueryItem,
+    attributes: &FighterAttributes,
+    attack_script_assets: &FighterAttackScriptAssets,
 ) {
     let old_name = current.name();
     let new_name = next.name();
 
-    current.on_exit(ctx);
-    next.on_enter(ctx);
+    current.on_exit(&mut frame.exit_context());
+    next.on_enter(&mut frame.enter_context(attributes, attack_script_assets));
     *current = next;
     info!("{} -> {}", old_name, new_name);
 }
 
 pub fn state_interrupt_system(
     mut query: Query<StatefulFighterQuery>,
-    stage_collision: Res<StageCollision>,
     game_settings: Res<GameSettings>,
     baked_animations: Res<Assets<BakedFighterAnimations>>,
     fighter_manifests: Res<Assets<FighterManifest>>,
-    attack_scripts: Res<Assets<FighterAttackScript>>,
 ) {
     for fighter in &mut query {
         let StatefulFighterQueryItem {
@@ -279,22 +392,25 @@ pub fn state_interrupt_system(
             attack_script_assets,
             mut pending_hit_reaction,
             mut hitstop,
+            mut hitstop_shake,
         } = fighter;
-        let mut state_context = frame.context(
-            &game_settings,
-            &stage_collision,
-            animations,
-            &baked_animations,
-            &attack_scripts,
-            attack_script_assets,
-            fighter_manifests
+        let manifest = fighter_manifests
             .get(&fighter.manifest)
-                .expect("Fighter manifest should be valid"),
-        );
+            .expect("Fighter manifest should be valid");
 
         let new_state = if let Some(reaction) = pending_hit_reaction.take() {
             hitstop.remaining_frames = *reaction.hitstop_frames;
-            let hitstop_kind = match &*state {
+            let shake_frames = reaction.hitstop_frames.calculate_shake_frames(&game_settings);
+            hitstop_shake.role = FighterHitstopShakeRole::Receiver;
+            hitstop_shake.total_frames = shake_frames;
+            hitstop_shake.remaining_frames = shake_frames;
+            hitstop_shake.kind = if state.is_visually_grounded() {
+                FighterHitstopShakeKind::Horizontal
+            } else {
+                FighterHitstopShakeKind::Vertical
+            };
+            
+            let mut hitstop_kind = match &*state {
                 FighterState::Wait(value) => {
                     hitstun::HitstopStateKind::Grounded(value.grounded_common.clone())
                 }
@@ -315,18 +431,49 @@ pub fn state_interrupt_system(
                 }
                 _ => hitstun::HitstopStateKind::Airborne,
             };
-            Some(FighterState::Hitstun(HitstunState {
-                hit_reaction: reaction,
+
+            if let hitstun::HitstopStateKind::Grounded(_) = hitstop_kind {
+                let straight_up_angle = FGi32::lit("90.0");
+                if reaction.hitstop_frames >= HitStop::new(game_settings.fighter_common.tumble_bounce_hitstop_threshold) {
+                    hitstop_kind = hitstun::HitstopStateKind::Airborne;
+                // TODO: Use floor normal here
+                } else if reaction.launch_angle.abs_diff(straight_up_angle) < game_settings.fighter_common.attack_ground_to_airborne_transition_vertical_angle_threshold {
+                        hitstop_kind = hitstun::HitstopStateKind::Airborne;
+                } else {
+                    // straight down is 270
+                    let straight_down_angle = FGi32::lit("270.0");
+                    let meteor_threshold = game_settings.fighter_common.meteor_angle_threshold;
+                    if (reaction.launch_angle - straight_down_angle).abs() <= meteor_threshold {
+                        // TODO: Floor bounce
+                        hitstop_kind = hitstun::HitstopStateKind::Airborne;
+                    }
+                }
+            }
+
+            info!("Entering hitstop kind: {:?}", hitstop_kind);
+            Some(FighterState::Hitstun(HitstunState::new(
+                reaction,
                 hitstop_kind,
-            }))
+            )))
         } else if hitstop.remaining_frames > 0 {
             None
         } else {
-            state.check_interrupt(&mut state_context)
+            state.check_interrupt(&mut frame.interrupt_context(
+                &game_settings,
+                animations,
+                &baked_animations,
+                &manifest.attributes,
+            ))
         };
 
         if let Some(new_state) = new_state {
-            transition_state(&mut state, new_state, &mut state_context);
+            transition_state(
+                &mut state,
+                new_state,
+                &mut frame,
+                &manifest.attributes,
+                attack_script_assets,
+            );
         };
     }
 }
@@ -334,39 +481,34 @@ pub fn state_interrupt_system(
 pub fn state_collision_interrupt_system(
     mut query: Query<StatefulFighterQuery>,
     stage_collision: Res<StageCollision>,
-    game_settings: Res<GameSettings>,
-    baked_animations: Res<Assets<BakedFighterAnimations>>,
     fighter_manifests: Res<Assets<FighterManifest>>,
-    attack_scripts: Res<Assets<FighterAttackScript>>,
 ) {
     for fighter in &mut query {
         let StatefulFighterQueryItem {
             mut state,
             mut frame,
-            animations,
             fighter,
             attack_script_assets,
             hitstop,
             ..
         } = fighter;
-        let mut state_context = frame.context(
-            &game_settings,
-            &stage_collision,
-            animations,
-            &baked_animations,
-            &attack_scripts,
-            &attack_script_assets,
-            fighter_manifests
-                .get(&fighter.manifest)
-                .expect("Fighter manifest should be valid"),
-        );
-
         if hitstop.remaining_frames > 0 {
             continue;
         }
 
-        if let Some(new_state) = state.check_collision_interrupt(&mut state_context) {
-            transition_state(&mut state, new_state, &mut state_context);
+        let manifest = fighter_manifests
+            .get(&fighter.manifest)
+            .expect("Fighter manifest should be valid");
+        let new_state =
+            state.check_collision_interrupt(&mut frame.collision_context(&stage_collision));
+        if let Some(new_state) = new_state {
+            transition_state(
+                &mut state,
+                new_state,
+                &mut frame,
+                &manifest.attributes,
+                &attack_script_assets,
+            );
         }
     }
 }

src/fighter/state/run.rs

@@ -1,11 +1,12 @@
 use bevy::prelude::*;
 
-use super::{FighterStateContext, FighterStateImpl, ground, wait, walk};
+use super::{
+    CollisionContext, EnterContext, FighterStateImpl, InterruptContext, UpdateContext, ground,
+    wait, walk,
+};
 use crate::fighter::animation::AnimKind;
 use crate::fighter::state::FighterState;
-use crate::fighter::state::fall::FallState;
-use crate::fighter::state::ground::{GroundedMotionResult, GroundedStateCommon};
-use crate::math::int::FGi32;
+use crate::fighter::state::ground::GroundedStateCommon;
 
 #[derive(Component, Debug, Clone, Hash)]
 pub struct RunState {
@@ -14,7 +15,7 @@ pub struct RunState {
 
 impl FighterStateImpl for RunState {
     const NAME: &'static str = "Run";
-    fn check_interrupt(&self, state_context: &mut FighterStateContext) -> Option<FighterState> {
+    fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
         if let Some(state) =
             ground::grounded_movement_common_interrupts(state_context, &self.grounded_common)
         {
@@ -32,21 +33,20 @@ impl FighterStateImpl for RunState {
         }
     }
 
-    fn on_enter(&mut self, state_context: &mut super::FighterStateContext) {
+    fn on_enter(&mut self, state_context: &mut EnterContext) {
         state_context.play_animation(AnimKind::Run, true);
     }
 
-    fn update(&mut self, state_context: &mut super::FighterStateContext) {
+    fn update(&mut self, state_context: &mut UpdateContext) {
         let last_frame = state_context.input.get_last_frame();
         let (accel, target_vel) = state_context
-            .fighter_manifest
-            .attributes
-            .get_accel_and_target_dashrun(&last_frame, FGi32::ONE);
+            .fighter_attributes
+            .get_accel_and_target_dashrun(&last_frame, state_context.facing_direction.to_sign());
         let accel = ground::compute_ground_accel(
             accel,
             target_vel,
             state_context.velocity.x,
-            &state_context.fighter_manifest.attributes,
+            state_context.fighter_attributes,
             state_context.game_settings,
         );
         state_context.velocity.x += accel;
@@ -60,20 +60,20 @@ impl FighterStateImpl for RunState {
 
     fn check_collision_interrupt(
         &mut self,
-        state_context: &mut FighterStateContext,
+        state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
-        if let GroundedMotionResult::InAir =
-            ground::collide_with_stage_grounded(state_context, &mut self.grounded_common, false)
-        {
-            Some(FighterState::Fall(FallState))
-        } else {
-            None
+        ground::collision_interrupt(state_context, &mut self.grounded_common, true)
     }
+    
+    fn is_visually_grounded<'a>(
+        &'a self,
+    ) -> bool {
+        true
     }
 }
 
 pub fn check_input(
-    state_context: &FighterStateContext,
+    state_context: &InterruptContext,
     ground_state_common: &GroundedStateCommon,
 ) -> Option<FighterState> {
     let input_frame = state_context.input.get_last_frame();

src/fighter/state/turn.rs

@@ -1,7 +1,6 @@
-use super::{FighterStateContext, FighterStateImpl};
+use super::{CollisionContext, EnterContext, FighterStateImpl, InterruptContext, UpdateContext};
 use crate::fighter::animation::AnimKind;
-use crate::fighter::state::fall::FallState;
-use crate::fighter::state::ground::{self, GroundedMotionResult, GroundedStateCommon};
+use crate::fighter::state::ground::{self, GroundedStateCommon};
 use crate::fighter::state::{FighterState, dash, jump, wait, walk};
 use crate::input::FighterCommands;
 
@@ -12,7 +11,7 @@ pub struct TurnState {
 
 impl FighterStateImpl for TurnState {
     const NAME: &'static str = "Turn";
-    fn check_interrupt(&self, state_context: &mut FighterStateContext) -> Option<FighterState> {
+    fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
         // State chain that results in the turn completing
         if state_context.get_current_animation_frame()
             <= state_context
@@ -42,51 +41,31 @@ impl FighterStateImpl for TurnState {
         }
     }
 
-    fn on_enter(&mut self, state_context: &mut super::FighterStateContext) {
+    fn on_enter(&mut self, state_context: &mut EnterContext) {
         state_context.play_animation(AnimKind::Turn, false);
         *state_context.facing_direction = state_context.facing_direction.reverse();
     }
 
-    fn update(&mut self, state_context: &mut super::FighterStateContext) {
-        let friction = if state_context.velocity.x.abs()
-            > state_context.fighter_manifest.attributes.max_walk_vel
-        {
-            state_context.fighter_manifest.attributes.ground_friction
-                * state_context
-                    .game_settings
-                    .fighter_common
-                    .ground_friction_over_walk_speed_multiplier
-        } else {
-            state_context.fighter_manifest.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,
-        );
+    fn update(&mut self, state_context: &mut UpdateContext) {
+        ground::update_friction_motion(state_context);
     }
 
     fn check_collision_interrupt(
         &mut self,
-        state_context: &mut FighterStateContext,
+        state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
-        if let GroundedMotionResult::InAir =
-            ground::collide_with_stage_grounded(state_context, &mut self.grounded_common, false)
-        {
-            Some(FighterState::Fall(FallState))
-        } else {
-            None
+        ground::collision_interrupt(state_context, &mut self.grounded_common, false)
     }
+    
+    fn is_visually_grounded<'a>(
+        &'a self,
+    ) -> bool {
+        true
     }
 }
 
 pub fn check_input(
-    state_context: &FighterStateContext,
+    state_context: &InterruptContext,
     grounded_common: &GroundedStateCommon,
 ) -> Option<FighterState> {
     let input_frame = state_context.input.get_last_frame();

src/fighter/state/wait.rs

@@ -1,8 +1,9 @@
-use super::{FighterStateContext, FighterStateImpl, ground};
+use super::{
+    CollisionContext, EnterContext, FighterStateImpl, InterruptContext, UpdateContext, ground,
+};
 use crate::fighter::animation::AnimKind;
 use crate::fighter::state::FighterState;
-use crate::fighter::state::fall::FallState;
-use crate::fighter::state::ground::{GroundedMotionResult, GroundedStateCommon};
+use crate::fighter::state::ground::GroundedStateCommon;
 
 #[derive(Debug, Clone, Hash)]
 pub struct WaitState {
@@ -11,7 +12,7 @@ pub struct WaitState {
 
 impl FighterStateImpl for WaitState {
     const NAME: &'static str = "Wait";
-    fn check_interrupt(&self, state_context: &mut FighterStateContext) -> Option<FighterState> {
+    fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
         if let Some(state) =
             ground::grounded_movement_common_interrupts(state_context, &self.grounded_common)
         {
@@ -31,50 +32,30 @@ impl FighterStateImpl for WaitState {
         }
     }
 
-    fn on_enter(&mut self, state_context: &mut super::FighterStateContext) {
+    fn on_enter(&mut self, state_context: &mut EnterContext) {
         state_context.play_animation(AnimKind::Wait, true);
     }
 
-    fn update(&mut self, state_context: &mut super::FighterStateContext) {
-        let friction = if state_context.velocity.x.abs()
-            > state_context.fighter_manifest.attributes.max_walk_vel
-        {
-            state_context.fighter_manifest.attributes.ground_friction
-                * state_context
-                    .game_settings
-                    .fighter_common
-                    .ground_friction_over_walk_speed_multiplier
-        } else {
-            state_context.fighter_manifest.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,
-        );
+    fn update(&mut self, state_context: &mut UpdateContext) {
+        ground::update_friction_motion(state_context);
     }
 
     fn check_collision_interrupt(
         &mut self,
-        state_context: &mut FighterStateContext,
+        state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
-        if let GroundedMotionResult::InAir =
-            ground::collide_with_stage_grounded(state_context, &mut self.grounded_common, false)
-        {
-            Some(FighterState::Fall(FallState))
-        } else {
-            None
+        ground::collision_interrupt(state_context, &mut self.grounded_common, false)
     }
+    
+    fn is_visually_grounded<'a>(
+        &'a self,
+    ) -> bool {
+        true
     }
 }
 
 pub fn check_input(
-    state_context: &FighterStateContext,
+    state_context: &InterruptContext,
     ground_state_common: &GroundedStateCommon,
 ) -> Option<FighterState> {
     let input_frame = state_context.input.get_last_frame();

src/fighter/state/walk.rs

@@ -1,8 +1,10 @@
-use super::{FighterStateContext, FighterStateImpl, dash, ground, wait};
+use super::{
+    CollisionContext, EnterContext, FighterStateImpl, InterruptContext, UpdateContext, dash,
+    ground, wait,
+};
 use crate::fighter::animation::AnimKind;
 use crate::fighter::state::FighterState;
-use crate::fighter::state::fall::FallState;
-use crate::fighter::state::ground::{GroundedMotionResult, GroundedStateCommon};
+use crate::fighter::state::ground::GroundedStateCommon;
 
 #[derive(Debug, Clone, Hash)]
 pub struct WalkState {
@@ -11,7 +13,7 @@ pub struct WalkState {
 
 impl FighterStateImpl for WalkState {
     const NAME: &'static str = "Walk";
-    fn check_interrupt(&self, state_context: &mut FighterStateContext) -> Option<FighterState> {
+    fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
         if let Some(state) =
             ground::grounded_movement_common_interrupts(state_context, &self.grounded_common)
         {
@@ -21,22 +23,21 @@ impl FighterStateImpl for WalkState {
             .or_else(|| dash::check_input(state_context, &self.grounded_common))
     }
 
-    fn on_enter(&mut self, state_context: &mut FighterStateContext) {
+    fn on_enter(&mut self, state_context: &mut EnterContext) {
         state_context.play_animation(AnimKind::Walk, true);
     }
 
-    fn update(&mut self, state_context: &mut FighterStateContext) {
+    fn update(&mut self, state_context: &mut UpdateContext) {
         let last_frame = state_context.input.get_last_frame();
         let (accel, target_vel) = state_context
-            .fighter_manifest
-            .attributes
+            .fighter_attributes
             .get_accel_and_target_walk(&last_frame);
 
         let accel = ground::compute_ground_accel(
             accel,
             target_vel,
             state_context.velocity.x,
-            &state_context.fighter_manifest.attributes,
+            state_context.fighter_attributes,
             &state_context.game_settings,
         );
 
@@ -51,20 +52,20 @@ impl FighterStateImpl for WalkState {
 
     fn check_collision_interrupt(
         &mut self,
-        state_context: &mut FighterStateContext,
+        state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
-        if let GroundedMotionResult::InAir =
-            ground::collide_with_stage_grounded(state_context, &mut self.grounded_common, false)
-        {
-            Some(FighterState::Fall(FallState))
-        } else {
-            None
+        ground::collision_interrupt(state_context, &mut self.grounded_common, false)
     }
+    
+    fn is_visually_grounded<'a>(
+        &'a self,
+    ) -> bool {
+        true
     }
 }
 
 pub fn check_input(
-    state_context: &FighterStateContext,
+    state_context: &InterruptContext,
     ground_state_common: &GroundedStateCommon,
 ) -> Option<FighterState> {
     let input_frame = state_context.input.get_last_frame();

src/game_settings.rs

@@ -9,12 +9,36 @@ use crate::{math::int::FGi32, menus::style::FGUiStyle};
 #[reflect(opaque)]
 pub struct FighterSettingsCommon {
     pub walk_speed_ease: FGi32,
+
+    /// Maximum allowed horizontal velocity
     pub ground_max_horizontal_velocity: FGi32,
+
+    /// Ground friction applied when the fighter is above the walk speed
     pub ground_friction_over_walk_speed_multiplier: FGi32,
     pub knockback_stacking_window: u32,
     pub knockback_decay_per_frame: FGi32,
+
+    /// Multiplier that translates knockback -> game unit velocity
     pub knockback_launch_velocity_multiplier: FGi32,
     pub hitstun_frames_per_unit_knockback: FGi32,
+
+    /// If an attack's hitstop > this value it will cause a grounded fighter to either bounce (if a meteor/spike)
+    /// or to become airborne
+    pub tumble_bounce_hitstop_threshold: u32,
+
+    /// Angle diff from straight down under which the attack will count as a meteor
+    pub meteor_angle_threshold: FGi32,
+
+    /// Angle diff from straight up under which the attack will force an airborne state 
+    pub attack_ground_to_airborne_transition_vertical_angle_threshold: FGi32,
+    pub visual_shake_frames_per_hitstop_frame: FGi32,
+    // offsets applied when the fighter is in hitstop
+    pub visual_shake_table: Vec<f32>,
+    /// The attacker will always get less hitstop
+    pub attacker_visual_shake_multiplier: f32,
+    
+    /// Maximum angle changed caused by directional influence
+    pub di_max_angle: FGi32,
 }
 #[derive(Reflect, Serialize, Deserialize, Clone)]
 #[reflect(opaque)]

src/input/buffer.rs

@@ -20,6 +20,8 @@ pub enum FighterCommands {
     Jump,
     Shield,
     Attack,
+    SmashMoveUp,
+    SmashMoveDown,
     SmashMoveLeft,
     SmashMoveRight,
 }
@@ -60,6 +62,8 @@ impl FighterAttackCommandType {
 pub struct FighterCommandLifetimes {
     smash_move_left: u8,
     smash_move_right: u8,
+    smash_move_down: u8,
+    smash_move_up: u8,
     jump: u8,
     shield: u8,
     attack: u8,
@@ -72,6 +76,8 @@ impl Index<FighterCommands> for FighterCommandLifetimes {
         match command {
             FighterCommands::SmashMoveLeft => &self.smash_move_left,
             FighterCommands::SmashMoveRight => &self.smash_move_right,
+            FighterCommands::SmashMoveDown => &self.smash_move_down,
+            FighterCommands::SmashMoveUp => &self.smash_move_up,
             FighterCommands::Jump => &self.jump,
             FighterCommands::Shield => &self.shield,
             FighterCommands::Attack => &self.attack,
@@ -84,6 +90,8 @@ impl IndexMut<FighterCommands> for FighterCommandLifetimes {
         match command {
             FighterCommands::SmashMoveLeft => &mut self.smash_move_left,
             FighterCommands::SmashMoveRight => &mut self.smash_move_right,
+            FighterCommands::SmashMoveDown => &mut self.smash_move_down,
+            FighterCommands::SmashMoveUp => &mut self.smash_move_up,
             FighterCommands::Jump => &mut self.jump,
             FighterCommands::Shield => &mut self.shield,
             FighterCommands::Attack => &mut self.attack,
@@ -221,6 +229,19 @@ pub fn postprocess_input(
         let mut x_flick_detected =
             x_abs >= axis_threshold && input.frames_in_x_flick_deadzone <= frame_threshold;
 
+        if y_flick_detected {
+            input.clear_command(FighterCommands::SmashMoveUp);
+            input.clear_command(FighterCommands::SmashMoveDown);
+
+            let command_to_set = if input.current_frame.movement.y > 0.0 {
+                FighterCommands::SmashMoveUp
+            } else {
+                FighterCommands::SmashMoveDown
+            };
+
+            input.set_lifetime(command_to_set, game_settings.input_common.input_buffer_size);
+        }
+
         // if both flicks are detected, only one wins
 
         if x_flick_detected && y_flick_detected {

src/input/gamecube/poll.rs

@@ -45,8 +45,8 @@ impl GcPortState {
             dpad_right: b.dpad_right(),
             left_trigger_digital: b.left_trigger(),
             right_trigger_digital: b.right_trigger(),
-            left_stick: cal.left_stick(&c),
-            right_stick: cal.right_stick(&c),
+            left_stick: cal.left_stick_coords(&c),
+            right_stick: cal.right_stick_coords(&c),
             triggers: (c.triggers.left.raw(), c.triggers.right.raw()),
         }
     }

src/lib.rs

@@ -28,13 +28,11 @@ use bevy::{
     tasks::block_on,
 };
 use bevy_asset_loader::prelude::*;
-use bevy_wind_waker_shader::prelude::*;
 use clap::Parser;
 use ron_asset_manager::RonAssetPlugin;
 
 use crate::{
-    camera::MatchCameraPlugin, fighter::manifest::FighterManifest, game_settings::GameSettings,
-    schedule::GameplaySchedulePlugin, stage::manifest::StageManifest,
+    camera::MatchCameraPlugin, fighter::manifest::FighterManifest, game_settings::GameSettings, schedule::GameplaySchedulePlugin, stage::manifest::StageManifest, ui::InGameUIPlugin,
 };
 
 mod args;
@@ -53,6 +51,7 @@ pub mod schedule;
 pub mod scripting;
 pub mod stage;
 pub mod texture_reference;
+pub mod ui;
 
 #[derive(States, Debug, Clone, Copy, Eq, PartialEq, Hash, Default)]
 pub enum AppState {
@@ -71,6 +70,7 @@ pub enum AppState {
     LoadingMatch,
     PreparingMatch,
     InMatch,
+    MatchDisconnected,
     MatchLoadFailed,
 }
 
@@ -88,7 +88,6 @@ impl Plugin for GamePlugin {
         app.init_state::<AppState>()
             .add_plugins((
                 SettingsPlugin::new("moe.eirteam.shinespark.debug_settings"),
-                WindWakerShaderPlugin::default(),
                 // Brings up GGRS (and with it `GgrsSchedule`), so it goes first.
                 netcode::FighterNetcodePlugin::default(),
                 GameplaySchedulePlugin,
@@ -103,6 +102,7 @@ impl Plugin for GamePlugin {
                 RonAssetPlugin::<FighterManifest>::create("fighter.ron"),
                 RonAssetPlugin::<StageManifest>::create("stage.ron"),
                 RonAssetPlugin::<GameSettings>::create("ron"),
+                InGameUIPlugin,
             ))
             .add_plugins(menus::MenuPlugin)
             .add_loading_state(

src/match_loading.rs

@@ -8,25 +8,28 @@ use bevy_ggrs::prelude::Session;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    AppState,
     args::Args,
     fighter::{
-        FighterId, FighterRoster,
         animation::AnimKind,
         attack::{AttackKind, FighterAttackScriptAssets},
-        baked_animation::{BAKED_ANIMATION_FPS, BakedFighterAnimations},
+        baked_animation::{BakedFighterAnimations, BAKED_ANIMATION_FPS},
         manifest::{FighterManifest, FighterManifestRegistry},
         spawn_fighter,
         visual::FighterAnimations,
+        FighterId, FighterRoster,
     },
     input::{LocalInputAssignments, LocalInputSource},
     math::{int::FGi32, vec::FGVec2},
-    netcode::{GGRSCfg, session::create_session},
+    netcode::{
+        session::{create_session, ConnectionStatus, SessionConfig},
+        GGRSCfg,
+    },
     scripting::FighterAttackScript,
     stage::{
         self,
         manifest::{StageId, StageManifest, StageManifestRegistry},
     },
+    AppState,
 };
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
@@ -140,6 +143,7 @@ pub fn initiate_match(
     next_state: &mut NextState<AppState>,
     request: PendingMatch,
 ) {
+    commands.remove_resource::<crate::netcode::session::MatchDisconnected>();
     commands.insert_resource(request);
     next_state.set(AppState::LoadingMatch);
 }
@@ -176,6 +180,14 @@ pub fn initiate_default_match(
         }
         return;
     }
+    let session_config = match SessionConfig::from_args(&args, args.players) {
+        Ok(config) => config,
+        Err(error) => {
+            error!("Invalid network configuration: {error}");
+            next_state.set(AppState::MatchLoadFailed);
+            return;
+        }
+    };
     let players = (0..args.players)
         .map(|handle| MatchPlayer {
             handle,
@@ -183,10 +195,21 @@ pub fn initiate_default_match(
         })
         .collect();
 
-    assigments.push((0, LocalInputSource::Keyboard));
+    assigments.clear();
+    let local_handles = session_config
+        .players
+        .iter()
+        .enumerate()
+        .filter_map(|(handle, player)| {
+            matches!(player, crate::netcode::session::PlayerConnection::Local).then_some(handle)
+        });
+    let mut local_handles = local_handles;
+    if let Some(handle) = local_handles.next() {
+        assigments.push((handle, LocalInputSource::Keyboard));
+    }
 
-    for (idx, entity) in gamepads.iter().take(args.players - 1).enumerate() {
-        assigments.push((idx + 1, LocalInputSource::Gamepad(entity)));
+    for (entity, handle) in gamepads.iter().zip(local_handles) {
+        assigments.push((handle, LocalInputSource::Gamepad(entity)));
     }
 
     initiate_match(
@@ -373,6 +396,16 @@ pub fn prepare_match(
         ));
     }
 
+    let session_config = match SessionConfig::from_args(&args, request.players.len()) {
+        Ok(config) => config,
+        Err(error) => {
+            fail_match(
+                &mut next_state,
+                &format!("invalid network configuration: {error}"),
+            );
+            return;
+        }
+    };
     let session = match create_session(&args, request.players.len()) {
         Ok(session) => session,
         Err(error) => {
@@ -418,6 +451,8 @@ pub fn prepare_match(
     }
 
     commands.insert_resource(FighterRoster(fighter_roster));
+    commands.insert_resource(session_config);
+    commands.insert_resource(ConnectionStatus::default());
     commands.insert_resource::<Session<GGRSCfg>>(session);
     next_state.set(AppState::InMatch);
 }
@@ -448,6 +483,8 @@ pub fn cleanup_match(
         commands.entity(fighter).despawn();
     }
     commands.remove_resource::<Session<GGRSCfg>>();
+    commands.remove_resource::<SessionConfig>();
+    commands.remove_resource::<ConnectionStatus>();
     commands.remove_resource::<stage::line::StageCollision>();
     commands.remove_resource::<MatchAssets>();
     commands.remove_resource::<PendingMatch>();

src/math/fixed_transform.rs

@@ -0,0 +1,136 @@
+use std::io;
+
+use bevy::prelude::*;
+
+use crate::math::{
+    int::{FGWide, FGi32, FGi32Ext},
+    vec3::FGVec3,
+};
+
+/// Parent transforms are composed after quantization, which makes every runtime sample platform-independent.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize, Hash)]
+pub struct FixedMat4 {
+    pub cols: [[FGi32; 4]; 4],
+}
+
+impl FixedMat4 {
+    pub const IDENTITY: Self = Self {
+        cols: [
+            [FGi32::ONE, FGi32::ZERO, FGi32::ZERO, FGi32::ZERO],
+            [FGi32::ZERO, FGi32::ONE, FGi32::ZERO, FGi32::ZERO],
+            [FGi32::ZERO, FGi32::ZERO, FGi32::ONE, FGi32::ZERO],
+            [FGi32::ZERO, FGi32::ZERO, FGi32::ZERO, FGi32::ONE],
+        ],
+    };
+
+    pub fn from_mat4(matrix: Mat4) -> io::Result<Self> {
+        let values = matrix.to_cols_array();
+        let mut cols = [[FGi32::ZERO; 4]; 4];
+        for (index, value) in values.into_iter().enumerate() {
+            cols[index / 4][index % 4] = FGi32::checked_from_num(value).ok_or_else(|| {
+                io::Error::new(
+                    io::ErrorKind::InvalidData,
+                    "animation transform overflows Q16.16",
+                )
+            })?;
+        }
+        Ok(Self { cols })
+    }
+
+    pub fn to_mat4(self) -> Mat4 {
+        Mat4::from_cols_array_2d(&self.cols.map(|column| column.map(|value| value.to_num())))
+    }
+
+    pub fn mul(self, rhs: Self) -> Self {
+        let mut cols = [[FGi32::ZERO; 4]; 4];
+        for column in 0..4 {
+            for row in 0..4 {
+                let mut value = FGWide::ZERO;
+                for k in 0..4 {
+                    value +=
+                        FGWide::from_num(self.cols[k][row]) * FGWide::from_num(rhs.cols[column][k]);
+                }
+                cols[column][row] = FGi32::from_num(value);
+            }
+        }
+        Self { cols }
+    }
+
+    pub fn transform_point(self, point: FGVec3) -> FGVec3 {
+        let input = [point.x, point.y, point.z, FGi32::ONE];
+        let mut output = [FGi32::ZERO; 3];
+        for row in 0..3 {
+            let mut value = FGWide::ZERO;
+            for (column, input) in input.into_iter().enumerate() {
+                value += FGWide::from_num(self.cols[column][row]) * FGWide::from_num(input);
+            }
+            output[row] = FGi32::from_num(value);
+        }
+        FGVec3 {
+            x: output[0],
+            y: output[1],
+            z: output[2],
+        }
+    }
+
+    pub fn translate(&mut self, translation: FGVec3) {
+        self.cols[3][0] = translation.x;
+        self.cols[3][1] = translation.y;
+        self.cols[3][2] = translation.z;
+    }
+    pub fn with_translation(mut self, translation: FGVec3) -> Self {
+        self.translate(translation);
+        self
+    }
+
+    pub fn with_rotation(mut self, rotation: FGVec3) -> Self {
+        let (sin_x, cos_x) = rotation.x.sin_cos_rads();
+        let (sin_y, cos_y) = rotation.y.sin_cos_rads();
+        let (sin_z, cos_z) = rotation.z.sin_cos_rads();
+        self.cols[0][0] = cos_y * cos_z;
+        self.cols[0][1] = cos_x * sin_z + sin_x * sin_y * cos_z;
+        self.cols[0][2] = sin_x * sin_z - cos_x * sin_y * cos_z;
+        self.cols[1][0] = -cos_y * sin_z;
+        self.cols[1][1] = cos_x * cos_z - sin_x * sin_y * sin_z;
+        self.cols[1][2] = sin_x * cos_z + cos_x * sin_y * sin_z;
+        self.cols[2][0] = sin_y;
+        self.cols[2][1] = -sin_x * cos_y;
+        self.cols[2][2] = cos_x * cos_y;
+        self
+    }
+
+    pub fn get_translation(&self) -> FGVec3 {
+        FGVec3::new(self.cols[3][0], self.cols[3][1], self.cols[3][2])
+    }
+
+    pub fn rotate_y(self, quarter_turns: u8) -> Self {
+        let rotation = match quarter_turns % 4 {
+            0 => Self::IDENTITY,
+            1 => Self {
+                cols: [
+                    [FGi32::ZERO, FGi32::ZERO, FGi32::NEG_ONE, FGi32::ZERO],
+                    [FGi32::ZERO, FGi32::ONE, FGi32::ZERO, FGi32::ZERO],
+                    [FGi32::ONE, FGi32::ZERO, FGi32::ZERO, FGi32::ZERO],
+                    [FGi32::ZERO, FGi32::ZERO, FGi32::ZERO, FGi32::ONE],
+                ],
+            },
+            2 => Self {
+                cols: [
+                    [FGi32::NEG_ONE, FGi32::ZERO, FGi32::ZERO, FGi32::ZERO],
+                    [FGi32::ZERO, FGi32::ONE, FGi32::ZERO, FGi32::ZERO],
+                    [FGi32::ZERO, FGi32::ZERO, FGi32::NEG_ONE, FGi32::ZERO],
+                    [FGi32::ZERO, FGi32::ZERO, FGi32::ZERO, FGi32::ONE],
+                ],
+            },
+            _ => Self {
+                cols: [
+                    [FGi32::ZERO, FGi32::ZERO, FGi32::ONE, FGi32::ZERO],
+                    [FGi32::ZERO, FGi32::ONE, FGi32::ZERO, FGi32::ZERO],
+                    [FGi32::NEG_ONE, FGi32::ZERO, FGi32::ZERO, FGi32::ZERO],
+                    [FGi32::ZERO, FGi32::ZERO, FGi32::ZERO, FGi32::ONE],
+                ],
+            },
+        };
+        self.mul(rotation)
+    }
+}

src/math/mod.rs

@@ -1,4 +1,5 @@
 pub mod int;
 pub mod segment;
 pub mod vec;
+pub mod fixed_transform;
 pub mod vec3;

src/netcode/session.rs

@@ -1,49 +1,234 @@
-//! Bringing up the GGRS session and reporting what it does.
+//! Bringing up GGRS sessions and reporting their connection lifecycle.
+
+use std::net::SocketAddr;
 
 use bevy::prelude::*;
 use bevy_ggrs::{ggrs::UdpNonBlockingSocket, prelude::*};
+use thiserror::Error;
 
-use crate::args::Args;
+use crate::args::{parse_socket_addr, Args};
 use crate::netcode::GGRSCfg;
 
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum PlayerConnection {
+    Local,
+    Remote(SocketAddr),
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Resource)]
+pub struct SessionConfig {
+    pub local_port: u16,
+    pub players: Vec<PlayerConnection>,
+}
+
+#[derive(Debug, Error, PartialEq, Eq)]
+pub enum SessionConfigError {
+    #[error("a session must have at least one player")]
+    NoPlayers,
+    #[error("local UDP port must be nonzero")]
+    LocalPortZero,
+    #[error("invalid network player declaration `{0}`; expected HANDLE=local or HANDLE=ADDRESS")]
+    InvalidPlayerDeclaration(String),
+    #[error("network player handle {0} is outside the session player range")]
+    PlayerHandleOutOfRange(usize),
+    #[error("network player handle {0} was declared more than once")]
+    DuplicatePlayerHandle(usize),
+    #[error("network player {0} has an invalid address: {1}")]
+    InvalidRemoteAddress(usize, String),
+    #[error("at least one player must be local")]
+    NoLocalPlayers,
+    #[error("network player declarations are not supported in sync-test or replay mode")]
+    UnsupportedOfflineNetworkConfig,
+}
+
+impl SessionConfig {
+    pub fn from_args(args: &Args, player_count: usize) -> Result<Self, SessionConfigError> {
+        if player_count == 0 {
+            return Err(SessionConfigError::NoPlayers);
+        }
+        if args.local_port == 0 {
+            return Err(SessionConfigError::LocalPortZero);
+        }
+        if (args.synctest || args.play_replay.is_some()) && !args.net_players.is_empty() {
+            return Err(SessionConfigError::UnsupportedOfflineNetworkConfig);
+        }
+
+        let mut players = vec![PlayerConnection::Local; player_count];
+        for declaration in &args.net_players {
+            let Some((handle, address)) = declaration.split_once('=') else {
+                return Err(SessionConfigError::InvalidPlayerDeclaration(
+                    declaration.clone(),
+                ));
+            };
+            let handle = handle
+                .parse::<usize>()
+                .map_err(|_| SessionConfigError::InvalidPlayerDeclaration(declaration.clone()))?;
+            if handle >= player_count {
+                return Err(SessionConfigError::PlayerHandleOutOfRange(handle));
+            }
+            if !matches!(players[handle], PlayerConnection::Local)
+                || args.net_players[..]
+                    .iter()
+                    .take_while(|item| *item != declaration)
+                    .any(|item| {
+                        item.split_once('=')
+                            .and_then(|(handle, _)| handle.parse::<usize>().ok())
+                            == Some(handle)
+                    })
+            {
+                return Err(SessionConfigError::DuplicatePlayerHandle(handle));
+            }
+            players[handle] = if address == "local" {
+                PlayerConnection::Local
+            } else {
+                PlayerConnection::Remote(
+                    parse_socket_addr(address)
+                        .map_err(|error| SessionConfigError::InvalidRemoteAddress(handle, error))?,
+                )
+            };
+        }
+
+        if !players
+            .iter()
+            .any(|player| matches!(player, PlayerConnection::Local))
+        {
+            return Err(SessionConfigError::NoLocalPlayers);
+        }
+        Ok(Self {
+            local_port: args.local_port,
+            players,
+        })
+    }
+}
+
 pub fn create_session(args: &Args, player_count: usize) -> Result<Session<GGRSCfg>> {
+    let config = SessionConfig::from_args(args, player_count)
+        .map_err(|error| bevy::ecs::error::BevyError::from(error.to_string()))?;
     let mut sess_build = SessionBuilder::<GGRSCfg>::new()
         .with_num_players(player_count)?
         .with_check_distance(args.check_distance)
-        .with_input_delay(args.input_delay); // (optional) set input delay for the local player
+        .with_input_delay(args.input_delay);
 
-    for i in 0..player_count {
-        sess_build = sess_build.add_player(PlayerType::Local, i)?;
+    for (handle, player) in config.players.iter().enumerate() {
+        let player_type = match player {
+            PlayerConnection::Local => PlayerType::Local,
+            PlayerConnection::Remote(address) => PlayerType::Remote(*address),
+        };
+        sess_build = sess_build.add_player(player_type, handle)?;
     }
 
     if args.synctest {
-        println!("Start synctest!");
-        let sess = sess_build.start_synctest_session()?;
-        Ok(Session::SyncTest(sess))
+        info!("starting GGRS sync test");
+        Ok(Session::SyncTest(sess_build.start_synctest_session()?))
     } else {
-        println!("Start p2p!");
-        let socket = UdpNonBlockingSocket::bind_to_port(6969)?;
-        let sess = sess_build.start_p2p_session(socket)?;
-        Ok(Session::P2P(sess))
+        info!(
+            "starting direct UDP P2P session on port {}",
+            config.local_port
+        );
+        let socket = UdpNonBlockingSocket::bind_to_port(config.local_port)?;
+        Ok(Session::P2P(sess_build.start_p2p_session(socket)?))
     }
 }
 
-pub fn print_events_system(session: Option<ResMut<Session<GGRSCfg>>>) {
-    let Some(mut session) = session else {
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Resource)]
+pub enum ConnectionStatus {
+    #[default]
+    Connecting,
+    Running,
+    Interrupted,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Resource)]
+pub struct MatchDisconnected {
+    pub address: SocketAddr,
+}
+
+pub fn print_events_system(
+    mut commands: Commands,
+    mut next_state: ResMut<NextState<crate::AppState>>,
+    mut status: Option<ResMut<ConnectionStatus>>,
+    session: Option<ResMut<Session<GGRSCfg>>>,
+) {
+    let (Some(mut session), Some(status)) = (session, status.as_deref_mut()) else {
         return;
     };
-    match session.as_mut() {
-        Session::P2P(s) => {
-            for event in s.events() {
+    let Session::P2P(session) = session.as_mut() else {
+        return;
+    };
+    for event in session.events() {
         match event {
-                    GgrsEvent::Disconnected { .. } | GgrsEvent::NetworkInterrupted { .. } => {
-                        warn!("GGRS event: {event:?}")
+            GgrsEvent::NetworkInterrupted { addr, .. } => {
+                warn!("GGRS network interrupted: {addr}");
+                *status = ConnectionStatus::Interrupted;
             }
-                    GgrsEvent::DesyncDetected { .. } => error!("GGRS event: {event:?}"),
+            GgrsEvent::NetworkResumed { addr } => {
+                info!("GGRS network resumed: {addr}");
+                *status = ConnectionStatus::Running;
+            }
+            GgrsEvent::Disconnected { addr } => {
+                error!("GGRS peer disconnected: {addr}");
+                commands.insert_resource(MatchDisconnected { address: addr });
+                next_state.set(crate::AppState::MatchDisconnected);
+            }
+            GgrsEvent::Synchronized { .. } => {
+                info!("GGRS session synchronized");
+                *status = ConnectionStatus::Running;
+            }
+            GgrsEvent::DesyncDetected { .. } => error!("GGRS desync detected: {event:?}"),
             _ => info!("GGRS event: {event:?}"),
         }
     }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use clap::Parser;
+
+    fn args(values: &[&str]) -> Args {
+        Args::try_parse_from(values).unwrap()
     }
-        _ => {}
+
+    #[test]
+    fn defaults_to_local_players() {
+        let config = SessionConfig::from_args(&args(&["game", "--players", "2"]), 2).unwrap();
+        assert_eq!(
+            config.players,
+            [PlayerConnection::Local, PlayerConnection::Local]
+        );
+    }
+
+    #[test]
+    fn configures_remote_players_by_handle() {
+        let config = SessionConfig::from_args(
+            &args(&["game", "--players", "2", "--net-player", "1=127.0.0.1:7001"]),
+            2,
+        )
+        .unwrap();
+        assert!(matches!(config.players[0], PlayerConnection::Local));
+        assert!(matches!(config.players[1], PlayerConnection::Remote(_)));
+    }
+
+    #[test]
+    fn validates_handles_and_local_ownership() {
+        let duplicate = args(&[
+            "game",
+            "--players",
+            "2",
+            "--net-player",
+            "1=127.0.0.1:7001",
+            "--net-player",
+            "1=127.0.0.1:7002",
+        ]);
+        assert!(matches!(
+            SessionConfig::from_args(&duplicate, 2),
+            Err(SessionConfigError::DuplicatePlayerHandle(1))
+        ));
+
+        let no_local = args(&["game", "--players", "1", "--net-player", "0=127.0.0.1:7001"]);
+        assert!(matches!(
+            SessionConfig::from_args(&no_local, 1),
+            Err(SessionConfigError::NoLocalPlayers)
+        ));
     }
 }

src/ui/battle_ui.rs

@@ -0,0 +1,57 @@
+use bevy::prelude::*;
+
+use crate::{
+    fighter::manifest::{FighterManifest, FighterManifestRegistry}, match_loading::{PendingMatch}, ui::{errors::UIErrors, fighter_info::FighterInfoUI},
+};
+
+#[derive(Component, FromTemplate)]
+pub struct BattleUI {
+}
+
+pub fn spawn_battle_ui(mut commands: Commands, request: Res<PendingMatch>, fighter_registry: Res<FighterManifestRegistry>, manifests: Res<Assets<FighterManifest>>) -> Result {
+
+    let mut fighter_uis = vec![];
+
+    for player in &request.players {
+        let manifest = fighter_registry.get(player.fighter).ok_or_else(|| UIErrors::FighterManifestHandleNotFound(player.fighter))?;
+        let manifest = manifests.get(manifest).ok_or_else(|| UIErrors::FighterManifestNotFound(player.fighter))?;
+
+        fighter_uis.push(FighterInfoUI::build(manifest, player));
+    }
+
+    let scene = bsn! {
+        BattleUI {
+        }
+        Node {
+            width: percent(100),
+            height: percent(100),
+            flex_direction: FlexDirection::Column,
+            align_items: AlignItems::Center,
+            justify_content: JustifyContent::End,
+        }
+        Children [
+            (
+                #FighterInfos
+                Node {
+                    width: percent(100),
+                    flex_direction: FlexDirection::Row,
+                    align_items: AlignItems::End,
+                    justify_content: JustifyContent::SpaceEvenly,
+                }
+                Children [
+                    {fighter_uis}
+                ]
+            )
+        ]
+    };
+
+    commands.spawn_scene(scene);
+
+    Ok(())
+}
+
+pub fn cleanup_battle_ui(mut commands: Commands, battle_ui: Query<Entity, With<BattleUI>>) {
+    for entity in battle_ui {
+        commands.entity(entity).despawn();
+    }
+}

src/ui/errors.rs

@@ -0,0 +1,14 @@
+use bevy::{scene::SpawnSceneError};
+
+use crate::{fighter::FighterId};
+
+#[derive(thiserror::Error, Debug)]
+pub enum UIErrors {
+    #[error("Scene spawn failed: {0:?}")]
+    SceneSpawnFailed(#[from] SpawnSceneError),
+    #[error("Fighter manifest handle not found for fighter id {0:?}")]
+    FighterManifestHandleNotFound(FighterId),
+
+    #[error("Fighter manifest not found for fighter id {0:?}")]
+    FighterManifestNotFound(FighterId),
+}

src/ui/fighter_info.rs

@@ -0,0 +1,57 @@
+use bevy::prelude::*;
+
+use crate::{fighter::{attack::FighterDamage, manifest::{FighterManifest}}, match_loading::MatchPlayer, player::Player};
+
+#[derive(Component, FromTemplate)]
+pub struct FighterInfoUI {
+    percentage_text: Entity,
+    _name_text: Entity,
+    player_handle: usize,
+    visible_damage: FighterDamage,
+}
+
+impl FighterInfoUI {
+    pub fn build(_manifest: &FighterManifest, match_player: &MatchPlayer) -> impl Scene {
+        let fighter_name = "El grande padre";
+        bsn! {
+            FighterInfoUI {
+                percentage_text: #PercentageText,
+                _name_text: #NameText,
+                player_handle: {match_player.handle}
+            }
+            Node {
+                flex_direction: FlexDirection::Column,
+                align_items: AlignItems::Center,
+                justify_content: JustifyContent::Center,
+            }
+            Children [
+                (
+                    #PercentageText
+                    Text("0.00%")
+                    TextFont {
+                        font_size: px(crate::menus::style::H2_SIZE),
+                    }
+                ),
+                (
+                    #NameText
+                    Text({fighter_name})
+                )
+            ]
+        }
+    }
+}
+
+pub fn update_fighter_info_damage(fighters: Query<(&Player, &FighterDamage)>, ui_elements: Query<&mut FighterInfoUI>, mut commands: Commands) {
+    for mut ui_element in ui_elements {
+        let Some((_, damage)) = fighters.iter().find(|(player, _)| {
+            player.handle == ui_element.player_handle
+        }) else {
+            continue;
+        };
+
+        if *damage != ui_element.visible_damage {
+            commands.entity(ui_element.percentage_text).insert(Text(format!("{}%", damage)));
+            ui_element.visible_damage = damage.clone();
+        }
+    }
+}

src/ui/mod.rs

@@ -0,0 +1,18 @@
+use bevy::prelude::*;
+
+use crate::AppState;
+
+pub mod battle_ui;
+pub mod errors;
+pub mod fighter_info;
+
+#[derive(Default)]
+pub struct InGameUIPlugin;
+
+impl Plugin for InGameUIPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_systems(OnEnter(AppState::InMatch), battle_ui::spawn_battle_ui)
+            .add_systems(OnExit(AppState::InMatch), battle_ui::cleanup_battle_ui)
+            .add_systems(PostUpdate, fighter_info::update_fighter_info_damage);
+    }
+}