Tighten hold buffer lifetime semantics

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

.gitea/workflows/ci.yml

@@ -15,6 +15,27 @@ jobs:
       - name: Check out source
         uses: actions/checkout@v4
 
+      - name: Install Lore CLI
+        run: |
+          scripts/install-lore.sh "$RUNNER_TEMP/lore-bin"
+          echo "$RUNNER_TEMP/lore-bin" >> "$GITHUB_PATH"
+
+      - name: Select Lore asset branch
+        run: |
+          branch=main
+          if [[ "$GITHUB_EVENT_NAME" == pull_request ]]; then
+            branch="$(python3 -c 'import json, os; e=json.load(open(os.environ["GITHUB_EVENT_PATH"], encoding="utf-8")); p=e["pull_request"]; print(p["head"]["ref"] if p["head"]["repo"]["full_name"] == os.environ["GITHUB_REPOSITORY"] else "main")')"
+          fi
+          echo "LORE_BRANCH=$branch" >> "$GITHUB_ENV"
+          echo "Using Lore branch: $branch"
+
+      - name: Fetch assets from Lore
+        env:
+          LORE_CI_USERNAME: ${{ secrets.LORE_CI_USERNAME }}
+          LORE_CI_PASSWORD: ${{ secrets.LORE_CI_PASSWORD }}
+          LORE_AUTH_URL: https://auth.eirexe.moe
+        run: scripts/update-assets.sh "$LORE_BRANCH"
+
       - name: Install Rust toolchain
         run: |
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \
@@ -50,3 +71,148 @@ 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 Lore CLI
+        run: |
+          scripts/install-lore.sh "$RUNNER_TEMP/lore-bin"
+          echo "$RUNNER_TEMP/lore-bin" >> "$GITHUB_PATH"
+
+      - name: Select Lore asset branch
+        run: |
+          branch=main
+          if [[ "$GITHUB_EVENT_NAME" == pull_request ]]; then
+            branch="$(python3 -c 'import json, os; e=json.load(open(os.environ["GITHUB_EVENT_PATH"], encoding="utf-8")); p=e["pull_request"]; print(p["head"]["ref"] if p["head"]["repo"]["full_name"] == os.environ["GITHUB_REPOSITORY"] else "main")')"
+          fi
+          echo "LORE_BRANCH=$branch" >> "$GITHUB_ENV"
+          echo "Using Lore branch: $branch"
+
+      - name: Fetch assets from Lore
+        env:
+          LORE_CI_USERNAME: ${{ secrets.LORE_CI_USERNAME }}
+          LORE_CI_PASSWORD: ${{ secrets.LORE_CI_PASSWORD }}
+          LORE_AUTH_URL: https://auth.eirexe.moe
+        run: scripts/update-assets.sh "$LORE_BRANCH"
+
+      - 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 \
+            libxfixes3 \
+            libxi6 \
+            libxkbcommon-dev \
+            libxkbcommon-x11-0 \
+            blender \
+            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: Install pinned Blender
+        run: |
+          scripts/install-blender.sh "$RUNNER_TEMP/blender"
+          echo "BLENDER=$RUNNER_TEMP/blender/blender" >> "$GITHUB_ENV"
+
+      - name: Preprocess assets
+        run: cargo run --locked --bin process-assets --no-default-features --features debug_features -j 4
+
+      - name: Verify processed battlefield asset
+        run: |
+          python3 - <<'PY'
+          import json
+          import struct
+
+          path = "imported_assets/Default/stages/battlefield/bf2.blend"
+          with open(path, "rb") as asset:
+              header = asset.read(12)
+              if len(header) != 12:
+                  raise SystemExit(f"processed asset is truncated: {path}")
+              magic, version, length = struct.unpack("<4sII", header)
+              if magic != b"glTF" or version != 2 or length != asset.seek(0, 2):
+                  raise SystemExit(f"processed asset is not a valid GLB: {path}")
+              asset.seek(12)
+              json_length, chunk_type = struct.unpack("<II", asset.read(8))
+              if chunk_type != 0x4E4F534A:
+                  raise SystemExit(f"processed asset has no JSON chunk: {path}")
+              document = json.loads(asset.read(json_length))
+          meshes = document.get("meshes", [])
+          if not meshes:
+              raise SystemExit(f"processed asset contains no meshes: {path}")
+          print(f"{path}: {len(meshes)} meshes, {length} bytes")
+          PY
+
+      - 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

.gitignore

@@ -1,6 +1,7 @@
 /target
 /.jackdaw
 imported_assets
+/assets/
 
 # Local editor configuration
 **/.vscode/
@@ -10,3 +11,7 @@ imported_assets
 *_old.glb
 /replay.json
 *.replay.tmp
+
+# Python debugger formatter tests
+__pycache__/
+*.pyc

Cargo.lock

@@ -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"

Cargo.toml

@@ -6,11 +6,17 @@ authors = [""]
 
 [workspace]
 
+[features]
+default = ["development", "debug_features"]
+development = ["bevy/dynamic_linking", "bevy/file_watcher", "bevy/embedded_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", "compressed_image_saver", "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"

README.md

@@ -1,12 +1,50 @@
-# 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.
+## Debugging fixed-point values with lldb
-- Open the folder in jackdaw to author scenes, then hit Play. The
+
-  editor builds its own artifacts into `.jackdaw/` (gitignored) and
+If using CodeLLDB:
-  never modifies your manifest or lockfile.
+```json
-- Gameplay lives in `src/lib.rs` (`GamePlugin`); authored scenes live
+"preRunCommands": [
-  in `assets/*.bsn`.
+    "command script import ${workspaceFolder}/tools/lldb_fixed.py"
-- Components you derive `Reflect` on appear in the editor's inspector
+]
-  automatically; no registration code is needed.
+```
+
+## Direct P2P Debugging
+
+```text
+# Process 1 owns player 0 and listens on 7000.
+cargo run -- --debug-match --players 2 --local-port 7000 \
+  --net-player 0=local --net-player 1=127.0.0.1:7001
+
+# Process 2 owns player 1 and listens on 7001.
+cargo run -- --debug-match --players 2 --local-port 7001 \
+  --net-player 0=127.0.0.1:7000 --net-player 1=local
+```
+
+## 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
+```
+
+## Assets
+
+Game assets are managed in Lore rather than Git. Install the Lore CLI, then
+bootstrap or update the local checkout with:
+
+```sh
+scripts/install-lore.sh
+scripts/update-assets.sh
+```
+
+The default Lore branch is `main`; pass another branch explicitly when testing
+coordinated code and asset changes:
+
+```sh
+scripts/update-assets.sh my-feature-branch
+```

assets/fighters/test/scripts/fair.attack.rhai

@@ -1,12 +0,0 @@
-frame(4);
-hitbox(0,
-    "hand_l",
-    damage("5.0"),
-    vec3("0.0", "0.0", "0.0"),
-    fg32("5.0"),
-    angle_sakurai(),
-    knockback_normal(),
-    knockback("10.0"),
-    fg32("1.0")
-);
-frame(8);

assets/fighters/test/scripts/jab.attack.rhai

@@ -1,12 +0,0 @@
-frame(3);
-hitbox(0,
-    "hand_l",
-    damage("5.0"),
-    vec3("0.0", "0.0", "0.0"),
-    fg32("5.0"),
-    angle(fg32("45.0")),
-    knockback_normal(),
-    knockback("18.0"),
-    fg32("140.0")
-);
-frame(8);

assets/fighters/test/scripts/uptilt.attack.rhai

@@ -1,13 +0,0 @@
-frame(9);
-hitbox(0,
-    "hand_l",
-    damage("5.0"),
-    vec3("1.0", "0.0", "0.0"),
-    fg32("7.0"),
-    angle_sakurai(),
-    knockback_normal(),
-    knockback("10.0"),
-    fg32("1.0")
-);
-
-frame(15);

assets/fighters/test/test.fighter.ron

@@ -1,218 +0,0 @@
-(
-    id: TestFighter,
-    model_path: "fighters/test/test_fighter.gltf",
-    model_scale: "10.0",
-    baked_animation_path: "fighters/test/test.fighterbake",
-    icon: (
-        path: "fighters/test/icon.png",
-    ),
-    attributes: (
-        base_walk_accel: "0.1",
-        stick_walk_accel: "0.16",
-        max_walk_vel: "1.0",
-        ground_friction: "0.1",
-        dash_acceleration_duration: 13,
-        dash_duration: 24,
-        base_dash_accel: "0.1",
-        stick_dash_accel: "0.05",
-        max_dash_vel: "2.0",
-        short_hop_vertical_velocity: "1.45",
-        full_jump_vertical_velocity: "2.0",
-        jump_horizontal_velocity: "0.6",
-        air_jump_horizontal_velocity: "0.96",
-        air_jump_multiplier: "1.0",
-        dash_initial_velocity: "1.4",
-        terminal_velocity: "1.6",
-        gravity: "0.084",
-        weight: "100.0",
-        jumpsquat_duration: 5,
-        landing_iasa: 4,
-        landing_duration: 30,
-
-        max_air_horizontal_velocity: "2.5",
-        air_drift_max: "1.0",
-        air_acceleration_base: "0.03",
-        air_acceleration_stick: "0.01",
-        air_friction: "0.01",
-
-        air_dodge_duration: 49,
-        air_dodge_velocity: "2.790",
-        air_dodge_decay: "0.9",
-        ecb_vertical_midpoint_offset: "0.0"
-    ),
-    camera: (
-        vertical_origin_offset: "8.0",
-        forward_extent: "25.5",
-        backward_extent: "8.5",
-        upward_extent: "15.0",
-        downward_extent: "5.0",
-        visibility_radius: "5.0",
-    ),
-    animations: {
-        Wait: "Idle_Loop_Game",
-        Walk: "Walk_Loop_IK_Game",
-        Run: "Run_Game",
-        Dash: "Dash_Game",
-        JumpSquat: "Jump_Squat_Game",
-        JumpForward: "Jump_Start_IK_Game",
-        JumpBack: "JumpB_Game",
-        LandingSpecial: "SpecialLand_Game",
-        Landing: "Jump_Land_Game",
-        AirDodge: "Idle_Loop_Game",
-        DoubleJumpForward: "Jump_Start_IK_Game",
-        DoubleJumpBack: "JumpB_Game",
-        Fall: "Fall_Loop_Game",
-        Turn: "Turn_Game",
-
-        FlinchGround: "Air_Hit_Game",
-        FlinchAir: "Air_Hit_Game",
-
-        AttackJab1: "Punch_Jab_Game",
-        AttackUpTilt: "Idle_Loop_Game",
-        AttackForwardTilt: "Idle_Loop_Game",
-        AttackDownTilt: "Idle_Loop_Game"
-    },
-    attack_scripts: {
-        NeutralAir: "fighters/test/scripts/fair.attack.rhai",
-        Jab: "fighters/test/scripts/jab.attack.rhai",
-        UpTilt: "fighters/test/scripts/uptilt.attack.rhai",
-        ForwardTilt: "fighters/test/scripts/uptilt.attack.rhai",
-        DownTilt: "fighters/test/scripts/uptilt.attack.rhai",
-    },
-    hurtboxes: [
-        // center one
-        (
-            bone: "spine_01",
-            offset: (x: "0.0", y: "0.0", z: "0.0"),
-            rotation: FGVec3(x: "0.0", y: "0.0", z: "0.0"),
-            half_length: "0.05",
-            radius: "0.15"
-        ),
-        (
-            bone: "spine_03",
-            offset: (x: "0.0", y: "0.0", z: "0.0"),
-            rotation: FGVec3(x: "0.0", y: "0.0", z: "0.0"),
-            half_length: "0.05",
-            radius: "0.15"
-        ),
-        (
-            bone: "Head",
-            offset: (x: "0.0", y: "0.125", z: "0.0"),
-            rotation: FGVec3(x: "0.0", y: "0.0", z: "0.0"),
-            half_length: "0.05",
-            radius: "0.1"
-        ),
-        (
-            bone: "thigh_r",
-            offset: (x: "0.0", y: "0.15", z: "-0.01"),
-            rotation: FGVec3(x: "0.0", y: "0.0", z: "0.0"),
-            half_length: "0.2",
-            radius: "0.07"
-        ),
-        (
-            bone: "thigh_l",
-            offset: (x: "0.0", y: "0.15", z: "-0.01"),
-            rotation: FGVec3(x: "0.0", y: "0.0", z: "0.0"),
-            half_length: "0.2",
-            radius: "0.07"
-        ),
-        (
-            bone: "calf_l",
-            offset: (x: "0.0", y: "0.15", z: "-0.0"),
-            rotation: FGVec3(x: "0.0", y: "0.0", z: "0.0"),
-            half_length: "0.2",
-            radius: "0.05"
-        ),
-        (
-            bone: "calf_r",
-            offset: (x: "0.0", y: "0.15", z: "-0.0"),
-            rotation: FGVec3(x: "0.0", y: "0.0", z: "0.0"),
-            half_length: "0.2",
-            radius: "0.05"
-        ),
-        (
-            bone: "foot_r",
-            offset: (x: "0.0", y: "0.1", z: "0.01"),
-            rotation: FGVec3(x: "-25.0", y: "0.0", z: "0.0"),
-            half_length: "0.1",
-            radius: "0.04"
-        ),
-        (
-            bone: "foot_l",
-            offset: (x: "0.0", y: "0.1", z: "0.01"),
-            rotation: FGVec3(x: "-25.0", y: "0.0", z: "0.0"),
-            half_length: "0.1",
-            radius: "0.04"
-        ),
-        (
-            bone: "upperarm_l",
-            offset: (x: "0.0", y: "0.09", z: "-0.0"),
-            rotation: FGVec3(x: "0.0", y: "0.0", z: "0.0"),
-            half_length: "0.125",
-            radius: "0.05"
-        ),
-        (
-            bone: "lowerarm_l",
-            offset: (x: "0.0", y: "0.12", z: "-0.0"),
-            rotation: FGVec3(x: "0.0", y: "0.0", z: "0.0"),
-            half_length: "0.115",
-            radius: "0.04"
-        ),
-        (
-            bone: "hand_l",
-            offset: (x: "0.0", y: "0.05", z: "-0.0"),
-            rotation: FGVec3(x: "0.0", y: "0.0", z: "0.0"),
-            half_length: "0.01",
-            radius: "0.04"
-        ),
-        (
-            bone: "upperarm_r",
-            offset: (x: "0.0", y: "0.09", z: "-0.0"),
-            rotation: FGVec3(x: "0.0", y: "0.0", z: "0.0"),
-            half_length: "0.125",
-            radius: "0.05"
-        ),
-        (
-            bone: "lowerarm_r",
-            offset: (x: "0.0", y: "0.12", z: "-0.0"),
-            rotation: FGVec3(x: "0.0", y: "0.0", z: "0.0"),
-            half_length: "0.115",
-            radius: "0.04"
-        ),
-        (
-            bone: "hand_r",
-            offset: (x: "0.0", y: "0.05", z: "-0.0"),
-            rotation: FGVec3(x: "0.0", y: "0.0", z: "0.0"),
-            half_length: "0.01",
-            radius: "0.04"
-        ),
-        /*(
-            bone: "RFootJA",
-            offset: (x: "0.0", y: "0.5", z: "0.0"),
-            rotation: FGVec3(x: "0.0", y: "0.0", z: "90.0"),
-            half_length: "0.5",
-            radius: "1.0"
-        ),
-        (
-            bone: "JOBJ_47",
-            offset: (x: "0.0", y: "0.0", z: "0.0"),
-            rotation: FGVec3(x: "0.0", y: "0.0", z: "90.0"),
-            half_length: "0.5",
-            radius: "1.0"
-        ),
-        (
-            bone: "LFootJA",
-            offset: (x: "0.0", y: "0.5", z: "0.0"),
-            rotation: FGVec3(x: "0.0", y: "0.0", z: "90.0"),
-            half_length: "0.5",
-            radius: "1.0"
-        ),
-        (
-            bone: "JOBJ_41",
-            offset: (x: "0.0", y: "0.0", z: "0.0"),
-            rotation: FGVec3(x: "0.0", y: "0.0", z: "90.0"),
-            half_length: "0.5",
-            radius: "1.0"
-        ),*/
-    ]
-)

assets/fighters/test/test.fighterbake

@@ -1,3 +0,0 @@
-(
-    manifest_path: "fighters/test/test.fighter.ron",
-)

assets/game.stylesheet.ron

@@ -1,128 +0,0 @@
-(
-    cursor: (
-        path: "ui/textures/cursor.png",
-        sampling: Nearest
-    ),
-    css_token: (
-        path: "ui/textures/fighter_select_token.png",
-        sampling: Linear
-    ),
-    player_colors: [
-        Srgba((red: 0.780, green: 0.420, blue: 0.933, alpha: 1.000)),
-        Srgba((red: 0.843, green: 0.227, blue: 0.204, alpha: 1.000)),
-        Srgba((red: 0.333, green: 0.804, blue: 0.078, alpha: 1.000)),
-        Srgba((red: 0.075, green: 0.376, blue: 0.416, alpha: 1.000)),
-        Srgba((red: 0.682, green: 0.878, blue: 0.914, alpha: 1.000))
-    ],
-    button_styles: {
-        MainMenu: (
-            focus_outline_width_px: 4,
-            focus_outline_offset_px: 2,
-            focus_outline_color: Srgba((red: 1.0, green: 1.0, blue: 0.0, alpha: 1.0)),
-            normal: (
-                background_color: Srgba((red: 1.0, green: 0.0, blue: 0.0, alpha: 1.0)),
-                border_color: Srgba((red: 1.0, green: 0.0, blue: 0.0, alpha: 1.0)),
-                text_color: Srgba((red: 1.0, green: 0.0, blue: 0.0, alpha: 1.0)),
-                box_shadow: (),
-            ),
-            press: (
-                background_color: Srgba((red: 1.0, green: 0.0, blue: 0.0, alpha: 1.0)),
-                border_color: Srgba((red: 1.0, green: 0.0, blue: 0.0, alpha: 1.0)),
-                text_color: Srgba((red: 1.0, green: 0.0, blue: 0.0, alpha: 1.0)),
-                box_shadow: (),
-            ),
-            hover: (
-                background_color: Srgba((red: 0.0, green: 1.0, blue: 0.0, alpha: 1.0)),
-                border_color: Srgba((red: 1.0, green: 0.0, blue: 0.0, alpha: 1.0)),
-                text_color: Srgba((red: 1.0, green: 0.0, blue: 0.0, alpha: 1.0)),
-                box_shadow: (),
-            )
-        ),
-        CharacterSelectCharacter: (
-            focus_outline_width_px: 10,
-            focus_outline_offset_px: 5,
-            focus_outline_color: Srgba((red: 1.0, green: 1.0, blue: 0.0, alpha: 1.0)),
-            normal: (
-                background_color: Srgba((red: 1.0, green: 0.0, blue: 0.0, alpha: 1.0)),
-                text_color: Srgba((red: 1.0, green: 0.0, blue: 0.0, alpha: 1.0)),
-                box_shadow: (),
-                border_size: 10,
-            ),
-            press: (
-                background_color: Srgba((red: 1.0, green: 0.0, blue: 0.0, alpha: 1.0)),
-                text_color: Srgba((red: 1.0, green: 0.0, blue: 0.0, alpha: 1.0)),
-                box_shadow: (),
-            ),
-            hover: (
-                background_color: Srgba((red: 0.0, green: 1.0, blue: 0.0, alpha: 1.0)),
-                text_color: Srgba((red: 1.0, green: 0.0, blue: 0.0, alpha: 1.0)),
-                box_shadow: (),
-            )
-        ),
-        CharacterSelectStartBanner: (
-            focus_outline_width_px: 10,
-            focus_outline_offset_px: 5,
-            focus_outline_color: Srgba((red: 1.0, green: 1.0, blue: 0.0, alpha: 1.0)),
-            normal: (
-                background_color: Srgba((red: 1.0, green: 0.0, blue: 0.0, alpha: 1.0)),
-                text_color: Srgba((red: 1.0, green: 0.0, blue: 0.0, alpha: 1.0)),
-                box_shadow: (),
-            ),
-            press: (
-                background_color: Srgba((red: 1.0, green: 0.0, blue: 0.0, alpha: 1.0)),
-                text_color: Srgba((red: 1.0, green: 0.0, blue: 0.0, alpha: 1.0)),
-                box_shadow: (),
-            ),
-            hover: (
-                background_color: Srgba((red: 0.0, green: 1.0, blue: 0.0, alpha: 1.0)),
-                text_color: Srgba((red: 1.0, green: 0.0, blue: 0.0, alpha: 1.0)),
-                box_shadow: (),
-            )
-        ),
-        StageSelectIcon: (
-            focus_outline_width_px: 4,
-            focus_outline_offset_px: 2,
-            focus_outline_color: Srgba((red: 1.0, green: 1.0, blue: 0.0, alpha: 1.0)),
-            normal: (
-                border_color: Srgba((red: 1.0, green: 1.0, blue: 0.0, alpha: 1.0)),
-                background_color: Srgba((red: 1.0, green: 0.0, blue: 0.0, alpha: 0.0)),
-                text_color: Srgba((red: 1.0, green: 0.0, blue: 0.0, alpha: 1.0)),
-                border_size: 10,
-                border_radius: 40.0,
-                box_shadow: (
-                    spread_radius: 5.0,
-                    blur_radius: 5.0,
-                    offset_px_y: 10,
-                    offset_px_x: 10,
-                    color: Srgba((red: 1.0, green: 1.0, blue: 1.0, alpha: 1.0))
-                ),
-            ),
-            press: (
-                background_color: Srgba((red: 1.0, green: 0.0, blue: 0.0, alpha: 1.0)),
-                border_color: Srgba((red: 1.0, green: 0.0, blue: 0.0, alpha: 1.0)),
-                text_color: Srgba((red: 1.0, green: 0.0, blue: 0.0, alpha: 1.0)),
-                border_radius: 40.0,
-                border_size: 10,
-                box_shadow: (
-                    spread_radius: 5.0,
-                    offset_px_y: 10,
-                    offset_px_x: 10,
-                    color: Srgba((red: 1.0, green: 1.0, blue: 1.0, alpha: 1.0))
-                ),
-            ),
-            hover: (
-                background_color: Srgba((red: 0.0, green: 1.0, blue: 0.0, alpha: 1.0)),
-                border_color: Srgba((red: 1.0, green: 0.0, blue: 0.0, alpha: 1.0)),
-                border_radius: 40.0,
-                border_size: 10,
-                text_color: Srgba((red: 1.0, green: 0.0, blue: 0.0, alpha: 1.0)),
-                box_shadow: (
-                    spread_radius: 5.0,
-                    offset_px_y: 10,
-                    offset_px_x: 10,
-                    color: Srgba((red: 1.0, green: 1.0, blue: 1.0, alpha: 1.0))
-                ),
-            )
-        ),
-    }
-)

assets/game_settings.ron

@@ -1,28 +0,0 @@
-(   
-    input_common: (
-        stick_deadzone: "0.275",
-        trigger_deadzone: "0.3",
-        smash_input_reset_axis_threshold: "0.25",
-        smash_input_axis_threshold: "0.8",
-        run_stick_threshold: "0.625",
-        smash_input_frame_threshold: 3,
-        input_buffer_size: 3,
-        turn_into_dashback_window: 2,
-    ),
-    fighter_common: (
-        walk_speed_ease: "0.5",
-        ground_max_horizontal_velocity: "3.0",
-        ground_friction_over_walk_speed_multiplier: "2.0",
-        knockback_stacking_window: 2,
-        knockback_decay_per_frame: "0.051",
-        knockback_launch_velocity_multiplier: "0.03",
-        hitstun_frames_per_unit_knockback: "0.4",
-
-    ),
-    stage_manifest_paths: [
-        "stages/battlefield/test.stage.ron"
-    ],
-    fighter_manifest_paths: [
-        "fighters/test/test.fighter.ron"
-    ]
-)

assets/stages/battlefield/test.stage.ron

@@ -1,139 +0,0 @@
-(
-    id: TestStage,
-    model_path: "stages/battlefield/battlefield.glb#Scene0",
-    icon: (
-        path: "stages/battlefield/icon.png"
-    ),
-
-    // Battlefield
-    /*camera: (
-        left: -200.0,
-        right: 200.0,
-        bottom: -59.0,
-        top: 170.0,
-        origin: (0.0, 44.0),
-        vertical_fov_degrees: 30.0,
-        min_depth: 83.0,
-        max_depth: 1000.0,
-        subject_scale: 1.5,
-        fighter_forward_extent_scale: 1.5,
-        tracking_smoothness: 1.8,
-        vertical_pan_degrees: -10.0,
-        horizontal_pan_degrees_per_unit: 0.1,
-        vertical_pan_degrees_per_unit: 0.1,
-        max_horizontal_pan_degrees: 17.5,
-        max_upward_pan_degrees: 5.0,
-        max_downward_pan_degrees: 7.0,
-    ),*/
-    // Yoshi's story
-
-    /*camera: (
-        left: -180.0,
-        right: 179.0,
-        bottom: -71.0,
-        top: 169.0,
-        origin: (0.0, 44.0),
-        vertical_fov_degrees: 20.0,
-        min_depth: 100.0,
-        max_depth: 1000.0,
-        subject_scale: 1.0,
-        fighter_forward_extent_scale: 1.0,
-        tracking_smoothness: 1.0,
-        vertical_pan_degrees: -10.0,
-        horizontal_pan_degrees_per_unit: 0.05,
-        vertical_pan_degrees_per_unit: 0.15,
-        max_horizontal_pan_degrees: 17.5,
-        max_upward_pan_degrees: 5.0,
-        max_downward_pan_degrees: 7.0,
-    ),*/
-
-    camera: (
-        left: -180.0,
-        right: 179.0,
-        bottom: -71.0,
-        top: 169.0,
-        origin: (0.0, 44.0),
-        vertical_fov_degrees: 20.0,
-        min_depth: 100.0,
-        max_depth: 1000.0,
-        subject_scale: 1.5,
-        fighter_forward_extent_scale: 1.0,
-        tracking_smoothness: 1.0,
-        vertical_pan_degrees: -10.0,
-        horizontal_pan_degrees_per_unit: 0.05,
-        vertical_pan_degrees_per_unit: 0.15,
-        max_horizontal_pan_degrees: 17.5,
-        max_upward_pan_degrees: 5.0,
-        max_downward_pan_degrees: 7.0,
-    ),
-    polygons: [
-        (
-            poly_type: Platform,
-            lines: [
-                (
-                    (x: "-20.0", y: "47.0"),
-                    Floor
-                ),
-                (
-                    (x: "20.0", y: "47.0"),
-                    Floor
-                )
-            ]
-        ),
-        (
-            poly_type: Platform,
-            lines: [
-                (
-                    (x: "-65.0", y: "24.0"),
-                    Floor
-                ),
-                (
-                    (x: "-25.0", y: "24.0"),
-                    Floor
-                )
-            ]
-        ),
-        (
-            poly_type: Platform,
-            lines: [
-                (
-                    (x: "25.0", y: "24.0"),
-                    Floor
-                ),
-                (
-                    (x: "65.0", y: "24.0"),
-                    Floor
-                )
-            ]
-        ),
-        (
-            poly_type: Closed,
-            lines: [
-                (
-                    (x: "-68.0", y: "-3.0"),
-                    Wall
-                ),
-                (
-                    (x: "-68.0", y: "0.0"),
-                    Floor,
-                ),
-                (
-                    (x: "0.0", y: "0.0"),
-                    Floor
-                ),
-                (
-                    (x: "68", y: "0.0"),
-                    Wall
-                ),
-                (
-                    (x: "68.0", y: "-3.0"),
-                    Ceiling
-                ),
-                (
-                    (x: "0.0", y: "-15.0"),
-                    Ceiling
-                ),
-            ]
-        )
-    ]
-)

assets/ui/textures/fighter_select_token.svg

@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="128"
-   height="128"
-   viewBox="0 0 33.866666 33.866666"
-   version="1.1"
-   id="svg1"
-   inkscape:version="1.4.4 (dcaf3e7d9e, 2026-05-05)"
-   sodipodi:docname="cursor.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview1"
-     pagecolor="#000000"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="mm"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="8.6620581"
-     inkscape:cy="67.086756"
-     inkscape:window-width="2560"
-     inkscape:window-height="1006"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs1">
-    <linearGradient
-       id="linearGradient1"
-       inkscape:collect="always">
-      <stop
-         style="stop-color:#949494;stop-opacity:1;"
-         offset="0"
-         id="stop1" />
-      <stop
-         style="stop-color:#6c6c6c;stop-opacity:1;"
-         offset="0.77473962"
-         id="stop3" />
-      <stop
-         style="stop-color:#9f9f9f;stop-opacity:1;"
-         offset="1"
-         id="stop2" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1"
-       id="radialGradient2"
-       cx="16.933332"
-       cy="16.933332"
-       fx="16.933332"
-       fy="16.933332"
-       r="12.733072"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2093771,0,0,1.2093771,-3.5454518,-3.5454518)" />
-  </defs>
-  <g
-     inkscape:label="Capa 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <circle
-       style="fill:url(#radialGradient2);stroke-width:0.319981"
-       id="path1"
-       cx="16.933332"
-       cy="16.933332"
-       r="15.399086" />
-  </g>
-</svg>

launch_localtest.sh

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

scripts/install-blender.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+version="5.2.2"
+sha256="84098912789dc450e95697c4184fb8a90acbe5111c2ba4aede3fecb57806a168"
+install_dir="${1:-${BLENDER_INSTALL_DIR:-${HOME}/.local/blender-${version}}}"
+
+if [[ "$(uname -s)" != Linux || "$(uname -m)" != x86_64 ]]; then
+    echo "error: this installer currently supports Linux x86_64 only" >&2
+    exit 1
+fi
+
+if [[ -x "$install_dir/blender" ]]; then
+    "$install_dir/blender" --version | head -n 1
+    exit 0
+fi
+
+mkdir -p "$(dirname "$install_dir")"
+tmp_dir="$(mktemp -d)"
+trap 'rm -rf "$tmp_dir"' EXIT
+
+archive="blender-${version}-linux-x64.tar.xz"
+url="https://download.blender.org/release/Blender5.2/${archive}"
+
+curl --fail --location --silent --show-error --output "$tmp_dir/$archive" "$url"
+printf '%s  %s\n' "$sha256" "$tmp_dir/$archive" | sha256sum --check --status
+tar --extract --xz --file "$tmp_dir/$archive" --directory "$tmp_dir"
+mv "$tmp_dir/blender-${version}-linux-x64" "$install_dir"
+
+"$install_dir/blender" --version | head -n 1

scripts/install-lore.sh

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+version="v0.10.0"
+sha256="0d1633b71e44081c6a3ca57ad5be3df7a9563698827638838939c3c832e87351"
+install_dir="${1:-${LORE_INSTALL_DIR:-${HOME}/.local/bin}}"
+
+if [[ "$(uname -s)" != Linux || "$(uname -m)" != x86_64 ]]; then
+    echo "error: this installer currently supports Linux x86_64 only" >&2
+    exit 1
+fi
+
+mkdir -p "$install_dir"
+tmp_dir="$(mktemp -d)"
+trap 'rm -rf "$tmp_dir"' EXIT
+
+archive="lore-${version}-x86_64-unknown-linux-gnu.tar.gz"
+url="https://github.com/EpicGames/lore/releases/download/${version}/${archive}"
+
+curl --fail --location --silent --show-error --output "$tmp_dir/$archive" "$url"
+printf '%s  %s\n' "$sha256" "$tmp_dir/$archive" | sha256sum --check --status
+tar --extract --gzip --file "$tmp_dir/$archive" --directory "$tmp_dir"
+
+binary="$(find "$tmp_dir" -type f -name lore -print -quit)"
+if [[ -z "$binary" ]]; then
+    echo "error: Lore archive did not contain a lore binary" >&2
+    exit 1
+fi
+
+install -m 0755 "$binary" "$install_dir/lore"
+"$install_dir/lore" --version

scripts/update-assets.sh

@@ -0,0 +1,111 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+readonly lore_url="${LORE_REPOSITORY_URL:-lore://lore.eirexe.moe/shinespark}"
+readonly default_branch="${LORE_DEFAULT_BRANCH:-main}"
+readonly assets_dir="${LORE_ASSETS_DIR:-assets}"
+branch="${1:-${LORE_BRANCH:-$default_branch}}"
+
+case "$branch" in
+    ""|*[!A-Za-z0-9._/-]*)
+        echo "error: invalid Lore branch name: $branch" >&2
+        exit 2
+        ;;
+esac
+
+if [[ -n "${LORE_IDENTITY_TOKEN:-}" ]]; then
+    lore_args=(--identity-token "$LORE_IDENTITY_TOKEN")
+elif [[ -n "${LORE_CI_USERNAME:-}" || -n "${LORE_CI_PASSWORD:-}" ]]; then
+    if [[ -z "${LORE_CI_USERNAME:-}" || -z "${LORE_CI_PASSWORD:-}" ]]; then
+        echo "error: LORE_CI_USERNAME and LORE_CI_PASSWORD must be provided together" >&2
+        exit 2
+    fi
+    : "${LORE_AUTH_URL:=https://auth.eirexe.moe}"
+    export LORE_AUTH_URL
+    token="$(python3 - <<'PY'
+import json
+import os
+import sys
+import urllib.error
+import urllib.request
+
+request = urllib.request.Request(
+    os.environ["LORE_AUTH_URL"].rstrip("/") + "/auth/login",
+    data=json.dumps({
+        "username": os.environ["LORE_CI_USERNAME"],
+        "password": os.environ["LORE_CI_PASSWORD"],
+    }).encode(),
+    headers={"Content-Type": "application/json"},
+    method="POST",
+)
+try:
+    with urllib.request.urlopen(request) as response:
+        payload = json.load(response)
+except urllib.error.HTTPError as error:
+    print(f"Lore authentication failed with HTTP {error.code}", file=sys.stderr)
+    sys.exit(1)
+
+token = payload.get("token")
+if not isinstance(token, str) or not token:
+    print("Lore authentication response did not contain a token", file=sys.stderr)
+    sys.exit(1)
+print(token)
+PY
+    )"
+    if [[ -n "${GITHUB_ENV:-}" ]]; then
+        echo "::add-mask::$token"
+    fi
+    lore_args=(--identity-token "$token")
+else
+    lore_args=()
+fi
+
+if [[ -e "$assets_dir" && ! -d "$assets_dir" ]]; then
+    echo "error: $assets_dir exists but is not a directory" >&2
+    exit 1
+fi
+
+if [[ -d "$assets_dir/.lore" ]]; then
+    if ! lore "${lore_args[@]}" --repository "$assets_dir" repository info >/dev/null; then
+        echo "error: $assets_dir is not a usable Lore checkout" >&2
+        exit 1
+    fi
+    if ! lore "${lore_args[@]}" --repository "$assets_dir" branch list --no-pager \
+        | grep -Fqx "  $branch"; then
+        if [[ "$branch" != "$default_branch" ]]; then
+            echo "warning: Lore branch does not exist: $branch; using $default_branch" >&2
+            branch="$default_branch"
+        else
+            echo "error: Lore branch does not exist: $branch" >&2
+            exit 1
+        fi
+    fi
+    lore "${lore_args[@]}" --repository "$assets_dir" sync "$branch@LATEST"
+    exit 0
+fi
+
+if [[ -d "$assets_dir" && -n "$(find "$assets_dir" -mindepth 1 -maxdepth 1 -print -quit)" ]]; then
+    echo "error: refusing to overwrite non-Lore directory: $assets_dir" >&2
+    exit 1
+fi
+
+metadata_dir="$(mktemp -d)"
+trap 'rm -rf "$metadata_dir"' EXIT
+lore "${lore_args[@]}" --non-interactive clone --bare "$lore_url" "$metadata_dir"
+
+if ! lore "${lore_args[@]}" --repository "$metadata_dir" branch list --no-pager \
+    | grep -Fqx "  $branch"; then
+    if [[ "$branch" != "$default_branch" ]]; then
+        echo "warning: Lore branch does not exist: $branch; using $default_branch" >&2
+        branch="$default_branch"
+    else
+        echo "error: Lore branch does not exist: $branch" >&2
+        echo "available branches:" >&2
+        lore "${lore_args[@]}" --repository "$metadata_dir" branch list --no-pager >&2
+        exit 1
+    fi
+fi
+
+rm -rf "$assets_dir"
+lore "${lore_args[@]}" --non-interactive clone --branch "$branch" "$lore_url" "$assets_dir"
+lore "${lore_args[@]}" --repository "$assets_dir" status --revision-only --no-pager

src/args.rs

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

src/bin/process-assets.rs

@@ -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);
+    }
+}

src/blend_asset.rs

@@ -0,0 +1,394 @@
+//! Blender `.blend` source processing.
+//!
+//! Blender is used as an offline importer. The processed result is a normal
+//! GLB, so the runtime continues to use Bevy's built-in glTF loader.
+
+use bevy::{
+    asset::{
+        AssetLoader, AssetPath, AsyncWriteExt, LoadContext,
+        io::{Reader, Writer},
+        processor::LoadTransformAndSave,
+        saver::{AssetSaver, SavedAsset},
+        transformer::{AssetTransformer, TransformedAsset},
+    },
+    gltf::GltfLoader,
+    prelude::*,
+    reflect::TypePath,
+};
+use serde::Deserialize;
+use std::{
+    collections::HashMap,
+    fs, io,
+    path::{Path, PathBuf},
+    process::Command,
+    time::{SystemTime, UNIX_EPOCH},
+};
+
+use crate::fighter::animation::AnimKind;
+
+const EXPORT_SCRIPT: &str = include_str!("blend_asset/export.py");
+
+#[derive(Asset, TypePath)]
+struct BlendSource {
+    glb: Vec<u8>,
+}
+
+#[derive(Default, TypePath)]
+struct BlendSourceLoader;
+
+#[derive(Debug, Deserialize)]
+struct ExportManifest {
+    dependencies: Vec<String>,
+}
+
+#[derive(Debug, Deserialize)]
+struct AnimationManifest {
+    animations: HashMap<AnimKind, String>,
+}
+
+impl AssetLoader for BlendSourceLoader {
+    type Asset = BlendSource;
+    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 source_bytes = Vec::new();
+        reader.read_to_end(&mut source_bytes).await?;
+
+        let temp = TempDir::new()?;
+        let source_path = locate_source(load_context.path().path());
+        let blend_path = if let Some(path) = source_path.as_deref() {
+            path.to_path_buf()
+        } else {
+            let path = temp.path().join("source.blend");
+            fs::write(&path, source_bytes)?;
+            path
+        };
+        let output = temp.path().join("export.gltf");
+        let script = temp.path().join("export.py");
+        let actions = referenced_actions(load_context, &asset_root()).await?;
+        let actions_path = temp.path().join("actions.json");
+        fs::write(
+            &actions_path,
+            serde_json::to_vec(&actions).map_err(io::Error::other)?,
+        )?;
+        fs::write(&script, EXPORT_SCRIPT)?;
+
+        let result = Command::new(std::env::var_os("BLENDER").unwrap_or_else(|| "blender".into()))
+            .arg("--background")
+            .arg(&blend_path)
+            .arg("--python")
+            .arg(&script)
+            .arg("--")
+            .arg(&output)
+            .arg(&actions_path)
+            .arg(&blend_path)
+            .output()
+            .map_err(|error| io::Error::other(format!("failed to start Blender: {error}")))?;
+        if !result.status.success() {
+            return Err(io::Error::other(format!(
+                "Blender export failed with {}:\n{}\n{}",
+                result.status,
+                String::from_utf8_lossy(&result.stdout),
+                String::from_utf8_lossy(&result.stderr)
+            )));
+        }
+
+        let manifest: ExportManifest =
+            serde_json::from_slice(&fs::read(temp.path().join("export-manifest.json"))?)
+                .map_err(|error| io::Error::new(io::ErrorKind::InvalidData, error))?;
+
+        let asset_root = asset_root();
+        let mut dependencies = manifest.dependencies;
+        let document: serde_json::Value = serde_json::from_slice(&fs::read(&output)?)
+            .map_err(|error| io::Error::new(io::ErrorKind::InvalidData, error))?;
+        validate_export(&document, &output)?;
+        if let Some(images) = document.get("images").and_then(serde_json::Value::as_array) {
+            for image in images {
+                if let Some(uri) = image.get("uri").and_then(serde_json::Value::as_str) {
+                    let path = temp.path().join(uri);
+                    dependencies.push(path.to_string_lossy().into_owned());
+                }
+            }
+        }
+
+        let mut seen = std::collections::HashSet::new();
+        for dependency in dependencies {
+            let physical = PathBuf::from(&dependency);
+            let Some(asset_path) = physical_to_asset_path(&physical, &asset_root) else {
+                continue;
+            };
+            if seen.insert(asset_path.clone()) {
+                // This read is intentionally discarded: it registers the file and
+                // its processed hash as a processor dependency.
+                load_context
+                    .read_asset_bytes(asset_path)
+                    .await
+                    .map_err(|error| {
+                        io::Error::other(format!("failed to read blend dependency: {error}"))
+                    })?;
+            }
+        }
+
+        let glb = make_glb(&output, &temp, load_context.path().path(), &asset_root)?;
+        Ok(BlendSource { glb })
+    }
+
+    fn extensions(&self) -> &[&str] {
+        &["blend"]
+    }
+}
+
+fn validate_export(document: &serde_json::Value, output: &Path) -> io::Result<()> {
+    for key in ["scenes", "nodes", "meshes"] {
+        let count = document
+            .get(key)
+            .and_then(serde_json::Value::as_array)
+            .map_or(0, Vec::len);
+        if count == 0 {
+            return Err(io::Error::new(
+                io::ErrorKind::InvalidData,
+                format!("Blender export {} contains no {key}", output.display()),
+            ));
+        }
+    }
+    Ok(())
+}
+
+async fn referenced_actions(
+    load_context: &mut LoadContext<'_>,
+    root: &Path,
+) -> io::Result<Vec<String>> {
+    let model_path = load_context.path().path();
+    let Some(stem) = model_path.file_stem().and_then(|stem| stem.to_str()) else {
+        return Ok(Vec::new());
+    };
+    let manifest_path = model_path
+        .parent()
+        .unwrap_or_else(|| Path::new(""))
+        .join(format!("{stem}.fighter.ron"));
+    if !root.join(&manifest_path).is_file() {
+        return Ok(Vec::new());
+    }
+    let bytes = load_context
+        .read_asset_bytes(manifest_path)
+        .await
+        .map_err(|error| io::Error::other(error.to_string()))?;
+    let manifest: AnimationManifest = ron::de::from_bytes(&bytes)
+        .map_err(|error| io::Error::new(io::ErrorKind::InvalidData, error))?;
+    Ok(manifest.animations.into_values().collect())
+}
+
+#[derive(Asset, TypePath)]
+struct ProcessedBlend {
+    bytes: Vec<u8>,
+}
+
+#[derive(Default, TypePath)]
+struct BlendTransformer;
+
+impl AssetTransformer for BlendTransformer {
+    type AssetInput = BlendSource;
+    type AssetOutput = ProcessedBlend;
+    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 bytes = source.glb.clone();
+        Ok(source.replace_asset(ProcessedBlend { bytes }))
+    }
+}
+
+#[derive(Default, TypePath)]
+struct BlendSaver;
+
+impl AssetSaver for BlendSaver {
+    type Asset = ProcessedBlend;
+    type Settings = ();
+    type OutputLoader = GltfLoader;
+    type Error = io::Error;
+
+    async fn save(
+        &self,
+        writer: &mut Writer,
+        asset: SavedAsset<'_, '_, Self::Asset>,
+        _: &Self::Settings,
+        _: AssetPath<'_>,
+    ) -> Result<<Self::OutputLoader as AssetLoader>::Settings, Self::Error> {
+        writer.write_all(&asset.bytes).await?;
+        Ok(default())
+    }
+}
+
+type BlendProcessor = LoadTransformAndSave<BlendSourceLoader, BlendTransformer, BlendSaver>;
+
+pub struct BlendAssetProcessingPlugin;
+
+impl Plugin for BlendAssetProcessingPlugin {
+    fn build(&self, app: &mut App) {
+        app.init_asset::<BlendSource>()
+            .init_asset::<ProcessedBlend>()
+            .register_asset_loader(BlendSourceLoader)
+            .register_asset_processor(BlendProcessor::new(BlendTransformer, BlendSaver))
+            .set_default_asset_processor::<BlendProcessor>("blend");
+    }
+}
+
+struct TempDir(PathBuf);
+
+impl TempDir {
+    fn new() -> io::Result<Self> {
+        let stamp = SystemTime::now()
+            .duration_since(UNIX_EPOCH)
+            .unwrap_or_default()
+            .as_nanos();
+        let path =
+            std::env::temp_dir().join(format!("shinespark-blend-{}-{stamp}", std::process::id()));
+        fs::create_dir_all(&path)?;
+        Ok(Self(path))
+    }
+    fn path(&self) -> &Path {
+        &self.0
+    }
+}
+
+impl Drop for TempDir {
+    fn drop(&mut self) {
+        let _ = fs::remove_dir_all(&self.0);
+    }
+}
+
+fn asset_root() -> PathBuf {
+    std::env::var_os("BEVY_ASSET_ROOT")
+        .map(PathBuf::from)
+        .unwrap_or_else(|| std::env::current_dir().unwrap_or_default().join("assets"))
+}
+
+fn locate_source(path: &Path) -> Option<PathBuf> {
+    let root = asset_root();
+    [root.join(path), PathBuf::from(path)]
+        .into_iter()
+        .find(|candidate| candidate.is_file())
+}
+
+fn physical_to_asset_path(path: &Path, root: &Path) -> Option<String> {
+    let canonical = fs::canonicalize(path).ok()?;
+    let root = fs::canonicalize(root).ok()?;
+    let relative = canonical.strip_prefix(root).ok()?;
+    Some(relative.to_string_lossy().replace('\\', "/"))
+}
+
+fn make_glb(
+    gltf_path: &Path,
+    temp: &TempDir,
+    model_asset_path: &Path,
+    asset_root: &Path,
+) -> io::Result<Vec<u8>> {
+    let mut json: serde_json::Value = serde_json::from_slice(&fs::read(gltf_path)?)
+        .map_err(|error| io::Error::new(io::ErrorKind::InvalidData, error))?;
+    let bin_name = json["buffers"][0]["uri"].as_str().ok_or_else(|| {
+        io::Error::new(io::ErrorKind::InvalidData, "glTF has no binary buffer URI")
+    })?;
+    let mut bin = fs::read(temp.path().join(bin_name))?;
+    let model_parent = model_asset_path.parent().unwrap_or_else(|| Path::new(""));
+    let image_count = json["images"].as_array().map_or(0, Vec::len);
+    if image_count > 0 && !json["bufferViews"].is_array() {
+        return Err(io::Error::new(
+            io::ErrorKind::InvalidData,
+            "glTF bufferViews are not an array",
+        ));
+    }
+    for index in 0..image_count {
+        let uri = json["images"][index]
+            .get("uri")
+            .and_then(serde_json::Value::as_str)
+            .map(str::to_owned);
+        let Some(uri) = uri else { continue };
+        if uri.starts_with("data:") {
+            continue;
+        }
+        let uri_path = temp.path().join(uri);
+        if let Some(asset_path) = physical_to_asset_path(&uri_path, asset_root) {
+            json["images"][index]["uri"] =
+                serde_json::Value::String(relative_uri(model_parent, Path::new(&asset_path)));
+        } else {
+            let bytes = fs::read(&uri_path)?;
+            while bin.len() % 4 != 0 {
+                bin.push(0);
+            }
+            let offset = bin.len();
+            bin.extend_from_slice(&bytes);
+            let mime = mime_type(&uri_path);
+            let view = json["bufferViews"].as_array().unwrap().len();
+            json["bufferViews"]
+                .as_array_mut()
+                .unwrap()
+                .push(serde_json::json!({
+                    "buffer": 0,
+                    "byteOffset": offset,
+                    "byteLength": bytes.len(),
+                }));
+            json["images"][index].as_object_mut().unwrap().remove("uri");
+            json["images"][index]["bufferView"] = serde_json::Value::from(view);
+            json["images"][index]["mimeType"] = serde_json::Value::String(mime.to_owned());
+        }
+    }
+    json["buffers"][0]["byteLength"] = serde_json::Value::from(bin.len());
+    json["buffers"][0].as_object_mut().unwrap().remove("uri");
+    let mut json_bytes = serde_json::to_vec(&json).map_err(io::Error::other)?;
+    while json_bytes.len() % 4 != 0 {
+        json_bytes.push(b' ');
+    }
+    while bin.len() % 4 != 0 {
+        bin.push(0);
+    }
+    let length = 12 + 8 + json_bytes.len() + 8 + bin.len();
+    let mut glb = Vec::with_capacity(length);
+    glb.extend_from_slice(b"glTF");
+    glb.extend_from_slice(&2u32.to_le_bytes());
+    glb.extend_from_slice(&(length as u32).to_le_bytes());
+    glb.extend_from_slice(&(json_bytes.len() as u32).to_le_bytes());
+    glb.extend_from_slice(b"JSON");
+    glb.extend_from_slice(&json_bytes);
+    glb.extend_from_slice(&(bin.len() as u32).to_le_bytes());
+    glb.extend_from_slice(b"BIN\0");
+    glb.extend_from_slice(&bin);
+    Ok(glb)
+}
+
+fn relative_uri(from: &Path, to: &Path) -> String {
+    let from: Vec<_> = from.components().collect();
+    let to: Vec<_> = to.components().collect();
+    let common = from.iter().zip(&to).take_while(|(a, b)| a == b).count();
+    let mut result = PathBuf::new();
+    for _ in common..from.len() {
+        result.push("..");
+    }
+    for component in &to[common..] {
+        result.push(component.as_os_str());
+    }
+    result.to_string_lossy().replace('\\', "/")
+}
+
+fn mime_type(path: &Path) -> &'static str {
+    match path
+        .extension()
+        .and_then(|e| e.to_str())
+        .unwrap_or_default()
+        .to_ascii_lowercase()
+        .as_str()
+    {
+        "jpg" | "jpeg" => "image/jpeg",
+        "webp" => "image/webp",
+        _ => "image/png",
+    }
+}

src/blend_asset/export.py

@@ -0,0 +1,80 @@
+import bpy
+import json
+import os
+import sys
+
+
+def main():
+    output = sys.argv[sys.argv.index("--") + 1]
+    actions_path = sys.argv[sys.argv.index("--") + 2]
+    source_path = sys.argv[sys.argv.index("--") + 3]
+    loaded_path = os.path.realpath(bpy.data.filepath)
+    expected_path = os.path.realpath(source_path)
+    if loaded_path != expected_path:
+        raise RuntimeError(
+            f"Blender loaded {loaded_path!r} instead of {expected_path!r}"
+        )
+    if not bpy.data.objects or not bpy.data.meshes:
+        raise RuntimeError("Blender loaded an empty scene")
+    with open(actions_path) as file:
+        actions_to_keep = set(json.load(file))
+
+    for obj in bpy.data.objects:
+        if not obj.animation_data:
+            continue
+        for track in list(obj.animation_data.nla_tracks):
+            if track.name.startswith("[Action Stash]"):
+                obj.animation_data.nla_tracks.remove(track)
+
+    nla_tracks = [
+        track
+        for obj in bpy.data.objects
+        if obj.animation_data
+        for track in obj.animation_data.nla_tracks
+    ]
+    use_nla_tracks = bool(nla_tracks)
+
+    # For blends without NLA tracks, use the actions referenced by the fighter
+    # manifest instead of sampling every source action.
+    if not use_nla_tracks and actions_to_keep:
+        from io_scene_gltf2 import GLTF2_filter_action
+
+        if not hasattr(bpy.types.Scene, "gltf_action_filter"):
+            bpy.types.Scene.gltf_action_filter = bpy.props.CollectionProperty(
+                type=GLTF2_filter_action
+            )
+        scene = bpy.context.scene
+        scene.gltf_action_filter.clear()
+        for action in bpy.data.actions:
+            item = scene.gltf_action_filter.add()
+            item.action = action
+            item.keep = action.name in actions_to_keep
+
+    bpy.ops.export_scene.gltf(
+        filepath=output,
+        export_format="GLTF_SEPARATE",
+        export_keep_originals=True,
+        export_extras=True,
+        export_animations=True,
+        export_skins=True,
+        export_morph=True,
+        export_yup=True,
+        export_def_bones=True,
+        export_action_filter=False,
+        export_animation_mode="NLA_TRACKS" if use_nla_tracks else "ACTIONS",
+    )
+
+    dependencies = []
+    for image in bpy.data.images:
+        if image.source not in {"FILE", "TILED"}:
+            continue
+        path = image.filepath_raw or image.filepath
+        if path and not image.packed_file:
+            dependencies.append(bpy.path.abspath(path))
+
+    with open(os.path.join(os.path.dirname(output), "export-manifest.json"), "w") as file:
+        json.dump({"dependencies": sorted(set(dependencies))}, file)
+
+
+if __name__ == "__main__":
+    main()

src/camera/mod.rs

@@ -5,7 +5,7 @@ use bevy_ggrs::GgrsFrameTiming;
 
 use crate::{
     debug_tools::DebugSettings,
-    fighter::{manifest::FighterManifest, motion::sample_presentation_translation},
+    fighter::{manifest::FighterManifest, motion::{sample_presentation_translation_with_snap, FighterPresentationSnap}},
     stage::manifest::StageCameraProfile,
 };
 
@@ -313,6 +313,7 @@ fn update_match_camera(
             &crate::fighter::motion::FighterPreviousTranslation,
             &crate::fighter::Fighter,
             &crate::fighter::FighterFacingDirection,
+            &FighterPresentationSnap,
             &mut FighterCameraExtents,
         ),
         With<crate::player::Player>,
@@ -329,16 +330,17 @@ fn update_match_camera(
     let subjects = fighters
         .iter_mut()
         .map(
-            |(translation, previous_translation, fighter, facing, mut extents)| {
+            |(translation, previous_translation, fighter, facing, presentation_snap, mut extents)| {
                 let manifest = manifests
                     .get(&fighter.manifest)
                     .expect("Fighter manifest should be valid");
                 fighter_subject_bounds(
-                    sample_presentation_translation(
+                    sample_presentation_translation_with_snap(
                         *previous_translation,
                         *translation,
                         timing.overstep_fraction(),
                         debug_settings.motion_sampling,
+                        *presentation_snap,
                     ),
                     manifest.camera,
                     *facing,
@@ -465,6 +467,7 @@ fn debug_draw_camera(
             &crate::fighter::motion::FighterPreviousTranslation,
             &crate::fighter::Fighter,
             &crate::fighter::FighterFacingDirection,
+            &FighterPresentationSnap,
             &FighterCameraExtents,
         ),
         With<crate::player::Player>,
@@ -486,15 +489,16 @@ fn debug_draw_camera(
             Color::srgb(1.0, 0.5, 0.0),
         );
         draw_rectangle(&mut gizmos, camera.frame, Color::srgb(1.0, 1.0, 0.0));
-        for (translation, previous_translation, fighter, _facing, extents) in &fighters {
+        for (translation, previous_translation, fighter, _facing, presentation_snap, extents) in &fighters {
             let manifest = manifests
                 .get(&fighter.manifest)
                 .expect("Fighter manifest should be valid");
-            let center = sample_presentation_translation(
+            let center = sample_presentation_translation_with_snap(
                 *previous_translation,
                 *translation,
                 timing.overstep_fraction(),
                 debug_settings.motion_sampling,
+                *presentation_snap,
             ) + Vec2::Y * manifest.camera.vertical_origin_offset.to_num::<f32>();
             draw_rectangle(
                 &mut gizmos,

src/debug_tools.rs

@@ -3,11 +3,9 @@
 use std::{collections::HashMap, time::Duration};
 
 use bevy::{
-    input::InputSystems,
+    camera::{CameraOutputMode, visibility::RenderLayers}, input::InputSystems, prelude::*, render::render_resource::BlendState, settings::{ReflectSettingsGroup, SaveSettingsDeferred, SettingsGroup},
-    prelude::*,
-    settings::{ReflectSettingsGroup, SaveSettingsDeferred, SettingsGroup},
 };
-use bevy_egui::{EguiContexts, EguiPrimaryContextPass, egui};
+use bevy_egui::{EguiContexts, EguiGlobalSettings, EguiPrimaryContextPass, PrimaryEguiContext, egui};
 use bevy_ggrs::{RollbackFrameRate, RunGgrsSystems};
 use enum_cycling::EnumCycle;
 use enum_cycling_derive::EnumCycle;
@@ -111,7 +109,9 @@ impl FighterDebugRowKind {
 enum DebugFlag {
     Network,
     Ecb,
+    BlastZones,
     StageCollision,
+    SpawnPositions,
     AnimationBones,
     AttackHitboxes,
     Hurtboxes,
@@ -175,6 +175,14 @@ const WORLD_MENU: &[DebugMenuEntry] = &[
         label: "Stage collision",
         flag: DebugFlag::StageCollision,
     },
+    DebugMenuEntry::Toggle {
+        label: "Blast zones",
+        flag: DebugFlag::BlastZones,
+    },
+    DebugMenuEntry::Toggle {
+        label: "Spawn points",
+        flag: DebugFlag::SpawnPositions,
+    },
     DebugMenuEntry::GameSpeed {
         label: "Game speed",
     },
@@ -245,7 +253,9 @@ pub struct DebugSettings {
     pub frame_stepping: bool,
     pub network: bool,
     pub ecb: bool,
+    pub blast_zones: bool,
     pub stage_collision: bool,
+    pub spawn_positions: bool,
     pub animation_bones: bool,
     pub attack_hitboxes: bool,
     pub hurtboxes: bool,
@@ -266,7 +276,9 @@ impl Default for DebugSettings {
             frame_stepping: false,
             network: false,
             ecb: false,
+            blast_zones: false,
             stage_collision: false,
+            spawn_positions: false,
             animation_bones: false,
             attack_hitboxes: false,
             hurtboxes: false,
@@ -330,6 +342,8 @@ impl DebugSettings {
         match flag {
             DebugFlag::Network => self.network,
             DebugFlag::Ecb => self.ecb,
+            DebugFlag::BlastZones => self.blast_zones,
+            DebugFlag::SpawnPositions => self.spawn_positions,
             DebugFlag::StageCollision => self.stage_collision,
             DebugFlag::AnimationBones => self.animation_bones,
             DebugFlag::AttackHitboxes => self.attack_hitboxes,
@@ -344,7 +358,9 @@ impl DebugSettings {
         match flag {
             DebugFlag::Network => self.network = !self.network,
             DebugFlag::Ecb => self.ecb = !self.ecb,
+            DebugFlag::BlastZones => self.blast_zones = !self.blast_zones,
             DebugFlag::StageCollision => self.stage_collision = !self.stage_collision,
+            DebugFlag::SpawnPositions => self.spawn_positions = !self.spawn_positions,
             DebugFlag::AnimationBones => self.animation_bones = !self.animation_bones,
             DebugFlag::AttackHitboxes => self.attack_hitboxes = !self.attack_hitboxes,
             DebugFlag::Hurtboxes => self.hurtboxes = !self.hurtboxes,
@@ -397,6 +413,7 @@ impl Plugin for DebugToolsPlugin {
                     .before(RunGgrsSystems)
                     .run_if(in_state(AppState::InMatch)),
             )
+            .add_systems(Startup, spawn_egui_camera)
             .add_systems(PreUpdate, restore_frame_step_time.after(RunGgrsSystems))
             .add_systems(
                 Update,
@@ -408,6 +425,26 @@ impl Plugin for DebugToolsPlugin {
     }
 }
 
+pub fn spawn_egui_camera(mut commands: Commands, mut egui_global_settings: ResMut<EguiGlobalSettings>,) {
+    egui_global_settings.auto_create_primary_context = false;
+    commands.spawn((
+        // The `PrimaryEguiContext` component requires everything needed to render a primary context.
+        PrimaryEguiContext,
+        Camera2d,
+        // Setting RenderLayers to none makes sure we won't render anything apart from the UI.
+        RenderLayers::none(),
+        Camera {
+            order: 2,
+            output_mode: CameraOutputMode::Write {
+                blend_state: Some(BlendState::ALPHA_BLENDING),
+                clear_color: ClearColorConfig::None,
+            },
+            clear_color: ClearColorConfig::Custom(Color::NONE),
+            ..default()
+        },
+    ));
+}
+
 fn player_handles(players: &Query<&Player>) -> Vec<usize> {
     let mut handles = players
         .iter()
@@ -865,6 +902,14 @@ pub fn stage_collision_enabled(settings: Res<DebugSettings>) -> bool {
     settings.stage_collision
 }
 
+pub fn blast_zones_enabled(settings: Res<DebugSettings>) -> bool {
+    settings.blast_zones
+}
+
+pub fn spawn_positions_enabled(settings: Res<DebugSettings>) -> bool {
+    settings.spawn_positions
+}
+
 pub fn animation_bones_enabled(settings: Res<DebugSettings>) -> bool {
     settings.animation_bones
 }

src/debug_tools/save_state.rs

@@ -1,22 +1,12 @@
 use bevy::prelude::*;
 
 use crate::{
-    camera::MatchCamera,
+    camera::MatchCamera, fighter::{
-    fighter::{
+        FighterECB, FighterFacingDirection, FighterHitboxes, FighterHitstop, FighterHitstopShake, FighterInvulnerabilityState, FighterPendingRespawn, FighterPreviousFacingDirection, FighterPreviousTranslation, FighterSurfaceState, FighterTranslation, FighterVelocity, animation::FighterAnimationFrame, attack::{
-        FighterECB, FighterFacingDirection, FighterHitboxes, FighterHitstop,
-        FighterPreviousFacingDirection, FighterPreviousTranslation, FighterTranslation,
-        FighterVelocity, Grounded,
-        animation::FighterAnimationFrame,
-        attack::{
             FighterDamage, FighterKnockbackVelocity, FighterPendingHitReaction, FighterPendingHits,
             FighterSolvedHurtboxes, FighterStaleMoveQueue,
-        },
+        }, baked_animation::FighterBoneMatrices, state::FighterState,
-        baked_animation::FighterBoneMatrices,
+    }, input::FighterInput, match_runtime::MatchState, player::Player, stage::line::StageCollision,
-        state::FighterState,
-    },
-    input::FighterInput,
-    player::Player,
-    stage::line::StageCollision,
 };
 
 #[derive(Resource, Default)]
@@ -29,6 +19,7 @@ struct Checkpoint {
     fighters: Vec<FighterCheckpoint>,
     stage_collision: StageCollision,
     pending_hits: FighterPendingHits,
+    match_state: MatchState,
 }
 
 #[derive(Clone)]
@@ -48,12 +39,15 @@ struct FighterCheckpoint {
     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,
+    surface: FighterSurfaceState,
+    pending_respawn: FighterPendingRespawn,
+    invulnerability_state: FighterInvulnerabilityState,
 }
 
 pub(super) fn save_or_restore(world: &mut World) {
@@ -98,10 +92,12 @@ pub(super) fn save_or_restore(world: &mut World) {
             checkpoint_fighters.push(checkpoint);
         }
         let pending_hits = world.resource::<FighterPendingHits>().clone();
+        let match_state = world.resource::<MatchState>().clone();
         world.resource_mut::<DebugSaveState>().checkpoint = Some(Checkpoint {
             fighters: checkpoint_fighters,
             stage_collision,
             pending_hits,
+            match_state,
         });
         info!("Saved debug game state");
         return;
@@ -146,19 +142,19 @@ pub(super) fn save_or_restore(world: &mut World) {
         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(saved.surface.clone());
-            entity.insert(Grounded);
+        entity.insert(saved.pending_respawn.clone());
-        } else {
+        entity.insert(saved.invulnerability_state.clone());
-            entity.remove::<Grounded>();
-        }
     }
     world.insert_resource(checkpoint.pending_hits.clone());
     world.insert_resource(checkpoint.stage_collision);
+    world.insert_resource(checkpoint.match_state);
     for mut match_camera in world.query::<&mut MatchCamera>().iter_mut(world) {
         match_camera.needs_snap = true;
     }
@@ -183,12 +179,15 @@ fn capture_fighter(world: &World, entity: Entity) -> Option<FighterCheckpoint> {
         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>(),
+        surface: fighter.get::<FighterSurfaceState>()?.clone(),
+        pending_respawn: fighter.get::<FighterPendingRespawn>()?.clone(),
+        invulnerability_state: fighter.get::<FighterInvulnerabilityState>()?.clone(),
     })
 }
 

src/fighter/animation.rs

@@ -84,6 +84,11 @@ pub enum AnimKind {
     AirDodge,
     Fall,
     Turn,
+    CrouchEnter,
+    CrouchIdle,
+    CrouchExit,
+
+    PlatformPass,
 
     FlinchGround,
     FlinchAir,
@@ -93,4 +98,5 @@ pub enum AnimKind {
     AttackUpTilt,
     AttackForwardTilt,
     AttackDownTilt,
+    AttackNeutralAir,
 }

src/fighter/attack/directional_influence.rs

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

src/fighter/attack/mod.rs

@@ -1,6 +1,7 @@
 use std::collections::{HashMap, VecDeque};
 
 mod reaction;
+pub mod directional_influence;
 
 use bevy::ecs::entity::{EntityMapper, MapEntities};
 use bevy::prelude::*;
@@ -31,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,
@@ -42,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)]
@@ -62,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 {
@@ -78,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)]
@@ -163,7 +179,7 @@ pub enum AttackKind {
 impl AttackKind {
     pub fn get_animation(&self) -> AnimKind {
         match self {
-            AttackKind::NeutralAir => AnimKind::AttackJab1,
+            AttackKind::NeutralAir => AnimKind::AttackNeutralAir,
             AttackKind::Jab => AnimKind::AttackJab1,
             AttackKind::UpTilt => AnimKind::AttackUpTilt,
             AttackKind::ForwardAir => AnimKind::AttackUpTilt,
@@ -589,7 +605,6 @@ impl Plugin for FighterAttackPlugin {
                 intersect_attacks_with_hurtboxes,
             )
                 .chain()
-                .after(crate::fighter::baked_animation::update_fighter_bone_matrices)
                 .in_set(GameplaySet::Attacks),
         );
     }

src/fighter/attack/reaction.rs

@@ -1,31 +1,24 @@
 use bevy::prelude::*;
 use bevy_ggrs::prelude::GgrsSchedule;
-use fixed_math::SinCos;
 
 use super::*;
 use crate::{
     fighter::{
-        Fighter, FighterFacingDirection, FighterHitboxes, FighterHitstop,
+        Fighter, FighterFacingDirection, FighterHitboxes, FighterHitstop, FighterHitstopShake, FighterHitstopShakeKind, FighterHitstopShakeRole, FighterPendingHitReaction, FighterStaleMoveQueue, errors::FighterErrors, manifest::FighterManifest, state::FighterState,
-        FighterPendingHitReaction, FighterStaleMoveQueue, errors::FighterErrors,
+    }, game_settings::GameSettings, math::{int::FGi32}, player::Player, schedule::GameplaySet, scripting::FighterAttackScript,
-        manifest::FighterManifest,
-    },
-    game_settings::GameSettings,
-    math::{int::FGi32, vec::FGVec2},
-    player::Player,
-    schedule::GameplaySet,
-    scripting::FighterAttackScript,
 };
 
 pub fn resolve_fighter_hits(
     mut pending_hits: ResMut<FighterPendingHits>,
     mut attacker: Query<(
-        &FighterStaleMoveQueue,
+        &mut FighterStaleMoveQueue,
         &FighterFacingDirection,
-        &FighterHitboxes,
+        &mut FighterHitboxes,
         &Player,
         &mut FighterHitstop,
+        &mut FighterHitstopShake,
     )>,
-    mut receiver: Query<(&mut FighterDamage, &Fighter, &mut FighterPendingHitReaction)>,
+    mut receiver: Query<(&mut FighterDamage, &Fighter, &mut FighterPendingHitReaction, &FighterState)>,
     attack_scripts: Res<Assets<FighterAttackScript>>,
     game_settings: Res<GameSettings>,
     fighter_manifests: Res<Assets<FighterManifest>>,
@@ -40,7 +33,7 @@ pub fn resolve_fighter_hits(
             .position(|hit| hit.defender != defender)
             .map_or(hits.len(), |offset| hit_offset + offset);
 
-        let Ok((mut receiver_damage, fighter, mut pending_reaction)) = receiver.get_mut(defender)
+        let Ok((mut receiver_damage, fighter, mut pending_reaction, receiver_state)) = receiver.get_mut(defender)
         else {
             hit_offset = next_defender;
             continue;
@@ -49,7 +42,7 @@ pub fn resolve_fighter_hits(
         let damage_data = hits[hit_offset..next_defender]
             .iter()
             .filter_map(|hit| {
-                let Ok((stale_move_queue, facing_dir, _hitboxes, player, _)) =
+                let Ok((stale_move_queue, facing_dir, _, player, _, _)) =
                     attacker.get(hit.attacker)
                 else {
                     return None;
@@ -59,7 +52,6 @@ pub fn resolve_fighter_hits(
                 let damage_received = stale_move_queue
                     .get_attack_damage_multiplier(hit.attack_kind)
                     * hitbox.damage.0;
-
                 Some((
                     hit.attacker,
                     damage_received,
@@ -96,17 +88,19 @@ pub fn resolve_fighter_hits(
             } else {
                 angle
             };
-            let (sin, cos) = launch_angle.sin_cos();
+
-            let launch_direction = FGVec2::new(cos, sin);
+            // Attacker hitstop and data
             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),
+                    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)
                 },
             ));
         }
@@ -114,10 +108,23 @@ pub fn resolve_fighter_hits(
         receiver_damage.0 += total_damage_received_this_frame;
 
         for (attacker_entity, _, reaction) in &reactions {
-            let Ok((.., mut hitstop)) = attacker.get_mut(*attacker_entity) else {
+            let Ok((.., _, mut hitstop, mut hitstop_shake)) = attacker.get_mut(*attacker_entity) else {
                 continue;
             };
-            hitstop.remaining_frames = reaction.hitstop_frames.max(hitstop.remaining_frames);
+
+            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
@@ -128,6 +135,19 @@ pub fn resolve_fighter_hits(
         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(())
 }
 

src/fighter/attributes.rs

@@ -37,12 +37,16 @@ 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,
 
     pub air_dodge_duration: u32,
     pub air_dodge_velocity: FGi32,
     pub air_dodge_decay: FGi32,
+
+    pub air_dodge_intangible_duration: u32,
+    pub air_dodge_intangible_start: u32,
 }
 
 impl FighterAttributes {

src/fighter/baked_animation/asset_baking.rs

@@ -0,0 +1,468 @@
+use super::{
+    BAKED_ANIMATION_FPS,
+    runtime::{BakedAnimationClip, BakedFighterAnimations},
+};
+use crate::fighter::{animation::AnimKind, manifest::FighterManifest};
+use crate::math::fixed_transform::FixedMat4;
+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))?;
+        // `read_asset_bytes` uses the processor's processed asset source. This
+        // deliberately allows `model_path` to point at a `.blend`: the blend
+        // processor has already converted it to a hybrid GLB by this point.
+        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()
+}

src/fighter/baked_animation/mod.rs

@@ -0,0 +1,387 @@
+//! 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,
+    resample_fighter_bone_matrices, 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 serde_json::json;
+    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) = test_gltf(&manifest.animations);
+        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());
+    }
+
+    /// Builds the smallest glTF document that still exercises the complete
+    /// animation-baking path. Keeping this fixture in memory avoids making
+    /// unit tests depend on the production Blender asset or Blender itself.
+    fn test_gltf(
+        animations: &HashMap<AnimKind, String>,
+    ) -> (gltf::Document, Vec<gltf::buffer::Data>) {
+        let mut names: Vec<_> = animations.values().cloned().collect();
+        names.sort();
+        names.dedup();
+
+        let mut data = Vec::new();
+        let mut buffer_views = Vec::new();
+        let mut accessors = Vec::new();
+        let mut gltf_animations = Vec::new();
+
+        for name in names {
+            let duration: f32 = match name.as_str() {
+                "Idle_Loop_Game" => 2.0,
+                "Walk_Loop_IK_Game" | "Run_Game" => 0.533333361,
+                "Dash_Game" => 0.333333343,
+                "Jump_Land_Game" => 0.133333340,
+                "JumpB_Game" => 56.0 / 60.0,
+                _ => 0.0,
+            };
+            let input_offset = data.len();
+            data.extend_from_slice(&0.0_f32.to_le_bytes());
+            data.extend_from_slice(&duration.to_le_bytes());
+            let output_offset = data.len();
+            data.extend_from_slice(
+                &[0.0_f32, 0.0, 0.0]
+                    .into_iter()
+                    .flat_map(f32::to_le_bytes)
+                    .collect::<Vec<_>>(),
+            );
+            data.extend_from_slice(
+                &[1.0_f32, 0.0, 0.0]
+                    .into_iter()
+                    .flat_map(f32::to_le_bytes)
+                    .collect::<Vec<_>>(),
+            );
+
+            let input_view = buffer_views.len();
+            buffer_views.push(json!({
+                "buffer": 0,
+                "byteOffset": input_offset,
+                "byteLength": 8
+            }));
+            let output_view = buffer_views.len();
+            buffer_views.push(json!({
+                "buffer": 0,
+                "byteOffset": output_offset,
+                "byteLength": 24
+            }));
+            let input_accessor = accessors.len();
+            accessors.push(json!({
+                "bufferView": input_view,
+                "componentType": 5126,
+                "count": 2,
+                "type": "SCALAR",
+                "min": [0.0],
+                "max": [duration]
+            }));
+            let output_accessor = accessors.len();
+            accessors.push(json!({
+                "bufferView": output_view,
+                "componentType": 5126,
+                "count": 2,
+                "type": "VEC3"
+            }));
+            gltf_animations.push(json!({
+                "name": name,
+                "samplers": [{
+                    "input": input_accessor,
+                    "output": output_accessor,
+                    "interpolation": "LINEAR"
+                }],
+                "channels": [{
+                    "sampler": 0,
+                    "target": { "node": 0, "path": "translation" }
+                }]
+            }));
+        }
+
+        let document = json!({
+            "asset": { "version": "2.0" },
+            "scene": 0,
+            "scenes": [{ "nodes": [0] }],
+            "nodes": [{ "name": "root", "children": [1] }, { "name": "hand" }],
+            "buffers": [{ "byteLength": data.len() }],
+            "bufferViews": buffer_views,
+            "accessors": accessors,
+            "animations": gltf_animations
+        });
+        let bytes = serde_json::to_vec(&document).unwrap();
+        let gltf = gltf::Gltf::from_slice(&bytes).unwrap();
+        (gltf.document, vec![gltf::buffer::Data(data)])
+    }
+
+    #[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(
+            AnimKind::Wait,
+            &["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(
+            AnimKind::Wait,
+            &["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(AnimKind::Wait, &names, &parents, &pose, FGi32::ONE);
+        let capacities = matrices.buffer_capacities();
+        matrices.set_pose(AnimKind::Wait, &names, &parents, &pose, FGi32::ONE);
+
+        assert_eq!(capacities, matrices.buffer_capacities());
+    }
+
+    #[test]
+    fn same_frame_resample_preserves_previous_gameplay_pose() {
+        let names = ["root".into()];
+        let parents = [None];
+        let mut pose_a = FixedMat4::IDENTITY;
+        pose_a.translate(FGVec3::lit("1", "0", "0"));
+        let mut pose_b = FixedMat4::IDENTITY;
+        pose_b.translate(FGVec3::lit("2", "0", "0"));
+        let mut snapped_pose = FixedMat4::IDENTITY;
+        snapped_pose.translate(FGVec3::lit("3", "0", "0"));
+        let mut matrices = FighterBoneMatrices::default();
+
+        matrices.set_pose(AnimKind::Wait, &names, &parents, &[pose_a], FGi32::ONE);
+        matrices.set_pose(AnimKind::Wait, &names, &parents, &[pose_b], FGi32::ONE);
+        matrices.resample_pose(
+            AnimKind::Landing,
+            &names,
+            &parents,
+            &[snapped_pose],
+            FGi32::ONE,
+        );
+
+        assert_eq!(matrices.get_index(0), Some((pose_a, snapped_pose)));
+    }
+
+    #[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(
+            AnimKind::Wait,
+            &["root".into(), "hand".into()],
+            &[None, Some(0)],
+            &[root, hand],
+            FGi32::lit("10"),
+        );
+        assert_eq!(matrices.local(1), Some(hand));
+        assert_eq!(
+            matrices.get_current("hand").unwrap().get_translation(),
+            FGVec3::lit("10", "20", "0")
+        );
+    }
+
+    #[test]
+    fn fixed_matrix_transforms_points() {
+        let transform = FixedMat4 {
+            cols: [
+                [FGi32::lit("2"), FGi32::ZERO, FGi32::ZERO, FGi32::ZERO],
+                [FGi32::ZERO, FGi32::lit("3"), FGi32::ZERO, FGi32::ZERO],
+                [FGi32::ZERO, FGi32::ZERO, FGi32::lit("4"), FGi32::ZERO],
+                [
+                    FGi32::lit("10"),
+                    FGi32::lit("-5"),
+                    FGi32::lit("1.5"),
+                    FGi32::ONE,
+                ],
+            ],
+        };
+        assert_eq!(
+            transform.transform_point(FGVec3::lit("1.25", "-2", "0.5")),
+            FGVec3::lit("12.5", "-11", "3.5")
+        );
+    }
+
+    #[test]
+    fn fixed_matrix_rotates_points_around_y() {
+        let transform = FixedMat4 {
+            cols: [
+                [FGi32::ONE, FGi32::ZERO, FGi32::ZERO, FGi32::ZERO],
+                [FGi32::ZERO, FGi32::ONE, FGi32::ZERO, FGi32::ZERO],
+                [FGi32::ZERO, FGi32::ZERO, FGi32::ONE, FGi32::ZERO],
+                [
+                    FGi32::lit("10"),
+                    FGi32::lit("2"),
+                    FGi32::lit("-3"),
+                    FGi32::ONE,
+                ],
+            ],
+        };
+        assert_eq!(
+            transform
+                .rotate_y(5)
+                .transform_point(FGVec3::lit("1", "0", "0")),
+            FGVec3::lit("10", "2", "-4")
+        );
+    }
+
+    #[test]
+    fn fixed_matrix_builders_set_euler_rotation_and_translation() {
+        let transform = FixedMat4::IDENTITY
+            .with_rotation(FGVec3::lit("0", "0", "1.5707963267948966"))
+            .with_translation(FGVec3::lit("10", "2", "-3"));
+        assert_eq!(
+            transform.transform_point(FGVec3::lit("1", "0", "0")),
+            FGVec3::lit("10", "3", "-3")
+        );
+        assert_eq!(transform.get_translation(), FGVec3::lit("10", "2", "-3"));
+    }
+
+    #[test]
+    fn fixed_matrix_rotation_builder_preserves_translation() {
+        let transform = FixedMat4::IDENTITY
+            .with_translation(FGVec3::lit("4", "5", "6"))
+            .with_rotation(FGVec3::lit("0", "0", "1.5707963267948966"));
+        assert_eq!(transform.get_translation(), FGVec3::lit("4", "5", "6"));
+    }
+}

src/fighter/baked_animation/runtime.rs

@@ -0,0 +1,364 @@
+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>>,
+    presentation_kind: Option<AnimKind>,
+}
+
+#[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_by_idx(&self, index: usize) -> Option<(FixedMat4, FixedMat4)> {
+        Some((
+            *self.previous_frame_matrices.get(index)?,
+            *self.matrices.get(index)?,
+        ))
+    }
+    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,
+        kind: AnimKind,
+        bone_names: &[String],
+        parents: &[Option<usize>],
+        local: &[FixedMat4],
+        model_scale: FGi32,
+    ) {
+        self.sample_pose(kind, bone_names, parents, local, model_scale, true);
+    }
+    pub(super) fn resample_pose(
+        &mut self,
+        kind: AnimKind,
+        bone_names: &[String],
+        parents: &[Option<usize>],
+        local: &[FixedMat4],
+        model_scale: FGi32,
+    ) {
+        self.sample_pose(kind, bone_names, parents, local, model_scale, false);
+    }
+    fn sample_pose(
+        &mut self,
+        kind: AnimKind,
+        bone_names: &[String],
+        parents: &[Option<usize>],
+        local: &[FixedMat4],
+        model_scale: FGi32,
+        advance_history: bool,
+    ) {
+        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());
+        if advance_history {
+            std::mem::swap(&mut self.matrices, &mut self.previous_frame_matrices);
+            std::mem::swap(&mut self.local_matrices, &mut self.previous_local_matrices);
+        }
+        let animation_changed = self.presentation_kind != Some(kind);
+        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"))
+            }),
+        );
+        // A state transition is a discontinuity, not an animation frame to
+        // interpolate from the previous clip.  Keep the presentation pose at
+        // the new clip's first/current frame immediately.
+        if animation_changed {
+            self.previous_local_matrices
+                .clone_from(&self.local_matrices);
+        }
+        self.presentation_kind = Some(kind);
+    }
+}
+
+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 {
+        sample_fighter_bone_matrices(
+            frame,
+            animations,
+            fighter,
+            &mut matrices,
+            &mut bone_indices,
+            &baked_assets,
+            &manifests,
+            true,
+        );
+    }
+}
+
+/// Resamples the current pose after collision-driven state transitions without
+/// advancing the previous-frame pose used for swept gameplay volumes.
+pub fn resample_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 {
+        sample_fighter_bone_matrices(
+            frame,
+            animations,
+            fighter,
+            &mut matrices,
+            &mut bone_indices,
+            &baked_assets,
+            &manifests,
+            false,
+        );
+    }
+}
+
+fn sample_fighter_bone_matrices(
+    frame: &FighterAnimationFrame,
+    animations: &FighterAnimations,
+    fighter: &Fighter,
+    matrices: &mut FighterBoneMatrices,
+    bone_indices: &mut FighterBoneIndexMap,
+    baked_assets: &Assets<BakedFighterAnimations>,
+    manifests: &Assets<FighterManifest>,
+    advance_history: bool,
+) {
+    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");
+    if advance_history {
+        matrices.set_pose(
+            frame.kind,
+            &baked.bone_names,
+            &baked.parents,
+            pose,
+            manifest.model_scale,
+        );
+    } else {
+        matrices.resample_pose(
+            frame.kind,
+            &baked.bone_names,
+            &baked.parents,
+            pose,
+            manifest.model_scale,
+        );
+    }
+    if bone_indices.0.is_empty() {
+        bone_indices.0.extend(
+            baked
+                .bone_names
+                .iter()
+                .enumerate()
+                .map(|(index, name)| (name.clone(), index)),
+        );
+    }
+}
+
+fn resolve_model_transform(
+    index: usize,
+    parents: &[Option<usize>],
+    local: &[FixedMat4],
+    model: &mut [Option<FixedMat4>],
+) -> std::io::Result<FixedMat4> {
+    if let Some(value) = model[index] {
+        return Ok(value);
+    }
+    let value = match parents[index] {
+        Some(parent) => resolve_model_transform(parent, parents, local, model)?.mul(local[index]),
+        None => local[index],
+    };
+    model[index] = Some(value);
+    Ok(value)
+}
+
+pub(super) fn interpolate_transform(
+    previous: FixedMat4,
+    current: FixedMat4,
+    factor: f32,
+) -> Transform {
+    let (previous_scale, previous_rotation, previous_translation) =
+        previous.to_mat4().to_scale_rotation_translation();
+    let (current_scale, current_rotation, current_translation) =
+        current.to_mat4().to_scale_rotation_translation();
+    let factor = factor.clamp(0.0, 1.0);
+    Transform {
+        translation: previous_translation.lerp(current_translation, factor),
+        rotation: previous_rotation.slerp(current_rotation, factor),
+        scale: previous_scale.lerp(current_scale, factor),
+    }
+}

src/fighter/baked_animation/visual_binding.rs

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

src/fighter/blast_zones.rs

@@ -0,0 +1,36 @@
+//! Various interactions with the blast zones
+
+use bevy::prelude::*;
+
+use crate::{fighter::{FighterPendingRespawn, FighterTranslation, state::FighterState}, match_loading::MatchConfig, stage::manifest::{StageManifest, StageManifestRegistry}};
+
+pub fn apply_blast_zones(
+    stage_registry: Res<StageManifestRegistry>,
+    stage_manifests: Res<Assets<StageManifest>>,
+    match_config: Res<MatchConfig>,
+    fighters: Query<(&FighterTranslation, &mut FighterPendingRespawn, &FighterState)>
+) {
+    let Some(stage_manifest_handle) = stage_registry.get(match_config.stage) else {
+        return;
+    };
+
+    let Some(stage_manifest) = stage_manifests.get(&stage_manifest_handle) else {
+        return;
+    };
+
+    for (translation, mut pending_respawn, state) in fighters {
+        let is_off_the_left = translation.x < stage_manifest.blast_zone_top_left.x;
+        let is_off_the_right = translation.x > stage_manifest.blast_zone_bottom_right.x;
+        let is_off_the_top = translation.y > stage_manifest.blast_zone_top_left.y;
+        let is_off_the_bottom = translation.y < stage_manifest.blast_zone_bottom_right.y;
+        
+        if is_off_the_left || is_off_the_bottom || is_off_the_right {
+            pending_respawn.0 = true;
+        } else if is_off_the_top {
+            let is_in_hitstun = matches!(state, FighterState::Hitstun(..));
+            if is_in_hitstun {
+                pending_respawn.0 = true;
+            }
+        }
+    }
+}

src/fighter/collision.rs

@@ -4,7 +4,7 @@ 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::{StageCollision, StageLineID};
+use crate::stage::line::{StageCollision, StageLineID, StagePolyType};
 /*
 pub fn collide_fighter_with_scene(
     fighters: Query<(&FighterECB, &mut FighterVelocity, &mut FighterTranslation)>,
@@ -44,17 +44,25 @@ pub fn air_collide_with_stage(
     prev_ecb: &FighterPreviousECB,
     ecb: &FighterECB,
     stage_collision: &StageCollision,
+    ignored_polys: &[usize],
+    can_ignore_soft_platforms: bool,
 ) -> Option<AirCollisionWithStageResult> {
     let ray_segment = FGSegment2d::new(
         prev_translation.0 + prev_ecb.get_bottom_point(),
         translation.0 + ecb.get_bottom_point(),
     );
 
-    let mut intersect_results = vec![];
+    stage_collision
-
+        .stage_polys
-    for (poly_idx, poly) in stage_collision.stage_polys.iter().enumerate() {
+        .iter()
-        if let Some(intersect_result) = poly.intersect_ray(ray_segment) {
+        .enumerate()
-            intersect_results.push((
+        .filter(|(poly_idx, poly)| {
+            !ignored_polys.contains(poly_idx)
+                && !(can_ignore_soft_platforms && matches!(poly.poly_type, StagePolyType::Platform))
+        })
+        .filter_map(|(poly_idx, poly)| {
+            poly.intersect_ray(ray_segment).map(|intersect_result| {
+                (
                     AirCollisionWithStageResult {
                         line_id: {
                             StageLineID {
@@ -68,13 +76,155 @@ pub fn air_collide_with_stage(
                     intersect_result
                         .position
                         .distance_squared(ray_segment.point2()),
-            ));
+                )
+            })
+        })
+        .max_by(|(_, a), (_, b)| a.cmp(b))
+        .map(|(result, _)| result)
 }
-    }
-    intersect_results.sort_by(|(_, a), (_, b)| a.cmp(b));
 
-    intersect_results
+#[cfg(test)]
-        .iter()
+mod tests {
-        .last()
+    use super::*;
-        .map(|(val, _)| val.to_owned().clone())
+    use crate::fighter::ecb::{FighterECB, FighterPreviousECB};
+    use crate::stage::line::{StagePoly, StagePolyLineSegmentType, StagePolyType};
+
+    fn horizontal_platform(y: &str) -> StagePoly {
+        StagePoly::build(
+            StagePolyType::Platform,
+            &[
+                (FGVec2::lit("-2", y), StagePolyLineSegmentType::Floor),
+                (FGVec2::lit("2", y), StagePolyLineSegmentType::Floor),
+            ],
+        )
+    }
+
+    fn solid_floor() -> StagePoly {
+        StagePoly::build(
+            StagePolyType::Closed,
+            &[
+                (FGVec2::lit("-2", "0"), StagePolyLineSegmentType::Floor),
+                (FGVec2::lit("2", "0"), StagePolyLineSegmentType::Floor),
+                (FGVec2::lit("2", "-2"), StagePolyLineSegmentType::Wall),
+                (FGVec2::lit("-2", "-2"), StagePolyLineSegmentType::Wall),
+            ],
+        )
+    }
+
+    #[test]
+    fn airborne_collision_skips_ignored_polygons() {
+        let stage_collision = StageCollision {
+            stage_polys: vec![horizontal_platform("0"), horizontal_platform("1")],
+        };
+        let previous_translation = FighterPreviousTranslation(FGVec2::lit("0", "2"));
+        let translation = FighterTranslation(FGVec2::lit("0", "-1"));
+        let previous_ecb = FighterPreviousECB {
+            bottom: FGVec2::ZERO,
+            top: FGVec2::ZERO,
+            left: FGVec2::ZERO,
+            right: FGVec2::ZERO,
+        };
+        let ecb = FighterECB {
+            bottom: FGVec2::ZERO,
+            top: FGVec2::ZERO,
+            left: FGVec2::ZERO,
+            right: FGVec2::ZERO,
+        };
+
+        let collision = air_collide_with_stage(
+            &previous_translation,
+            &translation,
+            &previous_ecb,
+            &ecb,
+            &stage_collision,
+            &[1],
+            false,
+        )
+        .expect("the non-ignored platform should still be collidable");
+
+        assert_eq!(collision.line_id.polygon, 0);
+        assert_eq!(collision.hit_position, FGVec2::lit("0", "0"));
+    }
+
+    #[test]
+    fn airborne_collision_skips_soft_platforms_while_passing_down() {
+        let stage_collision = StageCollision {
+            stage_polys: vec![horizontal_platform("0")],
+        };
+        let previous_translation = FighterPreviousTranslation(FGVec2::lit("0", "2"));
+        let translation = FighterTranslation(FGVec2::lit("0", "-1"));
+        let previous_ecb = FighterPreviousECB {
+            bottom: FGVec2::ZERO,
+            top: FGVec2::ZERO,
+            left: FGVec2::ZERO,
+            right: FGVec2::ZERO,
+        };
+        let ecb = FighterECB {
+            bottom: FGVec2::ZERO,
+            top: FGVec2::ZERO,
+            left: FGVec2::ZERO,
+            right: FGVec2::ZERO,
+        };
+
+        assert!(air_collide_with_stage(
+            &previous_translation,
+            &translation,
+            &previous_ecb,
+            &ecb,
+            &stage_collision,
+            &[],
+            true,
+        )
+        .is_none());
+
+        assert_eq!(
+            air_collide_with_stage(
+                &previous_translation,
+                &translation,
+                &previous_ecb,
+                &ecb,
+                &stage_collision,
+                &[],
+                false,
+            )
+            .expect("air dodges still collide with soft platforms")
+            .hit_position,
+            FGVec2::lit("0", "0")
+        );
+    }
+
+    #[test]
+    fn airborne_collision_still_hits_solid_floors_while_passing_down() {
+        let stage_collision = StageCollision {
+            stage_polys: vec![solid_floor()],
+        };
+        let previous_translation = FighterPreviousTranslation(FGVec2::lit("0", "2"));
+        let translation = FighterTranslation(FGVec2::lit("0", "-1"));
+        let previous_ecb = FighterPreviousECB {
+            bottom: FGVec2::ZERO,
+            top: FGVec2::ZERO,
+            left: FGVec2::ZERO,
+            right: FGVec2::ZERO,
+        };
+        let ecb = FighterECB {
+            bottom: FGVec2::ZERO,
+            top: FGVec2::ZERO,
+            left: FGVec2::ZERO,
+            right: FGVec2::ZERO,
+        };
+
+        let collision = air_collide_with_stage(
+            &previous_translation,
+            &translation,
+            &previous_ecb,
+            &ecb,
+            &stage_collision,
+            &[],
+            true,
+        )
+        .expect("solid floors remain collidable while passing down");
+
+        assert_eq!(collision.line_id.polygon, 0);
+        assert_eq!(collision.hit_position, FGVec2::lit("0", "0"));
+    }
 }

src/fighter/debug.rs

@@ -1,32 +1,32 @@
 //! Fighter debug views: gizmos and the egui inspector window.
 
-use std::sync::OnceLock;
 
-use bevy::color::palettes::css::ORANGE;
+use bevy::color::palettes::css::{ORANGE, ORANGE_RED, WHITE};
-use bevy::{color::palettes::css::YELLOW, prelude::*};
+use bevy::prelude::*;
-use bevy_egui::{EguiContexts, egui};
+use bevy_egui::{egui, EguiContexts};
 
 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};
 use crate::fighter::ecb::FighterPreviousECB;
 use crate::fighter::errors::FighterErrors;
-use crate::fighter::hurtbox::FixedAffineCapsule;
 use crate::fighter::manifest::FighterManifest;
-use crate::fighter::state::{FighterState, air};
+use crate::fighter::state::{air, FighterState};
 use crate::fighter::visual::FighterAnimations;
 use crate::fighter::{
     Fighter, FighterECB, FighterFacingDirection, FighterHitboxes, FighterPreviousTranslation,
     FighterTranslation, FighterVelocity,
 };
+use crate::filled_gizmos::FilledGizmos;
 use crate::game_settings::GameSettings;
 use crate::input::FighterInput;
 use crate::math::int::FGi32;
 use crate::math::vec::FGVec2;
+use crate::math::vec3::FGVec3;
 use crate::player::Player;
 
 pub fn debug_draw_ecb(
@@ -37,17 +37,27 @@ pub fn debug_draw_ecb(
         &FighterPreviousTranslation,
     )>,
     mut gizmos: Gizmos,
+    mut filled_gizmos: FilledGizmos,
 ) {
     for (ecb, trf, ecb_prev, trf_prev) in ecbs {
+        gizmos.cross(
+            FGVec3::new(trf.0.x, trf.0.y, FGi32::ZERO).to_vec3(),
+            2.0,
+            bevy::color::palettes::css::BLUE,
+        );
+
+        let prev_transformed = ecb_prev.to_3d_lineloop(Transform::from_xyz(
+            trf_prev.x.to_num::<f32>(),
+            trf_prev.y.to_num(),
+            0.0,
+        ));
+        filled_gizmos.polygon(&prev_transformed, ORANGE_RED);
+
         let transformed =
             ecb.to_3d_lineloop(Transform::from_xyz(trf.x.to_num(), trf.y.to_num(), 0.0));
-        gizmos.lineloop(transformed, YELLOW);
+        filled_gizmos.polygon(&transformed, ORANGE);
-        let prev_transformed = ecb_prev.to_3d_lineloop(Transform::from_xyz(
+        gizmos.lineloop(transformed, WHITE);
-            trf_prev.x.to_num(),
+
-            trf_prev.y.to_num(),
-            -0.1,
-        ));
-        gizmos.lineloop(prev_transformed, ORANGE);
     }
 }
 pub fn fighter_debug(
@@ -153,10 +163,17 @@ pub fn fighter_debug(
     Ok(())
 }
 
-pub fn animation_debug(query: Query<(&GlobalTransform, &FighterBoneMatrices)>, mut gizmos: Gizmos) {
+pub fn animation_debug(
-    for (global_transform, matrices) in query {
+    query: Query<(
-        let (_, rotation, translation) = global_transform.to_scale_rotation_translation();
+        &FighterTranslation,
-        let marker_transform = Transform::from_translation(translation).with_rotation(rotation);
+        &FighterFacingDirection,
+        &FighterBoneMatrices,
+    )>,
+    mut gizmos: Gizmos,
+) {
+    for (global_transform, facing_dir, matrices) in query {
+        let global_transform = global_transform.get_3d_transform(facing_dir);
+        let marker_transform = global_transform.to_mat4();
         for (_, matrix) in matrices.iter() {
             let pos = marker_transform.transform_point(Vec3::new(
                 matrix.cols[3][0].to_num(),
@@ -169,15 +186,23 @@ pub fn animation_debug(query: Query<(&GlobalTransform, &FighterBoneMatrices)>, m
     }
 }
 
-pub fn hurtbox_debug(query: Query<&FighterSolvedHurtboxes>, mut gizmos: Gizmos) {
+pub fn hurtbox_debug(
+    query: Query<&FighterSolvedHurtboxes>,
+    mut filled_gizmos: FilledGizmos,
+) {
     for hurtboxes in &query {
         for hurtbox in &hurtboxes.0 {
-            draw_affine_capsule(&mut gizmos, hurtbox.capsule, YELLOW);
+            filled_gizmos.affine_capsule(
+                hurtbox.capsule.transform.to_mat4(),
+                hurtbox.capsule.radius.to_num(),
+                hurtbox.capsule.half_length.to_num(),
+                Color::srgba(1.0, 1.0, 0.0, 0.75),
+            );
         }
     }
 }
 
-fn draw_affine_capsule(
+/*fn draw_affine_capsule(
     gizmos: &mut Gizmos,
     capsule: FixedAffineCapsule,
     color: impl Into<Color> + Copy,
@@ -199,9 +224,9 @@ fn draw_affine_capsule(
     for &(start, end) in &wireframe.lines {
         gizmos.line(vertices[start], vertices[end], color);
     }
-}
+}*/
 
-struct CapsuleWireVertex {
+/*struct CapsuleWireVertex {
     direction: Vec3,
     center_sign: f32,
 }
@@ -209,9 +234,9 @@ struct CapsuleWireVertex {
 struct CapsuleWireframe {
     vertices: Vec<CapsuleWireVertex>,
     lines: Vec<(usize, usize)>,
-}
+}*/
 
-fn capsule_wireframe() -> &'static CapsuleWireframe {
+/*fn capsule_wireframe() -> &'static CapsuleWireframe {
     const RESOLUTION: usize = 16;
     const HEMISPHERE_STEPS: usize = 4;
     static WIREFRAME: OnceLock<CapsuleWireframe> = OnceLock::new();
@@ -292,7 +317,7 @@ fn capsule_wireframe() -> &'static CapsuleWireframe {
 
         CapsuleWireframe { vertices, lines }
     })
-}
+}*/
 
 #[cfg(test)]
 mod capsule_debug_tests {
@@ -312,7 +337,7 @@ mod capsule_debug_tests {
         assert!(marker.abs_diff_eq(Vec3::new(3.0, 4.0, 3.0), 1e-5));
     }
 
-    #[test]
+    /*#[test]
     fn capsule_wireframe_caps_extend_in_opposite_directions() {
         let wireframe = capsule_wireframe();
         let lower: Vec<_> = wireframe
@@ -330,7 +355,7 @@ mod capsule_debug_tests {
         assert!(upper.iter().all(|vertex| vertex.direction.y >= 0.0));
         assert!(lower.iter().any(|vertex| vertex.direction == Vec3::NEG_Y));
         assert!(upper.iter().any(|vertex| vertex.direction == Vec3::Y));
-    }
+    }*/
 }
 
 pub fn attack_debug(
@@ -342,6 +367,7 @@ pub fn attack_debug(
         &FighterAnimationFrame,
     )>,
     mut gizmos: Gizmos,
+    mut filled_gizmos: FilledGizmos,
 ) {
     for (hitboxes, _matrices, _translation, _facing_direction, _frame) in query {
         if let Some(active_attack) = &hitboxes.0 {
@@ -368,6 +394,12 @@ pub fn attack_debug(
                     capsule_draw_trf.to_isometry(),
                     bevy::color::palettes::css::RED,
                 );
+                filled_gizmos.capsule(
+                    capsule_draw_trf.to_isometry(),
+                    solved_hitbox.capsule.radius.to_num(),
+                    length * 0.5,
+                    Color::srgba(1.0, 0.0, 0.0, 0.18),
+                );
 
                 gizmos.cross(start, 1.0, bevy::color::palettes::css::GREEN);
                 gizmos.cross(end, 1.0, bevy::color::palettes::css::GREEN);
@@ -382,14 +414,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 +429,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 +444,7 @@ pub fn attack_debug_gather(
         points.reserve(hit.hitstun_frames as usize);
 
         for _ in 1..hit.hitstun_frames {
-            air::integrate_gravity(&mut fighter_vel, &manifest.attributes);
+            air::integrate_gravity(&mut fighter_vel, &manifest.attributes, false);
 
             let vel = knockback_vel.length();
             let new_vel = vel

src/fighter/ecb.rs

@@ -1,28 +1,44 @@
 use bevy::prelude::*;
 
-use crate::math::{int::FGi32, vec::FGVec2};
+use crate::{
+    fighter::{
+        FighterFacingDirection, FighterSurfaceState, FighterTranslation,
+        baked_animation::FighterBoneMatrices,
+    }, math::{int::FGi32, vec::FGVec2},
+};
 
 /// Environment collision box: the diamond used to resolve a fighter against
 /// the stage. Purely geometry — the collision response lives in
 /// [`super::collision`].
-#[derive(Component, Debug, Clone, Copy, Hash)]
+#[derive(Component, Debug, Clone, Copy, Hash, Default)]
 #[require(FighterPreviousECB)]
 pub struct FighterECB {
-    pub vertical_half: FGi32,
+    pub top: FGVec2,
-    pub horizontal_half: FGi32,
+    pub bottom: FGVec2,
+    pub left: FGVec2,
+    pub right: FGVec2,
+}
+
+#[derive(Component, Debug, Clone)]
+pub struct FighterECBBoneIndices {
+    pub indices: Vec<usize>,
 }
 
 #[derive(Component, Debug, Clone, Copy, Default, Hash)]
 pub struct FighterPreviousECB {
-    pub vertical_half: FGi32,
+    pub top: FGVec2,
-    pub horizontal_half: FGi32,
+    pub bottom: FGVec2,
+    pub left: FGVec2,
+    pub right: FGVec2,
 }
 
 impl From<FighterECB> for FighterPreviousECB {
     fn from(ecb: FighterECB) -> Self {
         Self {
-            vertical_half: ecb.vertical_half,
+            top: ecb.top,
-            horizontal_half: ecb.horizontal_half,
+            bottom: ecb.bottom,
+            left: ecb.left,
+            right: ecb.right,
         }
     }
 }
@@ -35,53 +51,85 @@ pub fn snapshot_fighter_ecb(fighters: Query<(&FighterECB, &mut FighterPreviousEC
 
 impl FighterECB {
     pub fn to_3d_lineloop(&self, trf: Transform) -> [Vec3; 4] {
-        let rel_up = trf.transform_point(Vec3::new(
+        [self.top, self.right, self.bottom, self.left]
-            0.0,
+            .map(|point| trf.transform_point(Vec3::new(point.x.to_num(), point.y.to_num(), 0.0)))
-            (self.vertical_half + self.vertical_half).to_num(),
-            0.0,
-        ));
-        let rel_down = trf.transform_point(Vec3::new(0.0, 0.0, 0.0));
-        let rel_left = trf.transform_point(Vec3::new(
-            (-self.horizontal_half).to_num(),
-            self.vertical_half.to_num(),
-            0.0,
-        ));
-        let rel_right = trf.transform_point(Vec3::new(
-            self.horizontal_half.to_num(),
-            self.vertical_half.to_num(),
-            0.0,
-        ));
-        [rel_up, rel_right, rel_down, rel_left]
     }
 
     pub fn get_bottom_point(&self) -> FGVec2 {
-        FGVec2::new(FGi32::ZERO, FGi32::ZERO)
+        self.bottom
     }
 }
 
 impl FighterPreviousECB {
     pub fn to_3d_lineloop(&self, trf: Transform) -> [Vec3; 4] {
-        let rel_up = trf.transform_point(Vec3::new(
+        [self.top, self.right, self.bottom, self.left]
-            0.0,
+            .map(|point| trf.transform_point(Vec3::new(point.x.to_num(), point.y.to_num(), 0.0)))
-            (self.vertical_half + self.vertical_half).to_num(),
-            0.0,
-        ));
-        let rel_down = trf.transform_point(Vec3::new(0.0, 0.0, 0.0));
-        let rel_left = trf.transform_point(Vec3::new(
-            (-self.horizontal_half).to_num(),
-            self.vertical_half.to_num(),
-            0.0,
-        ));
-        let rel_right = trf.transform_point(Vec3::new(
-            self.horizontal_half.to_num(),
-            self.vertical_half.to_num(),
-            0.0,
-        ));
-        [rel_up, rel_right, rel_down, rel_left]
     }
 
     pub fn get_bottom_point(&self) -> FGVec2 {
-        FGVec2::new(FGi32::ZERO, FGi32::ZERO)
+        self.bottom
+    }
+}
+
+pub fn update_ecb(
+    query: Query<(
+        &mut FighterECB,
+        &FighterSurfaceState,
+        &FighterECBBoneIndices,
+        &FighterBoneMatrices,
+        &FighterTranslation,
+        &FighterFacingDirection,
+    )>,
+) {
+    for (mut ecb, surface_state, bone_indices, bone_matrices, translation, facing_dir) in query {
+        let trf = translation.get_3d_transform(facing_dir);
+
+        let transformed_ecb_bones = bone_indices.indices.iter().filter_map(|idx| {
+            let Some((_, bone_matrix)) = bone_matrices.get_by_idx(*idx) else {
+                return None;
+            };
+
+            let pt = trf.transform_point(bone_matrix.get_translation());
+
+            Some(FGVec2::new(pt.x, pt.y) - translation.0)
+        }).collect::<Vec<_>>();
+
+        let max_x = transformed_ecb_bones.iter().max_by(|a, b| a.x.cmp(&b.x)).map(|final_val| final_val.x).unwrap_or(FGi32::lit("0.5"));
+        let min_x = transformed_ecb_bones.iter().min_by(|a, b| a.x.cmp(&b.x)).map(|final_val| final_val.x).unwrap_or(FGi32::lit("-0.5"));
+        let max_y = transformed_ecb_bones.iter().max_by(|a, b| a.y.cmp(&b.y)).map(|final_val| final_val.y).unwrap_or(FGi32::lit("0.5"));
+        let min_y = transformed_ecb_bones.iter().min_by(|a, b| a.y.cmp(&b.y)).map(|final_val| final_val.y).unwrap_or(FGi32::lit("-0.5"));
+
+        let midpoint_height = (max_y + min_y) / FGi32::lit("2.0");
+        let top = FGVec2::new(FGi32::ZERO, max_y);
+        let bottom = FGVec2::new(FGi32::ZERO, min_y);
+        let left = FGVec2::new(min_x, midpoint_height);
+        let right = FGVec2::new(max_x, midpoint_height);
+
+        let ecb_lock_frames_remaining = if let FighterSurfaceState::Airborne { ecb_lock_frames_remaining, .. } = surface_state {
+            *ecb_lock_frames_remaining
+        } else {
+            0
+        };
+
+        ecb.top = top;
+
+        if ecb_lock_frames_remaining == 0 {
+            ecb.bottom = bottom;
+        }
+
+        ecb.left = left;
+        ecb.right = right;
+
+        if surface_state.is_grounded() {
+            ecb.bottom = FGVec2::ZERO;
+        }
+    }
+}
+
+pub fn decrement_ecb_lockout(surface_states: Query<&mut FighterSurfaceState>) {
+    for mut state in surface_states {
+        state.tick_ecb_lock();
+        state.tick_ignored_polygons();
     }
 }
 
@@ -92,12 +140,16 @@ mod tests {
     #[test]
     fn previous_ecb_copies_current_dimensions() {
         let current = FighterECB {
-            vertical_half: FGi32::lit("0.5"),
+            bottom: FGVec2::lit("0.0", "-0.5"),
-            horizontal_half: FGi32::lit("0.25"),
+            top: FGVec2::lit("0.0", "0.5"),
+            left: FGVec2::lit("-0.5", "0.0"),
+            right: FGVec2::lit("0.5", "0.0"),
         };
         let previous = FighterPreviousECB::from(current);
 
-        assert_eq!(previous.vertical_half, current.vertical_half);
+        assert_eq!(previous.top, current.top);
-        assert_eq!(previous.horizontal_half, current.horizontal_half);
+        assert_eq!(previous.bottom, current.bottom);
+        assert_eq!(previous.left, current.left);
+        assert_eq!(previous.right, current.right);
     }
 }

src/fighter/manifest.rs

@@ -65,6 +65,7 @@ pub struct FighterManifest {
     pub animations: HashMap<AnimKind, String>,
     pub attack_scripts: HashMap<AttackKind, String>,
     pub hurtboxes: Vec<FighterHurtbox>,
+    pub ecb_bones: Vec<String>,
 }
 
 #[derive(Resource)]

src/fighter/mod.rs

@@ -18,7 +18,9 @@ pub mod hurtbox;
 pub mod manifest;
 pub mod motion;
 pub mod state;
+pub mod surface;
 pub mod visual;
+pub mod blast_zones;
 
 // The fighter components are re-exported so the rest of the crate can say
 // `fighter::FighterVelocity` without caring which file it lives in. Named
@@ -28,29 +30,19 @@ pub use attributes::FighterAttributes;
 pub use ecb::FighterECB;
 pub use manifest::FighterId;
 pub use motion::{
-    FighterPreviousFacingDirection, FighterPreviousTranslation, FighterTranslation,
+    FighterPresentationSnap, FighterPreviousFacingDirection, FighterPreviousTranslation,
-    FighterVelocity, Grounded,
+    FighterTranslation, FighterVelocity,
 };
+pub use surface::FighterSurfaceState;
 
 use crate::{
-    AppState,
+    AppState, fighter::{
-    fighter::{
         attack::{
             AttackKind, FighterAttackPlugin, FighterAttackScriptAssets, FighterDamage,
             FighterKnockbackVelocity, FighterPendingHitReaction, FighterSolvedHurtboxes,
             FighterStaleMoveQueue,
-        },
+        }, baked_animation::{FighterBoneIndexMap, FighterBoneMatrices}, ecb::FighterECBBoneIndices, manifest::FighterManifest, state::{FighterState, air::AirborneStateCommon, fall::FallState}, visual::{FighterAnimations, FighterInvulnerabilityVisualState},
-        baked_animation::{FighterBoneIndexMap, FighterBoneMatrices},
+    }, game_settings::GameSettings, input::FighterInput, math::{int::FGi32, vec::FGVec2}, player::Player, schedule::GameplaySet, scripting::FighterAttackScript, stage::line::StageCollision,
-        manifest::FighterManifest,
-        state::{FighterState, 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;
 
@@ -65,11 +57,42 @@ 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,
 }
 
+#[derive(Component, Default, Copy, Clone, Hash, PartialEq, Eq)]
+pub enum FighterInvulnerabilityState {
+    #[default]
+    Vulnerable,
+    Invulnerable,
+    Intangible
+}
+
 impl FighterFacingDirection {
     fn reverse(&self) -> Self {
         match self {
@@ -114,13 +137,20 @@ impl FighterFacingDirection {
 #[require(Transform)]
 pub struct FighterVisual;
 
+#[derive(Component, DerefMut, Deref, Debug, Default, Hash, Clone, Copy)]
+pub struct FighterPendingRespawn(bool);
+
 #[derive(Component)]
 #[require(
     FighterStaleMoveQueue,
     FighterDamage,
     FighterPendingHitReaction,
+    FighterPendingRespawn,
     FighterHitstop,
-    FighterKnockbackVelocity
+    FighterKnockbackVelocity,
+    FighterTranslation,
+    FighterInvulnerabilityState,
+    FighterInvulnerabilityVisualState,
 )]
 pub struct Fighter {
     pub manifest: Handle<FighterManifest>,
@@ -133,6 +163,10 @@ impl Plugin for FighterPlugin {
     fn build(&self, app: &mut App) {
         app.add_plugins(FighterAttackPlugin)
             // Every state gets a chance to interrupt itself, in priority order.
+            .add_systems(
+                GgrsSchedule,
+                motion::clear_fighter_presentation_snaps.in_set(GameplaySet::Input),
+            )
             .add_systems(
                 GgrsSchedule,
                 (
@@ -157,10 +191,15 @@ impl Plugin for FighterPlugin {
             )*/
             .add_systems(
                 GgrsSchedule,
-                state::state_collision_interrupt_system.in_set(GameplaySet::Collision),
+                (
+                    (blast_zones::apply_blast_zones, ecb::update_ecb, ecb::decrement_ecb_lockout, state::state_collision_interrupt_system).chain(),
+                    baked_animation::resample_fighter_bone_matrices,
+                )
+                    .chain()
+                    .in_set(GameplaySet::Collision),
             )
             .add_systems(
-                Update,
+                PostUpdate,
                 (
                     motion::apply_fighter_translation_to_visuals,
                     animation::apply_animation,
@@ -183,19 +222,25 @@ impl Plugin for FighterPlugin {
             .checksum_component_with_hash::<FighterTranslation>()
             .rollback_component_with_copy::<FighterPreviousTranslation>()
             .checksum_component_with_hash::<FighterPreviousTranslation>()
+            .rollback_component_with_copy::<FighterPresentationSnap>()
+            .checksum_component_with_hash::<FighterPresentationSnap>()
             .rollback_component_with_copy::<FighterPreviousFacingDirection>()
             .checksum_component_with_hash::<FighterPreviousFacingDirection>()
             .rollback_component_with_copy::<animation::FighterAnimationFrame>()
             .checksum_component_with_hash::<animation::FighterAnimationFrame>()
-            .rollback_component_with_copy::<Grounded>()
+            .rollback_component_with_clone::<FighterSurfaceState>()
-            .checksum_component_with_hash::<Grounded>()
+            .checksum_component_with_hash::<FighterSurfaceState>()
             .rollback_component_with_copy::<FighterFacingDirection>()
             .rollback_component_with_copy::<FighterDamage>()
             .checksum_component_with_hash::<FighterDamage>()
             .rollback_component_with_clone::<FighterPendingHitReaction>()
             .checksum_component_with_hash::<FighterPendingHitReaction>()
+            .rollback_component_with_copy::<FighterPendingRespawn>()
+            .checksum_component_with_hash::<FighterPendingRespawn>()
             .rollback_component_with_copy::<FighterHitstop>()
             .checksum_component_with_hash::<FighterHitstop>()
+            .rollback_component_with_copy::<FighterInvulnerabilityState>()
+            .checksum_component_with_hash::<FighterInvulnerabilityState>()
             .rollback_component_with_copy::<FighterKnockbackVelocity>()
             .checksum_component_with_hash::<FighterKnockbackVelocity>()
             .rollback_resource_with_reflect::<StageCollision>()
@@ -223,6 +268,9 @@ impl Plugin for FighterPlugin {
                     .run_if(crate::debug_tools::attack_hitboxes_enabled)
                     .run_if(in_state(AppState::InMatch)),
             )
+            .add_systems(FixedPostUpdate, 
+                visual::update_status_colors.run_if(resource_exists::<GameSettings>)
+            )
             .add_systems(
                 FixedPostUpdate,
                 debug::hurtbox_debug.run_if(crate::debug_tools::hurtboxes_enabled),
@@ -230,6 +278,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>()
@@ -245,6 +294,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)]
@@ -253,39 +303,44 @@ pub struct FighterHitboxes(pub Option<FighterActiveAttack>);
 pub fn spawn_fighter(
     commands: &mut Commands,
     player_handle: usize,
+    controller_port: usize,
     spawn_position: FGVec2,
     manifest: Handle<FighterManifest>,
     model_scale: FGi32,
     animations: FighterAnimations,
     attack_scripts: FighterAttackScriptAssets,
     visual_root: WorldAssetRoot,
+    ecb_bone_indices: Vec<usize>,
 ) -> Entity {
     commands
         .spawn((
             Name(format!("Fighter {player_handle}").into()),
             Player {
                 handle: player_handle,
+                controller_port,
             },
             Fighter { manifest: manifest },
             FighterFacingDirection::Right,
             FighterPreviousFacingDirection(FighterFacingDirection::Right),
+            FighterSurfaceState::default(),
             Transform::from_scale(Vec3::splat(model_scale.to_num())),
             (
-                FighterECB {
+                FighterECB::default(),
-                    vertical_half: FGi32::lit("5.0"),
-                    horizontal_half: FGi32::lit("2.5"),
-                },
                 FighterHitboxes::default(),
+                FighterECBBoneIndices {
+                    indices: ecb_bone_indices
+                }
             ),
             (
                 FighterVelocity::default(),
                 FighterTranslation(spawn_position),
                 FighterPreviousTranslation(spawn_position),
+                FighterPresentationSnap::default(),
             ),
             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(),
@@ -299,8 +354,9 @@ pub fn spawn_fighter(
         .id()
 }
 
-pub fn decay_hitstop(query: Query<&mut FighterHitstop>) {
+pub fn decay_hitstop(query: Query<(&mut FighterHitstop, &mut FighterHitstopShake)>) {
-    for mut hitstop in query {
+    for (mut hitstop, mut hitstop_shake) in query {
         hitstop.remaining_frames = hitstop.remaining_frames.saturating_sub(1);
+        hitstop_shake.remaining_frames = hitstop_shake.remaining_frames.saturating_sub(1);
     }
 }

src/fighter/motion.rs

@@ -5,23 +5,27 @@ 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},
+    fighter::{FighterFacingDirection, baked_animation::FixedMat4},
     math::{int::FGi32, vec::FGVec2, vec3::FGVec3},
 };
 
 #[derive(Component, Clone, Copy, Hash)]
 pub struct FighterPreviousFacingDirection(pub FighterFacingDirection);
 
-#[derive(Component, Clone, Copy, Hash)]
-pub struct Grounded;
-
 #[derive(Component, Deref, DerefMut, Default, Debug, Clone, Copy, Hash)]
 pub struct FighterVelocity(pub FGVec2);
 
 #[derive(Component, Deref, DerefMut, Default, Clone, Copy, Hash)]
 pub struct FighterPreviousTranslation(pub FGVec2);
 
+/// Marks a simulation frame whose position changed discontinuously for
+/// presentation purposes (for example, a landing correction).
+#[derive(Component, Default, Clone, Copy, Hash, Debug, PartialEq, Eq)]
+pub struct FighterPresentationSnap(pub bool);
+
 #[derive(Component, Deref, DerefMut, Default, Clone, Copy, Hash)]
 #[require(FighterPreviousTranslation)]
 pub struct FighterTranslation(pub FGVec2);
@@ -53,30 +57,84 @@ pub fn sample_presentation_translation(
     }
 }
 
+pub fn sample_presentation_translation_with_snap(
+    previous: FighterPreviousTranslation,
+    current: FighterTranslation,
+    overstep_fraction: f32,
+    mode: PresentationMotionMode,
+    snapped: FighterPresentationSnap,
+) -> Vec2 {
+    if snapped.0 {
+        Vec2::new(current.x.to_num(), current.y.to_num())
+    } else {
+        sample_presentation_translation(previous, current, overstep_fraction, mode)
+    }
+}
+
+pub fn clear_fighter_presentation_snaps(mut fighters: Query<&mut FighterPresentationSnap>) {
+    for mut snap in &mut fighters {
+        snap.0 = false;
+    }
+}
+
 pub fn apply_fighter_translation_to_visuals(
     query: Query<(
         &FighterTranslation,
         &FighterPreviousTranslation,
-        &FighterECB,
+        &FighterPresentationSnap,
+        &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, presentation_snap, hitstop_shake, mut transform) in query {
-        let translation = sample_presentation_translation(
+        let translation = sample_presentation_translation_with_snap(
             *previous_translation,
             *translation,
             overstep_fraction,
             debug_settings.motion_sampling,
+            *presentation_snap,
         );
-        let bottom = ecb.get_bottom_point();
         transform.translation = Vec3::new(
-            translation.x + bottom.x.to_num::<f32>(),
+            translation.x,
-            translation.y + bottom.y.to_num::<f32>(),
+            translation.y,
             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 +143,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(
@@ -145,6 +196,19 @@ mod tests {
         assert_eq!(position, Vec2::new(7.0, 14.0));
     }
 
+    #[test]
+    fn presentation_translation_uses_current_sample_after_snap() {
+        let position = sample_presentation_translation_with_snap(
+            FighterPreviousTranslation(FGVec2::new(FGi32::lit("2"), FGi32::lit("4"))),
+            FighterTranslation(FGVec2::new(FGi32::lit("6"), FGi32::lit("12"))),
+            0.25,
+            PresentationMotionMode::Extrapolation,
+            FighterPresentationSnap(true),
+        );
+
+        assert_eq!(position, Vec2::new(6.0, 12.0));
+    }
+
     #[test]
     fn snapshot_fighter_motion_copies_current_world_state() {
         let mut world = World::new();

src/fighter/state/air.rs

@@ -1,11 +1,45 @@
-use crate::fighter::state::ground::GroundedStateCommon;
+use crate::fighter::state::jump::{JumpState, JumpType};
 use crate::fighter::state::land::{LandingState, LandingType};
-use crate::fighter::state::{CollisionContext, FighterState};
+use crate::fighter::state::{CollisionContext, FighterState, InterruptContext, air_attack, air_dodge};
 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(
@@ -56,25 +90,55 @@ pub fn apply_air_motion(
     translation.0 += velocity.0;
 }
 
-pub fn update_standard_motion(ctx: &mut crate::fighter::state::UpdateContext) {
+pub fn update_standard_motion(
-    integrate_gravity(ctx.velocity, ctx.fighter_attributes);
+    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);
+    apply_air_motion(
+        ctx.velocity,
+        ctx.translation,
+        ctx.prev_translation,
+    );
+}
+
+pub fn air_interrupts_common(ctx: &mut InterruptContext, airborne_state_common: &AirborneStateCommon) -> Option<FighterState> {
+    if ctx.input.has_command(FighterCommands::Jump) {
+            Some(FighterState::Jump(JumpState {
+                jump_type: JumpType::DoubleJump,
+                airborne_state_common: AirborneStateCommon::default(),
+            }))
+    } else {
+        air_dodge::check_input(ctx).or_else(|| air_attack::check_interrupt(ctx, airborne_state_common))
+    }
 }
 
 pub fn collision_interrupt(
     ctx: &mut CollisionContext,
     landing_type: LandingType,
+    can_ignore_soft_platforms: bool,
 ) -> Option<FighterState> {
-    let res = ctx.air_collide_with_stage()?;
+    let res = ctx.air_collide_with_stage(can_ignore_soft_platforms)?;
-    ctx.translation.0 = res.hit_position - ctx.ecb.get_bottom_point();
+    let diff = res.hit_position - ctx.translation.0;
-    let grounded_common = GroundedStateCommon {
+    ctx.ecb.bottom -= diff;
-        current_line_id: res.line_id,
+    ctx.ecb.top -= diff;
-    };
+    ctx.ecb.left -= diff;
-    Some(FighterState::Land(LandingState::create(
+    ctx.ecb.right -= diff;
-        grounded_common,
+    ctx.translation.0 = res.hit_position;
-        landing_type,
+    ctx.presentation_snap.0 = true;
-    )))
+    ctx.surface.land(res.line_id);
+    Some(FighterState::Land(LandingState::create(landing_type)))
 }
 
 #[cfg(test)]
@@ -110,12 +174,15 @@ 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"),
             air_dodge_duration: 0,
             air_dodge_velocity: FGi32::ZERO,
             air_dodge_decay: FGi32::ZERO,
+            air_dodge_intangible_duration: 29,
+            air_dodge_intangible_start: 4,
         }
     }
 

src/fighter/state/air_attack.rs

@@ -0,0 +1,127 @@
+use bevy::log::error;
+
+use crate::fighter::{
+    attack::{AttackKind, FighterAttackScriptAssets, update_active_hitbox_list}, state::{
+        CollisionContext, EnterContext, ExitContext, FighterState, FighterStateImpl, InterruptContext, UpdateContext, air::{self, AirborneStateCommon}, fall::FallState,
+    },
+};
+
+#[derive(Clone, Debug, Hash)]
+pub struct AirAttackState {
+    pub attack_kind: AttackKind,
+    pub airborne_state_common: AirborneStateCommon
+}
+
+impl FighterStateImpl for AirAttackState {
+    const NAME: &'static str = "AirAttack";
+
+    fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
+        if state_context.is_current_animation_finished() {
+            Some(FighterState::Fall(FallState::new(self.airborne_state_common)))
+        } else {
+            None
+        }
+    }
+
+    fn update(&mut self, state_context: &mut UpdateContext) {
+        let animation_frame = state_context.get_current_animation_frame();
+        let script = state_context
+            .attack_scripts
+            .get(&state_context.attack_script_assets.scripts[&self.attack_kind]);
+        if let Some(script) = script {
+            update_active_hitbox_list(
+                script,
+                &mut state_context
+                    .hitboxes
+                    .0
+                    .as_mut()
+                    .expect("ground attack must have active hitboxes")
+                    .active_hitboxes,
+                animation_frame,
+            );
+        }
+
+        air::update_standard_motion(state_context, &mut self.airborne_state_common);
+    }
+
+    fn on_enter(&mut self, state_context: &mut EnterContext) {
+        state_context
+            .input
+            .consume_command(crate::input::FighterCommands::Attack);
+        state_context.play_animation(self.attack_kind.get_animation(), false);
+        let script = state_context.attack_script_assets.scripts[&self.attack_kind].clone();
+        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 ExitContext) {
+        state_context.hitboxes.0 = None;
+    }
+
+    fn check_collision_interrupt(
+        &mut self,
+        state_context: &mut CollisionContext,
+    ) -> Option<FighterState> {
+        air::collision_interrupt(
+            state_context,
+            crate::fighter::state::land::LandingType::Normal,
+            false,
+        )
+    }
+
+    fn is_visually_grounded<'a>(&'a self) -> bool {
+        false
+    }
+}
+
+#[derive(thiserror::Error, Debug)]
+pub enum AirAttackStateCreateError {
+    #[error("Attack script: {attack:?} not found")]
+    AttackScriptNotFound{attack: AttackKind},
+}
+
+impl AirAttackState {
+    pub fn create(attack_kind: AttackKind, attack_script_assets: &FighterAttackScriptAssets, airborne_state_common: &AirborneStateCommon) -> Result<Self, AirAttackStateCreateError> {
+        if attack_script_assets.scripts.contains_key(&attack_kind) {
+            Ok(AirAttackState {
+                airborne_state_common: airborne_state_common.clone(),
+                attack_kind
+            })
+        } else {
+            Err(AirAttackStateCreateError::AttackScriptNotFound { attack: attack_kind })
+        }
+    }
+
+}
+
+
+pub fn check_interrupt(state_context: &InterruptContext, airborne_state_common: &AirborneStateCommon) -> Option<FighterState> {
+    if state_context
+        .input
+        .has_command(crate::input::FighterCommands::Attack)
+    {
+        let attack_kind = state_context
+            .input
+            .get_attack_command_type()
+            .to_attack_kind_airborne(state_context.facing_direction);
+        let state = AirAttackState::create(attack_kind, state_context.attack_script_assets, airborne_state_common);
+
+        match state {
+            Ok(state) => {
+                Some(FighterState::AirAttack(state))
+            },
+            Err(create_error) => {
+                error!("{}", create_error);
+                None
+            },
+        }
+    } else {
+        None
+    }
+}

src/fighter/state/air_dodge.rs

@@ -1,9 +1,13 @@
 use crate::{
     fighter::{
+        FighterInvulnerabilityState,
         animation::AnimKind,
         state::{
             CollisionContext, EnterContext, FighterState, FighterStateImpl, InterruptContext,
-            UpdateContext, air, fall::FallState, land::LandingType,
+            UpdateContext,
+            air::{self, AirborneStateCommon},
+            fall::FallState,
+            land::LandingType,
         },
     },
     input,
@@ -20,13 +24,26 @@ impl FighterStateImpl for AirDodgeState {
 
     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 UpdateContext) {
+        let airdodge_intangible_end = state_context.fighter_attributes.air_dodge_intangible_start
+            + state_context
+                .fighter_attributes
+                .air_dodge_intangible_duration;
+        if state_context.animation_frame
+            == state_context.fighter_attributes.air_dodge_intangible_start
+        {
+            *state_context.vulnerability = FighterInvulnerabilityState::Intangible;
+        } else if state_context.animation_frame >= airdodge_intangible_end {
+            *state_context.vulnerability = FighterInvulnerabilityState::Vulnerable;
+        }
         state_context.velocity.0 *= state_context.fighter_attributes.air_dodge_decay;
 
         air::apply_air_motion(
@@ -40,22 +57,52 @@ impl FighterStateImpl for AirDodgeState {
         &mut self,
         state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
-        air::collision_interrupt(state_context, LandingType::Special)
+        air::collision_interrupt(state_context, LandingType::Special, false)
     }
 
     fn on_enter(&mut self, state_context: &mut EnterContext) {
         state_context.play_animation(AnimKind::AirDodge, false);
 
+        state_context
+            .input
+            .clear_command(input::FighterCommands::Shield);
+        state_context
+            .input
+            .clear_command(input::FighterCommands::GuardHold);
+
         state_context.velocity.0 =
             self.direction * state_context.fighter_attributes.air_dodge_velocity;
     }
+
+    fn is_visually_grounded<'a>(&'a self) -> bool {
+        false
+    }
+
+    fn surface_policy(&self) -> super::SurfacePolicy {
+        super::SurfacePolicy::Airborne(crate::fighter::surface::EcbLockPolicy::StartOnDetach)
+    }
+
+    fn on_exit(&mut self, state_context: &mut super::ExitContext) {
+        *state_context.vulnerability = FighterInvulnerabilityState::Vulnerable;
+    }
+
+    fn name(&self) -> String {
+        Self::NAME.to_owned()
+    }
 }
 
 pub fn check_input(state_context: &InterruptContext) -> Option<FighterState> {
     state_context
         .input
         .has_command(input::FighterCommands::Shield)
-        .then(|| {
+        .then_some(())
+        .or_else(|| {
+            state_context
+                .input
+                .has_command(input::FighterCommands::GuardHold)
+                .then_some(())
+        })
+        .map(|_| {
             FighterState::AirDodge(AirDodgeState {
                 direction: state_context
                     .input

src/fighter/state/angel.rs

@@ -0,0 +1,53 @@
+use crate::{fighter::{animation::AnimKind, state::{FighterState, FighterStateImpl, air::AirborneStateCommon, fall::FallState}}, math::vec::FGVec2};
+
+#[derive(Debug, Clone, Hash)]
+pub struct AngelState {
+    frames_remaining: u32
+}
+
+impl AngelState {
+    pub fn new(duration: u32) -> Self {
+        Self {
+            frames_remaining: duration
+        }
+    }
+}
+
+impl FighterStateImpl for AngelState {
+    const NAME: &'static str = "Angel";
+
+    fn check_interrupt(&self, state_context: &mut super::InterruptContext) -> Option<super::FighterState> {
+        let moved_sideways = !state_context.input.get_last_frame().movement.x.is_zero();
+        let moved_vertically = !state_context.input.get_last_frame().movement.y.is_zero();
+
+        if self.frames_remaining == 0 || moved_sideways || moved_vertically {
+            Some(FighterState::Fall(FallState::new(AirborneStateCommon::default())))
+        } else {
+            None
+        }
+    }
+
+    fn update(&mut self, _state_context: &mut super::UpdateContext) {
+        self.frames_remaining = self.frames_remaining.saturating_sub(1);
+    }
+
+    fn is_visually_grounded<'a>(&'a self) -> bool {
+        false
+    }
+    
+    fn on_enter(&mut self, state_context: &mut super::EnterContext) {
+        state_context.play_animation(AnimKind::Wait, true);
+        state_context.velocity.0 = FGVec2::ZERO;
+    }
+    
+    fn check_collision_interrupt(
+        &mut self,
+        _state_context: &mut super::CollisionContext,
+    ) -> Option<super::FighterState> {
+        None
+    }
+    
+    fn surface_policy(&self) -> super::SurfacePolicy {
+        super::SurfacePolicy::Airborne(crate::fighter::surface::EcbLockPolicy::Clear)
+    }
+}

src/fighter/state/crouch.rs

@@ -0,0 +1,160 @@
+use super::{
+    CollisionContext, EnterContext, FighterStateImpl, InterruptContext, UpdateContext, ground,
+};
+use crate::fighter::FighterSurfaceState;
+use crate::fighter::animation::AnimKind;
+use crate::fighter::state::air::AirborneStateCommon;
+use crate::fighter::state::ground::{
+    grounded_movement_common_interrupts, grounded_movement_standstill_common_interrupts,
+};
+use crate::fighter::state::platform_pass::PlatformPassState;
+use crate::fighter::state::{FighterState, dash, ground_attack, turn, walk};
+use crate::input::FighterCommands;
+use crate::stage::line::StagePolyType;
+
+#[derive(Debug, Clone, Hash)]
+pub enum CrouchSubState {
+    Entering { pass_queued: bool },
+    Idle,
+    Exiting,
+}
+
+#[derive(Debug, Clone, Hash)]
+pub struct CrouchState {
+    sub_state: CrouchSubState,
+}
+
+pub fn crouch_idle_interrupts(state_context: &InterruptContext) -> Option<FighterState> {
+    if let Some(state) = ground_attack::check_interrupt(state_context) {
+        Some(state)
+    } else if let Some(state) = dash::check_input(state_context) {
+        Some(state)
+    } else if let Some(state) = turn::check_input(state_context) {
+        Some(state)
+    } else if let Some(state) = walk::check_input(state_context) {
+        Some(state)
+    } else {
+        None
+    }
+}
+
+pub fn crouch_entering_interrupts(state_context: &InterruptContext) -> Option<FighterState> {
+    if let Some(state) = ground_attack::check_interrupt(state_context) {
+        Some(state)
+    } else {
+        None
+    }
+}
+
+impl FighterStateImpl for CrouchState {
+    const NAME: &'static str = "Crouch";
+    fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
+        if let Some(state) = grounded_movement_common_interrupts(state_context) {
+            return Some(state);
+        }
+
+        match self.sub_state {
+            CrouchSubState::Entering { pass_queued } => {
+                // pass
+                if let FighterSurfaceState::Grounded { line_id } = state_context.surface {
+                    if let Some(stage_poly) = state_context
+                        .stage_collision
+                        .stage_polys
+                        .get(line_id.polygon)
+                    {
+                        let is_inputting_crouch = -state_context.game_settings.input_common.run_stick_threshold > state_context.input.get_last_frame().movement.y;
+                        let is_on_a_soft_platform = matches!(stage_poly.poly_type, StagePolyType::Platform);
+                        if pass_queued && is_inputting_crouch && is_on_a_soft_platform 
+                        {
+                            return Some(FighterState::PlatformPass(PlatformPassState::new(
+                                AirborneStateCommon::default(),
+                                line_id.polygon,
+                            )));
+                        }
+                    }
+                }
+
+                // While entering the crouch animation we do not allow movement inputs, but we do allow attacks and jumps
+                if state_context.is_current_animation_finished() {
+                    return Some(FighterState::Crouch(CrouchState {
+                        sub_state: CrouchSubState::Idle,
+                    }));
+                } else {
+                    return crouch_entering_interrupts(state_context);
+                }
+            }
+            CrouchSubState::Idle => {
+                if state_context.input.get_last_frame().movement.y
+                    > -state_context.game_settings.input_common.run_stick_threshold
+                {
+                    return Some(FighterState::Crouch(CrouchState {
+                        sub_state: CrouchSubState::Exiting,
+                    }));
+                } else {
+                    return crouch_idle_interrupts(state_context);
+                }
+            }
+            CrouchSubState::Exiting => {
+                if state_context.is_current_animation_finished() {
+                    return grounded_movement_standstill_common_interrupts(state_context);
+                } else {
+                    return crouch_idle_interrupts(state_context);
+                }
+            }
+        }
+    }
+
+    fn on_enter(&mut self, state_context: &mut EnterContext) {
+        match self.sub_state {
+            CrouchSubState::Entering { .. } => {
+                state_context.play_animation(AnimKind::CrouchEnter, false);
+            }
+            CrouchSubState::Idle => {
+                state_context.play_animation(AnimKind::CrouchIdle, true);
+            }
+            CrouchSubState::Exiting => {
+                state_context.play_animation(AnimKind::CrouchExit, false);
+            }
+        }
+    }
+
+    fn update(&mut self, state_context: &mut UpdateContext) {
+        if let CrouchSubState::Entering {
+            pass_queued,
+        } = &mut self.sub_state
+        {
+            if state_context
+                .input
+                .has_command(FighterCommands::SmashMoveDown)
+            {
+                state_context
+                    .input
+                    .clear_command(FighterCommands::SmashMoveDown);
+                *pass_queued = true;
+            }
+        }
+        ground::update_friction_motion(state_context);
+    }
+
+    fn check_collision_interrupt(
+        &mut self,
+        state_context: &mut CollisionContext,
+    ) -> Option<FighterState> {
+        ground::collision_interrupt(state_context, false)
+    }
+
+    fn is_visually_grounded<'a>(&'a self) -> bool {
+        true
+    }
+}
+
+pub fn check_input(state_context: &InterruptContext) -> Option<FighterState> {
+    let input_frame = state_context.input.get_last_frame();
+
+    if input_frame.movement.y <= -state_context.game_settings.input_common.run_stick_threshold {
+        return Some(FighterState::Crouch(CrouchState {
+            sub_state: CrouchSubState::Entering { pass_queued: false },
+        }));
+    }
+    None
+}

src/fighter/state/dash.rs

@@ -5,52 +5,43 @@ use super::{
 use crate::fighter::FighterFacingDirection;
 use crate::fighter::animation::AnimKind;
 use crate::fighter::state::FighterState;
-use crate::fighter::state::ground::GroundedStateCommon;
 use crate::input::FighterCommands::{SmashMoveLeft, SmashMoveRight};
 
 #[derive(Debug, Clone, Hash)]
 pub struct DashState {
     direction: FighterFacingDirection,
-    pub ground_common: GroundedStateCommon,
 }
 
 impl DashState {
-    pub fn new(direction: FighterFacingDirection, ground_common: GroundedStateCommon) -> Self {
+    pub fn new(direction: FighterFacingDirection) -> Self {
-        Self {
+        Self { direction }
-            direction,
-            ground_common,
-        }
     }
 }
 
 impl FighterStateImpl for DashState {
     const NAME: &'static str = "Dash";
     fn check_interrupt(&self, ctx: &mut InterruptContext) -> Option<FighterState> {
-        let ground = &self.ground_common;
         let attributes = ctx.fighter_attributes;
 
         // A reverse dash can interrupt before IASA
         if let Some(direction) =
             check_smash_input_with_dir(ctx).filter(|direction| *direction != self.direction)
         {
-            return Some(FighterState::Dash(DashState::new(
+            return Some(FighterState::Dash(DashState::new(direction)));
-                direction,
-                ground.clone(),
-            )));
         }
 
-        if let Some(state) = ground::grounded_movement_common_interrupts(ctx, ground) {
+        if let Some(state) = ground::grounded_movement_common_interrupts(ctx) {
             return Some(state);
         }
 
         if ctx.is_current_animation_finished() {
-            return run::check_input(ctx, ground)
+            return run::check_input(ctx)
-                .or_else(|| walk::check_input(ctx, ground))
+                .or_else(|| walk::check_input(ctx))
-                .or_else(|| wait::check_input(ctx, ground));
+                .or_else(|| wait::check_input(ctx));
         }
 
         if ctx.get_current_animation_frame() > attributes.dash_acceleration_duration {
-            return run::check_input(ctx, ground);
+            return run::check_input(ctx);
         }
 
         None
@@ -106,7 +97,11 @@ impl FighterStateImpl for DashState {
         &mut self,
         state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
-        ground::collision_interrupt(state_context, &mut self.ground_common, true)
+        ground::collision_interrupt(state_context, true)
+    }
+
+    fn is_visually_grounded<'a>(&'a self) -> bool {
+        true
     }
 }
 
@@ -120,10 +115,6 @@ fn check_smash_input_with_dir(state_context: &InterruptContext) -> Option<Fighte
     }
 }
 
-pub fn check_input(
+pub fn check_input(state_context: &InterruptContext) -> Option<FighterState> {
-    state_context: &InterruptContext,
+    check_smash_input_with_dir(state_context).map(|dir| FighterState::Dash(DashState::new(dir)))
-    ground_common: &GroundedStateCommon,
-) -> Option<FighterState> {
-    check_smash_input_with_dir(state_context)
-        .map(|dir| FighterState::Dash(DashState::new(dir, ground_common.clone())))
 }

src/fighter/state/fall.rs

@@ -1,14 +1,26 @@
 use super::{CollisionContext, EnterContext, FighterStateImpl, InterruptContext, UpdateContext};
 use crate::fighter::animation::AnimKind;
-use crate::fighter::state::{FighterState, air, jump};
+use crate::fighter::state::air::AirborneStateCommon;
+use crate::fighter::state::{FighterState, air, air_attack, jump};
 
-#[derive(Debug, Clone, Copy, Hash)]
+#[derive(Debug, Clone, Copy, Hash, Default)]
-pub struct FallState;
+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 InterruptContext) -> Option<FighterState> {
-        jump::check_input_double_jump(state_context)
+        jump::check_input_double_jump(state_context).or_else(|| air_attack::check_interrupt(state_context, &self.airborne_state_common))
     }
 
     fn on_enter(&mut self, state_context: &mut EnterContext) {
@@ -16,7 +28,7 @@ impl FighterStateImpl for FallState {
     }
 
     fn update(&mut self, state_context: &mut UpdateContext) {
-        air::update_standard_motion(state_context);
+        air::update_standard_motion(state_context, &mut self.airborne_state_common);
     }
 
     fn check_collision_interrupt(
@@ -26,15 +38,17 @@ impl FighterStateImpl for FallState {
         air::collision_interrupt(
             state_context,
             crate::fighter::state::land::LandingType::Normal,
+            true,
         )
     }
+    
+    fn is_visually_grounded<'a>(
+        &'a self,
+    ) -> bool {
+        false
     }
 
-pub fn check_input(state_context: &InterruptContext) -> Option<FighterState> {
+    fn surface_policy(&self) -> super::SurfacePolicy {
-    let input_frame = state_context.input.get_last_frame();
+        super::SurfacePolicy::Airborne(crate::fighter::surface::EcbLockPolicy::StartOnDetach)
-
-    if input_frame.movement.x.abs() < state_context.game_settings.input_common.stick_deadzone {
-        return Some(FighterState::Fall(FallState));
     }
-    None
 }

src/fighter/state/ground.rs

@@ -3,7 +3,7 @@
 //! bit-for-bit deterministic for rollback.
 
 use crate::fighter::state::{
-    CollisionContext, FighterState, InterruptContext, dash, fall, ground_attack, turn, wait, walk,
+    CollisionContext, FighterState, InterruptContext, air, crouch, dash, fall, ground_attack, turn, wait, walk,
 };
 use crate::fighter::{
     FighterAttributes, FighterPreviousTranslation, FighterTranslation, FighterVelocity,
@@ -13,13 +13,6 @@ use crate::math::int::{FGWide, FGi32};
 use crate::math::vec::FGVec2;
 use crate::stage::line::{StageLineID, StagePoly, StagePolyLineSegment, StagePolyLineSegmentType};
 
-use bevy::prelude::*;
-
-#[derive(Reflect, Hash, Clone, Debug)]
-pub struct GroundedStateCommon {
-    pub current_line_id: StageLineID,
-}
-
 pub fn apply_grounded_friction(friction: FGi32, ground_vel: FGi32) -> FGi32 {
     if friction.abs() > ground_vel.abs() {
         -ground_vel
@@ -181,22 +174,23 @@ pub fn update_friction_motion(ctx: &mut crate::fighter::state::UpdateContext) {
 
 pub fn collide_with_stage_grounded(
     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 ecb = &state_context.ecb;
     let stage_collision = state_context.stage_collision;
 
-    let stage_poly = stage_collision
+    let Some(current_line_id) = state_context.surface.line_id() else {
-        .stage_polys
+        return GroundedMotionResult::InAir;
-        .get(ground_common.current_line_id.polygon);
+    };
+
+    let stage_poly = stage_collision.stage_polys.get(current_line_id.polygon);
 
     if let Some(stage_poly) = stage_poly {
         let ecb_bottom_pos = translation.0 + ecb.get_bottom_point();
         match resolve_grounded_position(
             stage_poly,
-            ground_common.current_line_id.segment,
+            current_line_id.segment,
             ecb_bottom_pos,
             can_walk_off,
         ) {
@@ -216,31 +210,45 @@ pub fn collide_with_stage_grounded(
                             .0
                             .project_onto_normalized(current_segment.normal)
                 };
-                ground_common.current_line_id.segment = segment_idx;
+                state_context.surface.land(StageLineID {
+                    polygon: current_line_id.polygon,
+                    segment: segment_idx,
+                });
                 GroundedMotionResult::InGround
             }
-            GroundedPositionResult::InAir => GroundedMotionResult::InAir,
+            GroundedPositionResult::InAir => {
+                state_context.surface.apply_airborne_policy(
+                    crate::fighter::surface::EcbLockPolicy::StartOnDetach,
+                    state_context.leave_ground_ecb_lock_duration,
+                );
+                GroundedMotionResult::InAir
+            }
         }
     } else {
+        state_context.surface.apply_airborne_policy(
+            crate::fighter::surface::EcbLockPolicy::StartOnDetach,
+            state_context.leave_ground_ecb_lock_duration,
+        );
         GroundedMotionResult::InAir
     }
 }
 
-pub fn collision_interrupt(
+pub fn collision_interrupt(ctx: &mut CollisionContext, can_walk_off: bool) -> Option<FighterState> {
-    ctx: &mut CollisionContext,
+    match collide_with_stage_grounded(ctx, can_walk_off) {
-    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)),
+        GroundedMotionResult::InAir => Some(FighterState::Fall(fall::FallState::new(
+            air::AirborneStateCommon::default(),
+        ))),
     }
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::fighter::ecb::FighterPreviousECB;
+    use crate::fighter::{FighterECB, FighterSurfaceState};
     use crate::stage::line::StagePolyType;
+    use crate::input::FighterInput;
 
     fn two_segment_floor() -> StagePoly {
         StagePoly::build(
@@ -346,28 +354,126 @@ mod tests {
             GroundedPositionResult::InAir
         ));
     }
+
+    #[test]
+    fn grounded_collision_updates_surface_segment() {
+        let stage_collision = crate::stage::line::StageCollision {
+            stage_polys: vec![two_segment_floor()],
+        };
+        let mut surface = FighterSurfaceState::Grounded {
+            line_id: StageLineID {
+                polygon: 0,
+                segment: 0,
+            },
+        };
+        let mut translation = FighterTranslation(FGVec2::lit("11", "0"));
+        let previous_translation = FighterPreviousTranslation(translation.0);
+        let mut velocity = FighterVelocity::default();
+        let mut ecb = FighterECB {
+            bottom: FGVec2::lit("0.0", "-0.5"),
+            top: FGVec2::lit("0.0", "0.5"),
+            left: FGVec2::lit("-0.5", "0.0"),
+            right: FGVec2::lit("0.5", "0.0"),
+        };
+        let previous_ecb = FighterPreviousECB::from(ecb);
+        let mut presentation_snap = crate::fighter::FighterPresentationSnap::default();
+        let mut context = CollisionContext {
+            translation: &mut translation,
+            prev_translation: &previous_translation,
+            input: &FighterInput::default(),
+            velocity: &mut velocity,
+            surface: &mut surface,
+            ecb: &mut ecb,
+            prev_ecb: &previous_ecb,
+            stage_collision: &stage_collision,
+            leave_ground_ecb_lock_duration: 10,
+            presentation_snap: &mut presentation_snap,
+            downward_stick_threshold: FGi32::ONE,
+        };
+
+        assert!(matches!(
+            collide_with_stage_grounded(&mut context, true),
+            GroundedMotionResult::InGround
+        ));
+        assert_eq!(
+            surface.line_id(),
+            Some(StageLineID {
+                polygon: 0,
+                segment: 1,
+            })
+        );
+    }
+
+    #[test]
+    fn walking_off_edge_clears_surface_contact() {
+        let stage_collision = crate::stage::line::StageCollision {
+            stage_polys: vec![StagePoly::build(
+                StagePolyType::Platform,
+                &[
+                    (FGVec2::lit("0", "0"), StagePolyLineSegmentType::Floor),
+                    (FGVec2::lit("10", "0"), StagePolyLineSegmentType::Floor),
+                ],
+            )],
+        };
+        let mut surface = FighterSurfaceState::Grounded {
+            line_id: StageLineID {
+                polygon: 0,
+                segment: 0,
+            },
+        };
+        let mut translation = FighterTranslation(FGVec2::lit("11", "0"));
+        let previous_translation = FighterPreviousTranslation(translation.0);
+        let mut velocity = FighterVelocity::default();
+        let mut ecb = FighterECB {
+            bottom: FGVec2::lit("0.0", "-0.5"),
+            top: FGVec2::lit("0.0", "0.5"),
+            left: FGVec2::lit("-0.5", "0.0"),
+            right: FGVec2::lit("0.5", "0.0"),
+        };
+        let previous_ecb = FighterPreviousECB::from(ecb);
+        let mut presentation_snap = crate::fighter::FighterPresentationSnap::default();
+        let mut context = CollisionContext {
+            translation: &mut translation,
+            prev_translation: &previous_translation,
+            input: &FighterInput::default(),
+            velocity: &mut velocity,
+            surface: &mut surface,
+            ecb: &mut ecb,
+            prev_ecb: &previous_ecb,
+            stage_collision: &stage_collision,
+            leave_ground_ecb_lock_duration: 10,
+            presentation_snap: &mut presentation_snap,
+            downward_stick_threshold: FGi32::ONE,
+        };
+
+        assert!(matches!(
+            collide_with_stage_grounded(&mut context, true),
+            GroundedMotionResult::InAir
+        ));
+        assert!(matches!(surface, FighterSurfaceState::Airborne { .. }));
+    }
 }
 
 pub fn grounded_movement_common_interrupts(
     state_context: &InterruptContext,
-    ground_common: &GroundedStateCommon,
 ) -> Option<FighterState> {
-    super::jump::check_input(state_context, ground_common)
+    super::jump::check_input(state_context)
 }
 
 pub fn grounded_movement_standstill_common_interrupts(
     state_context: &InterruptContext,
-    ground_common: &GroundedStateCommon,
 ) -> Option<FighterState> {
-    if let Some(state) = ground_attack::check_interrupt(state_context, &ground_common) {
+    if let Some(state) = ground_attack::check_interrupt(state_context) {
         Some(state)
-    } else if let Some(state) = dash::check_input(state_context, &ground_common) {
+    } else if let Some(state) = dash::check_input(state_context) {
         Some(state)
-    } else if let Some(state) = turn::check_input(state_context, &ground_common) {
+    } else if let Some(state) = turn::check_input(state_context) {
         Some(state)
-    } else if let Some(state) = walk::check_input(state_context, &ground_common) {
+    } else if let Some(state) = crouch::check_input(state_context) {
         Some(state)
-    } else if let Some(state) = wait::check_input(state_context, &ground_common) {
+    } else if let Some(state) = walk::check_input(state_context) {
+        Some(state)
+    } else if let Some(state) = wait::check_input(state_context) {
         Some(state)
     } else {
         None

src/fighter/state/ground_attack.rs

@@ -2,14 +2,13 @@ use crate::fighter::{
     attack::{AttackKind, update_active_hitbox_list},
     state::{
         CollisionContext, EnterContext, ExitContext, FighterState, FighterStateImpl,
-        InterruptContext, UpdateContext, ground::GroundedStateCommon, wait::WaitState,
+        InterruptContext, UpdateContext, wait::WaitState,
     },
 };
 
 #[derive(Clone, Debug, Hash)]
 pub struct GroundAttackState {
     pub attack_kind: AttackKind,
-    pub grounded_common: GroundedStateCommon,
 }
 
 impl FighterStateImpl for GroundAttackState {
@@ -17,9 +16,7 @@ impl FighterStateImpl for GroundAttackState {
 
     fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
         if state_context.is_current_animation_finished() {
-            Some(FighterState::Wait(WaitState {
+            Some(FighterState::Wait(WaitState))
-                grounded_common: self.grounded_common.clone(),
-            }))
         } else {
             None
         }
@@ -45,15 +42,18 @@ impl FighterStateImpl for GroundAttackState {
     }
 
     fn on_enter(&mut self, state_context: &mut EnterContext) {
+        state_context
+            .input
+            .consume_command(crate::input::FighterCommands::Attack);
         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,
         });
     }
 
@@ -67,12 +67,13 @@ impl FighterStateImpl for GroundAttackState {
     ) -> Option<FighterState> {
         None
     }
+
+    fn is_visually_grounded<'a>(&'a self) -> bool {
+        true
+    }
 }
 
-pub fn check_interrupt(
+pub fn check_interrupt(state_context: &InterruptContext) -> Option<FighterState> {
-    state_context: &InterruptContext,
-    grounded_common: &GroundedStateCommon,
-) -> Option<FighterState> {
     if state_context
         .input
         .has_command(crate::input::FighterCommands::Attack)
@@ -83,7 +84,6 @@ pub fn check_interrupt(
             .to_attack_kind_grounded();
         Some(FighterState::GroundAttack(GroundAttackState {
             attack_kind,
-            grounded_common: grounded_common.clone(),
         }))
     } else {
         None

src/fighter/state/hitstun.rs

@@ -1,22 +1,22 @@
 use crate::{
     fighter::{
         animation::AnimKind,
-        attack::FighterHitReaction,
+        attack::{self, FighterHitReaction},
         state::{
             CollisionContext, EnterContext, ExitContext, FighterState, FighterStateImpl,
-            InterruptContext, UpdateContext, air,
+            InterruptContext, UpdateContext,
+            air::{self, AirborneStateCommon},
             fall::FallState,
-            ground::{GroundedStateCommon, collision_interrupt},
+            ground::collision_interrupt,
             land::LandingType,
             wait::WaitState,
         },
-    },
+    }, math::{int::FGi32, vec::FGVec2},
-    math::int::FGi32,
 };
 
 #[derive(Clone, Debug, Hash)]
 pub enum HitstopStateKind {
-    Grounded(GroundedStateCommon),
+    Grounded,
     Airborne,
 }
 
@@ -24,6 +24,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 {
@@ -31,7 +42,7 @@ impl FighterStateImpl for HitstunState {
 
     fn name(&self) -> String {
         let hitstop_kind = match self.hitstop_kind {
-            HitstopStateKind::Grounded(_) => "Grounded",
+            HitstopStateKind::Grounded => "Grounded",
             HitstopStateKind::Airborne => "Airborne",
         };
 
@@ -46,12 +57,10 @@ impl FighterStateImpl for HitstunState {
     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) => {
+                HitstopStateKind::Grounded => Some(FighterState::Wait(WaitState)),
-                    Some(FighterState::Wait(WaitState {
+                HitstopStateKind::Airborne => Some(FighterState::Fall(FallState::new(
-                        grounded_common: grounded_state_common.clone(),
+                    AirborneStateCommon::default(),
-                    }))
+                ))),
-                }
-                HitstopStateKind::Airborne => Some(FighterState::Fall(FallState)),
             }
         } else {
             None
@@ -59,7 +68,23 @@ impl FighterStateImpl for HitstunState {
     }
 
     fn update(&mut self, ctx: &mut UpdateContext) {
-        air::integrate_gravity(ctx.velocity, ctx.fighter_attributes);
+        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
@@ -73,11 +98,11 @@ impl FighterStateImpl for HitstunState {
 
     fn on_enter(&mut self, state_context: &mut EnterContext) {
         let animation = match self.hitstop_kind {
-            HitstopStateKind::Grounded(_) => AnimKind::FlinchGround,
+            HitstopStateKind::Grounded => AnimKind::FlinchGround,
             HitstopStateKind::Airborne => AnimKind::FlinchAir,
         };
         state_context.play_animation(animation, false);
-        state_context.knockback_velocity.0 = self.hit_reaction.launch_velocity;
+        state_context.velocity.0 = FGVec2::ZERO;
     }
 
     fn on_exit(&mut self, _state_context: &mut ExitContext) {}
@@ -87,12 +112,26 @@ impl FighterStateImpl for HitstunState {
         state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
         match &mut self.hitstop_kind {
-            HitstopStateKind::Grounded(grounded_state_common) => {
+            HitstopStateKind::Grounded => collision_interrupt(state_context, true),
-                collision_interrupt(state_context, grounded_state_common, true)
-            }
             HitstopStateKind::Airborne => {
-                air::collision_interrupt(state_context, LandingType::Normal)
+                air::collision_interrupt(state_context, LandingType::Normal, false)
             }
         }
     }
+
+    fn is_visually_grounded<'a>(&'a self) -> bool {
+        match self.hitstop_kind {
+            HitstopStateKind::Grounded => true,
+            HitstopStateKind::Airborne => false,
+        }
+    }
+
+    fn surface_policy(&self) -> super::SurfacePolicy {
+        match self.hitstop_kind {
+            HitstopStateKind::Grounded => super::SurfacePolicy::Grounded,
+            HitstopStateKind::Airborne => super::SurfacePolicy::Airborne(
+                crate::fighter::surface::EcbLockPolicy::StartOnDetach,
+            ),
+        }
+    }
 }

src/fighter/state/jump.rs

@@ -5,12 +5,13 @@ use crate::{
         animation::AnimKind,
         state::{
             CollisionContext, EnterContext, FighterState, FighterStateImpl, InterruptContext,
-            UpdateContext, air,
+            UpdateContext,
-            air_dodge::{self, AirDodgeState},
+            air::{self, AirborneStateCommon},
-            ground::{self, GroundedStateCommon},
+            air_dodge::AirDodgeState,
+            ground,
         },
     },
-    input::FighterCommands,
+    input::{DigitalAction, FighterCommands},
     math::{int::FGi32, vec::FGVec2},
 };
 #[derive(Debug, Hash, Clone, Copy)]
@@ -22,19 +23,18 @@ pub enum JumpType {
 
 #[derive(Debug, Clone, Hash)]
 pub struct JumpState {
-    jump_type: JumpType,
+    pub jump_type: JumpType,
+    pub airborne_state_common: AirborneStateCommon,
 }
 
 #[derive(Debug, Clone, Hash)]
 pub struct JumpSquatState {
-    pub grounded_common: GroundedStateCommon,
     pub duration_counter: u32,
 }
 
 impl JumpSquatState {
-    pub fn create(grounded_common: GroundedStateCommon) -> Self {
+    pub fn create() -> Self {
         Self {
-            grounded_common,
             duration_counter: 0,
         }
     }
@@ -68,13 +68,26 @@ impl FighterStateImpl for JumpSquatState {
                 direction: wavedash_dir.normalize_or_zero(),
             }))
         } else if self.duration_counter >= state_context.fighter_attributes.jumpsquat_duration {
-            info!("Jump {}", state_context.input.get_last_frame().jump);
+            info!(
-            let jump_type = if state_context.input.get_last_frame().jump {
+                "Jump {}",
+                state_context
+                    .input
+                    .get_last_frame()
+                    .is_held(DigitalAction::Jump)
+            );
+            let jump_type = if state_context
+                .input
+                .get_last_frame()
+                .is_held(DigitalAction::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
         }
@@ -89,29 +102,36 @@ impl FighterStateImpl for JumpSquatState {
         &mut self,
         state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
-        ground::collision_interrupt(state_context, &mut self.grounded_common, false)
+        ground::collision_interrupt(state_context, false)
     }
 
     fn on_enter(&mut self, state_context: &mut EnterContext) {
         state_context.play_animation(AnimKind::JumpSquat, false);
+        // Preserve buffered inputs while jump squat makes the transition
+        // temporarily unavailable, matching Ultimate/HDR-style hold input.
+        state_context.input.enable_hold_all(10);
         state_context.input.clear_command(FighterCommands::Jump);
     }
+
+    fn on_exit(&mut self, state_context: &mut crate::fighter::state::ExitContext) {
+        // The hold policy is state-scoped and must never leak into the next
+        // state. Command lifetime itself remains independent of this policy.
+        state_context.input.disable_hold_all();
+    }
+
+    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 InterruptContext) -> Option<FighterState> {
-        if state_context.input.has_command(FighterCommands::Jump) {
+        air::air_interrupts_common(state_context, &self.airborne_state_common)
-            Some(FighterState::Jump(JumpState {
-                jump_type: JumpType::DoubleJump,
-            }))
-        } else {
-            air_dodge::check_input(state_context)
-        }
     }
 
     fn update(&mut self, state_context: &mut UpdateContext) {
-        air::update_standard_motion(state_context);
+        air::update_standard_motion(state_context, &mut self.airborne_state_common);
     }
 
     fn on_enter(&mut self, state_context: &mut EnterContext) {
@@ -172,18 +192,30 @@ impl FighterStateImpl for JumpState {
         air::collision_interrupt(
             state_context,
             crate::fighter::state::land::LandingType::Normal,
+            true,
         )
     }
+
+    fn is_visually_grounded<'a>(&'a self) -> bool {
+        false
+    }
+
+    fn surface_policy(&self) -> super::SurfacePolicy {
+        use crate::fighter::surface::EcbLockPolicy;
+        match self.jump_type {
+            JumpType::DoubleJump => super::SurfacePolicy::Airborne(EcbLockPolicy::Restart),
+            JumpType::ShortHop | JumpType::LongJump => {
+                super::SurfacePolicy::Airborne(EcbLockPolicy::StartOnDetach)
+            }
+        }
+    }
 }
 
-pub fn check_input(
+pub fn check_input(state_context: &InterruptContext) -> Option<FighterState> {
-    state_context: &InterruptContext,
-    ground_common: &GroundedStateCommon,
-) -> Option<FighterState> {
     state_context
         .input
         .has_command(FighterCommands::Jump)
-        .then(|| FighterState::JumpSquat(JumpSquatState::create(ground_common.clone())))
+        .then(|| FighterState::JumpSquat(JumpSquatState::create()))
 }
 
 pub fn check_input_double_jump(state_context: &InterruptContext) -> Option<FighterState> {
@@ -193,6 +225,7 @@ pub fn check_input_double_jump(state_context: &InterruptContext) -> Option<Fight
         .then(|| {
             FighterState::Jump(JumpState {
                 jump_type: JumpType::DoubleJump,
+                airborne_state_common: AirborneStateCommon::default(),
             })
         })
 }

src/fighter/state/land.rs

@@ -3,7 +3,7 @@ use crate::fighter::{
     state::{
         CollisionContext, EnterContext, FighterState, FighterStateImpl, InterruptContext,
         UpdateContext, dash,
-        ground::{self, GroundedStateCommon, grounded_movement_standstill_common_interrupts},
+        ground::{self, grounded_movement_standstill_common_interrupts},
         walk,
     },
 };
@@ -16,16 +16,12 @@ pub enum LandingType {
 
 #[derive(Debug, Clone, Hash)]
 pub struct LandingState {
-    pub grounded_common: GroundedStateCommon,
     pub landing_type: LandingType,
 }
 
 impl LandingState {
-    pub fn create(grounded_common: GroundedStateCommon, landing_type: LandingType) -> Self {
+    pub fn create(landing_type: LandingType) -> Self {
-        Self {
+        Self { landing_type }
-            grounded_common,
-            landing_type,
-        }
     }
 }
 
@@ -34,14 +30,14 @@ impl FighterStateImpl for LandingState {
 
     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)
+            grounded_movement_standstill_common_interrupts(state_context)
         } else if state_context.get_current_animation_frame()
             >= state_context.fighter_attributes.landing_iasa
             && let LandingType::Normal = self.landing_type
         {
-            dash::check_input(state_context, &self.grounded_common).or_else(|| {
+            dash::check_input(state_context).or_else(|| {
-                ground::grounded_movement_common_interrupts(state_context, &self.grounded_common)
+                ground::grounded_movement_common_interrupts(state_context)
-                    .or_else(|| walk::check_input(state_context, &self.grounded_common))
+                    .or_else(|| walk::check_input(state_context))
             })
         } else {
             None
@@ -56,7 +52,7 @@ impl FighterStateImpl for LandingState {
         &mut self,
         state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
-        ground::collision_interrupt(state_context, &mut self.grounded_common, true)
+        ground::collision_interrupt(state_context, true)
     }
 
     fn on_enter(&mut self, state_context: &mut EnterContext) {
@@ -69,4 +65,8 @@ impl FighterStateImpl for LandingState {
             }
         };
     }
+
+    fn is_visually_grounded<'a>(&'a self) -> bool {
+        true
+    }
 }

src/fighter/state/mod.rs

@@ -8,25 +8,37 @@ use bevy::prelude::*;
 use crate::fighter::animation::{AnimKind, FighterAnimationFrame};
 use crate::fighter::attack::{
     FighterAttackScriptAssets, FighterKnockbackVelocity, FighterPendingHitReaction,
-    FighterStaleMoveQueue,
+    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::surface::EcbLockPolicy;
 use crate::fighter::visual::FighterAnimations;
 use crate::fighter::{
-    Fighter, FighterECB, FighterFacingDirection, FighterHitboxes, FighterHitstop,
+    Fighter, FighterDamage, FighterECB, FighterFacingDirection, FighterHitboxes, FighterHitstop,
-    FighterPreviousTranslation, FighterTranslation, FighterVelocity,
+    FighterHitstopShake, FighterHitstopShakeKind, FighterHitstopShakeRole,
+    FighterInvulnerabilityState, FighterPendingRespawn, FighterPresentationSnap,
+    FighterPreviousTranslation, FighterSurfaceState, FighterTranslation, FighterVelocity,
 };
 use crate::game_settings::GameSettings;
 use crate::input::FighterInput;
+use crate::match_loading::MatchConfig;
+use crate::match_runtime::MatchState;
+use crate::math::int::FGi32;
+use crate::math::vec::FGVec2;
+use crate::player::Player;
 use crate::scripting::FighterAttackScript;
 use crate::stage::line::StageCollision;
+use crate::stage::manifest::{StageManifest, StageManifestRegistry};
 
 pub mod air;
+pub mod air_attack;
 pub mod air_dodge;
+pub mod angel;
+pub mod crouch;
 pub mod dash;
 pub mod fall;
 pub mod ground;
@@ -34,11 +46,18 @@ pub mod ground_attack;
 pub mod hitstun;
 pub mod jump;
 pub mod land;
+pub mod platform_pass;
 pub mod run;
 pub mod turn;
 pub mod wait;
 pub mod walk;
 
+#[derive(Clone, Copy, Debug, Hash, PartialEq, Eq)]
+pub enum SurfacePolicy {
+    Grounded,
+    Airborne(EcbLockPolicy),
+}
+
 macro_rules! fighter_states {
     ($($variant:ident => $ty:ty),* $(,)?) => {
         #[derive(Component, Clone, Debug, Hash)]
@@ -66,6 +85,14 @@ macro_rules! fighter_states {
             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()),* }
+            }
+
+            pub fn surface_policy(&self) -> SurfacePolicy {
+                match self { $(Self::$variant(s) => s.surface_policy()),* }
+            }
         }
 
         $(impl From<$ty> for FighterState {
@@ -91,6 +118,12 @@ pub trait FighterStateImpl: Sized {
     ) -> Option<FighterState> {
         None
     }
+
+    fn is_visually_grounded<'a>(&'a self) -> bool;
+
+    fn surface_policy(&self) -> SurfacePolicy {
+        SurfacePolicy::Grounded
+    }
 }
 
 pub struct AnimationStatus {
@@ -103,7 +136,10 @@ pub struct InterruptContext<'a> {
     pub facing_direction: &'a mut FighterFacingDirection,
     pub game_settings: &'a GameSettings,
     pub fighter_attributes: &'a FighterAttributes,
+    pub surface: &'a FighterSurfaceState,
     pub animation: AnimationStatus,
+    pub stage_collision: &'a StageCollision,
+    pub attack_script_assets: &'a FighterAttackScriptAssets,
 }
 
 impl InterruptContext<'_> {
@@ -124,8 +160,10 @@ pub struct EnterContext<'a> {
     pub stale_move_queue: &'a mut FighterStaleMoveQueue,
     pub facing_direction: &'a mut FighterFacingDirection,
     pub animation_frame: &'a mut FighterAnimationFrame,
+    pub surface: &'a mut FighterSurfaceState,
     pub fighter_attributes: &'a FighterAttributes,
     pub attack_script_assets: &'a FighterAttackScriptAssets,
+    pub game_settings: &'a GameSettings,
 }
 
 impl EnterContext<'_> {
@@ -135,16 +173,21 @@ impl EnterContext<'_> {
 }
 
 pub struct ExitContext<'a> {
+    pub input: &'a mut FighterInput,
     pub hitboxes: &'a mut FighterHitboxes,
+    pub surface: &'a mut FighterSurfaceState,
+    pub vulnerability: &'a mut FighterInvulnerabilityState,
 }
 
 pub struct UpdateContext<'a> {
     pub translation: &'a mut FighterTranslation,
     pub prev_translation: &'a mut FighterPreviousTranslation,
-    pub input: &'a FighterInput,
+    pub input: &'a mut FighterInput,
     pub hitboxes: &'a mut FighterHitboxes,
     pub velocity: &'a mut FighterVelocity,
+    pub surface: &'a mut FighterSurfaceState,
     pub knockback_velocity: &'a mut FighterKnockbackVelocity,
+    pub vulnerability: &'a mut FighterInvulnerabilityState,
     pub game_settings: &'a GameSettings,
     pub animation_frame: u32,
     pub fighter_attributes: &'a FighterAttributes,
@@ -162,22 +205,33 @@ impl UpdateContext<'_> {
 pub struct CollisionContext<'a> {
     pub translation: &'a mut FighterTranslation,
     pub prev_translation: &'a FighterPreviousTranslation,
+    pub input: &'a FighterInput,
     pub velocity: &'a mut FighterVelocity,
-    pub ecb: &'a FighterECB,
+    pub surface: &'a mut FighterSurfaceState,
+    pub ecb: &'a mut FighterECB,
     pub prev_ecb: &'a FighterPreviousECB,
     pub stage_collision: &'a StageCollision,
+    pub leave_ground_ecb_lock_duration: u32,
+    pub presentation_snap: &'a mut FighterPresentationSnap,
+    pub downward_stick_threshold: FGi32,
 }
 
 impl CollisionContext<'_> {
     pub fn air_collide_with_stage(
         &self,
+        can_ignore_soft_platforms: bool,
     ) -> Option<crate::fighter::collision::AirCollisionWithStageResult> {
+        let ignored_polys = self.surface.ignored_polygon_ids();
+        let ignore_soft_platforms = can_ignore_soft_platforms
+            && self.input.get_last_frame().movement.y <= -self.downward_stick_threshold;
         crate::fighter::collision::air_collide_with_stage(
             self.prev_translation,
             self.translation,
             self.prev_ecb,
             self.ecb,
             self.stage_collision,
+            &ignored_polys,
+            ignore_soft_platforms,
         )
     }
 }
@@ -185,6 +239,8 @@ impl CollisionContext<'_> {
 fighter_states! {
     Wait => wait::WaitState,
     Walk => walk::WalkState,
+    PlatformPass => platform_pass::PlatformPassState,
+    Crouch => crouch::CrouchState,
     Dash => dash::DashState,
     Run => run::RunState,
     Fall => fall::FallState,
@@ -195,6 +251,8 @@ fighter_states! {
     Turn => turn::TurnState,
     GroundAttack => ground_attack::GroundAttackState,
     Hitstun => hitstun::HitstunState,
+    Angel => angel::AngelState,
+    AirAttack => air_attack::AirAttackState,
 }
 
 #[derive(QueryData)]
@@ -202,15 +260,18 @@ fighter_states! {
 pub struct FighterFrameQuery {
     pub translation: &'static mut FighterTranslation,
     pub prev_translation: &'static mut FighterPreviousTranslation,
+    pub presentation_snap: &'static mut FighterPresentationSnap,
     pub input: &'static mut FighterInput,
     pub hitboxes: &'static mut FighterHitboxes,
     pub velocity: &'static mut FighterVelocity,
+    pub surface: &'static mut FighterSurfaceState,
     pub knockback_velocity: &'static mut FighterKnockbackVelocity,
     pub stale_move_queue: &'static mut FighterStaleMoveQueue,
-    pub ecb: &'static FighterECB,
+    pub ecb: &'static mut FighterECB,
     pub prev_ecb: &'static FighterPreviousECB,
     pub facing_direction: &'static mut FighterFacingDirection,
     pub animation_frame: &'static mut FighterAnimationFrame,
+    pub vulnerability: &'static mut FighterInvulnerabilityState,
     pub fighter: &'static Fighter,
 }
 
@@ -237,6 +298,8 @@ impl<'w, 's> FighterFrameQueryItem<'w, 's> {
         animations: &'a FighterAnimations,
         baked_animations: &'a Assets<BakedFighterAnimations>,
         attributes: &'a FighterAttributes,
+        stage_collision: &'a StageCollision,
+        attack_script_assets: &'a FighterAttackScriptAssets,
     ) -> InterruptContext<'a> {
         let animation = self.animation_status(animations, baked_animations);
         InterruptContext {
@@ -245,6 +308,9 @@ impl<'w, 's> FighterFrameQueryItem<'w, 's> {
             game_settings,
             fighter_attributes: attributes,
             animation,
+            surface: &self.surface,
+            stage_collision,
+            attack_script_assets: attack_script_assets,
         }
     }
 
@@ -252,6 +318,7 @@ impl<'w, 's> FighterFrameQueryItem<'w, 's> {
         &'a mut self,
         attributes: &'a FighterAttributes,
         attack_script_assets: &'a FighterAttackScriptAssets,
+        game_settings: &'a GameSettings,
     ) -> EnterContext<'a> {
         EnterContext {
             input: &mut self.input,
@@ -261,14 +328,19 @@ impl<'w, 's> FighterFrameQueryItem<'w, 's> {
             stale_move_queue: &mut self.stale_move_queue,
             facing_direction: &mut self.facing_direction,
             animation_frame: &mut self.animation_frame,
+            surface: &mut self.surface,
             fighter_attributes: attributes,
             attack_script_assets,
+            game_settings,
         }
     }
 
     fn exit_context(&mut self) -> ExitContext<'_> {
         ExitContext {
+            input: &mut self.input,
             hitboxes: &mut self.hitboxes,
+            surface: &mut self.surface,
+            vulnerability: &mut self.vulnerability,
         }
     }
 
@@ -282,30 +354,40 @@ impl<'w, 's> FighterFrameQueryItem<'w, 's> {
         UpdateContext {
             translation: &mut self.translation,
             prev_translation: &mut self.prev_translation,
-            input: &self.input,
+            input: &mut self.input,
             hitboxes: &mut self.hitboxes,
             velocity: &mut self.velocity,
+            surface: &mut self.surface,
             knockback_velocity: &mut self.knockback_velocity,
             game_settings,
             animation_frame: self.animation_frame.frame,
+            vulnerability: &mut self.vulnerability,
             fighter_attributes: attributes,
             attack_scripts,
             attack_script_assets,
-            facing_direction: &self.facing_direction
+            facing_direction: &self.facing_direction,
         }
     }
 
     fn collision_context<'a>(
         &'a mut self,
         stage_collision: &'a StageCollision,
+        game_settings: &'a GameSettings,
     ) -> CollisionContext<'a> {
         CollisionContext {
             translation: &mut self.translation,
             prev_translation: &self.prev_translation,
+            presentation_snap: &mut self.presentation_snap,
+            input: &self.input,
             velocity: &mut self.velocity,
-            ecb: &self.ecb,
+            surface: &mut self.surface,
+            ecb: &mut self.ecb,
             prev_ecb: &self.prev_ecb,
             stage_collision,
+            leave_ground_ecb_lock_duration: game_settings
+                .fighter_common
+                .leave_ground_ecb_frame_lock_duration,
+            downward_stick_threshold: game_settings.input_common.run_stick_threshold,
         }
     }
 }
@@ -318,8 +400,12 @@ pub struct StatefulFighterQuery {
     pub animations: &'static FighterAnimations,
     pub fighter: &'static Fighter,
     pub attack_script_assets: &'static FighterAttackScriptAssets,
+    pub player: &'static Player,
     pub pending_hit_reaction: &'static mut FighterPendingHitReaction,
     pub hitstop: &'static mut FighterHitstop,
+    pub hitstop_shake: &'static mut FighterHitstopShake,
+    pub pending_respawn: &'static mut FighterPendingRespawn,
+    pub damage: &'static mut FighterDamage,
 }
 
 pub fn state_update_system(
@@ -359,12 +445,21 @@ fn transition_state(
     frame: &mut FighterFrameQueryItem,
     attributes: &FighterAttributes,
     attack_script_assets: &FighterAttackScriptAssets,
+    game_settings: &GameSettings,
 ) {
     let old_name = current.name();
     let new_name = next.name();
 
     current.on_exit(&mut frame.exit_context());
-    next.on_enter(&mut frame.enter_context(attributes, attack_script_assets));
+    if let SurfacePolicy::Airborne(lock_policy) = next.surface_policy() {
+        frame.surface.apply_airborne_policy(
+            lock_policy,
+            game_settings
+                .fighter_common
+                .leave_ground_ecb_frame_lock_duration,
+        );
+    }
+    next.on_enter(&mut frame.enter_context(attributes, attack_script_assets, game_settings));
     *current = next;
     info!("{} -> {}", old_name, new_name);
 }
@@ -374,6 +469,7 @@ pub fn state_interrupt_system(
     game_settings: Res<GameSettings>,
     baked_animations: Res<Assets<BakedFighterAnimations>>,
     fighter_manifests: Res<Assets<FighterManifest>>,
+    stage_collision: Res<StageCollision>,
 ) {
     for fighter in &mut query {
         let StatefulFighterQueryItem {
@@ -384,6 +480,8 @@ pub fn state_interrupt_system(
             attack_script_assets,
             mut pending_hit_reaction,
             mut hitstop,
+            mut hitstop_shake,
+            ..
         } = fighter;
         let manifest = fighter_manifests
             .get(&fighter.manifest)
@@ -391,31 +489,53 @@ pub fn state_interrupt_system(
 
         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
-                FighterState::Wait(value) => {
+                .hitstop_frames
-                    hitstun::HitstopStateKind::Grounded(value.grounded_common.clone())
+                .calculate_shake_frames(&game_settings);
-                }
+            hitstop_shake.role = FighterHitstopShakeRole::Receiver;
-                FighterState::Walk(value) => {
+            hitstop_shake.total_frames = shake_frames;
-                    hitstun::HitstopStateKind::Grounded(value.grounded_common.clone())
+            hitstop_shake.remaining_frames = shake_frames;
-                }
+            hitstop_shake.kind = if state.is_visually_grounded() {
-                FighterState::Dash(value) => {
+                FighterHitstopShakeKind::Horizontal
-                    hitstun::HitstopStateKind::Grounded(value.ground_common.clone())
+            } else {
-                }
+                FighterHitstopShakeKind::Vertical
-                FighterState::Run(value) => {
-                    hitstun::HitstopStateKind::Grounded(value.grounded_common.clone())
-                }
-                FighterState::Turn(value) => {
-                    hitstun::HitstopStateKind::Grounded(value.grounded_common.clone())
-                }
-                FighterState::GroundAttack(value) => {
-                    hitstun::HitstopStateKind::Grounded(value.grounded_common.clone())
-                }
-                _ => hitstun::HitstopStateKind::Airborne,
             };
-            Some(FighterState::Hitstun(HitstunState {
+
-                hit_reaction: reaction,
+            let mut hitstop_kind = if frame.surface.is_grounded() {
+                hitstun::HitstopStateKind::Grounded
+            } else {
+                hitstun::HitstopStateKind::Airborne
+            };
+
+            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 {
@@ -424,6 +544,8 @@ pub fn state_interrupt_system(
                 animations,
                 &baked_animations,
                 &manifest.attributes,
+                &stage_collision,
+                attack_script_assets,
             ))
         };
 
@@ -434,6 +556,7 @@ pub fn state_interrupt_system(
                 &mut frame,
                 &manifest.attributes,
                 attack_script_assets,
+                &game_settings,
             );
         };
     }
@@ -443,25 +566,90 @@ pub fn state_collision_interrupt_system(
     mut query: Query<StatefulFighterQuery>,
     stage_collision: Res<StageCollision>,
     fighter_manifests: Res<Assets<FighterManifest>>,
+    game_settings: Res<GameSettings>,
+    match_config: Res<MatchConfig>,
+    mut match_state: ResMut<MatchState>,
+    stage_registry: Res<StageManifestRegistry>,
+    stage_manifests: Res<Assets<StageManifest>>,
 ) {
+    let Some(stage_manifest_handle) = stage_registry.get(match_config.stage) else {
+        return;
+    };
+
+    let Some(stage_manifest) = stage_manifests.get(&stage_manifest_handle) else {
+        return;
+    };
+
     for fighter in &mut query {
         let StatefulFighterQueryItem {
             mut state,
             mut frame,
             fighter,
             attack_script_assets,
-            hitstop,
+            mut hitstop,
+            mut pending_respawn,
+            player,
+            mut damage,
             ..
         } = fighter;
-        if hitstop.remaining_frames > 0 {
-            continue;
-        }
 
         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 pending_respawn.0 {
+            **pending_respawn = false;
+            let respawn_state = FighterState::Angel(angel::AngelState::new(60 * 3));
+
+            // Find the angel platform position
+            let respawn_point = stage_manifest
+                .respawn_points
+                .get(player.controller_port % stage_manifest.respawn_points.len());
+
+            if let None = respawn_point {
+                error!("Couldn't get a respawn point, falling back to the world origin");
+            }
+
+            let respawn_point = respawn_point.copied().unwrap_or(FGVec2::ZERO);
+
+            frame.translation.0 = respawn_point;
+            frame.presentation_snap.0 = true;
+
+            // Clear hitstop
+            hitstop.remaining_frames = 0;
+
+            // subtract one stock
+
+            let player_state = match_state.players.get_mut(player.handle).expect(&format!(
+                "Failed to get fighter for GGRS slot {} (controller port {})",
+                player.handle, player.controller_port
+            ));
+
+            if let Some(stocks_remaining) = &mut player_state.stocks_remaining {
+                *stocks_remaining = stocks_remaining.saturating_sub(1);
+            }
+
+            // reset percentage
+            *damage = FighterDamage::default();
+
+            transition_state(
+                &mut state,
+                respawn_state,
+                &mut frame,
+                &manifest.attributes,
+                attack_script_assets,
+                &game_settings,
+            );
+            continue;
+        }
+
+        if hitstop.remaining_frames > 0 {
+            continue;
+        }
+
+        let new_state = state.check_collision_interrupt(
+            &mut frame.collision_context(&stage_collision, &game_settings),
+        );
         if let Some(new_state) = new_state {
             transition_state(
                 &mut state,
@@ -469,6 +657,7 @@ pub fn state_collision_interrupt_system(
                 &mut frame,
                 &manifest.attributes,
                 &attack_script_assets,
+                &game_settings,
             );
         }
     }

src/fighter/state/platform_pass.rs

@@ -0,0 +1,62 @@
+use super::{CollisionContext, EnterContext, FighterStateImpl, InterruptContext, UpdateContext};
+use crate::fighter::animation::AnimKind;
+use crate::fighter::state::air::AirborneStateCommon;
+use crate::fighter::state::{ExitContext, FighterState, air, jump};
+
+#[derive(Debug, Clone, Copy, Hash, Default)]
+pub struct PlatformPassState {
+    airborne_state_common: AirborneStateCommon,
+    ignored_polygon: usize,
+}
+
+impl PlatformPassState {
+    pub fn new(airborne_state_common: AirborneStateCommon, ignored_polygon: usize) -> Self {
+        Self {
+            airborne_state_common,
+            ignored_polygon
+        }
+    }
+}
+
+impl FighterStateImpl for PlatformPassState {
+    const NAME: &'static str = "PlatformPass";
+    
+    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 EnterContext) {
+        state_context.surface.ignore_polygon(self.ignored_polygon, state_context.game_settings.fighter_common.platform_pass_platform_ignore_duration_frames);
+        state_context.velocity.y = state_context.game_settings.fighter_common.platform_pass_initial_downwards_velocity;
+        state_context.play_animation(AnimKind::PlatformPass, false);
+    }
+
+    fn on_exit(&mut self, state_context: &mut ExitContext) {
+        state_context.surface.clear_polygon_ignore(self.ignored_polygon);
+    }
+
+    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 CollisionContext,
+    ) -> Option<FighterState> {
+        air::collision_interrupt(
+            state_context,
+            crate::fighter::state::land::LandingType::Normal,
+            true,
+        )
+    }
+    
+    fn is_visually_grounded<'a>(
+        &'a self,
+    ) -> bool {
+        false
+    }
+
+    fn surface_policy(&self) -> super::SurfacePolicy {
+        super::SurfacePolicy::Airborne(crate::fighter::surface::EcbLockPolicy::StartOnDetach)
+    }
+}

src/fighter/state/run.rs

@@ -6,19 +6,14 @@ use super::{
 };
 use crate::fighter::animation::AnimKind;
 use crate::fighter::state::FighterState;
-use crate::fighter::state::ground::GroundedStateCommon;
 
 #[derive(Component, Debug, Clone, Hash)]
-pub struct RunState {
+pub struct RunState;
-    pub grounded_common: GroundedStateCommon,
-}
 
 impl FighterStateImpl for RunState {
     const NAME: &'static str = "Run";
     fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
-        if let Some(state) =
+        if let Some(state) = ground::grounded_movement_common_interrupts(state_context) {
-            ground::grounded_movement_common_interrupts(state_context, &self.grounded_common)
-        {
             return Some(state);
         }
 
@@ -28,8 +23,7 @@ impl FighterStateImpl for RunState {
         {
             None
         } else {
-            walk::check_input(state_context, &self.grounded_common)
+            walk::check_input(state_context).or_else(|| wait::check_input(state_context))
-                .or_else(|| wait::check_input(state_context, &self.grounded_common))
         }
     }
 
@@ -62,20 +56,19 @@ impl FighterStateImpl for RunState {
         &mut self,
         state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
-        ground::collision_interrupt(state_context, &mut self.grounded_common, true)
+        ground::collision_interrupt(state_context, true)
+    }
+
+    fn is_visually_grounded<'a>(&'a self) -> bool {
+        true
     }
 }
 
-pub fn check_input(
+pub fn check_input(state_context: &InterruptContext) -> Option<FighterState> {
-    state_context: &InterruptContext,
-    ground_state_common: &GroundedStateCommon,
-) -> Option<FighterState> {
     let input_frame = state_context.input.get_last_frame();
     if input_frame.movement.x.abs() >= state_context.game_settings.input_common.run_stick_threshold
     {
-        return Some(FighterState::Run(RunState {
+        return Some(FighterState::Run(RunState));
-            grounded_common: ground_state_common.clone(),
-        }));
     }
     None
 }

src/fighter/state/turn.rs

@@ -1,13 +1,11 @@
 use super::{CollisionContext, EnterContext, FighterStateImpl, InterruptContext, UpdateContext};
 use crate::fighter::animation::AnimKind;
-use crate::fighter::state::ground::{self, GroundedStateCommon};
+use crate::fighter::state::ground;
 use crate::fighter::state::{FighterState, dash, jump, wait, walk};
 use crate::input::FighterCommands;
 
 #[derive(Debug, Clone, Hash)]
-pub struct TurnState {
+pub struct TurnState;
-    pub grounded_common: GroundedStateCommon,
-}
 
 impl FighterStateImpl for TurnState {
     const NAME: &'static str = "Turn";
@@ -19,19 +17,19 @@ impl FighterStateImpl for TurnState {
                 .input_common
                 .turn_into_dashback_window as u32
         {
-            if let Some(state) = dash::check_input(state_context, &self.grounded_common) {
+            if let Some(state) = dash::check_input(state_context) {
                 return Some(state);
             }
         }
-        if let Some(state) = jump::check_input(state_context, &self.grounded_common) {
+        if let Some(state) = jump::check_input(state_context) {
             *state_context.facing_direction = state_context.facing_direction.reverse();
             Some(state)
         } else if state_context.is_current_animation_finished() {
-            if let Some(state) = dash::check_input(state_context, &self.grounded_common) {
+            if let Some(state) = dash::check_input(state_context) {
                 Some(state)
-            } else if let Some(state) = walk::check_input(state_context, &self.grounded_common) {
+            } else if let Some(state) = walk::check_input(state_context) {
                 Some(state)
-            } else if let Some(state) = wait::check_input(state_context, &self.grounded_common) {
+            } else if let Some(state) = wait::check_input(state_context) {
                 Some(state)
             } else {
                 None
@@ -54,14 +52,15 @@ impl FighterStateImpl for TurnState {
         &mut self,
         state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
-        ground::collision_interrupt(state_context, &mut self.grounded_common, false)
+        ground::collision_interrupt(state_context, false)
+    }
+
+    fn is_visually_grounded<'a>(&'a self) -> bool {
+        true
     }
 }
 
-pub fn check_input(
+pub fn check_input(state_context: &InterruptContext) -> Option<FighterState> {
-    state_context: &InterruptContext,
-    grounded_common: &GroundedStateCommon,
-) -> Option<FighterState> {
     let input_frame = state_context.input.get_last_frame();
 
     let has_smash_input = state_context
@@ -75,9 +74,7 @@ pub fn check_input(
         && input_frame.movement.x.signum() != state_context.facing_direction.to_sign()
         && !has_smash_input
     {
-        return Some(FighterState::Turn(TurnState {
+        return Some(FighterState::Turn(TurnState));
-            grounded_common: grounded_common.clone(),
-        }));
     }
     None
 }

src/fighter/state/wait.rs

@@ -3,24 +3,18 @@ use super::{
 };
 use crate::fighter::animation::AnimKind;
 use crate::fighter::state::FighterState;
-use crate::fighter::state::ground::GroundedStateCommon;
 
 #[derive(Debug, Clone, Hash)]
-pub struct WaitState {
+pub struct WaitState;
-    pub grounded_common: GroundedStateCommon,
-}
 
 impl FighterStateImpl for WaitState {
     const NAME: &'static str = "Wait";
     fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
-        if let Some(state) =
+        if let Some(state) = ground::grounded_movement_common_interrupts(state_context) {
-            ground::grounded_movement_common_interrupts(state_context, &self.grounded_common)
-        {
             Some(state)
-        } else if let Some(state) = ground::grounded_movement_standstill_common_interrupts(
+        } else if let Some(state) =
-            state_context,
+            ground::grounded_movement_standstill_common_interrupts(state_context)
-            &self.grounded_common,
+        {
-        ) {
             // Don't transition into yourself
             if let FighterState::Wait(_) = state {
                 None
@@ -44,20 +38,19 @@ impl FighterStateImpl for WaitState {
         &mut self,
         state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
-        ground::collision_interrupt(state_context, &mut self.grounded_common, false)
+        ground::collision_interrupt(state_context, false)
+    }
+
+    fn is_visually_grounded<'a>(&'a self) -> bool {
+        true
     }
 }
 
-pub fn check_input(
+pub fn check_input(state_context: &InterruptContext) -> Option<FighterState> {
-    state_context: &InterruptContext,
-    ground_state_common: &GroundedStateCommon,
-) -> 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::Wait(WaitState {
+        return Some(FighterState::Wait(WaitState));
-            grounded_common: ground_state_common.clone(),
-        }));
     }
     None
 }

src/fighter/state/walk.rs

@@ -3,24 +3,18 @@ use super::{
     ground, wait,
 };
 use crate::fighter::animation::AnimKind;
-use crate::fighter::state::FighterState;
+use crate::fighter::state::{self, FighterState};
-use crate::fighter::state::ground::GroundedStateCommon;
 
 #[derive(Debug, Clone, Hash)]
-pub struct WalkState {
+pub struct WalkState;
-    pub grounded_common: GroundedStateCommon,
-}
 
 impl FighterStateImpl for WalkState {
     const NAME: &'static str = "Walk";
     fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
-        if let Some(state) =
+        if let Some(state) = ground::grounded_movement_common_interrupts(state_context) {
-            ground::grounded_movement_common_interrupts(state_context, &self.grounded_common)
-        {
             return Some(state);
         }
-        wait::check_input(state_context, &self.grounded_common)
+        wait::check_input(state_context).or_else(|| dash::check_input(state_context)).or_else(|| state::ground_attack::check_interrupt(state_context))
-            .or_else(|| dash::check_input(state_context, &self.grounded_common))
     }
 
     fn on_enter(&mut self, state_context: &mut EnterContext) {
@@ -54,20 +48,19 @@ impl FighterStateImpl for WalkState {
         &mut self,
         state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
-        ground::collision_interrupt(state_context, &mut self.grounded_common, false)
+        ground::collision_interrupt(state_context, false)
+    }
+
+    fn is_visually_grounded<'a>(&'a self) -> bool {
+        true
     }
 }
 
-pub fn check_input(
+pub fn check_input(state_context: &InterruptContext) -> Option<FighterState> {
-    state_context: &InterruptContext,
-    ground_state_common: &GroundedStateCommon,
-) -> Option<FighterState> {
     let input_frame = state_context.input.get_last_frame();
 
     if !input_frame.movement.x.is_zero() {
-        return Some(FighterState::Walk(WalkState {
+        return Some(FighterState::Walk(WalkState));
-            grounded_common: ground_state_common.clone(),
-        }));
     }
 
     None

src/fighter/surface.rs

@@ -0,0 +1,227 @@
+use bevy::prelude::*;
+
+use crate::stage::line::StageLineID;
+
+#[derive(Clone, Copy, Debug, Hash, PartialEq, Eq)]
+pub enum EcbLockPolicy {
+    StartOnDetach,
+    Restart,
+    Preserve,
+    Clear,
+}
+
+/// The stage surface currently supporting a fighter.
+///
+/// This is physics state rather than fighter-state-machine state. Keeping it
+/// separate means grounded, landing, and hitstun states all share one source
+/// of truth for stage contact.
+#[derive(Clone, Debug, Hash, PartialEq, Eq)]
+pub struct IgnoredPolygon {
+    pub polygon: usize,
+    pub frames_remaining: u32,
+}
+
+#[derive(Component, Clone, Debug, Hash, PartialEq, Eq)]
+pub enum FighterSurfaceState {
+    Airborne {
+        ecb_lock_frames_remaining: u32,
+        ignored_polys: Vec<IgnoredPolygon>,
+    },
+    Grounded {
+        line_id: StageLineID,
+    },
+}
+
+impl Default for FighterSurfaceState {
+    fn default() -> Self {
+        Self::Airborne {
+            ecb_lock_frames_remaining: 0,
+            ignored_polys: vec![],
+        }
+    }
+}
+
+impl FighterSurfaceState {
+    pub fn is_grounded(&self) -> bool {
+        matches!(self, Self::Grounded { .. })
+    }
+
+    pub fn line_id(&self) -> Option<StageLineID> {
+        match self {
+            Self::Airborne { .. } => None,
+            Self::Grounded { line_id } => Some(*line_id),
+        }
+    }
+
+    pub(crate) fn land(&mut self, line_id: StageLineID) {
+        *self = Self::Grounded { line_id };
+    }
+
+    pub fn clear_polygon_ignore(&mut self, polygon: usize) {
+        let Self::Airborne { ignored_polys, .. } = self else {
+            return;
+        };
+
+        ignored_polys.retain(|element| element.polygon != polygon);
+    }
+    
+    pub fn ignore_polygon(&mut self, polygon: usize, duration_frames: u32) {
+        let Self::Airborne { ignored_polys, .. } = self else {
+            return;
+        };
+
+        if duration_frames == 0 {
+            return;
+        }
+
+        if let Some(ignored) = ignored_polys.iter_mut().find(|ignored| ignored.polygon == polygon) {
+            ignored.frames_remaining = duration_frames;
+        } else {
+            ignored_polys.push(IgnoredPolygon {
+                polygon,
+                frames_remaining: duration_frames,
+            });
+        }
+    }
+
+    pub fn is_polygon_ignored(&self, polygon: usize) -> bool {
+        matches!(self, Self::Airborne { ignored_polys, .. }
+            if ignored_polys.iter().any(|ignored| ignored.polygon == polygon))
+    }
+
+    pub(crate) fn ignored_polygon_ids(&self) -> Vec<usize> {
+        match self {
+            Self::Airborne { ignored_polys, .. } => {
+                ignored_polys.iter().map(|ignored| ignored.polygon).collect()
+            }
+            Self::Grounded { .. } => vec![],
+        }
+    }
+
+    pub(crate) fn apply_airborne_policy(
+        &mut self,
+        policy: EcbLockPolicy,
+        ecb_lock_duration: u32,
+    ) {
+        let current_lock = match self {
+            Self::Airborne { ecb_lock_frames_remaining, .. } => *ecb_lock_frames_remaining,
+            Self::Grounded { .. } => 0,
+        };
+        let ecb_lock_frames_remaining = match policy {
+            EcbLockPolicy::StartOnDetach if self.is_grounded() => ecb_lock_duration,
+            EcbLockPolicy::StartOnDetach => current_lock,
+            EcbLockPolicy::Restart => ecb_lock_duration,
+            EcbLockPolicy::Preserve => current_lock,
+            EcbLockPolicy::Clear => 0,
+        };
+        let ignored_polys = match self {
+            Self::Airborne { ignored_polys, .. } => ignored_polys.clone(),
+            Self::Grounded { .. } => vec![],
+        };
+        *self = Self::Airborne { ecb_lock_frames_remaining, ignored_polys };
+    }
+
+    pub(crate) fn tick_ecb_lock(&mut self) {
+        if let Self::Airborne { ecb_lock_frames_remaining, .. } = self {
+            *ecb_lock_frames_remaining = ecb_lock_frames_remaining.saturating_sub(1);
+        }
+    }
+
+    pub(crate) fn tick_ignored_polygons(&mut self) {
+        if let Self::Airborne { ignored_polys, .. } = self {
+            for ignored in ignored_polys.iter_mut() {
+                ignored.frames_remaining = ignored.frames_remaining.saturating_sub(1);
+            }
+            ignored_polys.retain(|ignored| ignored.frames_remaining > 0);
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn contact_lifecycle_has_one_source_of_truth() {
+        let mut surface = FighterSurfaceState::default();
+        assert!(!surface.is_grounded());
+        assert_eq!(surface.line_id(), None);
+
+        let line_id = StageLineID {
+            polygon: 2,
+            segment: 3,
+        };
+        surface.land(line_id);
+        assert!(surface.is_grounded());
+        assert_eq!(surface.line_id(), Some(line_id));
+
+        surface.apply_airborne_policy(EcbLockPolicy::Clear, 0);
+        assert!(!surface.is_grounded());
+        assert_eq!(surface.line_id(), None);
+    }
+
+    #[test]
+    fn start_on_detach_does_not_reset_an_existing_lock() {
+        let mut surface = FighterSurfaceState::default();
+        surface.apply_airborne_policy(EcbLockPolicy::Restart, 5);
+        surface.tick_ecb_lock();
+        surface.apply_airborne_policy(EcbLockPolicy::StartOnDetach, 5);
+
+        assert_eq!(
+            surface,
+            FighterSurfaceState::Airborne {
+                ecb_lock_frames_remaining: 4,
+                ignored_polys: vec![],
+            }
+        );
+    }
+
+    #[test]
+    fn restart_retriggers_an_existing_lock() {
+        let mut surface = FighterSurfaceState::default();
+        surface.apply_airborne_policy(EcbLockPolicy::Restart, 5);
+        surface.tick_ecb_lock();
+        surface.apply_airborne_policy(EcbLockPolicy::Restart, 5);
+
+        assert_eq!(
+            surface,
+            FighterSurfaceState::Airborne {
+                ecb_lock_frames_remaining: 5,
+                ignored_polys: vec![],
+            }
+        );
+    }
+
+    #[test]
+    fn ignored_polygon_expires_after_requested_frames() {
+        let mut surface = FighterSurfaceState::default();
+        surface.ignore_polygon(3, 2);
+
+        assert!(surface.is_polygon_ignored(3));
+        surface.tick_ignored_polygons();
+        assert!(surface.is_polygon_ignored(3));
+        surface.tick_ignored_polygons();
+        assert!(!surface.is_polygon_ignored(3));
+    }
+
+    #[test]
+    fn ignoring_polygon_refreshes_existing_entry() {
+        let mut surface = FighterSurfaceState::default();
+        surface.ignore_polygon(3, 2);
+        surface.ignore_polygon(3, 5);
+        surface.tick_ignored_polygons();
+        surface.tick_ignored_polygons();
+        assert!(surface.is_polygon_ignored(3));
+    }
+
+    #[test]
+    fn airborne_policy_preserves_ignored_polygons_and_landing_clears_them() {
+        let mut surface = FighterSurfaceState::default();
+        surface.ignore_polygon(3, 5);
+        surface.apply_airborne_policy(EcbLockPolicy::Restart, 2);
+        assert!(surface.is_polygon_ignored(3));
+
+        surface.land(StageLineID { polygon: 0, segment: 0 });
+        assert!(!surface.is_polygon_ignored(3));
+    }
+}

src/fighter/visual.rs

@@ -1,4 +1,8 @@
-use crate::fighter::baked_animation::BakedFighterAnimations;
+use crate::{
+    fighter::{FighterInvulnerabilityState, baked_animation::BakedFighterAnimations},
+    game_settings::GameSettings,
+    materials::fighter_material::{FighterMaterial, FighterMesh},
+};
 use bevy::prelude::*;
 
 #[derive(Component, Clone)]
@@ -6,3 +10,62 @@ pub struct FighterAnimations {
     /// The single animation source for gameplay and the visual skeleton.
     pub baked: Handle<BakedFighterAnimations>,
 }
+
+#[derive(Component, Clone, Default)]
+pub struct FighterInvulnerabilityVisualState {
+    pub last_known_state: FighterInvulnerabilityState,
+    pub frames_in_state: u32,
+}
+
+pub fn update_status_colors(
+    mut fighters: Query<(
+        &FighterInvulnerabilityState,
+        &mut FighterInvulnerabilityVisualState,
+    )>,
+    meshes: Query<(&FighterMesh, &MeshMaterial3d<FighterMaterial>)>,
+    mut materials: ResMut<Assets<FighterMaterial>>,
+    game_settings: Res<GameSettings>,
+) {
+    for (invuln_state, mut invuln_state_visual) in &mut fighters {
+        if *invuln_state != invuln_state_visual.last_known_state {
+            invuln_state_visual.last_known_state = *invuln_state;
+            invuln_state_visual.frames_in_state = 0;
+        }
+    }
+    for (mesh, mat) in meshes {
+        let (_, invuln_state_visual) = fighters
+            .get(mesh.fighter)
+            .expect("Material should have relevant fighter available");
+
+        let status_color = match invuln_state_visual.last_known_state {
+            FighterInvulnerabilityState::Vulnerable => bevy::color::palettes::css::WHITE.into(),
+            FighterInvulnerabilityState::Invulnerable => {
+                game_settings.fighter_common.intangible_color
+            }
+            FighterInvulnerabilityState::Intangible => {
+                game_settings.fighter_common.intangible_color
+            }
+        };
+
+        let intensity = match invuln_state_visual.last_known_state {
+            FighterInvulnerabilityState::Vulnerable => 0.0,
+            FighterInvulnerabilityState::Invulnerable | FighterInvulnerabilityState::Intangible => {
+                let cycle_frames = invuln_state_visual.frames_in_state
+                    % game_settings.fighter_common.intangible_pulse_duration;
+                1.0 - cycle_frames as f32
+                    / ((game_settings.fighter_common.intangible_pulse_duration) as f32)
+            }
+        };
+
+        let mut material = materials
+            .get_mut(mat.id())
+            .expect("Material should exist here...");
+        material
+            .extension
+            .update_status_color(status_color.into(), intensity);
+    }
+
+    for (_, mut invuln_state_visual) in fighters {
+        invuln_state_visual.frames_in_state = invuln_state_visual.frames_in_state.saturating_add(1);
+    }
+}

src/filled_gizmo.wgsl

@@ -0,0 +1,30 @@
+#import bevy_pbr::mesh_functions::{get_world_from_local, mesh_position_local_to_clip}
+
+@group(#{MATERIAL_BIND_GROUP}) @binding(0) var<uniform> material_color: vec4<f32>;
+
+struct Vertex {
+    @builtin(instance_index) instance_index: u32,
+    @location(0) position: vec3<f32>,
+    @location(1) color: vec4<f32>,
+};
+
+struct VertexOutput {
+    @builtin(position) clip_position: vec4<f32>,
+    @location(0) color: vec4<f32>,
+};
+
+@vertex
+fn vertex(vertex: Vertex) -> VertexOutput {
+    var output: VertexOutput;
+    output.clip_position = mesh_position_local_to_clip(
+        get_world_from_local(vertex.instance_index),
+        vec4<f32>(vertex.position, 1.0),
+    );
+    output.color = vertex.color;
+    return output;
+}
+
+@fragment
+fn fragment(input: VertexOutput) -> @location(0) vec4<f32> {
+    return material_color * input.color;
+}

src/filled_gizmos.rs

@@ -0,0 +1,417 @@
+//! Immediate-mode filled debug geometry.
+//!
+//! Unlike Bevy's line-only `Gizmos`, this collects triangles into one dynamic
+//! mesh. It is intended for small, transient debug overlays rather than game
+//! geometry.
+
+use std::f32::consts::{FRAC_PI_2, PI, TAU};
+
+use bevy::{
+    asset::{load_internal_asset, uuid_handle, RenderAssetUsages},
+    camera::visibility::NoFrustumCulling,
+    ecs::system::SystemParam,
+    mesh::{Indices, MeshVertexBufferLayoutRef, PrimitiveTopology},
+    pbr::{MaterialPipeline, MaterialPipelineKey},
+    prelude::*,
+    render::render_resource::{
+        AsBindGroup, RenderPipelineDescriptor, SpecializedMeshPipelineError,
+    },
+    shader::ShaderRef,
+};
+
+const SPHERE_SECTORS: usize = 16;
+const SPHERE_STACKS: usize = 8;
+const CAPSULE_SECTORS: usize = 16;
+const CAPSULE_HEMISPHERE_STEPS: usize = 4;
+
+#[derive(Default)]
+struct FilledGizmoGeometry {
+    positions: Vec<[f32; 3]>,
+    normals: Vec<[f32; 3]>,
+    colors: Vec<[f32; 4]>,
+    indices: Vec<u32>,
+}
+
+#[derive(Resource, Default)]
+struct FilledGizmoBuffer {
+    /// Geometry requested by the current schedule invocation.
+    pending: FilledGizmoGeometry,
+    /// The last completed fixed-timestep geometry. This is retained between
+    /// render frames, just like Bevy's fixed-timestep gizmos.
+    retained: FilledGizmoGeometry,
+    mesh: Option<Handle<Mesh>>,
+    fixed_commit: bool,
+}
+
+/// Immediate-mode API for drawing filled debug shapes.
+#[derive(SystemParam)]
+pub struct FilledGizmos<'w> {
+    buffer: ResMut<'w, FilledGizmoBuffer>,
+}
+
+impl FilledGizmos<'_> {
+    /// Draw a filled planar polygon. Vertices must be ordered around the
+    /// perimeter and the polygon must be convex.
+    pub fn polygon(&mut self, vertices: &[Vec3], color: impl Into<Color> + Copy) {
+        if vertices.len() < 3 {
+            return;
+        }
+        let color = color.into().to_linear().to_f32_array();
+        let normal = (vertices[1] - vertices[0])
+            .cross(vertices[2] - vertices[0])
+            .normalize_or_zero();
+        let base = self.buffer.pending.positions.len() as u32;
+        for &vertex in vertices {
+            self.push_vertex(vertex, normal, color);
+        }
+        for index in 2..vertices.len() as u32 {
+            self.buffer
+                .pending
+                .indices
+                .extend([base, base + index - 1, base + index]);
+        }
+    }
+
+    pub fn sphere(&mut self, isometry: Isometry3d, radius: f32, color: impl Into<Color> + Copy) {
+        if radius <= 0.0 {
+            return;
+        }
+        let color = color.into().to_linear().to_f32_array();
+        let base = self.buffer.pending.positions.len() as u32;
+        for stack in 0..=SPHERE_STACKS {
+            let latitude = PI * 0.5 - stack as f32 * PI / SPHERE_STACKS as f32;
+            let (sin_lat, cos_lat) = latitude.sin_cos();
+            for sector in 0..=SPHERE_SECTORS {
+                let longitude = sector as f32 * TAU / SPHERE_SECTORS as f32;
+                let (sin_lon, cos_lon) = longitude.sin_cos();
+                let normal = Vec3::new(cos_lat * cos_lon, sin_lat, cos_lat * sin_lon);
+                self.push_vertex(
+                    isometry.transform_point(normal * radius).into(),
+                    isometry.rotation * normal,
+                    color,
+                );
+            }
+        }
+        let stride = SPHERE_SECTORS + 1;
+        for stack in 0..SPHERE_STACKS {
+            for sector in 0..SPHERE_SECTORS {
+                let a = base + (stack * stride + sector) as u32;
+                let b = a + stride as u32;
+                self.buffer
+                    .pending
+                    .indices
+                    .extend([a, b, a + 1, a + 1, b, b + 1]);
+            }
+        }
+    }
+
+    pub fn capsule(
+        &mut self,
+        isometry: Isometry3d,
+        radius: f32,
+        half_length: f32,
+        color: impl Into<Color> + Copy,
+    ) {
+        let transform = Mat4::from_scale_rotation_translation(
+            Vec3::ONE,
+            isometry.rotation,
+            isometry.translation.into(),
+        );
+        self.affine_capsule(transform, radius, half_length, color);
+    }
+
+    /// Draw a capsule transformed by an arbitrary affine transform.
+    pub fn affine_capsule(
+        &mut self,
+        transform: Mat4,
+        radius: f32,
+        half_length: f32,
+        color: impl Into<Color> + Copy,
+    ) {
+        if radius <= 0.0 {
+            return;
+        }
+        let color = color.into().to_linear().to_f32_array();
+        let base = self.buffer.pending.positions.len() as u32;
+        let mut rings = Vec::new();
+        for step in 1..=CAPSULE_HEMISPHERE_STEPS {
+            let angle = -FRAC_PI_2 + step as f32 * FRAC_PI_2 / CAPSULE_HEMISPHERE_STEPS as f32;
+            rings.push((
+                radius * angle.cos(),
+                -half_length + radius * angle.sin(),
+                angle.sin(),
+            ));
+        }
+        rings.push((radius, half_length, 0.0));
+        for step in 1..CAPSULE_HEMISPHERE_STEPS {
+            let angle = step as f32 * FRAC_PI_2 / CAPSULE_HEMISPHERE_STEPS as f32;
+            rings.push((
+                radius * angle.cos(),
+                half_length + radius * angle.sin(),
+                angle.sin(),
+            ));
+        }
+
+        let mut ring_indices = Vec::new();
+        let bottom_pole = self.push_capsule_vertex(
+            &mut ring_indices,
+            transform,
+            Vec3::NEG_Y,
+            -half_length,
+            radius,
+            color,
+        );
+        for &(ring_radius, y, normal_y) in &rings {
+            let mut ring = Vec::with_capacity(CAPSULE_SECTORS);
+            for sector in 0..CAPSULE_SECTORS {
+                let angle = sector as f32 * TAU / CAPSULE_SECTORS as f32;
+                let (sin, cos) = angle.sin_cos();
+                let normal = Vec3::new(
+                    cos * (1.0 - normal_y * normal_y).sqrt(),
+                    normal_y,
+                    sin * (1.0 - normal_y * normal_y).sqrt(),
+                );
+                ring.push(self.push_transformed_vertex(
+                    transform,
+                    Vec3::new(cos * ring_radius, y, sin * ring_radius),
+                    normal,
+                    color,
+                ));
+            }
+            ring_indices.push(ring);
+        }
+        let top_pole = self.push_capsule_vertex(
+            &mut ring_indices,
+            transform,
+            Vec3::Y,
+            half_length,
+            radius,
+            color,
+        );
+        for sector in 0..CAPSULE_SECTORS {
+            let next = (sector + 1) % CAPSULE_SECTORS;
+            self.buffer.pending.indices.extend([
+                bottom_pole,
+                ring_indices[0][next],
+                ring_indices[0][sector],
+            ]);
+            for ring in ring_indices.windows(2) {
+                self.buffer.pending.indices.extend([
+                    ring[0][sector],
+                    ring[0][next],
+                    ring[1][sector],
+                    ring[1][sector],
+                    ring[0][next],
+                    ring[1][next],
+                ]);
+            }
+            let last = ring_indices.len() - 1;
+            self.buffer.pending.indices.extend([
+                ring_indices[last][sector],
+                ring_indices[last][next],
+                top_pole,
+            ]);
+        }
+        // Keep the base used by this shape observable to avoid accidental
+        // future changes making the generated indices refer to another shape.
+        debug_assert!(base <= bottom_pole);
+    }
+
+    fn push_capsule_vertex(
+        &mut self,
+        _rings: &mut Vec<Vec<u32>>,
+        transform: Mat4,
+        normal: Vec3,
+        y: f32,
+        radius: f32,
+        color: [f32; 4],
+    ) -> u32 {
+        self.push_transformed_vertex(
+            transform,
+            Vec3::new(0.0, y + normal.y * radius, 0.0),
+            normal,
+            color,
+        )
+    }
+
+    fn push_transformed_vertex(
+        &mut self,
+        transform: Mat4,
+        position: Vec3,
+        normal: Vec3,
+        color: [f32; 4],
+    ) -> u32 {
+        let transformed_normal = transform
+            .inverse()
+            .transpose()
+            .transform_vector3(normal)
+            .normalize_or_zero();
+        let index = self.buffer.pending.positions.len() as u32;
+        self.push_vertex(
+            transform.transform_point3(position),
+            transformed_normal,
+            color,
+        );
+        index
+    }
+
+    fn push_vertex(&mut self, position: Vec3, normal: Vec3, color: [f32; 4]) {
+        self.buffer.pending.positions.push(position.to_array());
+        self.buffer.pending.normals.push(normal.to_array());
+        self.buffer.pending.colors.push(color);
+    }
+}
+
+pub struct FilledGizmosPlugin;
+
+const FILLED_GIZMO_SHADER_HANDLE: Handle<Shader> =
+    uuid_handle!("0e4a979f-ea11-4e5a-91cd-19c89d4e9b53");
+
+/// A deliberately minimal material: unlike `StandardMaterial`, its fragment
+/// shader writes vertex colors directly and therefore bypasses PBR lighting
+/// and camera tonemapping.
+#[derive(Asset, AsBindGroup, Reflect, Clone, Debug)]
+struct FilledGizmoMaterial {
+    #[uniform(0)]
+    color: LinearRgba,
+}
+
+impl Material for FilledGizmoMaterial {
+    fn vertex_shader() -> ShaderRef {
+        FILLED_GIZMO_SHADER_HANDLE.clone().into()
+    }
+
+    fn fragment_shader() -> ShaderRef {
+        FILLED_GIZMO_SHADER_HANDLE.clone().into()
+    }
+
+    fn alpha_mode(&self) -> AlphaMode {
+        AlphaMode::Blend
+    }
+
+    fn enable_prepass() -> bool {
+        false
+    }
+
+    fn enable_shadows() -> bool {
+        false
+    }
+
+    fn specialize(
+        _pipeline: &MaterialPipeline,
+        descriptor: &mut RenderPipelineDescriptor,
+        layout: &MeshVertexBufferLayoutRef,
+        _key: MaterialPipelineKey<Self>,
+    ) -> Result<(), SpecializedMeshPipelineError> {
+        descriptor.vertex.buffers = vec![layout.0.get_layout(&[
+            Mesh::ATTRIBUTE_POSITION.at_shader_location(0),
+            Mesh::ATTRIBUTE_COLOR.at_shader_location(1),
+        ])?];
+        descriptor.primitive.cull_mode = None;
+        Ok(())
+    }
+}
+
+impl Plugin for FilledGizmosPlugin {
+    fn build(&self, app: &mut App) {
+        load_internal_asset!(
+            app,
+            FILLED_GIZMO_SHADER_HANDLE,
+            "filled_gizmo.wgsl",
+            Shader::from_wgsl
+        );
+        app.add_plugins(MaterialPlugin::<FilledGizmoMaterial>::default())
+            .init_resource::<FilledGizmoBuffer>()
+            .add_systems(Startup, setup_filled_gizmo_mesh)
+            .add_systems(FixedFirst, begin_fixed_filled_gizmos)
+            .add_systems(FixedLast, commit_fixed_filled_gizmos)
+            .add_systems(Last, upload_filled_gizmo_mesh);
+    }
+}
+
+fn setup_filled_gizmo_mesh(
+    mut commands: Commands,
+    mut meshes: ResMut<Assets<Mesh>>,
+    mut materials: ResMut<Assets<FilledGizmoMaterial>>,
+    mut buffer: ResMut<FilledGizmoBuffer>,
+) {
+    let mesh = meshes.add(
+        Mesh::new(
+            PrimitiveTopology::TriangleList,
+            RenderAssetUsages::default(),
+        )
+        .with_inserted_attribute(Mesh::ATTRIBUTE_POSITION, vec![[0.0; 3]; 3])
+        .with_inserted_attribute(Mesh::ATTRIBUTE_NORMAL, vec![[0.0, 0.0, 1.0]; 3])
+        .with_inserted_attribute(Mesh::ATTRIBUTE_COLOR, vec![[0.0, 0.0, 0.0, 0.0]; 3])
+        .with_inserted_indices(Indices::U32(vec![0, 1, 2])),
+    );
+    let material = materials.add(FilledGizmoMaterial {
+        color: LinearRgba::WHITE,
+    });
+    commands.spawn((
+        Mesh3d(mesh.clone()),
+        MeshMaterial3d(material),
+        NoFrustumCulling,
+    ));
+    buffer.mesh = Some(mesh);
+}
+
+fn begin_fixed_filled_gizmos(mut buffer: ResMut<FilledGizmoBuffer>) {
+    buffer.pending = FilledGizmoGeometry::default();
+    buffer.fixed_commit = false;
+}
+
+fn commit_fixed_filled_gizmos(mut buffer: ResMut<FilledGizmoBuffer>) {
+    let pending = std::mem::take(&mut buffer.pending);
+    buffer.pending = std::mem::replace(&mut buffer.retained, pending);
+    buffer.fixed_commit = true;
+}
+
+fn upload_filled_gizmo_mesh(
+    mut meshes: ResMut<Assets<Mesh>>,
+    mut buffer: ResMut<FilledGizmoBuffer>,
+) {
+    // No fixed tick and no render-frame requests means the existing mesh is
+    // already the correct image. In particular, do not replace it with the
+    // empty placeholder between fixed updates.
+    if !buffer.fixed_commit && buffer.pending.positions.is_empty() {
+        return;
+    }
+    let Some(handle) = buffer.mesh.clone() else {
+        return;
+    };
+
+    let (positions, normals, colors, indices) = if buffer.fixed_commit {
+        // Retained geometry must remain in the CPU-side buffer after upload;
+        // otherwise the next render frame would have nothing to draw.
+        (
+            buffer.retained.positions.clone(),
+            buffer.retained.normals.clone(),
+            buffer.retained.colors.clone(),
+            buffer.retained.indices.clone(),
+        )
+    } else {
+        (
+            std::mem::take(&mut buffer.pending.positions),
+            std::mem::take(&mut buffer.pending.normals),
+            std::mem::take(&mut buffer.pending.colors),
+            std::mem::take(&mut buffer.pending.indices),
+        )
+    };
+
+    if let Some(mut mesh) = meshes.get_mut(&handle) {
+        if positions.is_empty() {
+            mesh.insert_attribute(Mesh::ATTRIBUTE_POSITION, vec![[0.0; 3]; 3]);
+            mesh.insert_attribute(Mesh::ATTRIBUTE_NORMAL, vec![[0.0, 0.0, 1.0]; 3]);
+            mesh.insert_attribute(Mesh::ATTRIBUTE_COLOR, vec![[0.0, 0.0, 0.0, 0.0]; 3]);
+            mesh.insert_indices(Indices::U32(vec![0, 1, 2]));
+        } else {
+            mesh.insert_attribute(Mesh::ATTRIBUTE_POSITION, positions);
+            mesh.insert_attribute(Mesh::ATTRIBUTE_NORMAL, normals);
+            mesh.insert_attribute(Mesh::ATTRIBUTE_COLOR, colors);
+            mesh.insert_indices(Indices::U32(indices));
+        }
+    }
+    buffer.pending = FilledGizmoGeometry::default();
+    buffer.fixed_commit = false;
+}

src/game_settings.rs

@@ -9,12 +9,42 @@ 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,
+    pub leave_ground_ecb_frame_lock_duration: u32,
+    pub platform_pass_platform_ignore_duration_frames: u32,
+    pub platform_pass_initial_downwards_velocity: FGi32,
+
+    pub intangible_color: Color,
+    pub intangible_pulse_duration: u32,
 }
 #[derive(Reflect, Serialize, Deserialize, Clone)]
 #[reflect(opaque)]

src/input/buffer.rs

@@ -1,30 +1,59 @@
-//! Per-fighter input state: the current and previous frame, plus the buffered
+//! Rollback-safe input history and command buffering.
-//! commands (smash inputs and friends) that states query when deciding whether
+//!
-//! to interrupt.
+//! Raw mapped bindings, button edges, and command lifetimes are deliberately
-
+//! separate. This preserves combinations such as pressing a second shield
-use std::ops::{Index, IndexMut};
+//! binding while the first one is held, while still allowing a command to
+//! survive after its source button is released.
 
 use bevy::prelude::*;
 use bevy_ggrs::{PlayerInputs, Rollback};
 use strum::IntoEnumIterator;
 use strum_macros::EnumIter;
 
+use crate::fighter::FighterFacingDirection;
 use crate::fighter::attack::AttackKind;
 use crate::game_settings::GameSettings;
-use crate::input::FighterInputFrame;
+use crate::input::{DigitalAction, FighterInputFrame};
 use crate::netcode::GGRSCfg;
 use crate::player::Player;
 
-#[derive(Clone, Copy, EnumIter, Debug)]
+#[derive(Clone, Copy, EnumIter, Debug, PartialEq, Eq, Hash)]
 pub enum FighterCommands {
     Jump,
     Shield,
+    GuardHold,
     Attack,
+    SmashMoveUp,
+    SmashMoveDown,
     SmashMoveLeft,
     SmashMoveRight,
 }
 
-#[derive(Default, Clone, Hash, Copy)]
+pub(crate) fn second_binding_pressed(
+    current: crate::input::ActionBindingMask,
+    previous: crate::input::ActionBindingMask,
+) -> bool {
+    current.count() >= 2 && current.pressed_since(previous).0 != 0
+}
+
+impl FighterCommands {
+    pub const COUNT: usize = 8;
+
+    pub const fn index(self) -> usize {
+        match self {
+            Self::Jump => 0,
+            Self::Shield => 1,
+            Self::GuardHold => 2,
+            Self::Attack => 3,
+            Self::SmashMoveUp => 4,
+            Self::SmashMoveDown => 5,
+            Self::SmashMoveLeft => 6,
+            Self::SmashMoveRight => 7,
+        }
+    }
+}
+
+#[derive(Default, Clone, Hash, Copy, Debug)]
 pub enum FighterAttackCommandType {
     #[default]
     Neutral,
@@ -41,60 +70,140 @@ pub enum FighterAttackCommandType {
 impl FighterAttackCommandType {
     pub fn to_attack_kind_grounded(&self) -> AttackKind {
         match self {
-            FighterAttackCommandType::Neutral => AttackKind::Jab,
+            Self::Neutral => AttackKind::Jab,
-            FighterAttackCommandType::SmashAttackUp => AttackKind::UpSmash,
+            Self::SmashAttackUp => AttackKind::UpSmash,
-            FighterAttackCommandType::SmashAttackDown => AttackKind::DownSmash,
+            Self::SmashAttackDown => AttackKind::DownSmash,
-            FighterAttackCommandType::SmashAttackLeft => AttackKind::ForwardSmash,
+            Self::SmashAttackLeft | Self::SmashAttackRight => AttackKind::ForwardSmash,
-            FighterAttackCommandType::SmashAttackRight => AttackKind::ForwardSmash,
+            Self::TiltAttackUp => AttackKind::UpTilt,
-            FighterAttackCommandType::TiltAttackUp => AttackKind::UpTilt,
+            Self::TiltAttackDown => AttackKind::DownTilt,
-            FighterAttackCommandType::TiltAttackDown => AttackKind::DownTilt,
+            Self::TiltAttackLeft | Self::TiltAttackRight => AttackKind::ForwardTilt,
-            FighterAttackCommandType::TiltAttackLeft => AttackKind::ForwardTilt,
+        }
-            FighterAttackCommandType::TiltAttackRight => AttackKind::ForwardTilt,
+    }
+
+    pub fn to_attack_kind_airborne(&self, facing_direction: &FighterFacingDirection) -> AttackKind {
+        match self {
+            Self::Neutral => AttackKind::NeutralAir,
+            Self::SmashAttackUp | Self::TiltAttackUp => AttackKind::UpAir,
+            Self::SmashAttackDown | Self::TiltAttackDown => AttackKind::DownAir,
+            Self::SmashAttackLeft | Self::TiltAttackLeft => match facing_direction {
+                FighterFacingDirection::Left => AttackKind::ForwardAir,
+                FighterFacingDirection::Right => AttackKind::BackAir,
+            },
+            Self::SmashAttackRight | Self::TiltAttackRight => match facing_direction {
+                FighterFacingDirection::Left => AttackKind::BackAir,
+                FighterFacingDirection::Right => AttackKind::ForwardAir,
+            },
         }
     }
 }
 
-/// Frames of life remaining for each buffered command. Indexed by
+#[derive(Clone, Copy, Debug, Hash)]
-/// [`FighterCommands`] so adding a command is a two-line change here.
+struct CommandSlot {
-#[derive(Default, Clone, Copy, Hash)]
+    lifetime: u8,
-pub struct FighterCommandLifetimes {
+    age: u16,
-    smash_move_left: u8,
+    hold_remaining: HoldLimit,
-    smash_move_right: u8,
+    consumed: bool,
-    jump: u8,
-    shield: u8,
-    attack: u8,
 }
 
-impl Index<FighterCommands> for FighterCommandLifetimes {
+impl Default for CommandSlot {
-    type Output = u8;
+    fn default() -> Self {
-
+        Self {
-    fn index(&self, command: FighterCommands) -> &Self::Output {
+            lifetime: 0,
-        match command {
+            age: 0,
-            FighterCommands::SmashMoveLeft => &self.smash_move_left,
+            hold_remaining: HoldLimit::Disabled,
-            FighterCommands::SmashMoveRight => &self.smash_move_right,
+            consumed: false,
-            FighterCommands::Jump => &self.jump,
-            FighterCommands::Shield => &self.shield,
-            FighterCommands::Attack => &self.attack,
         }
     }
 }
 
-impl IndexMut<FighterCommands> for FighterCommandLifetimes {
+#[derive(Clone, Copy, Debug, Default, Hash, PartialEq, Eq)]
-    fn index_mut(&mut self, command: FighterCommands) -> &mut Self::Output {
+enum HoldLimit {
-        match command {
+    #[default]
-            FighterCommands::SmashMoveLeft => &mut self.smash_move_left,
+    Disabled,
-            FighterCommands::SmashMoveRight => &mut self.smash_move_right,
+    Frames(u16),
-            FighterCommands::Jump => &mut self.jump,
+    Infinite,
-            FighterCommands::Shield => &mut self.shield,
+}
-            FighterCommands::Attack => &mut self.attack,
+
+#[derive(Clone, Copy, Debug, Default, Hash, PartialEq, Eq)]
+enum HoldOverride {
+    #[default]
+    Inherit,
+    Disabled,
+    Frames(u16),
+    Infinite,
+}
+
+impl HoldOverride {
+    fn from_max_frames(max_frames: u16) -> Self {
+        if max_frames == 0 {
+            Self::Infinite
+        } else {
+            Self::Frames(max_frames)
         }
     }
 }
 
-#[derive(Component, Default, Clone, Copy, Hash)]
+impl HoldLimit {
+    fn from_max_frames(max_frames: u16) -> Self {
+        if max_frames == 0 {
+            Self::Infinite
+        } else {
+            Self::Frames(max_frames)
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, Hash)]
+struct ButtonHistory {
+    trigger_age: u16,
+    release_age: u16,
+    held_frames: u16,
+    secondary_trigger_age: u16,
+}
+
+impl Default for ButtonHistory {
+    fn default() -> Self {
+        Self {
+            trigger_age: u16::MAX,
+            release_age: u16::MAX,
+            held_frames: 0,
+            secondary_trigger_age: u16::MAX,
+        }
+    }
+}
+
+impl ButtonHistory {
+    fn update(&mut self, current: u16, previous: u16) {
+        let pressed = current & !previous;
+        let released = previous & !current;
+        self.trigger_age = self.trigger_age.saturating_add(1);
+        self.release_age = self.release_age.saturating_add(1);
+        self.secondary_trigger_age = self.secondary_trigger_age.saturating_add(1);
+        if pressed != 0 {
+            self.trigger_age = 0;
+        }
+        if released != 0 {
+            self.release_age = 0;
+        }
+        if current != 0 {
+            self.held_frames = self.held_frames.saturating_add(1);
+        } else {
+            self.held_frames = 0;
+        }
+        if current.count_ones() >= 2 && (pressed != 0 || previous.count_ones() < 2) {
+            self.secondary_trigger_age = 0;
+        }
+    }
+}
+
+/// Per-fighter input state. Every field is deterministic rollback state.
+#[derive(Component, Clone, Copy, Hash)]
 #[require(Rollback)]
 pub struct FighterInput {
-    command_lifetimes: FighterCommandLifetimes,
+    command_slots: [CommandSlot; FighterCommands::COUNT],
+    hold_limits: [HoldOverride; FighterCommands::COUNT],
+    hold_all: HoldLimit,
+    button_history: [ButtonHistory; 3],
     prev_frame: FighterInputFrame,
     current_frame: FighterInputFrame,
     frames_in_x_flick_deadzone: u8,
@@ -102,6 +211,22 @@ pub struct FighterInput {
     attack_command: FighterAttackCommandType,
 }
 
+impl Default for FighterInput {
+    fn default() -> Self {
+        Self {
+            command_slots: [CommandSlot::default(); FighterCommands::COUNT],
+            hold_limits: [HoldOverride::default(); FighterCommands::COUNT],
+            hold_all: HoldLimit::default(),
+            button_history: [ButtonHistory::default(); 3],
+            prev_frame: FighterInputFrame::default(),
+            current_frame: FighterInputFrame::default(),
+            frames_in_x_flick_deadzone: 0xFE,
+            frames_in_y_flick_deadzone: 0xFE,
+            attack_command: FighterAttackCommandType::Neutral,
+        }
+    }
+}
+
 impl FighterInput {
     pub fn get_last_frame(&self) -> FighterInputFrame {
         self.current_frame
@@ -113,40 +238,190 @@ impl FighterInput {
     }
 
     pub fn clear_buffer(&mut self) {
-        self.command_lifetimes = FighterCommandLifetimes::default()
+        self.command_slots = [CommandSlot::default(); FighterCommands::COUNT];
     }
 
     pub fn clear_command(&mut self, command: FighterCommands) {
-        self.command_lifetimes[command] = 0;
+        let slot = &mut self.command_slots[command.index()];
+        slot.lifetime = 0;
+        slot.hold_remaining = HoldLimit::Disabled;
+        slot.consumed = true;
+    }
+
+    pub fn consume_command(&mut self, command: FighterCommands) -> bool {
+        if self.has_command(command) {
+            self.clear_command(command);
+            true
+        } else {
+            false
+        }
     }
 
     pub fn set_lifetime(&mut self, command: FighterCommands, lifetime: u8) {
-        self.command_lifetimes[command] = lifetime;
+        let slot = &mut self.command_slots[command.index()];
+        slot.lifetime = lifetime;
+        slot.age = 0;
+        slot.hold_remaining = HoldLimit::Disabled;
+        slot.consumed = false;
+        self.latch_if_hold_enabled(command);
     }
 
     pub fn has_command(&self, command: FighterCommands) -> bool {
-        self.command_lifetimes[command] > 0
+        self.command_slots[command.index()].lifetime > 0
     }
 
     pub fn reduce_command_lifetime(&mut self, command: FighterCommands) {
-        self.command_lifetimes[command] = self.command_lifetimes[command].saturating_sub(1);
+        self.command_slots[command.index()].lifetime = self.command_slots[command.index()]
+            .lifetime
+            .saturating_sub(1);
+    }
+
+    pub fn enable_hold_all(&mut self, max_frames: u16) {
+        self.hold_all = HoldLimit::from_max_frames(max_frames);
+        self.latch_active_commands();
+    }
+
+    /// Stops enrolling commands in the global hold buffer. Commands already
+    /// latched retain their remaining lifetime so they can cross a state
+    /// boundary, such as jump squat into the first airborne frame.
+    pub fn disable_hold_all(&mut self) {
+        self.hold_all = HoldLimit::Disabled;
+    }
+
+    /// Stops global enrollment and immediately cancels every latched command.
+    pub fn cancel_hold_all(&mut self) {
+        self.disable_hold_all();
+        for slot in &mut self.command_slots {
+            slot.hold_remaining = HoldLimit::Disabled;
+        }
+    }
+
+    pub fn enable_hold(&mut self, command: FighterCommands, max_frames: u16) {
+        self.hold_limits[command.index()] = HoldOverride::from_max_frames(max_frames);
+        if self.has_command(command) {
+            self.latch_if_hold_enabled(command);
+        }
+    }
+
+    /// Explicitly prevents this command from using either command-specific or
+    /// global hold buffering, while preserving an existing latch.
+    pub fn disable_hold(&mut self, command: FighterCommands) {
+        self.hold_limits[command.index()] = HoldOverride::Disabled;
+    }
+
+    /// Removes the command-specific policy so this command inherits the
+    /// global policy again.
+    pub fn reset_hold_override(&mut self, command: FighterCommands) {
+        self.hold_limits[command.index()] = HoldOverride::Inherit;
+    }
+
+    /// Stops enrollment and immediately cancels this command's hold lifetime.
+    pub fn cancel_hold(&mut self, command: FighterCommands) {
+        self.disable_hold(command);
+        self.command_slots[command.index()].hold_remaining = HoldLimit::Disabled;
+    }
+
+    fn latch_if_hold_enabled(&mut self, command: FighterCommands) {
+        let limit = self.hold_limit(command);
+        let slot = &mut self.command_slots[command.index()];
+        slot.hold_remaining = match limit {
+            HoldLimit::Disabled => return,
+            HoldLimit::Infinite => HoldLimit::Infinite,
+            // The limit includes tap-buffer frames already elapsed.
+            HoldLimit::Frames(max_frames) => {
+                let remaining = max_frames.saturating_sub(slot.age);
+                if remaining == 0 {
+                    return;
+                }
+                HoldLimit::Frames(remaining)
+            }
+        };
+    }
+
+    fn latch_active_commands(&mut self) {
+        for command in FighterCommands::iter() {
+            if self.has_command(command) {
+                self.latch_if_hold_enabled(command);
+            }
+        }
+    }
+
+    pub fn is_pressed(&self, action: DigitalAction) -> bool {
+        self.current_frame
+            .bindings_for(action)
+            .pressed_since(self.prev_frame.bindings_for(action))
+            .0
+            != 0
+    }
+
+    pub fn is_released(&self, action: DigitalAction) -> bool {
+        self.current_frame
+            .bindings_for(action)
+            .released_since(self.prev_frame.bindings_for(action))
+            .0
+            != 0
+    }
+
+    pub fn pressed_bindings(&self, action: DigitalAction) -> u16 {
+        self.current_frame
+            .bindings_for(action)
+            .pressed_since(self.prev_frame.bindings_for(action))
+            .0
+    }
+
+    pub fn binding_count(&self, action: DigitalAction) -> u32 {
+        self.current_frame.bindings_for(action).count()
     }
 
     pub fn get_frames_in_smash_move_deadzone(&self) -> u8 {
         self.frames_in_x_flick_deadzone
     }
-
     pub fn set_attack_command_type(&mut self, command: FighterAttackCommandType) {
         self.attack_command = command;
     }
-
     pub fn get_attack_command_type(&self) -> FighterAttackCommandType {
         self.attack_command
     }
+
+    fn hold_limit(&self, command: FighterCommands) -> HoldLimit {
+        let specific = self.hold_limits[command.index()];
+        match specific {
+            HoldOverride::Inherit => self.hold_all,
+            HoldOverride::Disabled => HoldLimit::Disabled,
+            HoldOverride::Frames(frames) => HoldLimit::Frames(frames),
+            HoldOverride::Infinite => HoldLimit::Infinite,
+        }
+    }
+
+    fn update_hold(&mut self, command: FighterCommands) {
+        let index = command.index();
+        let slot = &mut self.command_slots[index];
+        slot.age = slot.age.saturating_add(1);
+        match slot.hold_remaining {
+            HoldLimit::Disabled => {}
+            HoldLimit::Infinite => {
+                if slot.lifetime == 0 {
+                    slot.lifetime = 1;
+                }
+            }
+            HoldLimit::Frames(remaining) => {
+                // This tick consumes one of the total persistent frames, but
+                // the command remains active for the tick that consumes the
+                // final frame.
+                let remaining = remaining.saturating_sub(1);
+                slot.hold_remaining = if remaining == 0 {
+                    HoldLimit::Disabled
+                } else {
+                    HoldLimit::Frames(remaining)
+                };
+                if slot.lifetime == 0 {
+                    slot.lifetime = 1;
+                }
+            }
+        }
+    }
 }
 
-/// Turns this frame's rolled-back inputs into per-fighter [`FighterInput`]
-/// state. Runs in `GameplaySet::Input`, before any state looks at it.
 pub fn postprocess_input(
     query: Query<(&mut FighterInput, &Player)>,
     inputs: Res<PlayerInputs<GGRSCfg>>,
@@ -158,80 +433,95 @@ pub fn postprocess_input(
         }
 
         input.push_input_frame(inputs[player.handle].0);
+        let current_bindings = input.current_frame.bindings;
+        let previous_bindings = input.prev_frame.bindings;
+        for (history, action) in input.button_history.iter_mut().zip([
+            DigitalAction::Jump,
+            DigitalAction::Shield,
+            DigitalAction::Attack,
+        ]) {
+            history.update(
+                current_bindings.get(action).0,
+                previous_bindings.get(action).0,
+            );
+        }
 
-        // Directional smash detection
         let x_abs = input.current_frame.movement.x.abs();
         let y_abs = input.current_frame.movement.y.abs();
-
         let reset_deadzone = game_settings.input_common.smash_input_reset_axis_threshold;
         let axis_threshold = game_settings.input_common.smash_input_axis_threshold;
         let frame_threshold = game_settings.input_common.smash_input_frame_threshold;
 
         if x_abs < reset_deadzone {
             input.frames_in_x_flick_deadzone = 0xFE;
-        } else {
+        } else if input.prev_frame.movement.x.abs() < reset_deadzone
-            let prev_x_abs = input.prev_frame.movement.x.abs();
-            if prev_x_abs < reset_deadzone
             || input.prev_frame.movement.x.signum() != input.current_frame.movement.x.signum()
         {
             input.frames_in_x_flick_deadzone = 1;
         } else {
-                input.frames_in_x_flick_deadzone =
+            input.frames_in_x_flick_deadzone = input.frames_in_x_flick_deadzone.saturating_add(1);
-                    input.frames_in_x_flick_deadzone.saturating_add(1);
-            }
         }
 
         if y_abs < reset_deadzone {
             input.frames_in_y_flick_deadzone = 0xFE;
-        } else {
+        } else if input.prev_frame.movement.y.abs() < reset_deadzone
-            let prev_y_abs = input.prev_frame.movement.y.abs();
-            if prev_y_abs < reset_deadzone
             || input.prev_frame.movement.y.signum() != input.current_frame.movement.y.signum()
         {
             input.frames_in_y_flick_deadzone = 1;
         } else {
-                input.frames_in_y_flick_deadzone =
+            input.frames_in_y_flick_deadzone = input.frames_in_y_flick_deadzone.saturating_add(1);
-                    input.frames_in_y_flick_deadzone.saturating_add(1);
-            }
         }
 
-        if !input.prev_frame.jump && input.current_frame.jump {
+        let tap = game_settings.input_common.input_buffer_size;
-            input.set_lifetime(
+        let jump_pressed = input.is_pressed(DigitalAction::Jump);
-                FighterCommands::Jump,
+        let shield_pressed = input.is_pressed(DigitalAction::Shield);
-                game_settings.input_common.input_buffer_size,
+        let attack_pressed = input.is_pressed(DigitalAction::Attack);
-            );
+        if jump_pressed {
+            input.set_lifetime(FighterCommands::Jump, tap);
+        }
+        if shield_pressed {
+            input.set_lifetime(FighterCommands::Shield, tap);
         }
 
-        if !input.prev_frame.shield && input.current_frame.shield {
+        let shield_now = input.current_frame.bindings_for(DigitalAction::Shield);
-            input.set_lifetime(
+        let shield_previous = input.prev_frame.bindings_for(DigitalAction::Shield);
-                FighterCommands::Shield,
+        let second_shield_pressed = second_binding_pressed(shield_now, shield_previous);
-                game_settings.input_common.input_buffer_size,
+        if second_shield_pressed {
-            );
+            input.set_lifetime(FighterCommands::GuardHold, tap);
-        }
-
-        if !input.prev_frame.attack && input.current_frame.attack {
-            input.set_lifetime(
-                FighterCommands::Attack,
-                game_settings.input_common.input_buffer_size,
-            );
         }
 
         let mut y_flick_detected =
             y_abs >= axis_threshold && input.frames_in_y_flick_deadzone <= frame_threshold;
         let mut x_flick_detected =
             x_abs >= axis_threshold && input.frames_in_x_flick_deadzone <= frame_threshold;
-
+        if y_flick_detected {
-        // if both flicks are detected, only one wins
+            input.clear_command(FighterCommands::SmashMoveUp);
-
+            input.clear_command(FighterCommands::SmashMoveDown);
+            input.frames_in_y_flick_deadzone = 0xFF;
+            let command = if input.current_frame.movement.y > 0.0 {
+                FighterCommands::SmashMoveUp
+            } else {
+                FighterCommands::SmashMoveDown
+            };
+            input.set_lifetime(command, tap);
+        }
+        if x_flick_detected {
+            input.clear_command(FighterCommands::SmashMoveLeft);
+            input.clear_command(FighterCommands::SmashMoveRight);
+            input.frames_in_x_flick_deadzone = 0xFF;
+            let command = if input.current_frame.movement.x > 0.0 {
+                FighterCommands::SmashMoveRight
+            } else {
+                FighterCommands::SmashMoveLeft
+            };
+            input.set_lifetime(command, tap);
+        }
         if x_flick_detected && y_flick_detected {
             x_flick_detected = x_abs > y_abs;
             y_flick_detected = !x_flick_detected;
         }
 
-        let attack_detected = input.current_frame.attack && !input.prev_frame.attack;
+        if attack_pressed {
-
-        // Tilt/smash up/down
-        if attack_detected {
             let attack_type = if y_flick_detected {
                 if input.current_frame.movement.y > 0.0 {
                     FighterAttackCommandType::SmashAttackUp
@@ -259,25 +549,144 @@ pub fn postprocess_input(
             } else {
                 FighterAttackCommandType::Neutral
             };
-
+            input.set_lifetime(FighterCommands::Attack, tap);
-            input.set_lifetime(
-                FighterCommands::Attack,
-                game_settings.input_common.input_buffer_size,
-            );
             input.set_attack_command_type(attack_type);
         }
 
-        if x_flick_detected {
+        // Advance each command's independently latched persistence. Physical
-            input.clear_command(FighterCommands::SmashMoveLeft);
+        // source state is intentionally irrelevant after recognition.
-            input.clear_command(FighterCommands::SmashMoveRight);
+        for command in FighterCommands::iter() {
+            input.update_hold(command);
+        }
+    }
+}
 
-            let command_to_set = if input.current_frame.movement.x > 0.0 {
+#[cfg(test)]
-                FighterCommands::SmashMoveRight
+mod tests {
-            } else {
+    use super::*;
-                FighterCommands::SmashMoveLeft
+    use crate::input::ActionBindingMask;
-            };
 
-            input.set_lifetime(command_to_set, game_settings.input_common.input_buffer_size);
+    fn advance_command(input: &mut FighterInput, command: FighterCommands) {
+        input.reduce_command_lifetime(command);
+        input.update_hold(command);
     }
+
+    #[test]
+    fn second_binding_is_an_edge_not_a_level() {
+        let first = ActionBindingMask(0b0001);
+        let both = ActionBindingMask(0b0011);
+        assert!(second_binding_pressed(both, first));
+        assert!(!second_binding_pressed(both, both));
+    }
+
+    #[test]
+    fn replacing_a_binding_still_triggers_the_combination() {
+        let previous = ActionBindingMask(0b0011);
+        let current = ActionBindingMask(0b0101);
+        assert!(second_binding_pressed(current, previous));
+    }
+
+    #[test]
+    fn command_can_be_consumed_without_erasing_raw_input() {
+        let mut input = FighterInput::default();
+        input.set_lifetime(FighterCommands::GuardHold, 3);
+        assert!(input.consume_command(FighterCommands::GuardHold));
+        assert!(!input.has_command(FighterCommands::GuardHold));
+        assert_eq!(input.get_last_frame(), FighterInputFrame::default());
+    }
+
+    #[test]
+    fn hold_extension_does_not_resurrect_consumed_commands() {
+        let mut input = FighterInput::default();
+        input.enable_hold(FighterCommands::Shield, 10);
+        input.set_lifetime(FighterCommands::Shield, 1);
+        input.update_hold(FighterCommands::Shield);
+        input.reduce_command_lifetime(FighterCommands::Shield);
+        input.update_hold(FighterCommands::Shield);
+        assert!(input.has_command(FighterCommands::Shield));
+        input.consume_command(FighterCommands::Shield);
+        input.update_hold(FighterCommands::Shield);
+        assert!(!input.has_command(FighterCommands::Shield));
+    }
+
+    #[test]
+    fn hold_buffer_keeps_released_attack_through_jump_squat() {
+        let mut input = FighterInput::default();
+        input.set_lifetime(FighterCommands::Attack, 3);
+        // Recognition happened before jump squat enabled persistence.
+        input.update_hold(FighterCommands::Attack);
+        input.enable_hold_all(10);
+
+        // Five simulation ticks cover the test fighter's jump squat. The
+        // physical attack binding is released, but persistence belongs to the
+        // recognized command rather than the binding's held state.
+        for _ in 0..5 {
+            advance_command(&mut input, FighterCommands::Attack);
+        }
+
+        assert!(input.has_command(FighterCommands::Attack));
+        // Jump-squat exit stops enrollment. The latch crosses into Jump and
+        // remains visible on its first airborne interrupt frame.
+        input.disable_hold_all();
+        advance_command(&mut input, FighterCommands::Attack);
+        assert!(input.has_command(FighterCommands::Attack));
+        assert!(input.consume_command(FighterCommands::Attack));
+        assert!(!input.has_command(FighterCommands::Attack));
+    }
+
+    #[test]
+    fn finite_hold_limit_includes_elapsed_tap_frames() {
+        let mut input = FighterInput::default();
+        input.set_lifetime(FighterCommands::Attack, 3);
+        // The recognition frame has already elapsed when jump squat starts.
+        input.update_hold(FighterCommands::Attack);
+        input.enable_hold_all(10);
+
+        for _ in 0..9 {
+            advance_command(&mut input, FighterCommands::Attack);
+            assert!(input.has_command(FighterCommands::Attack));
+        }
+        advance_command(&mut input, FighterCommands::Attack);
+        assert!(!input.has_command(FighterCommands::Attack));
+    }
+
+    #[test]
+    fn stopping_enrollment_and_cancelling_latches_are_distinct() {
+        let mut input = FighterInput::default();
+        input.enable_hold_all(10);
+        input.set_lifetime(FighterCommands::Shield, 1);
+        input.disable_hold_all();
+        advance_command(&mut input, FighterCommands::Shield);
+        assert!(input.has_command(FighterCommands::Shield));
+
+        input.cancel_hold_all();
+        advance_command(&mut input, FighterCommands::Shield);
+        assert!(!input.has_command(FighterCommands::Shield));
+    }
+
+    #[test]
+    fn command_override_can_disable_global_hold() {
+        let mut input = FighterInput::default();
+        input.enable_hold_all(10);
+        input.disable_hold(FighterCommands::Attack);
+        input.set_lifetime(FighterCommands::Attack, 1);
+        advance_command(&mut input, FighterCommands::Attack);
+        assert!(!input.has_command(FighterCommands::Attack));
+
+        input.reset_hold_override(FighterCommands::Attack);
+        input.set_lifetime(FighterCommands::Attack, 1);
+        advance_command(&mut input, FighterCommands::Attack);
+        assert!(input.has_command(FighterCommands::Attack));
+    }
+
+    #[test]
+    fn infinite_hold_uses_an_explicit_state() {
+        let mut input = FighterInput::default();
+        input.enable_hold(FighterCommands::Shield, 0);
+        input.set_lifetime(FighterCommands::Shield, 1);
+        for _ in 0..u16::MAX as usize + 1 {
+            advance_command(&mut input, FighterCommands::Shield);
+        }
+        assert!(input.has_command(FighterCommands::Shield));
     }
 }

src/input/frame.rs

@@ -2,13 +2,119 @@ use serde::{Deserialize, Serialize};
 
 use crate::math::vec::FGVec2;
 
+/// A fixed-width set of distinct bindings assigned to one logical action.
+/// Keeping binding identity in the rollback frame allows combinations such as
+/// pressing a second shield binding while the first one is still held.
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize, Default)]
+pub struct ActionBindingMask(pub u16);
+
+impl ActionBindingMask {
+    pub const fn empty() -> Self {
+        Self(0)
+    }
+
+    pub const fn from_slot(slot: u8) -> Self {
+        Self(if slot < 16 { 1u16 << slot } else { 0 })
+    }
+
+    pub const fn contains(self, other: Self) -> bool {
+        self.0 & other.0 == other.0
+    }
+
+    pub const fn intersects(self, other: Self) -> bool {
+        self.0 & other.0 != 0
+    }
+
+    pub const fn count(self) -> u32 {
+        self.0.count_ones()
+    }
+
+    pub const fn pressed_since(self, previous: Self) -> Self {
+        Self(self.0 & !previous.0)
+    }
+
+    pub const fn released_since(self, previous: Self) -> Self {
+        Self(previous.0 & !self.0)
+    }
+}
+
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize, Default)]
+pub struct DigitalActionBindings {
+    pub jump: ActionBindingMask,
+    pub shield: ActionBindingMask,
+    pub attack: ActionBindingMask,
+}
+
+impl DigitalActionBindings {
+    pub fn set(&mut self, action: DigitalAction, slot: u8, pressed: bool) {
+        let mask = match action {
+            DigitalAction::Jump => &mut self.jump,
+            DigitalAction::Shield => &mut self.shield,
+            DigitalAction::Attack => &mut self.attack,
+        };
+        let bit = ActionBindingMask::from_slot(slot).0;
+        if pressed {
+            mask.0 |= bit;
+        } else {
+            mask.0 &= !bit;
+        }
+    }
+
+    pub const fn get(self, action: DigitalAction) -> ActionBindingMask {
+        match action {
+            DigitalAction::Jump => self.jump,
+            DigitalAction::Shield => self.shield,
+            DigitalAction::Attack => self.attack,
+        }
+    }
+}
+
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
+pub enum DigitalAction {
+    Jump,
+    Shield,
+    Attack,
+}
+
 /// One frame of a player's raw input. This is the type GGRS serializes and
 /// sends over the wire, so keep it small and keep it `PartialEq`.
 #[derive(Copy, Clone, Debug, PartialEq, Default, Serialize, Deserialize, Hash)]
 pub struct FighterInputFrame {
     pub movement: FGVec2,
     pub directional_attack: FGVec2,
-    pub jump: bool,
+    pub bindings: DigitalActionBindings,
-    pub shield: bool,
+}
-    pub attack: bool,
+
+impl FighterInputFrame {
+    pub const fn bindings_for(self, action: DigitalAction) -> ActionBindingMask {
+        self.bindings.get(action)
+    }
+
+    pub const fn is_held(self, action: DigitalAction) -> bool {
+        self.bindings_for(action).0 != 0
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn binding_masks_preserve_distinct_same_action_bindings() {
+        let mut bindings = DigitalActionBindings::default();
+        bindings.set(DigitalAction::Shield, 0, true);
+        bindings.set(DigitalAction::Shield, 1, true);
+        assert_eq!(bindings.shield.0, 0b11);
+        assert_eq!(bindings.shield.count(), 2);
+        assert_eq!(bindings.shield.pressed_since(ActionBindingMask(1)).0, 0b10);
+    }
+
+    #[test]
+    fn clearing_one_binding_does_not_clear_the_other() {
+        let mut bindings = DigitalActionBindings::default();
+        bindings.set(DigitalAction::Shield, 0, true);
+        bindings.set(DigitalAction::Shield, 1, true);
+        bindings.set(DigitalAction::Shield, 0, false);
+        assert_eq!(bindings.shield.0, 0b10);
+    }
 }

src/input/gamecube/poll.rs

@@ -1,6 +1,8 @@
 use std::panic::{self, AssertUnwindSafe};
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Mutex};
+use std::thread::JoinHandle;
+use std::time::{Duration, Instant};
 
 use bevy::prelude::*;
 use gc_adapter_neo::{Controller, GcAdapter};
@@ -45,8 +47,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),
+            left_stick: cal.left_stick_coords(&c),
-            right_stick: cal.right_stick(&c),
+            right_stick: cal.right_stick_coords(&c),
             triggers: (c.triggers.left.raw(), c.triggers.right.raw()),
         }
     }
@@ -55,10 +57,11 @@ impl GcPortState {
 /// Shared, `Send + Sync` handle to the latest snapshot from the poll
 /// thread. Safe to store as an ordinary [`Resource`] (no `NonSend` needed)
 /// because the `GcAdapter` itself never leaves its thread.
-#[derive(Resource, Clone)]
+#[derive(Resource)]
 pub struct GcAdapterSnapshot {
     ports: Arc<Mutex<[GcPortState; 4]>>,
     shutdown: Arc<AtomicBool>,
+    poll_thread: Option<JoinHandle<()>>,
 }
 
 impl GcAdapterSnapshot {
@@ -69,13 +72,37 @@ impl GcAdapterSnapshot {
 
 impl Drop for GcAdapterSnapshot {
     fn drop(&mut self) {
-        // Only actually signals shutdown once the last clone (this resource
+        self.shutdown.store(true, Ordering::Release);
-        // is never cloned in practice, but be defensive) is dropped.
+
-        if Arc::strong_count(&self.shutdown) <= 1 {
+        if let Some(poll_thread) = self.poll_thread.take() {
-            self.shutdown.store(true, Ordering::Relaxed);
+            if let Err(payload) = poll_thread.join() {
+                error!(
+                    "GameCube Controller Adapter poll thread panicked during shutdown: {payload:?}"
+                );
             }
         }
     }
+}
+
+const INITIAL_ERROR_BACKOFF: Duration = Duration::from_millis(1);
+const MAX_ERROR_BACKOFF: Duration = Duration::from_millis(100);
+
+fn next_error_backoff(backoff: Duration) -> Duration {
+    backoff.saturating_mul(2).min(MAX_ERROR_BACKOFF)
+}
+
+/// Wait for a retry while still allowing the owner to shut the poll thread down promptly.
+fn wait_for_retry(shutdown: &AtomicBool, delay: Duration) -> bool {
+    let deadline = Instant::now() + delay;
+    while !shutdown.load(Ordering::Acquire) {
+        let remaining = deadline.saturating_duration_since(Instant::now());
+        if remaining.is_zero() {
+            return true;
+        }
+        std::thread::sleep(remaining.min(Duration::from_millis(10)));
+    }
+    false
+}
 
 /// Connects to the first GameCube adapter found on the USB bus and starts
 /// polling it on a dedicated thread. Returns `None` (after logging a
@@ -94,7 +121,7 @@ pub fn spawn_poll_thread() -> Result<GcAdapterSnapshot, gc_adapter_neo::UsbError
 
     let thread_ports = ports.clone();
     let thread_shutdown = shutdown.clone();
-    std::thread::Builder::new()
+    let poll_thread = std::thread::Builder::new()
         .name("gc-adapter-poll".into())
         .spawn(move || {
             // Flush whatever the adapter had buffered before we started
@@ -107,17 +134,27 @@ pub fn spawn_poll_thread() -> Result<GcAdapterSnapshot, gc_adapter_neo::UsbError
             let mut rate_window_start = std::time::Instant::now();
             #[cfg(debug_assertions)]
             let mut rate_window_count: u32 = 0;
+            let mut error_backoff = INITIAL_ERROR_BACKOFF;
 
-            while !thread_shutdown.load(Ordering::Relaxed) {
+            while !thread_shutdown.load(Ordering::Acquire) {
                 let result = panic::catch_unwind(AssertUnwindSafe(|| adapter.read_controllers()));
 
                 let controllers = match result {
-                    Ok(Ok(controllers)) => controllers,
+                    Ok(Ok(controllers)) => {
+                        error_backoff = INITIAL_ERROR_BACKOFF;
+                        controllers
+                    }
                     // Ignore this, for some reason we get a bunch of these when we start reading
                     Ok(Err(
                         gc_adapter_neo::AdapterError::Parse(_)
                         | gc_adapter_neo::AdapterError::ShortRead(_),
-                    )) => continue,
+                    )) => {
+                        if !wait_for_retry(&thread_shutdown, error_backoff) {
+                            break;
+                        }
+                        error_backoff = next_error_backoff(error_backoff);
+                        continue;
+                    }
                     Ok(Err(gc_adapter_neo::AdapterError::Usb(err))) => {
                         error!(
                             "GameCube Controller Adapter USB read failed ({err:?}); stopping \
@@ -160,5 +197,32 @@ pub fn spawn_poll_thread() -> Result<GcAdapterSnapshot, gc_adapter_neo::UsbError
         })
         .expect("failed to spawn gc-adapter poll thread");
 
-    Ok(GcAdapterSnapshot { ports, shutdown })
+    Ok(GcAdapterSnapshot {
+        ports,
+        shutdown,
+        poll_thread: Some(poll_thread),
+    })
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn error_backoff_is_capped() {
+        let mut backoff = INITIAL_ERROR_BACKOFF;
+        for _ in 0..16 {
+            backoff = next_error_backoff(backoff);
+        }
+
+        assert_eq!(backoff, MAX_ERROR_BACKOFF);
+        assert_eq!(next_error_backoff(MAX_ERROR_BACKOFF), MAX_ERROR_BACKOFF);
+    }
+
+    #[test]
+    fn retry_wait_stops_when_shutdown_is_requested() {
+        let shutdown = AtomicBool::new(true);
+
+        assert!(!wait_for_retry(&shutdown, Duration::from_secs(1)));
+    }
 }

src/input/gamepad.rs

@@ -14,10 +14,13 @@ pub fn sample_gamepad(pad: &Gamepad, input_map: &BaseInputMap) -> FighterInputFr
         match &gamepad_element.binding {
             GamepadBinding::Button(button) => {
                 let pressed = pad.pressed(*button);
+                if let Some(action) = gamepad_element.action.digital_action() {
+                    input_frame
+                        .bindings
+                        .set(action, gamepad_element.binding_slot, pressed);
+                }
                 match gamepad_element.action {
-                    InputMapAction::Jump => input_frame.jump |= pressed,
+                    InputMapAction::Jump | InputMapAction::Shield | InputMapAction::Attack => {}
-                    InputMapAction::Shield => input_frame.shield |= pressed,
-                    InputMapAction::Attack => input_frame.attack |= pressed,
                     // Digital buttons driving movement isn't used by the
                     // default bindings (the stick covers that), but stay
                     // consistent with the keyboard backend if one is added.

src/input/keyboard.rs

@@ -30,9 +30,15 @@ pub fn sample_keyboard(key: &ButtonInput<KeyCode>, input_map: &BaseInputMap) ->
             InputMapAction::MovementYDir(sign) => {
                 input_frame.movement.y += (sign) * action_strength
             }
-            InputMapAction::Jump => input_frame.jump = action_strength != FGi32::ZERO,
+            InputMapAction::Jump | InputMapAction::Shield | InputMapAction::Attack => {
-            InputMapAction::Shield => input_frame.shield = action_strength != FGi32::ZERO,
+                if let Some(action) = keyboard_elment.action.digital_action() {
-            InputMapAction::Attack => input_frame.attack = action_strength != FGi32::ZERO,
+                    input_frame.bindings.set(
+                        action,
+                        keyboard_elment.binding_slot,
+                        action_strength != FGi32::ZERO,
+                    );
+                }
+            }
         }
     }
 

src/input/map.rs

@@ -19,6 +19,17 @@ pub enum InputMapAction {
     Attack,
 }
 
+impl InputMapAction {
+    pub const fn digital_action(&self) -> Option<crate::input::DigitalAction> {
+        match self {
+            Self::Jump => Some(crate::input::DigitalAction::Jump),
+            Self::Shield => Some(crate::input::DigitalAction::Shield),
+            Self::Attack => Some(crate::input::DigitalAction::Attack),
+            Self::MovementXDir(_) | Self::MovementYDir(_) => None,
+        }
+    }
+}
+
 #[derive(Debug)]
 pub enum MenuInputMapAction {
     MovementXDir(i32),
@@ -32,6 +43,7 @@ pub enum MenuInputMapAction {
 pub struct KeyboardInputMapElement {
     pub key: KeyCode,
     pub action: InputMapAction,
+    pub binding_slot: u8,
 }
 
 #[derive(Debug)]
@@ -44,6 +56,7 @@ pub enum GamepadBinding {
 pub struct GamepadInputMapElement {
     pub binding: GamepadBinding,
     pub action: InputMapAction,
+    pub binding_slot: u8,
 }
 
 #[derive(Debug)]

src/input/mod.rs

@@ -15,7 +15,7 @@ pub mod keyboard;
 pub mod map;
 
 pub use buffer::{FighterCommands, FighterInput};
-pub use frame::FighterInputFrame;
+pub use frame::{ActionBindingMask, DigitalAction, DigitalActionBindings, FighterInputFrame};
 pub use map::{
     BaseInputMap, GamepadBinding, GamepadInputMapElement, InputActionState, InputMapAction,
     KeyboardInputMapElement, MenuGamepadInputMapElement, MenuInputMap, MenuInputMapAction,
@@ -28,7 +28,7 @@ pub enum LocalInputSource {
     Gamepad(Entity),
 }
 
-/// Maps an input source to a player index
+/// Persistent mapping from physical/menu controller slots to input sources.
 #[derive(Resource, Clone, Debug, Default, Deref, DerefMut)]
 pub struct LocalInputAssignments(pub Vec<(usize, LocalInputSource)>);
 
@@ -50,6 +50,16 @@ impl LocalInputAssignments {
     }
 }
 
+/// Match-local mapping from dense GGRS handles to physical input sources.
+#[derive(Resource, Clone, Debug, Default, Deref, DerefMut)]
+pub struct MatchInputAssignments(pub Vec<Option<LocalInputSource>>);
+
+impl MatchInputAssignments {
+    pub fn get_for_handle(&self, handle: usize) -> Option<LocalInputSource> {
+        self.0.get(handle).copied().flatten()
+    }
+}
+
 use crate::game_settings::GameSettings;
 use crate::math::int::FGi32;
 use crate::netcode::GGRSCfg;
@@ -68,36 +78,43 @@ impl Plugin for FighterInputPlugin {
                 KeyboardInputMapElement {
                     key: KeyCode::KeyD,
                     action: InputMapAction::MovementXDir(1),
+                    binding_slot: 0,
                 },
                 // left
                 KeyboardInputMapElement {
                     key: KeyCode::KeyA,
                     action: InputMapAction::MovementXDir(-1),
+                    binding_slot: 0,
                 },
                 // up
                 KeyboardInputMapElement {
                     key: KeyCode::KeyW,
                     action: InputMapAction::MovementYDir(1),
+                    binding_slot: 0,
                 },
                 // down
                 KeyboardInputMapElement {
                     key: KeyCode::KeyS,
                     action: InputMapAction::MovementYDir(-1),
+                    binding_slot: 0,
                 },
                 // jump
                 KeyboardInputMapElement {
                     key: KeyCode::Space,
                     action: InputMapAction::Jump,
+                    binding_slot: 0,
                 },
                 // shield/airdodge
                 KeyboardInputMapElement {
                     key: KeyCode::ShiftLeft,
                     action: InputMapAction::Shield,
+                    binding_slot: 0,
                 },
                 // attack
                 KeyboardInputMapElement {
                     key: KeyCode::KeyJ,
                     action: InputMapAction::Attack,
+                    binding_slot: 0,
                 },
                 // Menu
             ],
@@ -106,29 +123,34 @@ impl Plugin for FighterInputPlugin {
                 GamepadInputMapElement {
                     binding: GamepadBinding::Axis(GamepadAxis::LeftStickX, 1),
                     action: InputMapAction::MovementXDir(1),
+                    binding_slot: 0,
                 },
                 GamepadInputMapElement {
                     binding: GamepadBinding::Axis(GamepadAxis::LeftStickY, 1),
                     action: InputMapAction::MovementYDir(1),
+                    binding_slot: 0,
                 },
                 // jump
                 GamepadInputMapElement {
                     binding: GamepadBinding::Button(GamepadButton::North),
                     action: InputMapAction::Jump,
-                },
+                    binding_slot: 0,
-                // shield/airdodge -- both shoulder buttons, Melee-style
-                GamepadInputMapElement {
-                    binding: GamepadBinding::Button(GamepadButton::LeftTrigger),
-                    action: InputMapAction::Shield,
                 },
                 GamepadInputMapElement {
-                    binding: GamepadBinding::Button(GamepadButton::RightTrigger),
+                    binding: GamepadBinding::Button(GamepadButton::LeftTrigger2),
                     action: InputMapAction::Shield,
+                    binding_slot: 0,
+                },
+                GamepadInputMapElement {
+                    binding: GamepadBinding::Button(GamepadButton::RightTrigger2),
+                    action: InputMapAction::Shield,
+                    binding_slot: 1,
                 },
                 // attack
                 GamepadInputMapElement {
                     binding: GamepadBinding::Button(GamepadButton::East),
                     action: InputMapAction::Attack,
+                    binding_slot: 0,
                 },
             ],
         })
@@ -245,20 +267,17 @@ fn read_local_inputs(
     input_map: Res<BaseInputMap>,
     gc_ports: Res<gamecube::GcPorts>,
     gamepads: Query<&Gamepad>,
-    assignments: Res<LocalInputAssignments>,
+    assignments: Res<MatchInputAssignments>,
     local_players: Res<LocalPlayers>,
     game_settings: Res<GameSettings>,
 ) {
     let mut local_inputs = HashMap::new();
 
     for handle in &local_players.0 {
-        let assigned = assignments
+        let assigned = assignments.get_for_handle(*handle);
-            .0
-            .iter()
-            .find(|(player_handle, _)| player_handle == handle);
         let gamepad = match assigned {
-            Some((_, LocalInputSource::Gamepad(entity))) => gamepads.get(*entity).ok(),
+            Some(LocalInputSource::Gamepad(entity)) => gamepads.get(entity).ok(),
-            Some((_, LocalInputSource::Keyboard)) => None,
+            Some(LocalInputSource::Keyboard) => None,
             None => gc_ports
                 .entities
                 .get(*handle)
@@ -268,8 +287,8 @@ fn read_local_inputs(
         };
 
         let mut input_frame = match assigned {
-            Some((_, LocalInputSource::Keyboard)) => keyboard::sample_keyboard(&key, &input_map),
+            Some(LocalInputSource::Keyboard) => keyboard::sample_keyboard(&key, &input_map),
-            Some((_, LocalInputSource::Gamepad(_))) => gamepad
+            Some(LocalInputSource::Gamepad(_)) => gamepad
                 .map(|pad| gamepad::sample_gamepad(pad, &input_map))
                 .unwrap_or_default(),
             None => FighterInputFrame::default(),

src/lib.rs

@@ -21,6 +21,8 @@
 //! save, click Rebuild in jackdaw (or run `jd build`) and it
 //! appears in `Add Component`. No registration code is needed.
 
+#![recursion_limit = "512"]
+
 use bevy::{
     asset::processor::{AssetProcessor, ProcessorState},
     prelude::*,
@@ -28,22 +30,27 @@ 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, materials::ShinesparkMaterialPlugin,
+    menus::style::FGUiStyle, schedule::GameplaySchedulePlugin, stage::manifest::StageManifest,
+    ui::InGameUIPlugin,
 };
 
 mod args;
+pub mod blend_asset;
 pub mod camera;
 pub mod debug_tools;
 pub mod fighter;
+pub mod filled_gizmos;
 pub mod game_settings;
 pub mod input;
 pub mod match_loading;
+pub mod match_runtime;
+pub mod materials;
 mod math;
 pub mod menus;
 pub mod netcode;
@@ -53,6 +60,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 +79,8 @@ pub enum AppState {
     LoadingMatch,
     PreparingMatch,
     InMatch,
+    MatchResults,
+    MatchDisconnected,
     MatchLoadFailed,
 }
 
@@ -80,6 +90,21 @@ 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((
+            blend_asset::BlendAssetProcessingPlugin,
+            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
@@ -87,22 +112,25 @@ impl Plugin for GamePlugin {
         // game-level content and configuration.
         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,
+                    filled_gizmos::FilledGizmosPlugin,
                     fighter::FighterPlugin,
                     fighter::baked_animation::BakedAnimationPlugin,
                     scripting::importer::FighterScriptImportPlugin,
                     stage::StagePlugin,
                     MatchCameraPlugin,
-                RonAssetPlugin::<FighterManifest>::create("fighter.ron"),
+                    GameAssetPlugin,
-                RonAssetPlugin::<StageManifest>::create("stage.ron"),
+                    InGameUIPlugin,
-                RonAssetPlugin::<GameSettings>::create("ron"),
+                ),
+                ShinesparkMaterialPlugin,
             ))
             .add_plugins(menus::MenuPlugin)
             .add_loading_state(
@@ -155,11 +183,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);
     }

src/main.rs

@@ -1,35 +1,49 @@
 use bevy::asset::AssetMode::Processed;
+#[cfg(feature = "debug_features")]
 use bevy::camera_controller::free_camera::FreeCameraPlugin;
+use bevy::gltf::GltfPlugin;
 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 {
     // A `Repeat` sampler so the tileable materials authored in the
     // editor render the same way at runtime; Bevy's default
     // `ClampToEdge` smears texture edges on brush geometry.
+    let default_sampler = ImageSamplerDescriptor::linear()
+        .set_address_mode(ImageAddressMode::Repeat)
+        .set_anisotropic_filter(16)
+        .clone();
+
     let default_plugins = DefaultPlugins
         .set(ImagePlugin {
-            default_sampler: ImageSamplerDescriptor {
+            default_sampler: default_sampler.clone(),
-                address_mode_u: ImageAddressMode::Repeat,
+        })
-                address_mode_v: ImageAddressMode::Repeat,
+        .set(GltfPlugin {
-                address_mode_w: ImageAddressMode::Repeat,
+            default_sampler,
-                ..ImageSamplerDescriptor::linear()
+            ..default()
-            },
         })
         .set(AssetPlugin {
             mode: Processed,
+            use_asset_processor_override: Some(cfg!(feature = "development")),
             ..default()
         });
 
-    App::new()
+    let mut app = App::new();
-        .add_plugins(default_plugins)
+    app.add_plugins(default_plugins)
         .add_plugins(avian3d::prelude::PhysicsPlugins::default())
         .add_plugins(shinespark::GamePlugin)
-        .add_plugins(FreeCameraPlugin)
+        .insert_resource(Time::<Fixed>::from_hz(60.0));
-        .add_plugins(EguiPlugin::default())
+
-        .add_plugins(WorldInspectorPlugin::default()) // adds default options and `InspectorEguiImpl`s
+    #[cfg(feature = "debug_features")]
-        .insert_resource(Time::<Fixed>::from_hz(60.0))
+    app.add_plugins((
-        .run()
+        FreeCameraPlugin,
+        EguiPlugin::default(),
+        WorldInspectorPlugin::default(),
+    ));
+
+    app.run()
 }

src/match_loading.rs

@@ -8,9 +8,7 @@ use bevy_ggrs::prelude::Session;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    AppState,
+    AppState, args::Args, fighter::{
-    args::Args,
-    fighter::{
         FighterId, FighterRoster,
         animation::AnimKind,
         attack::{AttackKind, FighterAttackScriptAssets},
@@ -18,12 +16,10 @@ use crate::{
         manifest::{FighterManifest, FighterManifestRegistry},
         spawn_fighter,
         visual::FighterAnimations,
-    },
+    }, input::{LocalInputAssignments, LocalInputSource, MatchInputAssignments}, match_runtime::MatchState, netcode::{
-    input::{LocalInputAssignments, LocalInputSource},
+        GGRSCfg,
-    math::{int::FGi32, vec::FGVec2},
+        session::{ConnectionStatus, SessionConfig, create_session},
-    netcode::{GGRSCfg, session::create_session},
+    }, scripting::FighterAttackScript, stage::{
-    scripting::FighterAttackScript,
-    stage::{
         self,
         manifest::{StageId, StageManifest, StageManifestRegistry},
     },
@@ -31,14 +27,72 @@ use crate::{
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
 pub struct MatchPlayer {
+    /// Dense index used by GGRS and rollback-simulated player state.
     pub handle: usize,
+    /// Physical controller port selected in the menu.
+    pub controller_port: usize,
     pub fighter: FighterId,
 }
 
-#[derive(Resource, Debug, Clone, PartialEq, Eq)]
+#[derive(Resource, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub struct PendingMatch {
+pub struct MatchConfig {
     pub stage: StageId,
     pub players: Vec<MatchPlayer>,
+    pub rules: MatchRules,
+}
+
+impl MatchConfig {
+    /// Maps a GGRS handle to the controller port used by gameplay.
+    ///
+    /// Multiplayer uses the stable, dense GGRS handle as the port. A
+    /// single-player match preserves the physical controller port selected in
+    /// the menu (for example, port 3 remains port 3).
+    pub fn controller_port_for_handle(&self, handle: usize) -> Option<usize> {
+        let player = self.players.iter().find(|player| player.handle == handle)?;
+        Some(if self.players.len() > 1 {
+            handle
+        } else {
+            player.controller_port
+        })
+    }
+}
+
+#[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 +110,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 +118,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 +126,7 @@ impl MatchAssets {
 
         Self {
             stage: asset_server.load(stage_manifest.model_path.clone()),
-            fighters: request
+            fighters: config
                 .players
                 .iter()
                 .map(|player| {
@@ -138,9 +192,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 +217,9 @@ pub fn initiate_default_match(
     if let Some(path) = &args.play_replay {
         match crate::replay::load(path) {
             Ok(replay) => {
-                let request = PendingMatch {
+                let config = replay.match_config.clone();
-                    stage: replay.match_config.stage,
-                    players: replay.match_config.players.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,32 +228,54 @@ 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,
+            controller_port: handle,
             fighter: FighterId::TestFighter,
         })
         .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() {
+    for (entity, handle) in gamepads.iter().zip(local_handles) {
-        assigments.push((idx + 1, LocalInputSource::Gamepad(entity)));
+        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>,
+    input_assignments: Res<LocalInputAssignments>,
     assets: Res<MatchAssets>,
     gltfs: Res<Assets<Gltf>>,
     baked_animations: Res<Assets<BakedFighterAnimations>>,
@@ -213,15 +287,34 @@ 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",
+            "player handles must be dense, unique, and non-empty",
         );
         return;
     }
 
-    if assets.fighters.len() != request.players.len() {
+    if let Err(error) = config.rules.validate() {
+        fail_match(&mut next_state, error);
+        return;
+    }
+
+    let stage_handle = stage_registry
+        .get(config.stage)
+        .expect("Initialization check should ensure all stages exist");
+    let stage_manifest = stage_manifests
+        .get(&stage_handle)
+        .expect("Initialization check should ensure stage manifests are kept alive");
+    let spawn_positions = match stage_manifest.neutral_spawn_positions(config.players.len()) {
+        Ok(positions) => positions,
+        Err(error) => {
+            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",
@@ -270,6 +363,15 @@ pub fn prepare_match(
             );
             return;
         }
+
+        let ecb_bone_indices = baked.bone_names.iter().enumerate().filter_map(|(idx, name)| {
+            if manifest.ecb_bones.contains(name) {
+                Some(idx)
+            } else {
+                None
+            }
+        }).collect::<Vec<_>>();
+
         if let Err(error) = manifest.attributes.validate() {
             fail_match(
                 &mut next_state,
@@ -370,10 +472,22 @@ pub fn prepare_match(
             attack_scripts,
             manifest_handle,
             manifest.model_scale,
+            ecb_bone_indices,
         ));
     }
 
-    let session = match create_session(&args, request.players.len()) {
+    let session_player_count = player_count_for_handles(&config.players);
+    let session_config = match SessionConfig::from_args(&args, session_player_count) {
+        Ok(config) => config,
+        Err(error) => {
+            fail_match(
+                &mut next_state,
+                &format!("invalid network configuration: {error}"),
+            );
+            return;
+        }
+    };
+    let session = match create_session(&args, session_player_count) {
         Ok(session) => session,
         Err(error) => {
             fail_match(
@@ -384,14 +498,13 @@ pub fn prepare_match(
         }
     };
 
+    commands.insert_resource(create_match_input_assignments(
+        &input_assignments,
+        &config.players,
+    ));
+
     let root = commands.spawn((Name::new("Match"), MatchRoot)).id();
 
-    let stage_handle = stage_registry
-        .get(request.stage)
-        .expect("Initialization check should ensure all stages exist");
-    let stage_manifest = stage_manifests
-        .get(&stage_handle)
-        .expect("Initialization check should ensure stage manifests are kept alive");
     stage::spawn_stage(
         &mut commands,
         root,
@@ -400,24 +513,32 @@ 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()
+    for (spawn_index, (player, (scene, animations, attack_scripts, manifest_handle, model_scale, ecb_bone_indices))) in
+        config.players.iter().zip(prepared).enumerate()
     {
-        let spawn_x = (index as i32 * 2 + 1 - request.players.len() as i32) * 5;
+        let spawn_point = spawn_positions[spawn_index];
         fighter_roster.push(spawn_fighter(
             &mut commands,
             player.handle,
-            FGVec2::new(FGi32::from_num(spawn_x), FGi32::lit("12.5")),
+            config
+                .controller_port_for_handle(player.handle)
+                .expect("validated match config contains every player handle"),
+            spawn_point,
             manifest_handle.clone(),
             model_scale,
             animations,
             attack_scripts,
             WorldAssetRoot(scene),
+            ecb_bone_indices
         ));
     }
 
     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);
 }
@@ -428,12 +549,30 @@ fn fail_match(next_state: &mut NextState<AppState>, message: &str) {
 }
 
 fn valid_player_handles(players: &[MatchPlayer]) -> bool {
-    let mut handles = players
+    if players.is_empty() {
-        .iter()
+        return false;
-        .map(|player| player.handle)
+    }
-        .collect::<Vec<_>>();
+
+    let mut handles = players.iter().map(|player| player.handle).collect::<Vec<_>>();
     handles.sort_unstable();
-    handles == (0..players.len()).collect::<Vec<_>>()
+    handles.into_iter().eq(0..players.len())
+}
+
+fn player_count_for_handles(players: &[MatchPlayer]) -> usize {
+    players.len()
+}
+
+fn create_match_input_assignments(
+    assignments: &LocalInputAssignments,
+    players: &[MatchPlayer],
+) -> MatchInputAssignments {
+    let mut match_assignments = vec![None; players.len()];
+    for player in players {
+        match_assignments[player.handle] = assignments
+            .get_from_slot(player.controller_port)
+            .copied();
+    }
+    MatchInputAssignments(match_assignments)
 }
 
 pub fn cleanup_match(
@@ -448,9 +587,13 @@ 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::<MatchInputAssignments>();
     commands.remove_resource::<FighterRoster>();
 }
 
@@ -459,25 +602,28 @@ mod tests {
     use super::*;
 
     #[test]
-    fn match_request_keeps_duplicate_fighter_slots() {
+    fn match_config_keeps_duplicate_fighter_slots() {
-        let request = PendingMatch {
+        let config = MatchConfig {
             stage: StageId::TestStage,
             players: vec![
                 MatchPlayer {
                     handle: 0,
+                    controller_port: 0,
                     fighter: FighterId::TestFighter,
                 },
                 MatchPlayer {
                     handle: 1,
+                    controller_port: 1,
                     fighter: FighterId::TestFighter,
                 },
             ],
+            rules: MatchRules::default(),
         };
 
-        assert_eq!(request.players.len(), 2);
+        assert_eq!(config.players.len(), 2);
-        assert_eq!(request.players[0].handle, 0);
+        assert_eq!(config.players[0].handle, 0);
-        assert_eq!(request.players[1].handle, 1);
+        assert_eq!(config.players[1].handle, 1);
-        assert!(valid_player_handles(&request.players));
+        assert!(valid_player_handles(&config.players));
     }
 
     #[test]
@@ -485,10 +631,12 @@ mod tests {
         let players = [
             MatchPlayer {
                 handle: 0,
+                controller_port: 0,
                 fighter: FighterId::TestFighter,
             },
             MatchPlayer {
                 handle: 0,
+                controller_port: 1,
                 fighter: FighterId::TestFighter,
             },
         ];
@@ -496,6 +644,135 @@ mod tests {
         assert!(!valid_player_handles(&players));
     }
 
+    #[test]
+    fn player_handles_must_not_have_gaps() {
+        let players = [
+            MatchPlayer {
+                handle: 0,
+                controller_port: 0,
+                fighter: FighterId::TestFighter,
+            },
+            MatchPlayer {
+                handle: 2,
+                controller_port: 3,
+                fighter: FighterId::TestFighter,
+            },
+        ];
+
+        assert!(!valid_player_handles(&players));
+        assert_eq!(player_count_for_handles(&players), 2);
+    }
+
+    #[test]
+    fn controller_ports_use_ggrs_handles_only_in_multiplayer() {
+        let single_player = MatchConfig {
+            stage: StageId::TestStage,
+            players: vec![MatchPlayer {
+                handle: 0,
+                controller_port: 3,
+                fighter: FighterId::TestFighter,
+            }],
+            rules: MatchRules::default(),
+        };
+        assert_eq!(single_player.controller_port_for_handle(0), Some(3));
+
+        let multiplayer = MatchConfig {
+            stage: StageId::TestStage,
+            players: vec![
+                MatchPlayer {
+                    handle: 0,
+                    controller_port: 0,
+                    fighter: FighterId::TestFighter,
+                },
+                MatchPlayer {
+                    handle: 1,
+                    controller_port: 3,
+                    fighter: FighterId::TestFighter,
+                },
+            ],
+            rules: MatchRules::default(),
+        };
+        assert_eq!(multiplayer.controller_port_for_handle(0), Some(0));
+        assert_eq!(multiplayer.controller_port_for_handle(1), Some(1));
+    }
+
+    #[test]
+    fn match_input_assignments_map_ports_to_ggrs_handles_without_mutating_ports() {
+        let players = [
+            MatchPlayer {
+                handle: 0,
+                controller_port: 0,
+                fighter: FighterId::TestFighter,
+            },
+            MatchPlayer {
+                handle: 1,
+                controller_port: 3,
+                fighter: FighterId::TestFighter,
+            },
+        ];
+        let assignments = LocalInputAssignments(vec![
+            (0, LocalInputSource::Keyboard),
+            (3, LocalInputSource::Gamepad(Entity::PLACEHOLDER)),
+        ]);
+
+        let match_assignments = create_match_input_assignments(&assignments, &players);
+
+        assert_eq!(match_assignments.get_for_handle(0), Some(LocalInputSource::Keyboard));
+        assert_eq!(
+            match_assignments.get_for_handle(1),
+            Some(LocalInputSource::Gamepad(Entity::PLACEHOLDER))
+        );
+        assert_eq!(assignments[0].0, 0);
+        assert_eq!(assignments[1].0, 3);
+    }
+
+    #[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();

src/match_runtime.rs

@@ -0,0 +1,318 @@
+//! Rollback-simulated state for an active match.
+
+use bevy::input::InputSystems;
+use bevy::prelude::*;
+use bevy_ggrs::{ConfirmedFrameCount, RollbackFrameCount, RunGgrsSystems, prelude::*};
+
+use crate::{
+    AppState,
+    match_loading::{MatchConfig, MatchRules},
+    netcode::session::SessionConfig,
+};
+
+#[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>,
+    /// The rollback frame on which the match first finished.
+    pub finished_at_frame: Option<i32>,
+}
+
+#[derive(Clone, Debug, Hash, PartialEq, Eq)]
+pub struct PlayerMatchState {
+    pub stocks_remaining: Option<u8>,
+    pub score: i32,
+    pub deaths: u32,
+}
+
+#[derive(Resource, Debug, Default, Clone, Copy, PartialEq, Eq)]
+pub struct PauseState {
+    pub paused: bool,
+}
+
+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(),
+            finished_at_frame: None,
+        }
+    }
+
+    pub fn is_match_finished(&self, config: &MatchConfig) -> bool {
+        let time_limit = match config.rules {
+            MatchRules::Stock {
+                starting_stocks: _,
+                time_limit_frames,
+            } => time_limit_frames,
+            MatchRules::Timed { time_limit_frames } => Some(time_limit_frames),
+        };
+
+        if let Some(time_limit) = time_limit {
+            if self.elapsed_frames >= time_limit {
+                return true;
+            }
+        }
+
+        if config.players.len() > 1
+            && let MatchRules::Stock {
+                starting_stocks: _,
+                time_limit_frames: _,
+            } = config.rules
+        {
+            let alive_fighter_count = self
+                .players
+                .iter()
+                .filter(|fighter| {
+                    fighter
+                        .stocks_remaining
+                        .map(|stocks| stocks)
+                        .unwrap_or_default()
+                        > 0
+                })
+                .count();
+            if alive_fighter_count <= 1 {
+                return true;
+            }
+        }
+
+        false
+    }
+
+    fn advance_frame(&mut self, config: &MatchConfig, frame: i32) {
+        if self.finished_at_frame.is_some() {
+            return;
+        }
+
+        self.elapsed_frames = self.elapsed_frames.saturating_add(1);
+
+        if self.is_match_finished(config) {
+            self.finished_at_frame = Some(frame);
+        }
+    }
+
+    fn finish_is_confirmed(&self, confirmed_frame: i32) -> bool {
+        self.finished_at_frame
+            .is_some_and(|finished_at| confirmed_frame >= finished_at)
+    }
+}
+
+pub struct MatchRuntimePlugin;
+
+impl Plugin for MatchRuntimePlugin {
+    fn build(&self, app: &mut App) {
+        app.rollback_resource_with_clone::<MatchState>()
+            .checksum_resource_with_hash::<MatchState>()
+            .init_resource::<PauseState>()
+            .configure_sets(PreUpdate, RunGgrsSystems.run_if(ggrs_should_run))
+            .add_systems(OnEnter(AppState::InMatch), reset_pause)
+            .add_systems(OnExit(AppState::InMatch), reset_pause)
+            .add_systems(
+                GgrsSchedule,
+                update_match_rules.in_set(crate::schedule::GameplaySet::MatchRules),
+            )
+            .add_systems(
+                PreUpdate,
+                toggle_pause
+                    .after(InputSystems)
+                    .before(RunGgrsSystems)
+                    .run_if(in_state(AppState::InMatch)),
+            )
+            .add_systems(
+                Update,
+                transition_after_confirmed_finish.run_if(in_state(AppState::InMatch)),
+            );
+    }
+}
+
+pub fn ggrs_should_run(pause: Option<Res<PauseState>>) -> bool {
+    !pause.is_some_and(|pause| pause.paused)
+}
+
+pub(crate) fn match_is_ongoing(match_state: Option<Res<MatchState>>) -> bool {
+    match_state.is_none_or(|match_state| match_state.finished_at_frame.is_none())
+}
+
+fn toggle_pause(
+    key: Res<ButtonInput<KeyCode>>,
+    gamepads: Query<&Gamepad>,
+    session: Res<SessionConfig>,
+    mut pause: ResMut<PauseState>,
+    mut virtual_time: ResMut<Time<Virtual>>,
+) {
+    if session.is_multiplayer() {
+        return;
+    }
+
+    let pressed = key.just_pressed(KeyCode::Escape)
+        || gamepads
+            .iter()
+            .any(|gamepad| gamepad.just_pressed(GamepadButton::Start));
+    if !pressed {
+        return;
+    }
+
+    pause.paused = !pause.paused;
+    virtual_time.toggle();
+}
+
+fn reset_pause(mut pause: ResMut<PauseState>, mut virtual_time: ResMut<Time<Virtual>>) {
+    pause.paused = false;
+    virtual_time.unpause();
+}
+
+fn update_match_rules(
+    mut match_state: ResMut<MatchState>,
+    match_config: Res<MatchConfig>,
+    frame: Res<RollbackFrameCount>,
+) {
+    match_state.advance_frame(&match_config, frame.0);
+}
+
+fn transition_after_confirmed_finish(
+    match_state: Res<MatchState>,
+    confirmed_frame: Res<ConfirmedFrameCount>,
+    mut next_state: ResMut<NextState<AppState>>,
+) {
+    if match_state.finish_is_confirmed(confirmed_frame.0) {
+        next_state.set(AppState::MatchResults);
+    }
+}
+
+#[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,
+                    controller_port: 3,
+                    fighter: FighterId::TestFighter,
+                },
+                MatchPlayer {
+                    handle: 0,
+                    controller_port: 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.finished_at_frame, None);
+        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())
+        );
+    }
+
+    #[test]
+    fn timed_match_finishes_on_its_rollback_frame() {
+        let config = config(MatchRules::Timed {
+            time_limit_frames: 2,
+        });
+        let mut state = MatchState::from_config(&config);
+
+        state.advance_frame(&config, 10);
+        assert_eq!(state.elapsed_frames, 1);
+        assert_eq!(state.finished_at_frame, None);
+
+        state.advance_frame(&config, 11);
+        assert_eq!(state.elapsed_frames, 2);
+        assert_eq!(state.finished_at_frame, Some(11));
+        assert!(!state.finish_is_confirmed(10));
+        assert!(state.finish_is_confirmed(11));
+
+        state.advance_frame(&config, 12);
+        assert_eq!(state.finished_at_frame, Some(11));
+        assert_eq!(state.elapsed_frames, 2);
+    }
+
+    #[test]
+    fn corrected_rollback_state_does_not_keep_speculative_finish() {
+        let config = config(MatchRules::Stock {
+            starting_stocks: 1,
+            time_limit_frames: None,
+        });
+        let state_before_prediction = MatchState::from_config(&config);
+        let mut predicted_state = state_before_prediction.clone();
+        predicted_state.players[1].stocks_remaining = Some(0);
+        predicted_state.advance_frame(&config, 20);
+        assert_eq!(predicted_state.finished_at_frame, Some(20));
+
+        let mut corrected_state = state_before_prediction;
+        corrected_state.advance_frame(&config, 20);
+        assert_eq!(corrected_state.finished_at_frame, None);
+        assert!(!corrected_state.finish_is_confirmed(20));
+    }
+
+    #[test]
+    fn single_player_stock_match_does_not_finish_by_elimination() {
+        let mut config = config(MatchRules::Stock {
+            starting_stocks: 1,
+            time_limit_frames: None,
+        });
+        config.players.truncate(1);
+        let mut state = MatchState::from_config(&config);
+
+        state.advance_frame(&config, 1);
+        assert_eq!(state.finished_at_frame, None);
+
+        state.players[0].stocks_remaining = Some(0);
+        state.advance_frame(&config, 2);
+        assert_eq!(state.finished_at_frame, None);
+    }
+
+    #[test]
+    fn single_player_stock_match_can_finish_by_time_limit() {
+        let mut config = config(MatchRules::Stock {
+            starting_stocks: 1,
+            time_limit_frames: Some(1),
+        });
+        config.players.truncate(1);
+        let mut state = MatchState::from_config(&config);
+
+        state.advance_frame(&config, 7);
+        assert_eq!(state.finished_at_frame, Some(7));
+    }
+}

src/materials/fighter_material.rs

@@ -0,0 +1,77 @@
+use bevy::{gltf::GltfMaterialName, pbr::{ExtendedMaterial, MaterialExtension}, prelude::*, render::render_resource::AsBindGroup, shader::ShaderRef, world_serialization::WorldInstanceReady};
+
+pub type FighterMaterial = ExtendedMaterial<StandardMaterial, FighterMaterialExtension>;
+
+#[derive(Component)]
+pub struct FighterMesh {
+    pub fighter: Entity
+}
+
+#[derive(Asset, AsBindGroup, Reflect, Debug, Clone, Default)]
+pub struct FighterMaterialExtension {
+    #[uniform(100)]
+    status_color: LinearRgba,
+    #[uniform(100)]
+    status_color_intensity: f32,
+}
+
+const SHADER_ASSET_PATH: &str = "embedded://shinespark/shaders/fighter.wgsl";
+
+impl FighterMaterialExtension {
+    pub fn new(status_color: Color) -> Self {
+        Self {
+            status_color: status_color.into(),
+            status_color_intensity: 0.0,
+            ..default()
+        }
+    }
+
+    pub fn update_status_color(&mut self, status_color: LinearRgba, intensity: f32) {
+        self.status_color = status_color;
+        self.status_color_intensity = intensity;
+    }
+}
+
+impl MaterialExtension for FighterMaterialExtension {
+    fn fragment_shader() -> ShaderRef {
+        SHADER_ASSET_PATH.into()
+    }
+
+    fn deferred_fragment_shader() -> ShaderRef {
+        SHADER_ASSET_PATH.into()
+    }
+}
+
+pub fn bind_fighter_material(
+    scene_ready: On<WorldInstanceReady>,
+    mut commands: Commands,
+    children: Query<&Children>,
+    //color_override: Query<&ColorOverride>,
+    mesh_materials: Query<(Entity, &MeshMaterial3d<StandardMaterial>, &GltfMaterialName)>,
+    mut asset_materials: ResMut<Assets<FighterMaterial>>,
+    original_materials: Res<Assets<StandardMaterial>>,
+) {
+    for descendant in children.iter_descendants(scene_ready.entity) {
+        let Ok((entity, id, material_name)) = mesh_materials.get(descendant) else {
+            continue;
+        };
+
+        dbg!(material_name);
+
+        if !material_name.starts_with("Fighter_") {
+            continue;
+        }
+
+        let Some(original_material) = original_materials.get(id.id()) else {
+            continue;
+        };
+
+        commands.entity(entity).insert((MeshMaterial3d(asset_materials.add(ExtendedMaterial {
+            base: StandardMaterial {
+                // can be used in forward or deferred mode
+                ..original_material.clone()
+            },
+            extension: FighterMaterialExtension::new(bevy::color::palettes::css::BLUE.into())
+        })), FighterMesh { fighter: scene_ready.entity  }));
+    }
+}

src/materials/mod.rs

@@ -0,0 +1,24 @@
+use bevy::{
+    asset::embedded_asset, prelude::*,
+};
+
+
+
+pub mod fighter_material;
+
+pub struct ShinesparkMaterialPlugin;
+
+pub fn startup_test(asset_server: Res<AssetServer>) {
+    let test: Handle<Shader> = asset_server.load("embedded://shinespark/shaders/fighter.wgsl");
+    dbg!(test);
+}
+
+impl Plugin for ShinesparkMaterialPlugin {
+    fn build(&self, app: &mut App) {
+        let omit_prefix = "";
+        embedded_asset!(app, omit_prefix, "shaders/fighter.wgsl");
+        app.add_systems(Startup, startup_test)
+            .add_observer(fighter_material::bind_fighter_material)
+            .add_plugins(MaterialPlugin::<fighter_material::FighterMaterial>::default());
+    }
+}

src/materials/shaders/fighter.wgsl

@@ -0,0 +1,67 @@
+#import bevy_pbr::{
+    pbr_fragment::pbr_input_from_standard_material,
+    pbr_functions::alpha_discard,
+}
+
+#ifdef PREPASS_PIPELINE
+#import bevy_pbr::{
+    prepass_io::{VertexOutput, FragmentOutput},
+    pbr_deferred_functions::deferred_output,
+}
+#else
+#import bevy_pbr::{
+    forward_io::{VertexOutput, FragmentOutput},
+    pbr_functions::{apply_pbr_lighting, main_pass_post_lighting_processing},
+}
+#endif
+
+struct FighterExtendedMaterial {
+    status_color: vec4<f32>,
+    status_color_intensity: f32,
+#ifdef SIXTEEN_BYTE_ALIGNMENT
+    // Web examples WebGL2 support: structs must be 16 byte aligned.
+    _webgl2_padding_8b: u32,
+    _webgl2_padding_12b: u32,
+    _webgl2_padding_16b: u32,
+#endif
+}
+
+@group(#{MATERIAL_BIND_GROUP}) @binding(100)
+var<uniform> fighter_material: FighterExtendedMaterial;
+
+@fragment
+fn fragment(
+    in: VertexOutput,
+    @builtin(front_facing) is_front: bool,
+) -> FragmentOutput {
+    // generate a PbrInput struct from the StandardMaterial bindings
+    var pbr_input = pbr_input_from_standard_material(in, is_front);
+
+    // we can optionally modify the input before lighting and alpha_discard is applied
+    //pbr_input.material.base_color.b = pbr_input.material.base_color.r;
+
+    // alpha discard
+    pbr_input.material.base_color = alpha_discard(pbr_input.material, pbr_input.material.base_color);
+
+#ifdef PREPASS_PIPELINE
+    // in deferred mode we can't modify anything after that, as lighting is run in a separate fullscreen shader.
+    let out = deferred_output(in, pbr_input);
+#else
+    var out: FragmentOutput;
+    // apply lighting
+    out.color = apply_pbr_lighting(pbr_input);
+
+    // we can optionally modify the lit color before post-processing is applied
+    var quantize_steps: i32 = 2;
+    out.color = vec4<f32>(vec4<u32>(out.color * f32(quantize_steps))) / f32(quantize_steps);
+
+    // apply in-shader post processing (fog, alpha-premultiply, and also tonemapping, debanding if the camera is non-hdr)
+    // note this does not include fullscreen postprocessing effects like bloom.
+    out.color = main_pass_post_lighting_processing(pbr_input, out.color);
+
+    out.color = mix(out.color, fighter_material.status_color, fighter_material.status_color_intensity * 0.5);
+
+#endif
+
+    return out;
+}

src/math/fixed_transform.rs

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

src/math/mod.rs

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

src/math/vec.rs

@@ -2,7 +2,7 @@ use bevy::math::Vec2;
 use bevy::prelude::*;
 use fixed::types::I32F32;
 use serde::{Deserialize, Serialize};
-use std::ops::{Add, AddAssign, Div, Mul, MulAssign, Sub};
+use std::ops::{Add, AddAssign, Div, Mul, MulAssign, Sub, SubAssign};
 
 use super::int::{FGWide, FGi32};
 
@@ -227,6 +227,15 @@ impl AddAssign for FGVec2 {
     }
 }
 
+impl SubAssign for FGVec2 {
+    fn sub_assign(&mut self, rhs: Self) {
+        *self = Self {
+            x: self.x - rhs.x,
+            y: self.y - rhs.y,
+        }
+    }
+}
+
 impl MulAssign for FGVec2 {
     fn mul_assign(&mut self, rhs: Self) {
         *self = Self {

src/menus/character_select/mod.rs

@@ -1,19 +1,8 @@
 use bevy::{picking::pointer::PointerId, prelude::*};
 
 use crate::{
-    AppState,
+    AppState, fighter::manifest::{FighterManifest, FighterManifestRegistry}, game_settings::CommonAssets, input::{LocalInputAssignments, LocalInputSource}, menus::{
-    fighter::manifest::{FighterManifest, FighterManifestRegistry},
+        MenuCameraMarker, MenuMarker, button::FGUiButton, character_select::{character_box::CharacterBox, token::CharacterSelectToken}, cursor::{FGMenuCursor, MenuCursorInputSource}, errors::MenuErrors::FighterManifestNotFound, match_config::{MenuMatchConfig, MenuMatchPlayerSlot}, scaling, spawn_menu, style::{FGUiButtonType, FGUiStyle},
-    game_settings::CommonAssets,
-    input::{LocalInputAssignments, LocalInputSource},
-    menus::{
-        MenuMarker,
-        button::FGUiButton,
-        character_select::{character_box::CharacterBox, token::CharacterSelectToken},
-        cursor::{FGMenuCursor, MenuCursorInputSource},
-        errors::MenuErrors::FighterManifestNotFound,
-        match_config::{MenuMatchConfig, MenuMatchPlayerSlot},
-        scaling, spawn_menu,
-        style::{FGUiButtonType, FGUiStyle},
     },
 };
 
@@ -241,7 +230,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, With<MenuCameraMarker>>,
     ui_scale: Res<UiScale>,
 ) -> Result {
     let camera = cam.into_inner();

src/menus/cursor.rs

@@ -9,11 +9,8 @@ use bevy::{
 };
 
 use crate::{
-    input::{LocalInputAssignments, LocalInputSource},
+    input::{LocalInputAssignments, LocalInputSource}, menus::{
-    menus::{
+        MenuCameraMarker, input::{MenuInput, MenuInputState}, scaling, style::FGUiStyle,
-        input::{MenuInput, MenuInputState},
-        scaling,
-        style::FGUiStyle,
     },
 };
 
@@ -181,7 +178,7 @@ pub fn cursor_input(
 }
 
 pub fn update_cursor_transform(
-    camera: Single<&Camera, With<IsDefaultUiCamera>>,
+    camera: Single<&Camera, With<MenuCameraMarker>>,
     query: Query<(&mut Node, &PointerLocation), With<FGMenuCursor>>,
     ui_scale: Res<UiScale>,
 ) {

src/menus/input.rs

@@ -226,7 +226,7 @@ fn gamepad_input(
                 input.accept.accumulate(&status);
             }
             MenuInputMapAction::Start => {
-                input.accept.accumulate(&status);
+                input.start.accumulate(&status);
             }
         }
     }

src/menus/match_config.rs

@@ -3,7 +3,7 @@ use thiserror::Error;
 
 use crate::{
     fighter::FighterId,
-    match_loading::{MatchPlayer, PendingMatch},
+    match_loading::{MatchConfig, MatchPlayer, MatchRules},
     stage::manifest::StageId,
 };
 
@@ -60,12 +60,15 @@ 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)?;
 
-        for player in self.players.iter() {
+        let mut players = self.players.iter().collect::<Vec<_>>();
+        players.sort_unstable_by_key(|player| player.slot);
+
+        for (handle, player) in players.into_iter().enumerate() {
             let fighter_id =
                 player
                     .fighter
@@ -74,13 +77,56 @@ impl MenuMatchConfig {
                     ))?;
             match_players.push(MatchPlayer {
                 fighter: fighter_id,
-                handle: player.slot,
+                handle,
+                controller_port: player.slot,
             });
         }
 
-        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());
+    }
+
+    #[test]
+    fn sparse_controller_ports_get_dense_ggrs_handles() {
+        let menu = MenuMatchConfig {
+            stage: Some(StageId::TestStage),
+            players: vec![
+                MenuMatchPlayerSlot {
+                    slot: 3,
+                    fighter: Some(FighterId::TestFighter),
+                },
+                MenuMatchPlayerSlot {
+                    slot: 0,
+                    fighter: Some(FighterId::TestFighter),
+                },
+            ],
+        };
+
+        let config = menu.to_match_config().unwrap();
+        assert_eq!(config.players[0].handle, 0);
+        assert_eq!(config.players[0].controller_port, 0);
+        assert_eq!(config.players[1].handle, 1);
+        assert_eq!(config.players[1].controller_port, 3);
+    }
+}

src/menus/match_results/mod.rs

@@ -0,0 +1,44 @@
+use bevy::{prelude::*, text::FontSourceTemplate};
+
+use crate::{AppState, menus::{MenuMarker, spawn_menu}};
+
+pub fn setup_post_match_menu(
+    existing_menu: Option<Single<Entity, With<MenuMarker>>>,
+    commands: Commands,
+) {
+    let menu = bsn! {
+        Node {
+                flex_direction: FlexDirection::Column,
+                width: percent(100),
+                height: percent(100),
+                justify_content: JustifyContent::Center,
+                align_items: AlignItems::Center
+        }
+        Children [
+        (
+            Text("[Insert beautiful post-match screen here]")
+            TextFont {
+                font: FontSourceTemplate::Handle("fonts/roboto.ttf"),
+                font_size: px(super::style::H1_SIZE),
+            }
+            TextColor(Color::srgb(0.9, 0.9, 0.9))
+        ),
+            Text("Press any button/key to continue...")
+            TextFont {
+                font: FontSourceTemplate::Handle("fonts/roboto.ttf"),
+                font_size: px(super::style::H3_SIZE),
+            }
+            TextColor(Color::srgb(0.9, 0.9, 0.9))
+        ]
+    };
+
+    spawn_menu(existing_menu, commands, menu);
+}
+
+pub fn check_return_to_character_select(gamepads: Query<&Gamepad>, keyboard: Res<ButtonInput<KeyCode>>, mut next_state: ResMut<NextState<AppState>>) {
+    let any_pressed = gamepads.iter().any(|gp| gp.get_just_pressed().count() > 0);
+    let any_pressed = any_pressed || keyboard.get_just_pressed().count() > 0;
+    if any_pressed {
+        next_state.set(AppState::MainMenu);
+    }
+}

src/menus/mod.rs

@@ -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;
@@ -20,6 +18,7 @@ pub mod errors;
 pub mod input;
 pub mod main_menu;
 pub mod match_config;
+pub mod match_results;
 pub mod navigation;
 pub mod scaling;
 pub mod stage_select;
@@ -27,6 +26,8 @@ pub mod style;
 
 #[derive(Component, Clone, Default)]
 pub struct MenuMarker {}
+#[derive(Component, Clone, Default)]
+pub struct MenuCameraMarker {}
 
 pub struct MenuPlugin;
 
@@ -40,6 +41,7 @@ pub fn wrap_menu(menu: impl Scene) -> impl Scene {
     bsn! {
         #MenuRoot
         MenuMarker
+        Transform
         Node {
             width: percent(100),
             height: percent(100),
@@ -48,6 +50,12 @@ pub fn wrap_menu(menu: impl Scene) -> impl Scene {
             flex_direction: FlexDirection::Column,
         }
         Children [
+            (
+                #MenuCamera
+                Camera
+                Camera2d
+                MenuCameraMarker
+            ),
             (
                 #MenuContainer
                 Node {
@@ -70,11 +78,7 @@ pub fn despawn_menu(
     mut commands: Commands,
 ) {
     if let Some(entity) = existing_menu {
-        commands
+        commands.entity(entity.into_inner()).despawn();
-            .entity(entity.into_inner())
-            .remove::<Camera2d>()
-            .remove::<Camera>()
-            .despawn();
     }
 }
 
@@ -84,11 +88,7 @@ pub fn spawn_menu(
     menu: impl Scene,
 ) {
     if let Some(entity) = existing_menu {
-        commands
+        commands.entity(entity.into_inner()).despawn();
-            .entity(entity.into_inner())
-            .remove::<Camera2d>()
-            .remove::<Camera>()
-            .despawn();
     }
     commands.queue_spawn_scene(wrap_menu(menu));
 }
@@ -113,28 +113,13 @@ where
 
 impl Plugin for MenuPlugin {
     fn build(&self, app: &mut App) {
-        app.add_systems(
+        app.add_systems(OnEnter(AppState::MainMenu), build_menu::<MainMenu>)
-            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>()
             .init_resource::<navigation::UINavigationActionState>()
             .init_resource::<navigation::UINavigationRepeat>()
             .init_resource::<input::MenuInputState>()
             .insert_resource(InputFocusVisible(true))
-        .insert_resource(GlobalUiDebugOptions {
+            .insert_resource(GlobalUiDebugOptions { ..default() })
-            enabled: true,
-            ..default()
-        })
             // Configure auto-navigation behavior
             .insert_resource(AutoNavigationConfig {
                 // Require at least 10% overlap in perpendicular axis for cardinal directions
@@ -199,7 +184,9 @@ impl Plugin for MenuPlugin {
                 OnExit(AppState::CharacterSelect),
                 (cursor::despawn_cursors, character_select::despawn_tokens),
             )
-        .add_observer(character_select::select_fighter.run_if(in_state(AppState::CharacterSelect)))
+            .add_observer(
+                character_select::select_fighter.run_if(in_state(AppState::CharacterSelect)),
+            )
             .add_observer(
                 character_select::update_start_banner_visibility
                     .run_if(in_state(AppState::CharacterSelect)),
@@ -222,7 +209,21 @@ impl Plugin for MenuPlugin {
             //---------
             // STAGE SELECT END
             //---------
-        .add_plugins(RonAssetPlugin::<FGUiStyle>::create("stylesheet.ron"))
+            //---------
+            // MATCH RESULT START
+            //---------
+            .add_systems(
+                OnEnter(AppState::MatchResults),
+                match_results::setup_post_match_menu,
+            )
+            .add_systems(
+                PostUpdate,
+                match_results::check_return_to_character_select
+                    .run_if(in_state(AppState::MatchResults)),
+            )
+            //---------
+            // MATCH RESULT END
+            //---------
             .add_systems(
                 Update,
                 (

src/menus/navigation.rs

@@ -102,7 +102,7 @@ pub fn process_inputs(
                 .insert(DirectionalNavigationAction::Right);
         }
     }
-    if input.accept.is_pressed() {
+    if input.accept.is_just_pressed() {
         action_state
             .pressed_actions
             .insert(DirectionalNavigationAction::Select);

src/menus/stage_select/mod.rs

@@ -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(())

src/netcode/session.rs

@@ -1,49 +1,251 @@
-//! 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 {
+    /// Returns whether this match has more than one remote participant.
+    pub fn is_multiplayer(&self) -> bool {
+        self.players.len() > 1
+            || self
+                .players
+                .iter()
+                .any(|player| matches!(player, PlayerConnection::Remote(_)))
+    }
+
+    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 {
+    for (handle, player) in config.players.iter().enumerate() {
-        sess_build = sess_build.add_player(PlayerType::Local, i)?;
+        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!");
+        info!("starting GGRS sync test");
-        let sess = sess_build.start_synctest_session()?;
+        Ok(Session::SyncTest(sess_build.start_synctest_session()?))
-        Ok(Session::SyncTest(sess))
     } else {
-        println!("Start p2p!");
+        info!(
-        let socket = UdpNonBlockingSocket::bind_to_port(6969)?;
+            "starting direct UDP P2P session on port {}",
-        let sess = sess_build.start_p2p_session(socket)?;
+            config.local_port
-        Ok(Session::P2P(sess))
+        );
+        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>>>) {
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Resource)]
-    let Some(mut session) = session else {
+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() {
+    let Session::P2P(session) = session.as_mut() else {
-        Session::P2P(s) => {
+        return;
-            for event in s.events() {
+    };
+    for event in session.events() {
         match event {
-                    GgrsEvent::Disconnected { .. } | GgrsEvent::NetworkInterrupted { .. } => {
+            GgrsEvent::NetworkInterrupted { addr, .. } => {
-                        warn!("GGRS event: {event:?}")
+                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]
+        );
+        assert!(config.is_multiplayer());
+    }
+
+    #[test]
+    fn single_local_player_is_not_multiplayer() {
+        let config = SessionConfig::from_args(&args(&["game", "--players", "1"]), 1).unwrap();
+        assert!(!config.is_multiplayer());
+    }
+
+    #[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(_)));
+        assert!(config.is_multiplayer());
+    }
+
+    #[test]
+    fn validates_handles_and_local_ownership() {
+        let duplicate = args(&[
+            "game",
+            "--players",
+            "2",
+            "--net-player",
+            "1=127.0.0.1:7001",
+            "--net-player",
+            "1=127.0.0.1:7002",
+        ]);
+        assert!(matches!(
+            SessionConfig::from_args(&duplicate, 2),
+            Err(SessionConfigError::DuplicatePlayerHandle(1))
+        ));
+
+        let no_local = args(&["game", "--players", "1", "--net-player", "0=127.0.0.1:7001"]);
+        assert!(matches!(
+            SessionConfig::from_args(&no_local, 1),
+            Err(SessionConfigError::NoLocalPlayers)
+        ));
     }
 }

src/player.rs

@@ -10,5 +10,8 @@ use bevy_ggrs::prelude::*;
 #[derive(Default, Component)]
 #[require(Rollback, Transform)]
 pub struct Player {
+    /// Dense GGRS session index.
     pub handle: usize,
+    /// Port used for port-dependent gameplay such as respawn placement.
+    pub controller_port: usize,
 }