Remove UI multi cam setup

Optimize rollback hot paths (#53 )
## Summary Fixes #20. - Reuse fighter animation scratch and output buffers across rollback frames. - Select air-collision hits in one pass without candidate allocations or sorting. - Index contiguous replay input frames directly and binary-search checksums. - Add regression tests for buffer reuse and replay lookup/validation. Reviewed-on: #53 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>
2026-09-20 18:17:37 +02:00 · 2026-09-20 12:41:13 +00:00 · 2026-09-20 13:35:43 +02:00 · 2026-09-20 11:34:45 +00:00 · 2026-09-20 11:13:15 +00:00 · 2026-09-19 21:40:15 +00:00
66 changed files with 3972 additions and 2217 deletions
@@ -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
@@ -10,7 +10,7 @@ on:
 jobs:
  build-and-test:
    runs-on: ubuntu-latest
-    timeout-minutes: 15
+    timeout-minutes: 30
    steps:
      - name: Check out source
        uses: actions/checkout@v4
@@ -20,7 +20,14 @@ jobs:
          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \
            sh -s -- -y --profile minimal
          echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
-          "$HOME/.cargo/bin/rustup" toolchain install nightly --profile minimal
+          "$HOME/.cargo/bin/rustup" toolchain install nightly-2026-09-14 --profile minimal
+
+      - name: Cache Rust dependencies and build artifacts
+        uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
+        with:
+          prefix-key: v2-rust
+          shared-key: linux-nightly
+          cache-bin: false

      - name: Install Linux dependencies
        run: |
@@ -43,3 +50,94 @@ jobs:

      - name: Run unit tests
        run: cargo test --locked --lib -j 4
+
+  production-build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 45
+    steps:
+      - name: Check out source
+        uses: actions/checkout@v4
+
+      - name: Install Rust toolchain
+        run: |
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \
+            sh -s -- -y --profile minimal
+          echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
+          "$HOME/.cargo/bin/rustup" toolchain install nightly-2026-09-14 --profile minimal
+
+      - name: Install Windows build tooling
+        run: |
+          "$HOME/.cargo/bin/rustup" target add x86_64-pc-windows-msvc --toolchain nightly-2026-09-14
+          "$HOME/.cargo/bin/cargo" install cargo-xwin --locked
+
+      - name: Cache production Rust dependencies and build artifacts
+        uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
+        with:
+          prefix-key: v2-rust
+          shared-key: linux-nightly-production
+          cache-bin: false
+
+      - name: Install Linux dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install --no-install-recommends -y \
+            clang-19 \
+            libasound2-dev \
+            libudev-dev \
+            libusb-1.0-0-dev \
+            libwayland-dev \
+            libx11-dev \
+            libxkbcommon-dev \
+            libxkbcommon-x11-0 \
+            lld-19 \
+            llvm-19 \
+            mesa-vulkan-drivers \
+            mold \
+            pkg-config
+          sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-19 100
+          sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-19 100
+          echo "/usr/lib/llvm-19/bin" >> "$GITHUB_PATH"
+          rm -f "$HOME/.cache/cargo-xwin/clang-cl"
+
+      - name: Preprocess assets
+        run: cargo run --locked --bin process-assets --no-default-features --features debug_features -j 4
+
+      - name: Build production binary
+        run: cargo build --locked --profile production --no-default-features --features debug_features -j 4
+
+      - name: Build Windows production binary
+        run: |
+          clang --version
+          cargo xwin build --locked --target x86_64-pc-windows-msvc --profile production --no-default-features --features debug_features -j 4 --bin shinespark
+
+      - name: Verify production binary is not Bevy/Rust dynamically linked
+        run: |
+          ! readelf -d target/production/shinespark | grep -E 'libbevy_dylib|libstd-.*\.so'
+
+      - name: Package Linux Steam depot
+        if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+        run: |
+          mkdir -p build/game
+          cp target/production/shinespark build/game/shinespark
+          cp target/x86_64-pc-windows-msvc/production/shinespark.exe build/game/shinespark.exe
+          cp -R imported_assets build/game/imported_assets
+
+      - if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+        uses: CyberAndrii/steam-totp@v1
+        name: Generate Steam TOTP
+        id: steam-totp
+        with:
+          shared_secret: ${{ secrets.STEAM_SHARED_SECRET }}
+
+      - name: Deploy Linux build to Steam
+        if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+        uses: game-ci/steam-deploy@v3
+        with:
+          username: ${{ secrets.STEAM_USERNAME }}
+          password: ${{ secrets.STEAM_PASSWORD }}
+          totp: ${{ steps.steam-totp.outputs.code }}
+          appId: 3409670
+          buildDescription: ${{ github.sha }}
+          rootPath: build
+          depot1Path: game
+          releaseBranch: master
@@ -10,3 +10,7 @@ imported_assets
 *_old.glb
 /replay.json
 *.replay.tmp
+
+# Python debugger formatter tests
+__pycache__/
+*.pyc
@@ -94,12 +94,6 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"

-[[package]]
-name = "adler32"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
-
 [[package]]
 name = "ahash"
 version = "0.8.12"
@@ -2096,14 +2090,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 +2218,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"
@@ -3242,16 +3202,6 @@ dependencies = [
 "windows-sys 0.60.2",
 ]

-[[package]]
-name = "filetime"
-version = "0.2.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c287a33c7f0a620c38e641e7f60827713987b3c0f26e8ddc9462cc69cf75759"
-dependencies = [
- "cfg-if",
- "libc",
-]
-
 [[package]]
 name = "find-msvc-tools"
 version = "0.1.9"
@@ -3468,9 +3418,9 @@ dependencies = [

 [[package]]
 name = "gc-adapter-neo"
-version = "1.0.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd350c081bf33e501e9a5a11732294dfe266683d6b58a366b097146f3e633cb5"
+checksum = "a8d3e10c6c4b928cb559f641765ebaa40f5f099bf51bc0227af7431859f8bd84"
 dependencies = [
 "binread",
 "modular-bitfield",
@@ -3523,17 +3473,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"
@@ -4311,26 +4250,6 @@ version = "0.2.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"

-[[package]]
-name = "libflate"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18"
-dependencies = [
- "adler32",
- "crc32fast",
- "libflate_lz77",
-]
-
-[[package]]
-name = "libflate_lz77"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a52d3a8bfc85f250440e4424db7d857e241a3aebbbe301f3eb606ab15c39acbf"
-dependencies = [
- "rle-decode-fast",
-]
-
 [[package]]
 name = "libloading"
 version = "0.8.9"
@@ -4371,15 +4290,13 @@ dependencies = [

 [[package]]
 name = "libusb1-sys"
-version = "0.4.4"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be241693102a24766d0b8526c8988771edac2842630d7e730f8e9fbc014f3703"
+checksum = "da050ade7ac4ff1ba5379af847a10a10a8e284181e060105bf8d86960ce9ce0f"
 dependencies = [
 "cc",
 "libc",
- "libflate",
 "pkg-config",
- "tar",
 "vcpkg",
 ]

@@ -5885,12 +5802,6 @@ dependencies = [
 "syn 2.0.119",
 ]

-[[package]]
-name = "rle-decode-fast"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422"
-
 [[package]]
 name = "robust"
 version = "1.2.0"
@@ -5961,9 +5872,9 @@ dependencies = [

 [[package]]
 name = "rusb"
-version = "0.6.5"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f32cd45962594f9f8cd4547b5757132715600e2c8840aa9ccd3d1a9ed6fdc6"
+checksum = "ab9f9ff05b63a786553a4c02943b74b34a988448671001e9a27e2f0565cc05a4"
 dependencies = [
 "libc",
 "libusb1-sys",
@@ -6170,9 +6081,8 @@ dependencies = [
 "bevy_asset_loader",
 "bevy_egui",
 "bevy_ggrs",
- "bevy_wind_waker_shader",
 "bincode",
- "bitfields",
+ "blake3",
 "clap",
 "enum_cycling",
 "enum_cycling_derive",
@@ -6542,17 +6452,6 @@ dependencies = [
 "slotmap",
 ]

-[[package]]
-name = "tar"
-version = "0.4.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f6221d9a6003c78398e3b239969f352578258df48c8eb051caadae0015bc840"
-dependencies = [
- "filetime",
- "libc",
- "xattr",
-]
-
 [[package]]
 name = "termcolor"
 version = "1.4.1"
@@ -7958,16 +7857,6 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd"

-[[package]]
-name = "xattr"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156"
-dependencies = [
- "libc",
- "rustix 1.1.4",
-]
-
 [[package]]
 name = "xcursor"
 version = "0.3.11"
@@ -6,11 +6,17 @@ authors = [""]

 [workspace]

+[features]
+default = ["development", "debug_features"]
+development = ["bevy/dynamic_linking", "bevy/file_watcher"]
+debug_features = ["bevy/free_camera"]
+
 [dependencies]
-bevy = { version = "0.19", features = ["asset_processor", "basis-universal", "dynamic_linking", "free_camera", "file_watcher", "bevy_settings"] }
+bevy = { version = "0.19", features = ["asset_processor", "basis-universal", "bevy_settings"] }
 # Loads the scenes you author in the editor (assets/*.bsn) and builds
 # physics colliders from them. An ordinary dependency; remove it if you
 # stop using authored scenes.
+blake3 = { version = "1.8.5", features = [ "pure" ] }
 thiserror = "2"
 avian3d = "0.7"
 arrayvec = "0.7.8"
@@ -22,15 +28,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.1", features = ["libusb"] }
 rhai = "1.26.0"
 enum_cycling = "0.2.1"
 enum_cycling_derive = "0.2.1"
@@ -39,3 +43,9 @@ fixed_math = "0.4.1"
 # Enable a large amount of optimization in the dev profile for dependencies.
 [profile.dev.package."*"]
 opt-level = 3
+
+[profile.production]
+inherits = "release"
+lto = "thin"
+codegen-units = 1
+strip = "symbols"
@@ -1,12 +1,33 @@
-# 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.
+## Debugging fixed-point values with lldb
+
+If using CodeLLDB:
+```json
+"preRunCommands": [
+    "command script import ${workspaceFolder}/tools/lldb_fixed.py"
+]
+```
+
+## 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
+```
+
+## Production Build
+
+```sh
+cargo run --locked \
+  --bin process-assets --no-default-features --features debug_features
+cargo build --locked \
+  --profile production --no-default-features --features debug_features
+```
@@ -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,
@@ -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"
@@ -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)
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly"
+channel = "nightly-2026-09-14"
@@ -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());
+    }
+}
@@ -0,0 +1,36 @@
+use bevy::{
+    app::ScheduleRunnerPlugin,
+    asset::{AssetMode, AssetPlugin, processor::AssetProcessor, processor::ProcessorState},
+    gltf::GltfPlugin,
+    image::{CompressedImageFormats, ImageLoader, ImagePlugin},
+    prelude::*,
+    tasks::block_on,
+    text::TextPlugin,
+};
+use shinespark::AssetProcessingPlugin;
+use std::{process::ExitCode, time::Duration};
+
+fn main() -> ExitCode {
+    let mut app = App::new();
+    app.add_plugins(MinimalPlugins.set(ScheduleRunnerPlugin::run_loop(Duration::from_millis(50))))
+        .add_plugins(AssetPlugin {
+            mode: AssetMode::Processed,
+            use_asset_processor_override: Some(true),
+            ..default()
+        })
+        .add_plugins((ImagePlugin::default(), TextPlugin, GltfPlugin::default()))
+        .register_asset_loader(ImageLoader::new(CompressedImageFormats::NONE))
+        .add_plugins(AssetProcessingPlugin)
+        .add_systems(Update, finish_when_processed);
+
+    app.run();
+    ExitCode::SUCCESS
+}
+
+fn finish_when_processed(processor: Option<Res<AssetProcessor>>, mut exit: MessageWriter<AppExit>) {
+    if processor
+        .is_some_and(|processor| block_on(processor.get_state()) == ProcessorState::Finished)
+    {
+        exit.write(AppExit::Success);
+    }
+}
@@ -3,16 +3,19 @@
 use std::{collections::HashMap, time::Duration};

 use bevy::{
+    input::InputSystems,
    prelude::*,
    settings::{ReflectSettingsGroup, SaveSettingsDeferred, SettingsGroup},
 };
 use bevy_egui::{EguiContexts, EguiPrimaryContextPass, egui};
-use bevy_ggrs::RollbackFrameRate;
+use bevy_ggrs::{RollbackFrameRate, RunGgrsSystems};
 use enum_cycling::EnumCycle;
 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)]
@@ -114,6 +117,7 @@ enum DebugFlag {
    Hurtboxes,
    Camera,
    DrawThroughGeometry,
+    FrameStepping,
 }

 #[derive(Clone, Copy)]
@@ -174,6 +178,10 @@ const WORLD_MENU: &[DebugMenuEntry] = &[
    DebugMenuEntry::GameSpeed {
        label: "Game speed",
    },
+    DebugMenuEntry::Toggle {
+        label: "Frame stepping",
+        flag: DebugFlag::FrameStepping,
+    },
 ];

 const DIAGNOSTICS_MENU: &[DebugMenuEntry] = &[DebugMenuEntry::Toggle {
@@ -233,6 +241,8 @@ pub struct DebugSettings {
    selections: Vec<usize>,
    #[reflect(ignore)]
    pub player_rows: HashMap<usize, [FighterDebugRowKind; PLAYER_DEBUG_ROW_COUNT]>,
+    #[reflect(ignore)]
+    pub frame_stepping: bool,
    pub network: bool,
    pub ecb: bool,
    pub stage_collision: bool,
@@ -253,6 +263,7 @@ impl Default for DebugSettings {
            pages: vec![DebugMenuPage::Static(ROOT_MENU)],
            selections: vec![0],
            player_rows: HashMap::new(),
+            frame_stepping: false,
            network: false,
            ecb: false,
            stage_collision: false,
@@ -325,6 +336,7 @@ impl DebugSettings {
            DebugFlag::Hurtboxes => self.hurtboxes,
            DebugFlag::DrawThroughGeometry => self.draw_through_geometry,
            DebugFlag::Camera => self.camera,
+            DebugFlag::FrameStepping => self.frame_stepping,
        }
    }

@@ -340,6 +352,7 @@ impl DebugSettings {
                self.draw_through_geometry = !self.draw_through_geometry
            }
            DebugFlag::Camera => self.camera = !self.camera,
+            DebugFlag::FrameStepping => self.frame_stepping = !self.frame_stepping,
        }
    }

@@ -356,9 +369,35 @@ impl DebugSettings {

 pub struct DebugToolsPlugin;

+#[derive(Resource, Default)]
+struct FrameStepState {
+    requested: bool,
+    time_backup: Option<Time>,
+    last_step_time: Time
+}
+
 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
+                    .after(InputSystems)
+                    .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,
                (handle_palette_input, sync_gizmo_depth_bias)
@@ -391,6 +430,61 @@ fn queue_settings_save(commands: &mut Commands) {
    commands.queue(SaveSettingsDeferred(Duration::from_secs_f32(0.1)));
 }

+fn frame_step_duration(frame_rate: usize) -> Duration {
+    Duration::from_nanos(1_000_000_000u64 / frame_rate as u64)
+}
+
+fn prepare_frame_step(
+    settings: Res<DebugSettings>,
+    gamepads: Query<&Gamepad>,
+    key: Res<ButtonInput<KeyCode>>,
+    mut state: ResMut<FrameStepState>,
+    mut time: ResMut<Time>,
+    frame_rate: Res<RollbackFrameRate>,
+) {
+    if !settings.frame_stepping {
+        state.requested = false;
+        return;
+    }
+
+    let pressed = gamepads
+        .iter()
+        .any(|gamepad| gamepad.pressed(GamepadButton::DPadDown));
+
+    let just_pressed = gamepads
+            .iter()
+            .any(|gamepad| gamepad.just_pressed(GamepadButton::DPadDown));
+
+    let just_pressed = key.just_pressed(KeyCode::F4) || just_pressed;
+    let pressed = key.pressed(KeyCode::F4) || pressed;
+
+    if just_pressed {
+        state.last_step_time = time.clone();
+    }
+
+    let can_repress = pressed && (time.elapsed() - state.last_step_time.elapsed()).as_millis() > 500;
+
+    if !settings.menu_open && (just_pressed || can_repress)
+    {
+        state.requested = true;
+    }
+
+    state.time_backup = Some(*time);
+    let delta = if state.requested {
+        frame_step_duration(**frame_rate)
+    } else {
+        Duration::ZERO
+    };
+    time.advance_by(delta);
+}
+
+fn restore_frame_step_time(mut state: ResMut<FrameStepState>, mut time: ResMut<Time>) {
+    if let Some(backup) = state.time_backup.take() {
+        *time = backup;
+        state.requested = false;
+    }
+}
+
 fn activate_selected(
    settings: &mut DebugSettings,
    page_len: usize,
@@ -408,8 +502,10 @@ fn activate_selected(
            }
            DebugMenuEntry::Toggle { flag, .. } => {
                settings.toggle_flag(flag);
+                if !matches!(flag, DebugFlag::FrameStepping) {
                    queue_settings_save(commands);
                }
+            }
            DebugMenuEntry::Submenu { entries, .. } => {
                settings.push_page(DebugMenuPage::Static(entries));
            }
@@ -623,9 +719,11 @@ fn draw_palette(
                                    let mut value = settings.flag(*flag);
                                    if ui.checkbox(&mut value, *label).changed() {
                                        settings.toggle_flag(*flag);
+                                        if !matches!(flag, DebugFlag::FrameStepping) {
                                            queue_settings_save(&mut commands);
                                        }
                                    }
+                                }
                                DebugMenuEntry::Submenu { label, .. }
                                | DebugMenuEntry::PlayerSlots { label } => {
                                    if ui.button(format!("{label} >")).clicked() {
@@ -839,6 +937,15 @@ mod tests {
        assert_eq!(GameSpeedDebug::Quarter.frame_rate(), 15);
    }

+    #[test]
+    fn frame_stepping_is_disabled_by_default_and_uses_game_speed_timestep() {
+        let settings = DebugSettings::default();
+
+        assert!(!settings.frame_stepping);
+        assert_eq!(frame_step_duration(60), Duration::from_nanos(16_666_666));
+        assert_eq!(frame_step_duration(30), Duration::from_nanos(33_333_333));
+    }
+
    #[test]
    fn empty_player_list_does_not_activate() {
        let mut settings = DebugSettings::default();
@@ -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;
+}
@@ -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);
+    }
+}
@@ -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)
@@ -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),
+        );
+    }
+}
@@ -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,

@@ -0,0 +1,465 @@
+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;
+
+pub struct BakedAnimationAssetProcessingPlugin;
+
+impl Plugin for BakedAnimationAssetProcessingPlugin {
+    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");
+    }
+}
+
+impl Plugin for BakedAnimationPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_plugins(BakedAnimationAssetProcessingPlugin)
+            .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()
+}
@@ -0,0 +1,264 @@
+//! Deterministic, fighter-local skeletal animation samples for gameplay and rendering.
+
+mod asset_baking;
+mod runtime;
+mod visual_binding;
+
+pub use crate::math::fixed_transform::FixedMat4;
+pub use asset_baking::{BakedAnimationAssetProcessingPlugin, BakedAnimationPlugin};
+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 repeated_pose_updates_reuse_scratch_and_output_buffers() {
+        let mut matrices = FighterBoneMatrices::default();
+        let names = ["root".into(), "hand".into()];
+        let parents = [None, Some(0)];
+        let pose = [FixedMat4::IDENTITY, FixedMat4::IDENTITY];
+
+        matrices.set_pose(&names, &parents, &pose, FGi32::ONE);
+        let capacities = matrices.buffer_capacities();
+        matrices.set_pose(&names, &parents, &pose, FGi32::ONE);
+
+        assert_eq!(capacities, matrices.buffer_capacities());
+    }
+
+    #[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"));
+    }
+}
@@ -0,0 +1,264 @@
+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::fixed_transform::FixedMat4,
+    math::int::FGi32,
+};
+
+#[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>,
+    model_matrices: Vec<Option<FixedMat4>>,
+}
+
+#[derive(Component, Clone, Debug, Default)]
+pub struct FighterBoneIndexMap(pub HashMap<String, usize>);
+
+impl FighterBoneMatrices {
+    #[cfg(test)]
+    pub(super) fn buffer_capacities(&self) -> [usize; 5] {
+        [
+            self.matrices.capacity(),
+            self.local_matrices.capacity(),
+            self.previous_frame_matrices.capacity(),
+            self.previous_local_matrices.capacity(),
+            self.model_matrices.capacity(),
+        ]
+    }
+
+    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");
+        }
+        self.matrices.reserve(local.len());
+        self.previous_frame_matrices.reserve(local.len());
+        self.local_matrices.reserve(local.len());
+        self.previous_local_matrices.reserve(local.len());
+        self.model_matrices.reserve(local.len());
+        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);
+        self.model_matrices.resize(local.len(), None);
+        self.model_matrices.fill(None);
+        for index in 0..local.len() {
+            resolve_model_transform(index, parents, local, &mut self.model_matrices)
+                .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.clear();
+        self.matrices.extend(
+            self.model_matrices.iter().map(|matrix| {
+                model_scale.mul(matrix.expect("baked bone hierarchy should be valid"))
+            }),
+        );
+    }
+}
+
+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),
+    }
+}
@@ -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;
+    }
+}
@@ -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,18 +39,24 @@ 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() {
-        if let Some(intersect_result) = poly.intersect_ray(ray_segment) {
-            intersect_results.push((
+    stage_collision
+        .stage_polys
+        .iter()
+        .enumerate()
+        .filter_map(|(poly_idx, poly)| {
+            poly.intersect_ray(ray_segment).map(|intersect_result| {
+                (
                    AirCollisionWithStageResult {
                        line_id: {
                            StageLineID {
@@ -63,13 +70,9 @@ pub fn air_collide_with_stage(
                    intersect_result
                        .position
                        .distance_squared(ray_segment.point2()),
-            ));
-        }
-    }
-    intersect_results.sort_by(|(_, a), (_, b)| a.cmp(b));
-
-    intersect_results
-        .iter()
-        .last()
-        .map(|(val, _)| val.to_owned().clone())
+                )
+            })
+        })
+        .max_by(|(_, a), (_, b)| a.cmp(b))
+        .map(|(result, _)| result)
 }
@@ -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
@@ -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);
    }
 }
@@ -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(
@@ -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"),
@@ -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)
@@ -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)
@@ -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
-}
@@ -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) {
@@ -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
@@ -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,
+        }
    }
 }
@@ -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()
            })
        })
 }
@@ -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
+    }
 }
@@ -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,
+            );
        }
    }
 }
@@ -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();
@@ -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();
@@ -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();
@@ -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();
@@ -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)]
@@ -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 {
@@ -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()),
        }
    }
@@ -28,13 +28,13 @@ 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,
+    match_runtime::MatchRuntimePlugin, menus::style::FGUiStyle, schedule::GameplaySchedulePlugin,
+    stage::manifest::StageManifest, ui::InGameUIPlugin,
 };

 mod args;
@@ -44,6 +44,7 @@ pub mod fighter;
 pub mod game_settings;
 pub mod input;
 pub mod match_loading;
+pub mod match_runtime;
 mod math;
 pub mod menus;
 pub mod netcode;
@@ -53,6 +54,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 +73,7 @@ pub enum AppState {
    LoadingMatch,
    PreparingMatch,
    InMatch,
+    MatchDisconnected,
    MatchLoadFailed,
 }

@@ -80,6 +83,20 @@ pub enum AppState {
 #[derive(Default)]
 pub struct GamePlugin;

+/// Registers every custom asset loader used by the game and asset processor.
+pub struct GameAssetPlugin;
+
+impl Plugin for GameAssetPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_plugins((
+            RonAssetPlugin::<FighterManifest>::create("fighter.ron"),
+            RonAssetPlugin::<StageManifest>::create("stage.ron"),
+            RonAssetPlugin::<GameSettings>::create("ron"),
+            RonAssetPlugin::<FGUiStyle>::create("stylesheet.ron"),
+        ));
+    }
+}
+
 impl Plugin for GamePlugin {
    fn build(&self, app: &mut App) {
        // Each module owns its own systems, rollback registrations and
@@ -88,10 +105,10 @@ 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,
+                MatchRuntimePlugin,
                input::FighterInputPlugin,
                replay::ReplayPlugin,
                debug_tools::DebugToolsPlugin,
@@ -100,9 +117,8 @@ impl Plugin for GamePlugin {
                scripting::importer::FighterScriptImportPlugin,
                stage::StagePlugin,
                MatchCameraPlugin,
-                RonAssetPlugin::<FighterManifest>::create("fighter.ron"),
-                RonAssetPlugin::<StageManifest>::create("stage.ron"),
-                RonAssetPlugin::<GameSettings>::create("ron"),
+                GameAssetPlugin,
+                InGameUIPlugin,
            ))
            .add_plugins(menus::MenuPlugin)
            .add_loading_state(
@@ -155,11 +171,27 @@ impl Plugin for GamePlugin {
    }
 }

+/// Registers the custom asset loaders and processors used by CI and release
+/// builds. The processing binary adds this plugin without starting the game.
+pub struct AssetProcessingPlugin;
+
+impl Plugin for AssetProcessingPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_plugins((
+            GameAssetPlugin,
+            scripting::importer::FighterScriptImportPlugin,
+            fighter::baked_animation::BakedAnimationAssetProcessingPlugin,
+        ));
+    }
+}
+
 fn wait_for_asset_processor(
    processor: Option<Res<AssetProcessor>>,
    mut next_state: ResMut<NextState<AppState>>,
 ) {
-    if processor.is_none_or(|processor| block_on(processor.get_state()) == ProcessorState::Finished)
+    if !cfg!(feature = "development")
+        || processor
+            .is_none_or(|processor| block_on(processor.get_state()) == ProcessorState::Finished)
    {
        next_state.set(AppState::LoadCommonAssets);
    }
@@ -1,8 +1,11 @@
 use bevy::asset::AssetMode::Processed;
+#[cfg(feature = "debug_features")]
 use bevy::camera_controller::free_camera::FreeCameraPlugin;
 use bevy::image::{ImageAddressMode, ImagePlugin, ImageSamplerDescriptor};
 use bevy::prelude::*;
+#[cfg(feature = "debug_features")]
 use bevy_egui::EguiPlugin;
+#[cfg(feature = "debug_features")]
 use bevy_inspector_egui::quick::WorldInspectorPlugin;

 fn main() -> AppExit {
@@ -20,16 +23,22 @@ fn main() -> AppExit {
        })
        .set(AssetPlugin {
            mode: Processed,
+            use_asset_processor_override: Some(cfg!(feature = "development")),
            ..default()
        });

-    App::new()
-        .add_plugins(default_plugins)
+    let mut app = App::new();
+    app.add_plugins(default_plugins)
        .add_plugins(avian3d::prelude::PhysicsPlugins::default())
        .add_plugins(shinespark::GamePlugin)
-        .add_plugins(FreeCameraPlugin)
-        .add_plugins(EguiPlugin::default())
-        .add_plugins(WorldInspectorPlugin::default()) // adds default options and `InspectorEguiImpl`s
-        .insert_resource(Time::<Fixed>::from_hz(60.0))
-        .run()
+        .insert_resource(Time::<Fixed>::from_hz(60.0));
+
+    #[cfg(feature = "debug_features")]
+    app.add_plugins((
+        FreeCameraPlugin,
+        EguiPlugin::default(),
+        WorldInspectorPlugin::default(),
+    ));
+
+    app.run()
 }
@@ -20,8 +20,12 @@ use crate::{
        visual::FighterAnimations,
    },
    input::{LocalInputAssignments, LocalInputSource},
+    match_runtime::MatchState,
    math::{int::FGi32, vec::FGVec2},
-    netcode::{GGRSCfg, session::create_session},
+    netcode::{
+        GGRSCfg,
+        session::{ConnectionStatus, SessionConfig, create_session},
+    },
    scripting::FighterAttackScript,
    stage::{
        self,
@@ -35,10 +39,49 @@ pub struct MatchPlayer {
    pub fighter: FighterId,
 }

-#[derive(Resource, Debug, Clone, PartialEq, Eq)]
-pub struct PendingMatch {
+#[derive(Resource, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub struct MatchConfig {
    pub stage: StageId,
    pub players: Vec<MatchPlayer>,
+    pub rules: MatchRules,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub enum MatchRules {
+    Stock {
+        starting_stocks: u8,
+        time_limit_frames: Option<u32>,
+    },
+    Timed {
+        time_limit_frames: u32,
+    },
+}
+
+impl Default for MatchRules {
+    fn default() -> Self {
+        Self::Stock {
+            starting_stocks: 3,
+            time_limit_frames: None,
+        }
+    }
+}
+
+impl MatchRules {
+    fn validate(&self) -> Result<(), &'static str> {
+        match self {
+            Self::Stock {
+                starting_stocks: 0, ..
+            } => Err("stock matches must start with at least one stock"),
+            Self::Stock {
+                time_limit_frames: Some(0),
+                ..
+            } => Err("stock match time limits must be greater than zero frames"),
+            Self::Timed {
+                time_limit_frames: 0,
+            } => Err("timed match limits must be greater than zero frames"),
+            _ => Ok(()),
+        }
+    }
 }

 pub struct SelectedFighterAssets {
@@ -56,7 +99,7 @@ pub struct MatchAssets {

 impl MatchAssets {
    fn requested(world: &World) -> Self {
-        let request = world.resource::<PendingMatch>();
+        let config = world.resource::<MatchConfig>();
        let asset_server = world.resource::<AssetServer>();
        let registry = world.resource::<FighterManifestRegistry>();
        let stage_registry = world.resource::<StageManifestRegistry>();
@@ -64,7 +107,7 @@ impl MatchAssets {
        let stage_manifests = world.resource::<Assets<StageManifest>>();

        let stage_handle = stage_registry
-            .get(request.stage)
+            .get(config.stage)
            .expect("Startup validation guarantees every stage has a manifest");
        let stage_manifest = stage_manifests
            .get(&stage_handle)
@@ -72,7 +115,7 @@ impl MatchAssets {

        Self {
            stage: asset_server.load(stage_manifest.model_path.clone()),
-            fighters: request
+            fighters: config
                .players
                .iter()
                .map(|player| {
@@ -138,9 +181,10 @@ pub struct MatchRoot;
 pub fn initiate_match(
    commands: &mut Commands,
    next_state: &mut NextState<AppState>,
-    request: PendingMatch,
+    config: MatchConfig,
 ) {
-    commands.insert_resource(request);
+    commands.remove_resource::<crate::netcode::session::MatchDisconnected>();
+    commands.insert_resource(config);
    next_state.set(AppState::LoadingMatch);
 }

@@ -162,12 +206,9 @@ pub fn initiate_default_match(
    if let Some(path) = &args.play_replay {
        match crate::replay::load(path) {
            Ok(replay) => {
-                let request = PendingMatch {
-                    stage: replay.match_config.stage,
-                    players: replay.match_config.players.clone(),
-                };
+                let config = replay.match_config.clone();
                commands.insert_resource(crate::replay::LoadedReplay(replay));
-                initiate_match(&mut commands, &mut next_state, request);
+                initiate_match(&mut commands, &mut next_state, config);
            }
            Err(error) => {
                error!("Replay load failed: {error}");
@@ -176,6 +217,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,25 +232,37 @@ 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(
        &mut commands,
        &mut next_state,
-        PendingMatch {
+        MatchConfig {
            stage: StageId::TestStage,
            players,
+            rules: MatchRules::default(),
        },
    );
 }

 pub fn prepare_match(
    mut commands: Commands,
-    request: Res<PendingMatch>,
+    config: Res<MatchConfig>,
    assets: Res<MatchAssets>,
    gltfs: Res<Assets<Gltf>>,
    baked_animations: Res<Assets<BakedFighterAnimations>>,
@@ -213,7 +274,7 @@ pub fn prepare_match(
    args: Res<Args>,
    mut next_state: ResMut<NextState<AppState>>,
 ) {
-    if !valid_player_handles(&request.players) {
+    if !valid_player_handles(&config.players) {
        fail_match(
            &mut next_state,
            "player handles must be unique and cover 0..player_count",
@@ -221,7 +282,12 @@ pub fn prepare_match(
        return;
    }

-    if assets.fighters.len() != request.players.len() {
+    if let Err(error) = config.rules.validate() {
+        fail_match(&mut next_state, error);
+        return;
+    }
+
+    if assets.fighters.len() != config.players.len() {
        fail_match(
            &mut next_state,
            "loaded character assets do not match the requested player slots",
@@ -373,7 +439,17 @@ pub fn prepare_match(
        ));
    }

-    let session = match create_session(&args, request.players.len()) {
+    let session_config = match SessionConfig::from_args(&args, config.players.len()) {
+        Ok(config) => config,
+        Err(error) => {
+            fail_match(
+                &mut next_state,
+                &format!("invalid network configuration: {error}"),
+            );
+            return;
+        }
+    };
+    let session = match create_session(&args, config.players.len()) {
        Ok(session) => session,
        Err(error) => {
            fail_match(
@@ -387,7 +463,7 @@ pub fn prepare_match(
    let root = commands.spawn((Name::new("Match"), MatchRoot)).id();

    let stage_handle = stage_registry
-        .get(request.stage)
+        .get(config.stage)
        .expect("Initialization check should ensure all stages exist");
    let stage_manifest = stage_manifests
        .get(&stage_handle)
@@ -400,11 +476,11 @@ pub fn prepare_match(
        stage_manifest.camera.clone(),
    );

-    let mut fighter_roster = Vec::with_capacity(request.players.len());
+    let mut fighter_roster = Vec::with_capacity(config.players.len());
    for (index, (player, (scene, animations, attack_scripts, manifest_handle, model_scale))) in
-        request.players.iter().zip(prepared).enumerate()
+        config.players.iter().zip(prepared).enumerate()
    {
-        let spawn_x = (index as i32 * 2 + 1 - request.players.len() as i32) * 5;
+        let spawn_x = (index as i32 * 2 + 1 - config.players.len() as i32) * 5;
        fighter_roster.push(spawn_fighter(
            &mut commands,
            player.handle,
@@ -418,6 +494,9 @@ pub fn prepare_match(
    }

    commands.insert_resource(FighterRoster(fighter_roster));
+    commands.insert_resource(MatchState::from_config(&config));
+    commands.insert_resource(session_config);
+    commands.insert_resource(ConnectionStatus::default());
    commands.insert_resource::<Session<GGRSCfg>>(session);
    next_state.set(AppState::InMatch);
 }
@@ -448,9 +527,12 @@ 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>();
+    commands.remove_resource::<MatchConfig>();
+    commands.remove_resource::<MatchState>();
    commands.remove_resource::<FighterRoster>();
 }

@@ -459,8 +541,8 @@ mod tests {
    use super::*;

    #[test]
-    fn match_request_keeps_duplicate_fighter_slots() {
-        let request = PendingMatch {
+    fn match_config_keeps_duplicate_fighter_slots() {
+        let config = MatchConfig {
            stage: StageId::TestStage,
            players: vec![
                MatchPlayer {
@@ -472,12 +554,13 @@ mod tests {
                    fighter: FighterId::TestFighter,
                },
            ],
+            rules: MatchRules::default(),
        };

-        assert_eq!(request.players.len(), 2);
-        assert_eq!(request.players[0].handle, 0);
-        assert_eq!(request.players[1].handle, 1);
-        assert!(valid_player_handles(&request.players));
+        assert_eq!(config.players.len(), 2);
+        assert_eq!(config.players[0].handle, 0);
+        assert_eq!(config.players[1].handle, 1);
+        assert!(valid_player_handles(&config.players));
    }

    #[test]
@@ -496,6 +579,53 @@ mod tests {
        assert!(!valid_player_handles(&players));
    }

+    #[test]
+    fn match_rules_reject_zero_limits() {
+        assert!(
+            MatchRules::Stock {
+                starting_stocks: 0,
+                time_limit_frames: None,
+            }
+            .validate()
+            .is_err()
+        );
+        assert!(
+            MatchRules::Stock {
+                starting_stocks: 3,
+                time_limit_frames: Some(0),
+            }
+            .validate()
+            .is_err()
+        );
+        assert!(
+            MatchRules::Timed {
+                time_limit_frames: 0,
+            }
+            .validate()
+            .is_err()
+        );
+    }
+
+    #[test]
+    fn match_rules_accept_valid_modes() {
+        assert!(MatchRules::default().validate().is_ok());
+        assert!(
+            MatchRules::Stock {
+                starting_stocks: 3,
+                time_limit_frames: Some(60),
+            }
+            .validate()
+            .is_ok()
+        );
+        assert!(
+            MatchRules::Timed {
+                time_limit_frames: 60,
+            }
+            .validate()
+            .is_ok()
+        );
+    }
+
    #[test]
    fn match_loading_waits_for_attack_scripts() {
        let mut attack_scripts = HashMap::new();
@@ -0,0 +1,102 @@
+//! Rollback-simulated state for an active match.
+
+use bevy::prelude::*;
+use bevy_ggrs::prelude::*;
+
+use crate::match_loading::{MatchConfig, MatchRules};
+
+#[derive(Resource, Clone, Debug, Hash, PartialEq, Eq)]
+pub struct MatchState {
+    pub elapsed_frames: u32,
+    /// Indexed by the player's session handle.
+    pub players: Vec<PlayerMatchState>,
+}
+
+#[derive(Clone, Debug, Hash, PartialEq, Eq)]
+pub struct PlayerMatchState {
+    pub stocks_remaining: Option<u8>,
+    pub score: i32,
+    pub deaths: u32,
+}
+
+impl MatchState {
+    pub fn from_config(config: &MatchConfig) -> Self {
+        let stocks_remaining = match &config.rules {
+            MatchRules::Stock {
+                starting_stocks, ..
+            } => Some(*starting_stocks),
+            MatchRules::Timed { .. } => None,
+        };
+
+        Self {
+            elapsed_frames: 0,
+            players: (0..config.players.len())
+                .map(|_| PlayerMatchState {
+                    stocks_remaining,
+                    score: 0,
+                    deaths: 0,
+                })
+                .collect(),
+        }
+    }
+}
+
+pub struct MatchRuntimePlugin;
+
+impl Plugin for MatchRuntimePlugin {
+    fn build(&self, app: &mut App) {
+        app.rollback_resource_with_clone::<MatchState>()
+            .checksum_resource_with_hash::<MatchState>();
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::{fighter::FighterId, match_loading::MatchPlayer, stage::manifest::StageId};
+
+    fn config(rules: MatchRules) -> MatchConfig {
+        MatchConfig {
+            stage: StageId::TestStage,
+            players: vec![
+                MatchPlayer {
+                    handle: 1,
+                    fighter: FighterId::TestFighter,
+                },
+                MatchPlayer {
+                    handle: 0,
+                    fighter: FighterId::TestFighter,
+                },
+            ],
+            rules,
+        }
+    }
+
+    #[test]
+    fn stock_state_starts_with_configured_stocks() {
+        let state = MatchState::from_config(&config(MatchRules::Stock {
+            starting_stocks: 4,
+            time_limit_frames: Some(60),
+        }));
+
+        assert_eq!(state.elapsed_frames, 0);
+        assert_eq!(state.players.len(), 2);
+        assert!(state.players.iter().all(|player| {
+            player.stocks_remaining == Some(4) && player.score == 0 && player.deaths == 0
+        }));
+    }
+
+    #[test]
+    fn timed_state_has_no_stock_counter() {
+        let state = MatchState::from_config(&config(MatchRules::Timed {
+            time_limit_frames: 60,
+        }));
+
+        assert!(
+            state
+                .players
+                .iter()
+                .all(|player| player.stocks_remaining.is_none())
+        );
+    }
+}
@@ -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)
+    }
+}
@@ -1,4 +1,5 @@
 pub mod int;
 pub mod segment;
 pub mod vec;
+pub mod fixed_transform;
 pub mod vec3;
@@ -241,7 +241,7 @@ pub fn copy_cursor_transform_to_token(
    character_boxes: Query<(&CharacterBox, &ComputedNode, &UiGlobalTransform)>,
    match_config: Res<MenuMatchConfig>,
    cursors: Query<&UiGlobalTransform, With<FGMenuCursor>>,
-    cam: Single<&Camera, With<IsDefaultUiCamera>>,
+    cam: Single<&Camera>,
    ui_scale: Res<UiScale>,
 ) -> Result {
    let camera = cam.into_inner();
@@ -181,7 +181,7 @@ pub fn cursor_input(
 }

 pub fn update_cursor_transform(
-    camera: Single<&Camera, With<IsDefaultUiCamera>>,
+    camera: Single<&Camera>,
    query: Query<(&mut Node, &PointerLocation), With<FGMenuCursor>>,
    ui_scale: Res<UiScale>,
 ) {
@@ -3,7 +3,7 @@ use thiserror::Error;

 use crate::{
    fighter::FighterId,
-    match_loading::{MatchPlayer, PendingMatch},
+    match_loading::{MatchConfig, MatchPlayer, MatchRules},
    stage::manifest::StageId,
 };

@@ -60,7 +60,7 @@ impl MenuMatchConfig {
        !has_unselected_fighter
    }

-    pub fn to_pending_match(&self) -> Result<PendingMatch, MenuMatchConfigErrors> {
+    pub fn to_match_config(&self) -> Result<MatchConfig, MenuMatchConfigErrors> {
        let mut match_players = vec![];

        let stage = self.stage.ok_or(MenuMatchConfigErrors::StageNotSelected)?;
@@ -78,9 +78,28 @@ impl MenuMatchConfig {
            });
        }

-        Ok(PendingMatch {
+        Ok(MatchConfig {
            players: match_players,
            stage,
+            rules: MatchRules::default(),
        })
    }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn menu_config_uses_default_match_rules() {
+        let menu = MenuMatchConfig {
+            stage: Some(StageId::TestStage),
+            players: vec![MenuMatchPlayerSlot {
+                slot: 0,
+                fighter: Some(FighterId::TestFighter),
+            }],
+        };
+
+        assert_eq!(menu.to_match_config().unwrap().rules, MatchRules::default());
+    }
+}
@@ -6,12 +6,10 @@ use bevy::{
    prelude::*,
 };

-use ron_asset_manager::RonAssetPlugin;
-
 use crate::{
    AppState,
    game_settings::CommonAssets,
-    menus::{character_select::CharacterSelectScreen, main_menu::MainMenu, style::FGUiStyle},
+    menus::{character_select::CharacterSelectScreen, main_menu::MainMenu},
 };
 pub mod button;
 pub mod character_select;
@@ -27,6 +25,8 @@ pub mod style;

 #[derive(Component, Clone, Default)]
 pub struct MenuMarker {}
+#[derive(Component, Clone, Default)]
+pub struct MenuCameraMarker {}

 pub struct MenuPlugin;

@@ -40,6 +40,7 @@ pub fn wrap_menu(menu: impl Scene) -> impl Scene {
    bsn! {
        #MenuRoot
        MenuMarker
+        Transform
        Node {
            width: percent(100),
            height: percent(100),
@@ -48,6 +49,11 @@ pub fn wrap_menu(menu: impl Scene) -> impl Scene {
            flex_direction: FlexDirection::Column,
        }
        Children [
+            (
+                #MenuCamera
+                Camera
+                Camera2d
+            ),
            (
                #MenuContainer
                Node {
@@ -67,15 +73,18 @@ pub fn wrap_menu(menu: impl Scene) -> impl Scene {

 pub fn despawn_menu(
    existing_menu: Option<Single<Entity, With<MenuMarker>>>,
+    existing_menu_camera: Option<Single<Entity, With<MenuCameraMarker>>>,
    mut commands: Commands,
 ) {
    if let Some(entity) = existing_menu {
        commands
            .entity(entity.into_inner())
-            .remove::<Camera2d>()
-            .remove::<Camera>()
            .despawn();
    }
+
+    if let Some(menu_cam) = existing_menu_camera {
+        commands.entity(*menu_cam).despawn();
+    }
 }

 pub fn spawn_menu(
@@ -86,8 +95,6 @@ pub fn spawn_menu(
    if let Some(entity) = existing_menu {
        commands
            .entity(entity.into_inner())
-            .remove::<Camera2d>()
-            .remove::<Camera>()
            .despawn();
    }
    commands.queue_spawn_scene(wrap_menu(menu));
@@ -116,14 +123,6 @@ impl Plugin for MenuPlugin {
        app.add_systems(
            OnEnter(AppState::MainMenu),
            (build_menu::<MainMenu>, |mut commands: Commands| {
-                commands.spawn((Camera2d, IsDefaultUiCamera));
-                commands.spawn((
-                    Camera2d,
-                    Camera {
-                        order: 1,
-                        ..default()
-                    },
-                ));
            }),
        )
        .add_message::<character_select::PlayerSlotAssigned>()
@@ -222,7 +221,6 @@ impl Plugin for MenuPlugin {
        //---------
        // STAGE SELECT END
        //---------
-        .add_plugins(RonAssetPlugin::<FGUiStyle>::create("stylesheet.ron"))
        .add_systems(
            Update,
            (
@@ -77,7 +77,7 @@ pub fn stage_selected(
        initiate_match(
            &mut commands,
            &mut next_state,
-            match_config.to_pending_match()?,
+            match_config.to_match_config()?,
        );
    }
    Ok(())
@@ -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)
+        ));
    }
 }
@@ -12,16 +12,12 @@ use clap::ValueEnum;
 use serde::{Deserialize, Serialize};

 use crate::{
-    AppState,
-    args::Args,
-    input::FighterInputFrame,
-    match_loading::{MatchPlayer, PendingMatch},
-    netcode::GGRSCfg,
+    AppState, args::Args, input::FighterInputFrame, match_loading::MatchConfig, netcode::GGRSCfg,
    schedule::GameplaySet,
 };

 const MAGIC: &[u8; 8] = b"SPRPLY01";
-pub const REPLAY_VERSION: u32 = 1;
+pub const REPLAY_VERSION: u32 = 2;

 #[derive(Clone, Copy, Debug, Default, Eq, PartialEq, ValueEnum)]
 pub enum ReplayFormat {
@@ -34,17 +30,11 @@ pub enum ReplayFormat {
 pub struct Replay {
    pub replay_version: u32,
    pub game_version: String,
-    pub match_config: ReplayMatch,
+    pub match_config: MatchConfig,
    pub frames: Vec<ReplayFrame>,
    pub checksums: Vec<ReplayChecksum>,
 }

-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub struct ReplayMatch {
-    pub stage: crate::stage::manifest::StageId,
-    pub players: Vec<MatchPlayer>,
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub struct ReplayFrame {
    pub frame: i32,
@@ -162,6 +152,20 @@ fn validate(replay: &Replay) -> Result<(), String> {
    {
        return Err("replay frames must be strictly ordered".into());
    }
+    if replay
+        .frames
+        .windows(2)
+        .any(|frames| frames[0].frame.checked_add(1) != Some(frames[1].frame))
+    {
+        return Err("replay frames must be contiguous".into());
+    }
+    if replay
+        .checksums
+        .windows(2)
+        .any(|checksums| checksums[0].frame >= checksums[1].frame)
+    {
+        return Err("replay checksums must be strictly ordered".into());
+    }
    if replay
        .frames
        .iter()
@@ -183,6 +187,21 @@ impl Replay {
        handles.sort_unstable();
        handles != (0..handles.len()).collect::<Vec<_>>()
    }
+
+    fn frame(&self, frame: i32) -> Option<&ReplayFrame> {
+        let first_frame = self.frames.first()?.frame;
+        let index = frame.checked_sub(first_frame)? as usize;
+        self.frames
+            .get(index)
+            .filter(|recorded| recorded.frame == frame)
+    }
+
+    fn checksum(&self, frame: i32) -> Option<u128> {
+        self.checksums
+            .binary_search_by_key(&frame, |checksum| checksum.frame)
+            .ok()
+            .map(|index| self.checksums[index].checksum)
+    }
 }

 fn start_replay(mut commands: Commands, args: Res<Args>, loaded: Option<Res<LoadedReplay>>) {
@@ -220,11 +239,7 @@ fn replay_inputs(
                .insert(frame.0, inputs.iter().map(|(input, _)| *input).collect());
        }
        ReplayMode::Playback { replay, mismatch } if !*mismatch => {
-            let Some(recorded) = replay
-                .frames
-                .iter()
-                .find(|recorded| recorded.frame == frame.0)
-            else {
+            let Some(recorded) = replay.frame(frame.0) else {
                error!("Replay has no input for frame {}", frame.0);
                *mismatch = true;
                return;
@@ -245,14 +260,10 @@ fn record_checksum(
    let Some(mut runtime) = runtime else { return };
    if matches!(&runtime.mode, ReplayMode::Record { .. }) {
        runtime.checksums.insert(frame.0, checksum.0);
-    } else if let ReplayMode::Playback { replay, mismatch } = &mut runtime.mode {
-        if let Some(expected) = replay
-            .checksums
-            .iter()
-            .find(|value| value.frame == frame.0)
-            .map(|value| value.checksum)
+    } else if let ReplayMode::Playback { replay, mismatch } = &mut runtime.mode
+        && let Some(expected) = replay.checksum(frame.0)
+        && expected != checksum.0
    {
-            if expected != checksum.0 {
        error!(
            "Replay desync at frame {}: expected {:X}, got {:X}",
            frame.0, expected, checksum.0
@@ -260,34 +271,32 @@ fn record_checksum(
        *mismatch = true;
    }
 }
-    }
-}

 fn stop_recording(
    mut commands: Commands,
    stop_request: Option<Res<StopReplayRecording>>,
    runtime: Option<ResMut<ReplayRuntime>>,
-    request: Option<Res<PendingMatch>>,
+    config: Option<Res<MatchConfig>>,
 ) {
    if stop_request.is_none() {
        return;
    }
    commands.remove_resource::<StopReplayRecording>();
-    finish_recording_inner(&mut commands, runtime, request);
+    finish_recording_inner(&mut commands, runtime, config);
 }

 fn finish_recording(
    mut commands: Commands,
    runtime: Option<ResMut<ReplayRuntime>>,
-    request: Option<Res<PendingMatch>>,
+    config: Option<Res<MatchConfig>>,
 ) {
-    finish_recording_inner(&mut commands, runtime, request);
+    finish_recording_inner(&mut commands, runtime, config);
 }

 fn finish_recording_inner(
    commands: &mut Commands,
    runtime: Option<ResMut<ReplayRuntime>>,
-    request: Option<Res<PendingMatch>>,
+    config: Option<Res<MatchConfig>>,
 ) {
    let Some(mut runtime) = runtime else { return };
    let ReplayMode::Record { path, format } = &runtime.mode else {
@@ -296,16 +305,13 @@ fn finish_recording_inner(
    if runtime.finished || runtime.frames.is_empty() {
        return;
    }
-    let Some(request) = request else { return };
+    let Some(config) = config else { return };
    let path = path.clone();
    let format = *format;
    let replay = Replay {
        replay_version: REPLAY_VERSION,
        game_version: env!("CARGO_PKG_VERSION").into(),
-        match_config: ReplayMatch {
-            stage: request.stage,
-            players: request.players.clone(),
-        },
+        match_config: config.as_ref().clone(),
        frames: runtime
            .frames
            .iter()
@@ -355,7 +361,7 @@ mod tests {
    use super::*;
    use crate::{
        fighter::FighterId,
-        match_loading::MatchPlayer,
+        match_loading::{MatchPlayer, MatchRules},
        math::{int::FGi32, vec::FGVec2},
        stage::manifest::StageId,
    };
@@ -364,12 +370,15 @@ mod tests {
        Replay {
            replay_version: REPLAY_VERSION,
            game_version: "test".into(),
-            match_config: ReplayMatch {
+            match_config: MatchConfig {
                stage: StageId::TestStage,
                players: vec![MatchPlayer {
                    handle: 0,
                    fighter: FighterId::TestFighter,
                }],
+                rules: MatchRules::Timed {
+                    time_limit_frames: 21_600,
+                },
            },
            frames: vec![ReplayFrame {
                frame: 1,
@@ -406,4 +415,52 @@ mod tests {
        replay.frames[0].inputs.clear();
        assert!(validate(&replay).is_err());
    }
+
+    #[test]
+    fn unsupported_replay_version_is_rejected() {
+        let mut replay = sample();
+        replay.replay_version = 1;
+
+        assert_eq!(
+            validate(&replay).unwrap_err(),
+            "unsupported replay version 1"
+        );
+    }
+
+    #[test]
+    fn playback_lookups_use_frame_offsets_and_support_sparse_checksums() {
+        let mut replay = sample();
+        replay.frames[0].frame = 10;
+        replay.frames.push(ReplayFrame {
+            frame: 11,
+            inputs: replay.frames[0].inputs.clone(),
+        });
+        replay.checksums.push(ReplayChecksum {
+            frame: 11,
+            checksum: 84,
+        });
+        replay.checksums[0].frame = 10;
+        validate(&replay).unwrap();
+
+        assert_eq!(replay.frame(10).unwrap().frame, 10);
+        assert_eq!(replay.frame(11).unwrap().frame, 11);
+        assert!(replay.frame(9).is_none());
+        assert_eq!(replay.checksum(10), Some(42));
+        assert_eq!(replay.checksum(11), Some(84));
+        assert_eq!(replay.checksum(12), None);
+    }
+
+    #[test]
+    fn noncontiguous_input_frames_are_rejected() {
+        let mut replay = sample();
+        replay.frames.push(ReplayFrame {
+            frame: 3,
+            inputs: replay.frames[0].inputs.clone(),
+        });
+
+        assert_eq!(
+            validate(&replay).unwrap_err(),
+            "replay frames must be contiguous"
+        );
+    }
 }
@@ -7,14 +7,10 @@ use strum::IntoEnumIterator;
 use strum_macros::EnumIter;

 use crate::{
-    AppState,
-    game_settings::GameSettings,
-    math::vec::FGVec2,
-    stage::{
+    AppState, game_settings::GameSettings, math::{int::FGi32, vec::FGVec2}, stage::{
        StagePoly,
        line::{StageCollision, StagePolyLineSegmentType, StagePolyType},
-    },
-    texture_reference::TextureReference,
+    }, texture_reference::TextureReference,
 };
 use bevy::prelude::*;

@@ -87,6 +83,14 @@ pub struct StageManifest {
    pub icon: TextureReference,
    pub camera: StageCameraProfile,
    pub polygons: Vec<StagePolyDefinition>,
+    #[reflect(ignore)]
+    pub blast_zone_left: FGi32,
+    #[reflect(ignore)]
+    pub blast_zone_right: FGi32,
+    #[reflect(ignore)]
+    pub blast_zone_top: FGi32,
+    #[reflect(ignore)]
+    pub blast_zone_bottom: FGi32,
 }

 #[derive(Resource)]
@@ -0,0 +1,66 @@
+use bevy::prelude::*;
+
+use crate::{
+    fighter::manifest::{FighterManifest, FighterManifestRegistry},
+    match_loading::MatchConfig,
+    ui::{errors::UIErrors, fighter_info::FighterInfoUI},
+};
+
+#[derive(Component, FromTemplate)]
+pub struct BattleUI {}
+
+pub fn spawn_battle_ui(
+    mut commands: Commands,
+    config: Res<MatchConfig>,
+    fighter_registry: Res<FighterManifestRegistry>,
+    manifests: Res<Assets<FighterManifest>>,
+) -> Result {
+    let mut fighter_uis = vec![];
+
+    for player in &config.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();
+    }
+}
@@ -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),
+}
@@ -0,0 +1,103 @@
+use bevy::prelude::*;
+
+use crate::{
+    fighter::{attack::FighterDamage, manifest::FighterManifest}, match_loading::{MatchPlayer}, match_runtime::MatchState, player::Player, ui::stock_icon::BattleUIStockIcon,
+};
+
+#[derive(Component, FromTemplate)]
+pub struct FighterInfoUI {
+    percentage_text: Entity,
+    stock_icon_container: Entity,
+    _name_text: Entity,
+    player_handle: usize,
+    visible_damage: FighterDamage,
+    visible_stocks: u8,
+}
+
+impl FighterInfoUI {
+    pub fn build(_manifest: &FighterManifest, match_player: &MatchPlayer) -> impl Scene {
+        let fighter_name = "El grande padre";
+        bsn! {
+            FighterInfoUI {
+                percentage_text: #PercentageText,
+                stock_icon_container: #StockIconContainer,
+                _name_text: #NameText,
+                player_handle: {match_player.handle}
+            }
+            Node {
+                flex_direction: FlexDirection::Column,
+                align_items: AlignItems::Center,
+                justify_content: JustifyContent::Center,
+            }
+            Children [
+                (
+                    #StockIconContainer
+                    Node
+                )
+                (
+                    #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();
+        }
+    }
+}
+
+pub fn update_fighter_info_stocks(
+    match_state: Res<MatchState>,
+    ui_elements: Query<&mut FighterInfoUI>,
+    mut commands: Commands,
+) {
+
+    for mut ui_element in ui_elements {
+        let handle = ui_element.player_handle;
+        let Some(match_player) = match_state.players.get(handle) else {
+            continue;
+        };
+
+        let Some(stocks) = match_player.stocks_remaining else {
+            continue;
+        };
+
+        if stocks != ui_element.visible_stocks {
+            commands
+                .entity(ui_element.stock_icon_container)
+                .despawn_children()
+                .with_children(|spawner| {
+                    for _ in 0..stocks {
+                        spawner.spawn_empty().apply_scene(BattleUIStockIcon::scene());
+                    }
+                });
+            ui_element.visible_stocks = stocks;
+        }
+    }
+}
@@ -0,0 +1,37 @@
+use bevy::prelude::*;
+
+use crate::{
+    AppState,
+    match_loading::{MatchConfig, MatchRules},
+    match_runtime::MatchState,
+};
+
+pub mod battle_ui;
+pub mod errors;
+pub mod fighter_info;
+pub mod stock_icon;
+
+#[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)
+            .add_systems(
+                PostUpdate,
+                fighter_info::update_fighter_info_stocks.run_if(
+                    resource_exists::<MatchState>
+                        .and_then(resource_exists::<MatchConfig>)
+                        .and_then(|match_config: Res<MatchConfig>| {
+                            if let MatchRules::Stock { .. } = match_config.rules {
+                                true
+                            } else {
+                                false
+                            }
+                        }),
+                ),
+            );
+    }
+}
@@ -0,0 +1,17 @@
+use bevy::prelude::*;
+
+#[derive(SceneComponent, Clone, FromTemplate)]
+pub struct BattleUIStockIcon;
+
+impl BattleUIStockIcon {
+    pub fn scene() -> impl Scene {
+        bsn! {
+            Node {
+                width: px(32),
+                height: px(32),
+                border_radius: BorderRadius::MAX,
+            }
+            BackgroundColor({bevy::color::palettes::css::RED})
+        }
+    }
+}
@@ -0,0 +1,123 @@
+"""LLDB summaries for Rust's `fixed` crate.
+
+Load this file from LLDB with:
+
+    command script import /path/to/shinespark/tools/lldb_fixed.py
+
+The implementation does not use floating-point arithmetic, so displayed values
+are exact even for FixedI128/FixedU128 values.
+"""
+
+import re
+
+try:
+    import lldb
+except ImportError:
+    # Keep the pure parsing and formatting helpers testable without LLDB.
+    lldb = None
+
+
+_FIXED_TYPE_RE = re.compile(r"(?:^|::)Fixed([IU])(8|16|32|64|128)<(.+)>$")
+_DIRECT_TYPENUM_RE = re.compile(r"(?:^|::)U(\d+)$")
+_TYPENUM_BIT_RE = re.compile(r"(?:^|::)B([01])(?=\s*[,>])")
+
+
+def parse_fixed_type(type_name):
+    """Return (signed, storage_bits, fractional_bits), or None."""
+    if not type_name:
+        return None
+
+    match = _FIXED_TYPE_RE.search(type_name.replace(" ", ""))
+    if match is None:
+        return None
+
+    signed = match.group(1) == "I"
+    storage_bits = int(match.group(2))
+    fractional_type = match.group(3)
+
+    direct = _DIRECT_TYPENUM_RE.search(fractional_type)
+    if direct is not None:
+        fractional_bits = int(direct.group(1))
+    else:
+        # typenum represents UInt<N, B> as a binary tree. Its textual Rust
+        # type lists the bits from most significant to least significant.
+        digits = _TYPENUM_BIT_RE.findall(fractional_type)
+        if not digits:
+            return None
+        fractional_bits = int("".join(digits), 2)
+
+    if fractional_bits > storage_bits:
+        return None
+    return signed, storage_bits, fractional_bits
+
+
+def normalize_bits(raw_bits, signed, storage_bits):
+    """Interpret a possibly unsigned LLDB integer using the fixed type's width."""
+    mask = (1 << storage_bits) - 1
+    raw_bits &= mask
+    if signed and raw_bits >= 1 << (storage_bits - 1):
+        raw_bits -= 1 << storage_bits
+    return raw_bits
+
+
+def format_fixed(raw_bits, fractional_bits):
+    """Format a scaled integer exactly as a decimal string."""
+    if fractional_bits == 0:
+        return str(raw_bits)
+
+    negative = raw_bits < 0
+    magnitude = -raw_bits if negative else raw_bits
+    whole = magnitude >> fractional_bits
+    remainder = magnitude & ((1 << fractional_bits) - 1)
+
+    if remainder == 0:
+        result = str(whole)
+    else:
+        # remainder / 2^n == (remainder * 5^n) / 10^n, which gives a finite,
+        # exact decimal representation without converting through a float.
+        decimal = str(remainder * 5**fractional_bits).zfill(fractional_bits)
+        result = f"{whole}.{decimal.rstrip('0')}"
+
+    return f"-{result}" if negative else result
+
+
+def _parse_lldb_integer(value):
+    text = value.GetValue()
+    if text is not None:
+        try:
+            return int(text, 0)
+        except ValueError:
+            pass
+
+    # GetValueAsUnsigned is also useful on LLDB versions that do not render
+    # primitive values through GetValue. It is sufficient for all <= 64-bit
+    # fixed types; current LLDB versions render i128/u128 through GetValue.
+    return value.GetValueAsUnsigned()
+
+
+def fixed_summary(value, _internal_dict):
+    layout = parse_fixed_type(value.GetTypeName())
+    if layout is None:
+        return None
+
+    signed, storage_bits, fractional_bits = layout
+    bits = value.GetChildMemberWithName("bits")
+    if not bits.IsValid():
+        return None
+
+    raw_bits = _parse_lldb_integer(bits)
+    raw_bits = normalize_bits(raw_bits, signed, storage_bits)
+    return format_fixed(raw_bits, fractional_bits)
+
+
+def __lldb_init_module(debugger, _internal_dict):
+    # LLDB's type-name regex sees the concrete fixed type rather than project
+    # aliases such as FGi32 and FGWide.
+    debugger.HandleCommand(
+        "type summary add --python-function lldb_fixed.fixed_summary "
+        "--category Shinespark --regex "
+        "'^fixed::Fixed(I|U)(8|16|32|64|128)<.+>$'"
+    )
+    # A dedicated category makes the formatter work even when CodeLLDB has not
+    # enabled rustc's standard `Rust` formatter category yet.
+    debugger.HandleCommand("type category enable Shinespark")
@@ -0,0 +1,58 @@
+import unittest
+
+import lldb_fixed
+
+
+class ParseFixedTypeTests(unittest.TestCase):
+    def test_direct_typenum_alias(self):
+        self.assertEqual(
+            lldb_fixed.parse_fixed_type("fixed::FixedI32<typenum::uint::U16>"),
+            (True, 32, 16),
+        )
+
+    def test_expanded_typenum(self):
+        type_name = (
+            "fixed::FixedI32<"
+            "typenum::uint::UInt<"
+            "typenum::uint::UInt<"
+            "typenum::uint::UInt<"
+            "typenum::uint::UInt<"
+            "typenum::uint::UInt<typenum::uint::UTerm, typenum::bit::B1>, "
+            "typenum::bit::B0>, typenum::bit::B0>, typenum::bit::B0>, "
+            "typenum::bit::B0>>"
+        )
+        self.assertEqual(lldb_fixed.parse_fixed_type(type_name), (True, 32, 16))
+
+    def test_unsigned_type(self):
+        self.assertEqual(
+            lldb_fixed.parse_fixed_type("fixed::FixedU64<typenum::uint::U24>"),
+            (False, 64, 24),
+        )
+
+    def test_unrelated_type(self):
+        self.assertIsNone(lldb_fixed.parse_fixed_type("core::primitive::i32"))
+
+
+class FormatFixedTests(unittest.TestCase):
+    def test_q16_16(self):
+        self.assertEqual(lldb_fixed.format_fixed(3 << 15, 16), "1.5")
+        self.assertEqual(lldb_fixed.format_fixed(-(3 << 15), 16), "-1.5")
+        self.assertEqual(lldb_fixed.format_fixed(1, 16), "0.0000152587890625")
+
+    def test_integer_value_has_no_decimal_suffix(self):
+        self.assertEqual(lldb_fixed.format_fixed(12 << 16, 16), "12")
+
+    def test_q96_32(self):
+        raw = (1 << 100) + (1 << 31)
+        self.assertEqual(
+            lldb_fixed.format_fixed(raw, 32),
+            "295147905179352825856.5",
+        )
+
+    def test_twos_complement_normalization(self):
+        self.assertEqual(lldb_fixed.normalize_bits(0xFFFF8000, True, 32), -32768)
+        self.assertEqual(lldb_fixed.normalize_bits(0xFFFF8000, False, 32), 0xFFFF8000)
+
+
+if __name__ == "__main__":
+    unittest.main()
Author	SHA1	Message	Date
EIREXE	d342c9282c	Remove UI multi cam setup CI / build-and-test (pull_request) Failing after 56s Details CI / production-build (pull_request) Failing after 1m34s Details	2026-09-20 18:17:37 +02:00
EIREXE	85236c4e0f	Optimize rollback hot paths (#53 ) CI / build-and-test (push) Successful in 1m16s Details CI / production-build (push) Successful in 9m36s Details ## Summary Fixes #20. - Reuse fighter animation scratch and output buffers across rollback frames. - Select air-collision hits in one pass without candidate allocations or sorting. - Index contiguous replay input frames directly and binary-search checksums. - Add regression tests for buffer reuse and replay lookup/validation. Reviewed-on: #53 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>	2026-09-20 12:41:13 +00:00
EIREXE	bcf1e114ef	Add script to debug fixed point numbers in lldb CI / build-and-test (push) Successful in 1m33s Details CI / production-build (push) Successful in 9m46s Details	2026-09-20 13:35:43 +02:00
EIREXE	15f07edaaf	Add stocks UI (#52 ) CI / build-and-test (push) Successful in 1m16s Details CI / production-build (push) Successful in 9m38s Details Reviewed-on: #52 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>	2026-09-20 11:34:45 +00:00
EIREXE	1276562890	Rename pending match to match config and add match state (#51 ) CI / build-and-test (push) Successful in 1m17s Details CI / production-build (push) Successful in 9m37s Details Reviewed-on: #51 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>	2026-09-20 11:13:15 +00:00
EIREXE	769d82573a	Build Windows executable in shared Steam depot (#50 ) CI / build-and-test (push) Successful in 1m20s Details CI / production-build (push) Successful in 9m36s Details ## Summary - install the nightly Windows MSVC target and cargo-xwin in CI - build the production Windows executable alongside Linux - package both executables and only imported_assets in one Steam depot Reviewed-on: #50 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>	2026-09-19 21:40:15 +00:00
EIREXE	9ba8697d57	Include missing battlefield icon CI / build-and-test (push) Successful in 1m10s Details CI / production-build (push) Successful in 5m5s Details	2026-09-19 21:54:33 +02:00
EIREXE	7d9b6aeafc	Fix headless asset preprocessing hang (#49 ) CI / build-and-test (push) Successful in 1m9s Details CI / production-build (push) Successful in 5m23s Details ## Summary - register Bevy's image loader explicitly in the headless asset processor - use no GPU-compressed image formats because the processor has no render device - allow PNG processing tasks to complete so `ProcessorState` reaches `Finished` Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>	2026-09-19 19:07:39 +00:00
EIREXE	ab6aec70c5	Fix processed RON assets being ignored (#48 ) CI / build-and-test (push) Successful in 1m9s Details CI / production-build (push) Canceled after 10m37s Details ## Summary - share custom RON asset loaders between the game and asset processor - register image, font, and glTF loaders in the headless processor - prevent `game_settings.ron` and `game.stylesheet.ron` from receiving ignored processed metadata Reviewed-on: #48 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>	2026-09-19 18:09:40 +00:00
EIREXE	de5d8eb030	Deploy production Linux builds to Steam (#47 ) CI / production-build (push) Successful in 5m15s Details CI / build-and-test (push) Successful in 1m8s Details ## Summary - package the production Linux binary and Bevy assets under `build/linux` - generate Steam TOTP credentials in CI - deploy app 3409670 to the Steam `master` branch using the latest commit hash as the build description - restrict packaging and deployment to pushes on `master`, excluding pull requests and manual runs Reviewed-on: #47 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>	2026-09-19 17:32:04 +00:00
EIREXE	0dc5d0392d	Add production build pipeline (#46 ) CI / build-and-test (push) Successful in 1m8s Details CI / production-build (push) Successful in 4m39s Details ## Summary - split development dynamic linking from production builds - add headless processed-asset generation - add a separate production CI cache and static Bevy/Rust linkage verification - keep custom debug features enabled for production builds behind a feature gate Reviewed-on: #46 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>	2026-09-19 17:04:18 +00:00
EIREXE	804e5e37e0	Implement damage UI, damage and stale moves. (#45 ) CI / build-and-test (push) Successful in 1m30s Details Reviewed-on: #45 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>	2026-09-19 15:40:44 +00:00
EIREXE	7269a1cb49	Implement fast falling (#44 ) CI / build-and-test (push) Successful in 1m17s Details Reviewed-on: #44 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>	2026-09-18 22:23:03 +00:00
EIREXE	9f51207f48	Implement directional influence (#43 ) CI / build-and-test (push) Successful in 1m9s Details Reviewed-on: #43 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>	2026-09-18 20:43:41 +00:00
EIREXE	2b5af49e15	Implement hitstop shake (#42 ) CI / build-and-test (push) Successful in 1m22s Details Reviewed-on: #42 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>	2026-09-18 11:56:53 +00:00
EIREXE	b9f1a52bbc	Specify ground to air transitions and thresholds (#41 ) CI / build-and-test (push) Successful in 1m10s Details Reviewed-on: #41 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>	2026-09-17 17:57:57 +00:00
EIREXE	0977de8457	Update gc-adapter-neo to 1.1.0 (#40 ) CI / build-and-test (push) Successful in 1m7s Details Fixes #33 Reviewed-on: #40 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>	2026-09-17 15:55:13 +00:00
EIREXE	e1d2253af5	Implement direct P2P session scaffolding (#39 ) CI / build-and-test (push) Successful in 1m10s Details Closes #24 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>	2026-09-17 15:04:39 +00:00
EIREXE	0454ca9e8a	Split baked animation modules (#38 ) CI / build-and-test (push) Successful in 1m15s Details Fixes #19 Splits the baked animation implementation into focused fixed-transform, runtime, visual-binding, and asset-baking modules behind the existing public facade. Preserves public APIs, serialized field order, TypePath, plugin registration, schedules, and runtime behavior. Reviewed-on: #38 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>	2026-09-17 14:03:09 +00:00
EIREXE	441e3d53b3	Fix Rust cache reuse for dynamic linking (#37 ) CI / build-and-test (push) Successful in 1m46s Details ## Summary - update rust-cache to v2.9.2, which preserves dynamic-linking target artifacts during cleanup - rotate the cache prefix to invalidate the broken v1 cache Reviewed-on: #37 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>	2026-09-17 08:55:52 +00:00
EIREXE	ff78847512	Fix run direction not being taken into account when accelerating (Fixes #11 ) (#35 ) CI / build-and-test (push) Successful in 10m58s Details Reviewed-on: #35 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>	2026-09-16 19:17:40 +00:00
EIREXE	ae8f7b5850	Deduplicate fighter state lifecycle policies (#36 ) CI / build-and-test (push) Failing after 10m51s Details Fixes #22 Extracts shared grounded collision/friction and airborne movement/landing policies while preserving state-specific behavior. Running fighters now pass `can_walk_off = true` so they can run off platform edges. Includes grounded and airborne hitstun call sites. Reviewed-on: #36 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>	2026-09-16 18:30:53 +00:00
EIREXE	43ee6d8153	Make combat reaction state rollback-safe (#34 ) CI / build-and-test (push) Successful in 13m10s Details ## Summary - replace the per-fighter received-attack inbox with a typed rollback-registered pending-hit resource - split combat reaction resolution into its own attack module - remap entity references during rollback and include pending hits in debug save states Fixes #21 Reviewed-on: #34 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>	2026-09-16 17:50:40 +00:00
EIREXE	352c6fcb6c	Stop using manual hashing for dash state (#31 ) CI / build-and-test (push) Successful in 11m2s Details Reviewed-on: #31 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>	2026-09-15 20:21:28 +00:00
EIREXE	06d20c2d27	Fix Rust CI cache reuse (#32 ) CI / build-and-test (push) Canceled after 42s Details Reviewed-on: #32 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>	2026-09-15 20:21:15 +00:00
EIREXE	b8b65e60e9	Spread state context architecture (Fixes #18 ) (#30 ) CI / build-and-test (push) Canceled after 0s Details Reviewed-on: #30 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>	2026-09-15 17:59:03 +00:00
EIREXE	43a04e9491	Add debug save states (#6 ) CI / build-and-test (push) Canceled after 5m11s Details Adds a one-slot in-memory debug save state. D-pad left stores the current single-player state and D-pad right restores it. Reviewed-on: #6 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>	2026-09-15 17:11:27 +00:00
EIREXE	cd9c39b70c	Add debug frame stepping (#5 ) CI / build-and-test (push) Successful in 24m23s Details Reviewed-on: #5 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>	2026-09-14 20:03:47 +00:00
EIREXE	0d96a8aed8	Make warnings an error CI / build-and-test (push) Failing after 15m6s Details	2026-09-14 18:25:15 +02:00
EIREXE	cebf1148c2	Persist Rust CI cache (#4 ) CI / build-and-test (push) Successful in 11m1s Details ## Summary - Pin the nightly Rust toolchain used by CI - Cache Cargo dependencies and build artifacts between Gitea Actions runs - Share the Linux nightly cache across branches Reviewed-on: #4 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>	2026-09-14 16:16:48 +00:00
EIREXE	088d594e97	Merge pull request 'Make debug menu usable with mouse and keyboard' (#2 ) from debug-menu-input into master CI / build-and-test (push) Successful in 11m29s Details Reviewed-on: #2	2026-09-14 13:32:42 +00:00
EIREXE	504f63be54	Add support for split .gltf and .bin files (#3 ) CI / build-and-test (push) Canceled after 15s Details Reviewed-on: #3 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>	2026-09-14 13:19:29 +00:00