Implement hitstop shake

.gitea/workflows/ci.yml

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

Cargo.lock

@@ -94,6 +94,12 @@ 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"
@@ -2090,6 +2096,14 @@ 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"
@@ -2218,6 +2232,32 @@ 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"
@@ -3202,6 +3242,16 @@ 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"
@@ -3418,9 +3468,9 @@ dependencies = [
 
 [[package]]
 name = "gc-adapter-neo"
-version = "1.1.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8d3e10c6c4b928cb559f641765ebaa40f5f099bf51bc0227af7431859f8bd84"
+checksum = "120a5b3858ae854c4674ae41a38173e8ea04b814fb3212fd3bdd1b04d414a9d7"
 dependencies = [
  "binread",
  "modular-bitfield",
@@ -3473,6 +3523,17 @@ 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"
@@ -4250,6 +4311,26 @@ 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"
@@ -4290,13 +4371,15 @@ dependencies = [
 
 [[package]]
 name = "libusb1-sys"
-version = "0.7.0"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da050ade7ac4ff1ba5379af847a10a10a8e284181e060105bf8d86960ce9ce0f"
+checksum = "be241693102a24766d0b8526c8988771edac2842630d7e730f8e9fbc014f3703"
 dependencies = [
  "cc",
  "libc",
+ "libflate",
  "pkg-config",
+ "tar",
  "vcpkg",
 ]
 
@@ -5802,6 +5885,12 @@ 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"
@@ -5872,9 +5961,9 @@ dependencies = [
 
 [[package]]
 name = "rusb"
-version = "0.9.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab9f9ff05b63a786553a4c02943b74b34a988448671001e9a27e2f0565cc05a4"
+checksum = "f6f32cd45962594f9f8cd4547b5757132715600e2c8840aa9ccd3d1a9ed6fdc6"
 dependencies = [
  "libc",
  "libusb1-sys",
@@ -6081,8 +6170,9 @@ dependencies = [
  "bevy_asset_loader",
  "bevy_egui",
  "bevy_ggrs",
+ "bevy_wind_waker_shader",
  "bincode",
- "blake3",
+ "bitfields",
  "clap",
  "enum_cycling",
  "enum_cycling_derive",
@@ -6452,6 +6542,17 @@ 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"
@@ -7857,6 +7958,16 @@ 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,17 +6,11 @@ authors = [""]
 
 [workspace]
 
-[features]
-default = ["development", "debug_features"]
-development = ["bevy/dynamic_linking", "bevy/file_watcher"]
-debug_features = ["bevy/free_camera"]
-
 [dependencies]
-bevy = { version = "0.19", features = ["asset_processor", "basis-universal", "bevy_settings"] }
+bevy = { version = "0.19", features = ["asset_processor", "basis-universal", "dynamic_linking", "free_camera", "file_watcher", "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"
@@ -28,13 +22,15 @@ 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.1.1", features = ["libusb"] }
+gc-adapter-neo = { version = "1.1.0", features = ["libusb"] }
 rhai = "1.26.0"
 enum_cycling = "0.2.1"
 enum_cycling_derive = "0.2.1"
@@ -43,9 +39,3 @@ 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

@@ -13,21 +13,3 @@ cargo run -- --debug-match --players 2 --local-port 7000 \
 cargo run -- --debug-match --players 2 --local-port 7001 \
   --net-player 0=127.0.0.1:7000 --net-player 1=local
 ```
-
-## Production Build
-
-Production builds use the `production` Cargo profile and do not dynamically
-link Bevy or Rust. Development builds retain Bevy dynamic linking for faster
-iteration. Cargo stores the production profile under `target/production`,
-separate from development artifacts under `target/debug`.
-
-```sh
-cargo run --locked \
-  --bin process-assets --no-default-features --features debug_features
-cargo build --locked \
-  --profile production --no-default-features --features debug_features
-```
-
-The asset preprocessing command must be run from the repository root. It
-populates `imported_assets/Default`, which is then consumed by the production
-game without running the asset processor at startup.

assets/fighters/test/test.fighter.ron

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

assets/game_settings.ron

@@ -24,8 +24,7 @@
         visual_shake_table: [
             -3.0, -1.5, 1.5, 3.0
         ],
-        attacker_visual_shake_multiplier: 0.4,
+        attacker_visual_shake_multiplier: 0.4
-        di_max_angle: "18.0"
     ),
     stage_manifest_paths: [
         "stages/battlefield/test.stage.ron"

src/bin/process-assets.rs

@@ -1,36 +0,0 @@
-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/fighter/attack/directional_influence.rs

@@ -1,69 +0,0 @@
-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,7 +1,6 @@
 use std::collections::{HashMap, VecDeque};
 
 mod reaction;
-pub mod directional_influence;
 
 use bevy::ecs::entity::{EntityMapper, MapEntities};
 use bevy::prelude::*;
@@ -32,15 +31,9 @@ use crate::{
 #[derive(Deref, Component, Default, Hash, Debug, Copy, Clone)]
 pub struct FighterKnockbackVelocity(pub FGVec2);
 
-#[derive(Debug, Default, Clone, Copy, Serialize, Deserialize, Component, Hash, PartialEq)]
+#[derive(Debug, Default, Clone, Copy, Serialize, Deserialize, Component, Hash)]
 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,
@@ -49,12 +42,11 @@ pub enum HitReactionKind {
 
 #[derive(Debug, Hash, Clone)]
 pub struct FighterHitReaction {
-    pub launch_velocity: FGi32,
+    pub launch_velocity: FGVec2,
     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)]

src/fighter/attack/reaction.rs

@@ -1,19 +1,20 @@
 use bevy::prelude::*;
 use bevy_ggrs::prelude::GgrsSchedule;
+use fixed_math::SinCos;
 
 use super::*;
 use crate::{
     fighter::{
         Fighter, FighterFacingDirection, FighterHitboxes, FighterHitstop, FighterHitstopShake, FighterHitstopShakeKind, FighterHitstopShakeRole, FighterPendingHitReaction, FighterStaleMoveQueue, errors::FighterErrors, manifest::FighterManifest, state::FighterState,
-    }, game_settings::GameSettings, math::{int::FGi32}, player::Player, schedule::GameplaySet, scripting::FighterAttackScript,
+    }, 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<(
-        &mut FighterStaleMoveQueue,
+        &FighterStaleMoveQueue,
         &FighterFacingDirection,
-        &mut FighterHitboxes,
+        &FighterHitboxes,
         &Player,
         &mut FighterHitstop,
         &mut FighterHitstopShake,
@@ -42,7 +43,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, _, player, _, _)) =
+                let Ok((stale_move_queue, facing_dir, _hitboxes, player, _, _)) =
                     attacker.get(hit.attacker)
                 else {
                     return None;
@@ -52,6 +53,7 @@ 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,
@@ -88,19 +90,18 @@ pub fn resolve_fighter_hits(
             } else {
                 angle
             };
-
+            let (sin, cos) = launch_angle.sin_cos();
-            // Attacker hitstop and data
+            let launch_direction = FGVec2::new(cos, sin);
             let hitstop = HitStop::calculate(FighterDamage(attack_damage), false);
             reactions.push((
                 attacker_entity,
                 attacker_slot,
                 FighterHitReaction {
-                    launch_velocity: knockback.get_launch_speed(&game_settings),
+                    launch_velocity: launch_direction * 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)
                 },
             ));
         }
@@ -108,7 +109,7 @@ pub fn resolve_fighter_hits(
         receiver_damage.0 += total_damage_received_this_frame;
 
         for (attacker_entity, _, reaction) in &reactions {
-            let Ok((.., _, mut hitstop, mut hitstop_shake)) = attacker.get_mut(*attacker_entity) else {
+            let Ok((.., mut hitstop, mut hitstop_shake)) = attacker.get_mut(*attacker_entity) else {
                 continue;
             };
 
@@ -135,19 +136,6 @@ 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,7 +37,6 @@ pub struct FighterAttributes {
     pub ground_friction: FGi32,
     pub terminal_velocity: FGi32,
     pub gravity: FGi32,
-    pub fast_fall_speed: FGi32,
     pub weight: FGi32,
     pub air_friction: FGi32,
 

src/fighter/baked_animation/asset_baking.rs

@@ -151,10 +151,7 @@ type FighterBakeProcessor = LoadTransformAndSave<
 >;
 
 pub struct BakedAnimationPlugin;
-
+impl Plugin for BakedAnimationPlugin {
-pub struct BakedAnimationAssetProcessingPlugin;
-
-impl Plugin for BakedAnimationAssetProcessingPlugin {
     fn build(&self, app: &mut App) {
         app.init_asset::<BakedFighterAnimations>()
             .register_asset_loader(FighterBakeSourceLoader)
@@ -163,13 +160,7 @@ impl Plugin for BakedAnimationAssetProcessingPlugin {
                 FighterBakeTransformer,
                 BakedFighterAnimationsSaver,
             ))
-            .set_default_asset_processor::<FighterBakeProcessor>("fighterbake");
+            .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

src/fighter/baked_animation/mod.rs

@@ -4,7 +4,7 @@ mod asset_baking;
 mod runtime;
 mod visual_binding;
 
-pub use asset_baking::{BakedAnimationAssetProcessingPlugin, BakedAnimationPlugin};
+pub use asset_baking::BakedAnimationPlugin;
 pub use crate::math::fixed_transform::FixedMat4;
 pub use runtime::{
     BakedAnimationClip, BakedFighterAnimations, FighterBoneIndexMap, FighterBoneMatrices,

src/fighter/debug.rs

@@ -9,7 +9,7 @@ use bevy_egui::{EguiContexts, egui};
 use crate::debug_tools::{DebugSettings, FighterDebugRowKind};
 use crate::fighter::animation::FighterAnimationFrame;
 use crate::fighter::attack::{
-    self, FighterKnockbackVelocity, FighterLastAttackDebug, FighterPendingHitReaction,
+    FighterKnockbackVelocity, FighterLastAttackDebug, FighterPendingHitReaction,
     FighterSolvedHurtboxes,
 };
 use crate::fighter::baked_animation::{BakedFighterAnimations, FighterBoneMatrices};
@@ -382,14 +382,14 @@ pub fn attack_debug_gather(
         &FighterPendingHitReaction,
         &FighterTranslation,
         &Fighter,
-        &FighterInput,
     )>,
     mut commands: Commands,
     manifests: Res<Assets<FighterManifest>>,
     game_settings: Res<GameSettings>,
 ) -> Result {
-    for (entity, reaction, translation, fighter, input) in query {
+    for (entity, reaction, translation, fighter) in query {
         let Some(ref hit) = reaction.0 else {
+            commands.entity(entity).remove::<FighterLastAttackDebug>();
             continue;
         };
 
@@ -397,13 +397,7 @@ pub fn attack_debug_gather(
             .get(&fighter.manifest)
             .ok_or(FighterErrors::FighterManifestNotFound)?;
 
-        let launch_dir = attack::directional_influence::apply_directional_influence(
+        let mut knockback_vel = FighterKnockbackVelocity(hit.launch_velocity);
-            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);
 
@@ -412,7 +406,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, false);
+            air::integrate_gravity(&mut fighter_vel, &manifest.attributes);
 
             let vel = knockback_vel.length();
             let new_vel = vel

src/fighter/mod.rs

@@ -38,7 +38,7 @@ use crate::{
             AttackKind, FighterAttackPlugin, FighterAttackScriptAssets, FighterDamage,
             FighterKnockbackVelocity, FighterPendingHitReaction, FighterSolvedHurtboxes,
             FighterStaleMoveQueue,
-        }, baked_animation::{FighterBoneIndexMap, FighterBoneMatrices}, manifest::FighterManifest, state::{FighterState, air::AirborneStateCommon, fall::FallState}, visual::FighterAnimations,
+        }, baked_animation::{FighterBoneIndexMap, FighterBoneMatrices}, 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;
@@ -259,7 +259,6 @@ 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)]
@@ -300,7 +299,7 @@ pub fn spawn_fighter(
             visual_root,
             animations,
             attack_scripts,
-            FighterState::Fall(FallState::new(AirborneStateCommon::default())),
+            FighterState::Fall(FallState),
             animation::FighterAnimationFrame::new(animation::AnimKind::Wait, true),
             (
                 baked_animation::FighterBoneMatrices::default(),

src/fighter/state/air.rs

@@ -2,44 +2,10 @@ use crate::fighter::state::ground::GroundedStateCommon;
 use crate::fighter::state::land::{LandingState, LandingType};
 use crate::fighter::state::{CollisionContext, FighterState};
 use crate::fighter::*;
-use crate::input::FighterCommands;
 
-#[derive(Default, Debug, Clone, Copy, Hash)]
+pub fn integrate_gravity(velocity: &mut FighterVelocity, attributes: &FighterAttributes) {
-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(
@@ -90,12 +56,8 @@ pub fn apply_air_motion(
     translation.0 += velocity.0;
 }
 
-pub fn update_standard_motion(
+pub fn update_standard_motion(ctx: &mut crate::fighter::state::UpdateContext) {
-    ctx: &mut crate::fighter::state::UpdateContext,
+    integrate_gravity(ctx.velocity, ctx.fighter_attributes);
-    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);
 }
@@ -148,7 +110,6 @@ mod tests {
             air_drift_max: FGi32::lit("1.2"),
             ground_friction: FGi32::ZERO,
             terminal_velocity: FGi32::ZERO,
-            fast_fall_speed: FGi32::ZERO,
             gravity: FGi32::ZERO,
             weight: FGi32::lit("1"),
             air_friction: FGi32::lit("0.001"),

src/fighter/state/air_dodge.rs

@@ -1,9 +1,13 @@
 use crate::{
     fighter::{
-        animation::AnimKind, state::{
+        animation::AnimKind,
-            CollisionContext, EnterContext, FighterState, FighterStateImpl, InterruptContext, UpdateContext, air::{self, AirborneStateCommon}, fall::FallState, land::LandingType,
+        state::{
+            CollisionContext, EnterContext, FighterState, FighterStateImpl, InterruptContext,
+            UpdateContext, air, fall::FallState, land::LandingType,
         },
-    }, input, math::vec::FGVec2,
+    },
+    input,
+    math::vec::FGVec2,
 };
 
 #[derive(Debug, Clone, Hash)]
@@ -16,7 +20,7 @@ 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::new(AirborneStateCommon::default())))
+            Some(FighterState::Fall(FallState))
         } else {
             None
         }

src/fighter/state/fall.rs

@@ -1,24 +1,12 @@
 use super::{CollisionContext, EnterContext, FighterStateImpl, InterruptContext, UpdateContext};
 use crate::fighter::animation::AnimKind;
-use crate::fighter::state::air::AirborneStateCommon;
 use crate::fighter::state::{FighterState, air, jump};
 
-#[derive(Debug, Clone, Copy, Hash, Default)]
+#[derive(Debug, Clone, Copy, Hash)]
-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)
     }
@@ -28,7 +16,7 @@ impl FighterStateImpl for FallState {
     }
 
     fn update(&mut self, state_context: &mut UpdateContext) {
-        air::update_standard_motion(state_context, &mut self.airborne_state_common);
+        air::update_standard_motion(state_context);
     }
 
     fn check_collision_interrupt(
@@ -48,3 +36,11 @@ impl FighterStateImpl for FallState {
     }
 }
 
+pub fn check_input(state_context: &InterruptContext) -> Option<FighterState> {
+    let input_frame = state_context.input.get_last_frame();
+
+    if input_frame.movement.x.abs() < state_context.game_settings.input_common.stick_deadzone {
+        return Some(FighterState::Fall(FallState));
+    }
+    None
+}

src/fighter/state/ground.rs

@@ -3,7 +3,7 @@
 //! bit-for-bit deterministic for rollback.
 
 use crate::fighter::state::{
-    CollisionContext, FighterState, InterruptContext, air, dash, fall, ground_attack, turn, wait, walk,
+    CollisionContext, FighterState, InterruptContext, dash, fall, ground_attack, turn, wait, walk,
 };
 use crate::fighter::{
     FighterAttributes, FighterPreviousTranslation, FighterTranslation, FighterVelocity,
@@ -233,7 +233,7 @@ pub fn collision_interrupt(
 ) -> Option<FighterState> {
     match collide_with_stage_grounded(ctx, common, can_walk_off) {
         GroundedMotionResult::InGround => None,
-        GroundedMotionResult::InAir => Some(FighterState::Fall(fall::FallState::new(air::AirborneStateCommon::default()))),
+        GroundedMotionResult::InAir => Some(FighterState::Fall(fall::FallState)),
     }
 }
 

src/fighter/state/ground_attack.rs

@@ -47,13 +47,13 @@ impl FighterStateImpl for GroundAttackState {
     fn on_enter(&mut self, state_context: &mut EnterContext) {
         state_context.play_animation(self.attack_kind.get_animation(), false);
         let script = state_context.attack_script_assets.scripts[&self.attack_kind].clone();
+        state_context.stale_move_queue.push(self.attack_kind);
         state_context.hitboxes.0 = Some(crate::fighter::FighterActiveAttack {
             kind: self.attack_kind,
             script,
             active_hitboxes: Vec::new(),
             solved_hitboxes: Vec::new(),
             hit_fighters: Vec::new(),
-            stalled: false
         });
     }
 

src/fighter/state/hitstun.rs

@@ -1,11 +1,10 @@
 use crate::{
     fighter::{
         animation::AnimKind,
-        attack::{self, FighterHitReaction},
+        attack::FighterHitReaction,
         state::{
             CollisionContext, EnterContext, ExitContext, FighterState, FighterStateImpl,
-            InterruptContext, UpdateContext,
+            InterruptContext, UpdateContext, air,
-            air::{self, AirborneStateCommon},
             fall::FallState,
             ground::{GroundedStateCommon, collision_interrupt},
             land::LandingType,
@@ -25,17 +24,6 @@ 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 {
@@ -63,9 +51,7 @@ impl FighterStateImpl for HitstunState {
                         grounded_common: grounded_state_common.clone(),
                     }))
                 }
-                HitstopStateKind::Airborne => {
+                HitstopStateKind::Airborne => Some(FighterState::Fall(FallState)),
-                    Some(FighterState::Fall(FallState::new(AirborneStateCommon::default())))
-                }
             }
         } else {
             None
@@ -73,23 +59,7 @@ impl FighterStateImpl for HitstunState {
     }
 
     fn update(&mut self, ctx: &mut UpdateContext) {
-        if !self.knockback_applied {
+        air::integrate_gravity(ctx.velocity, ctx.fighter_attributes);
-            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
@@ -107,6 +77,7 @@ impl FighterStateImpl for HitstunState {
             HitstopStateKind::Airborne => AnimKind::FlinchAir,
         };
         state_context.play_animation(animation, false);
+        state_context.knockback_velocity.0 = self.hit_reaction.launch_velocity;
     }
 
     fn on_exit(&mut self, _state_context: &mut ExitContext) {}
@@ -125,7 +96,9 @@ impl FighterStateImpl for HitstunState {
         }
     }
     
-    fn is_visually_grounded<'a>(&'a self) -> bool {
+    fn is_visually_grounded<'a>(
+        &'a self,
+    ) -> bool {
         match self.hitstop_kind {
             HitstopStateKind::Grounded(_) => true,
             HitstopStateKind::Airborne => false,

src/fighter/state/jump.rs

@@ -2,10 +2,16 @@ use bevy::prelude::*;
 
 use crate::{
     fighter::{
-        animation::AnimKind, state::{
+        animation::AnimKind,
-            CollisionContext, EnterContext, FighterState, FighterStateImpl, InterruptContext, UpdateContext, air::{self, AirborneStateCommon}, air_dodge::{self, AirDodgeState}, ground::{self, GroundedStateCommon},
+        state::{
+            CollisionContext, EnterContext, FighterState, FighterStateImpl, InterruptContext,
+            UpdateContext, air,
+            air_dodge::{self, AirDodgeState},
+            ground::{self, GroundedStateCommon},
         },
-    }, input::FighterCommands, math::{int::FGi32, vec::FGVec2},
+    },
+    input::FighterCommands,
+    math::{int::FGi32, vec::FGVec2},
 };
 #[derive(Debug, Hash, Clone, Copy)]
 pub enum JumpType {
@@ -17,7 +23,6 @@ pub enum JumpType {
 #[derive(Debug, Clone, Hash)]
 pub struct JumpState {
     jump_type: JumpType,
-    airborne_state_common: AirborneStateCommon,
 }
 
 #[derive(Debug, Clone, Hash)]
@@ -69,7 +74,7 @@ impl FighterStateImpl for JumpSquatState {
             } else {
                 JumpType::ShortHop
             };
-            Some(FighterState::Jump(JumpState { jump_type, airborne_state_common: AirborneStateCommon::default() }))
+            Some(FighterState::Jump(JumpState { jump_type }))
         } else {
             None
         }
@@ -105,7 +110,6 @@ impl FighterStateImpl for JumpState {
         if state_context.input.has_command(FighterCommands::Jump) {
             Some(FighterState::Jump(JumpState {
                 jump_type: JumpType::DoubleJump,
-                airborne_state_common: AirborneStateCommon::default()
             }))
         } else {
             air_dodge::check_input(state_context)
@@ -113,7 +117,7 @@ impl FighterStateImpl for JumpState {
     }
 
     fn update(&mut self, state_context: &mut UpdateContext) {
-        air::update_standard_motion(state_context, &mut self.airborne_state_common);
+        air::update_standard_motion(state_context);
     }
 
     fn on_enter(&mut self, state_context: &mut EnterContext) {
@@ -201,7 +205,6 @@ 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/mod.rs

@@ -148,7 +148,7 @@ pub struct ExitContext<'a> {
 pub struct UpdateContext<'a> {
     pub translation: &'a mut FighterTranslation,
     pub prev_translation: &'a mut FighterPreviousTranslation,
-    pub input: &'a mut FighterInput,
+    pub input: &'a FighterInput,
     pub hitboxes: &'a mut FighterHitboxes,
     pub velocity: &'a mut FighterVelocity,
     pub knockback_velocity: &'a mut FighterKnockbackVelocity,
@@ -289,7 +289,7 @@ impl<'w, 's> FighterFrameQueryItem<'w, 's> {
         UpdateContext {
             translation: &mut self.translation,
             prev_translation: &mut self.prev_translation,
-            input: &mut self.input,
+            input: &self.input,
             hitboxes: &mut self.hitboxes,
             velocity: &mut self.velocity,
             knockback_velocity: &mut self.knockback_velocity,
@@ -451,10 +451,10 @@ pub fn state_interrupt_system(
             }
 
             info!("Entering hitstop kind: {:?}", hitstop_kind);
-            Some(FighterState::Hitstun(HitstunState::new(
+            Some(FighterState::Hitstun(HitstunState {
-                reaction,
+                hit_reaction: reaction,
                 hitstop_kind,
-            )))
+            }))
         } else if hitstop.remaining_frames > 0 {
             None
         } else {

src/game_settings.rs

@@ -36,9 +36,6 @@ pub struct FighterSettingsCommon {
     pub visual_shake_table: Vec<f32>,
     /// The attacker will always get less hitstop
     pub attacker_visual_shake_multiplier: f32,
-    
-    /// Maximum angle changed caused by directional influence
-    pub di_max_angle: FGi32,
 }
 #[derive(Reflect, Serialize, Deserialize, Clone)]
 #[reflect(opaque)]

src/input/buffer.rs

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

src/lib.rs

@@ -28,13 +28,13 @@ use bevy::{
     tasks::block_on,
 };
 use bevy_asset_loader::prelude::*;
+use bevy_wind_waker_shader::prelude::*;
 use clap::Parser;
 use ron_asset_manager::RonAssetPlugin;
 
 use crate::{
     camera::MatchCameraPlugin, fighter::manifest::FighterManifest, game_settings::GameSettings,
-    match_runtime::MatchRuntimePlugin, menus::style::FGUiStyle, schedule::GameplaySchedulePlugin,
+    schedule::GameplaySchedulePlugin, stage::manifest::StageManifest,
-    stage::manifest::StageManifest, ui::InGameUIPlugin,
 };
 
 mod args;
@@ -44,7 +44,6 @@ pub mod fighter;
 pub mod game_settings;
 pub mod input;
 pub mod match_loading;
-pub mod match_runtime;
 mod math;
 pub mod menus;
 pub mod netcode;
@@ -54,7 +53,6 @@ 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 {
@@ -83,20 +81,6 @@ pub enum AppState {
 #[derive(Default)]
 pub struct GamePlugin;
 
-/// Registers every custom asset loader used by the game and asset processor.
-pub struct GameAssetPlugin;
-
-impl Plugin for GameAssetPlugin {
-    fn build(&self, app: &mut App) {
-        app.add_plugins((
-            RonAssetPlugin::<FighterManifest>::create("fighter.ron"),
-            RonAssetPlugin::<StageManifest>::create("stage.ron"),
-            RonAssetPlugin::<GameSettings>::create("ron"),
-            RonAssetPlugin::<FGUiStyle>::create("stylesheet.ron"),
-        ));
-    }
-}
-
 impl Plugin for GamePlugin {
     fn build(&self, app: &mut App) {
         // Each module owns its own systems, rollback registrations and
@@ -105,10 +89,10 @@ impl Plugin for GamePlugin {
         app.init_state::<AppState>()
             .add_plugins((
                 SettingsPlugin::new("moe.eirteam.shinespark.debug_settings"),
+                WindWakerShaderPlugin::default(),
                 // Brings up GGRS (and with it `GgrsSchedule`), so it goes first.
                 netcode::FighterNetcodePlugin::default(),
                 GameplaySchedulePlugin,
-                MatchRuntimePlugin,
                 input::FighterInputPlugin,
                 replay::ReplayPlugin,
                 debug_tools::DebugToolsPlugin,
@@ -117,8 +101,9 @@ impl Plugin for GamePlugin {
                 scripting::importer::FighterScriptImportPlugin,
                 stage::StagePlugin,
                 MatchCameraPlugin,
-                GameAssetPlugin,
+                RonAssetPlugin::<FighterManifest>::create("fighter.ron"),
-                InGameUIPlugin,
+                RonAssetPlugin::<StageManifest>::create("stage.ron"),
+                RonAssetPlugin::<GameSettings>::create("ron"),
             ))
             .add_plugins(menus::MenuPlugin)
             .add_loading_state(
@@ -171,27 +156,11 @@ 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 !cfg!(feature = "development")
+    if processor.is_none_or(|processor| block_on(processor.get_state()) == ProcessorState::Finished)
-        || processor
-            .is_none_or(|processor| block_on(processor.get_state()) == ProcessorState::Finished)
     {
         next_state.set(AppState::LoadCommonAssets);
     }

src/main.rs

@@ -1,11 +1,8 @@
 use bevy::asset::AssetMode::Processed;
-#[cfg(feature = "debug_features")]
 use bevy::camera_controller::free_camera::FreeCameraPlugin;
 use bevy::image::{ImageAddressMode, ImagePlugin, ImageSamplerDescriptor};
 use bevy::prelude::*;
-#[cfg(feature = "debug_features")]
 use bevy_egui::EguiPlugin;
-#[cfg(feature = "debug_features")]
 use bevy_inspector_egui::quick::WorldInspectorPlugin;
 
 fn main() -> AppExit {
@@ -23,22 +20,16 @@ fn main() -> AppExit {
         })
         .set(AssetPlugin {
             mode: Processed,
-            use_asset_processor_override: Some(cfg!(feature = "development")),
             ..default()
         });
 
-    let mut app = App::new();
+    App::new()
-    app.add_plugins(default_plugins)
+        .add_plugins(default_plugins)
         .add_plugins(avian3d::prelude::PhysicsPlugins::default())
         .add_plugins(shinespark::GamePlugin)
-        .insert_resource(Time::<Fixed>::from_hz(60.0));
+        .add_plugins(FreeCameraPlugin)
-
+        .add_plugins(EguiPlugin::default())
-    #[cfg(feature = "debug_features")]
+        .add_plugins(WorldInspectorPlugin::default()) // adds default options and `InspectorEguiImpl`s
-    app.add_plugins((
+        .insert_resource(Time::<Fixed>::from_hz(60.0))
-        FreeCameraPlugin,
+        .run()
-        EguiPlugin::default(),
-        WorldInspectorPlugin::default(),
-    ));
-
-    app.run()
 }

src/match_loading.rs

@@ -8,29 +8,28 @@ use bevy_ggrs::prelude::Session;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    AppState,
     args::Args,
     fighter::{
-        FighterId, FighterRoster,
         animation::AnimKind,
         attack::{AttackKind, FighterAttackScriptAssets},
-        baked_animation::{BAKED_ANIMATION_FPS, BakedFighterAnimations},
+        baked_animation::{BakedFighterAnimations, BAKED_ANIMATION_FPS},
         manifest::{FighterManifest, FighterManifestRegistry},
         spawn_fighter,
         visual::FighterAnimations,
+        FighterId, FighterRoster,
     },
     input::{LocalInputAssignments, LocalInputSource},
-    match_runtime::MatchState,
     math::{int::FGi32, vec::FGVec2},
     netcode::{
+        session::{create_session, ConnectionStatus, SessionConfig},
         GGRSCfg,
-        session::{ConnectionStatus, SessionConfig, create_session},
     },
     scripting::FighterAttackScript,
     stage::{
         self,
         manifest::{StageId, StageManifest, StageManifestRegistry},
     },
+    AppState,
 };
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
@@ -39,49 +38,10 @@ pub struct MatchPlayer {
     pub fighter: FighterId,
 }
 
-#[derive(Resource, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Resource, Debug, Clone, PartialEq, Eq)]
-pub struct MatchConfig {
+pub struct PendingMatch {
     pub stage: StageId,
     pub players: Vec<MatchPlayer>,
-    pub rules: MatchRules,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub enum MatchRules {
-    Stock {
-        starting_stocks: u8,
-        time_limit_frames: Option<u32>,
-    },
-    Timed {
-        time_limit_frames: u32,
-    },
-}
-
-impl Default for MatchRules {
-    fn default() -> Self {
-        Self::Stock {
-            starting_stocks: 3,
-            time_limit_frames: None,
-        }
-    }
-}
-
-impl MatchRules {
-    fn validate(&self) -> Result<(), &'static str> {
-        match self {
-            Self::Stock {
-                starting_stocks: 0, ..
-            } => Err("stock matches must start with at least one stock"),
-            Self::Stock {
-                time_limit_frames: Some(0),
-                ..
-            } => Err("stock match time limits must be greater than zero frames"),
-            Self::Timed {
-                time_limit_frames: 0,
-            } => Err("timed match limits must be greater than zero frames"),
-            _ => Ok(()),
-        }
-    }
 }
 
 pub struct SelectedFighterAssets {
@@ -99,7 +59,7 @@ pub struct MatchAssets {
 
 impl MatchAssets {
     fn requested(world: &World) -> Self {
-        let config = world.resource::<MatchConfig>();
+        let request = world.resource::<PendingMatch>();
         let asset_server = world.resource::<AssetServer>();
         let registry = world.resource::<FighterManifestRegistry>();
         let stage_registry = world.resource::<StageManifestRegistry>();
@@ -107,7 +67,7 @@ impl MatchAssets {
         let stage_manifests = world.resource::<Assets<StageManifest>>();
 
         let stage_handle = stage_registry
-            .get(config.stage)
+            .get(request.stage)
             .expect("Startup validation guarantees every stage has a manifest");
         let stage_manifest = stage_manifests
             .get(&stage_handle)
@@ -115,7 +75,7 @@ impl MatchAssets {
 
         Self {
             stage: asset_server.load(stage_manifest.model_path.clone()),
-            fighters: config
+            fighters: request
                 .players
                 .iter()
                 .map(|player| {
@@ -181,10 +141,10 @@ pub struct MatchRoot;
 pub fn initiate_match(
     commands: &mut Commands,
     next_state: &mut NextState<AppState>,
-    config: MatchConfig,
+    request: PendingMatch,
 ) {
     commands.remove_resource::<crate::netcode::session::MatchDisconnected>();
-    commands.insert_resource(config);
+    commands.insert_resource(request);
     next_state.set(AppState::LoadingMatch);
 }
 
@@ -206,9 +166,12 @@ pub fn initiate_default_match(
     if let Some(path) = &args.play_replay {
         match crate::replay::load(path) {
             Ok(replay) => {
-                let config = replay.match_config.clone();
+                let request = PendingMatch {
+                    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, config);
+                initiate_match(&mut commands, &mut next_state, request);
             }
             Err(error) => {
                 error!("Replay load failed: {error}");
@@ -252,17 +215,16 @@ pub fn initiate_default_match(
     initiate_match(
         &mut commands,
         &mut next_state,
-        MatchConfig {
+        PendingMatch {
             stage: StageId::TestStage,
             players,
-            rules: MatchRules::default(),
         },
     );
 }
 
 pub fn prepare_match(
     mut commands: Commands,
-    config: Res<MatchConfig>,
+    request: Res<PendingMatch>,
     assets: Res<MatchAssets>,
     gltfs: Res<Assets<Gltf>>,
     baked_animations: Res<Assets<BakedFighterAnimations>>,
@@ -274,7 +236,7 @@ pub fn prepare_match(
     args: Res<Args>,
     mut next_state: ResMut<NextState<AppState>>,
 ) {
-    if !valid_player_handles(&config.players) {
+    if !valid_player_handles(&request.players) {
         fail_match(
             &mut next_state,
             "player handles must be unique and cover 0..player_count",
@@ -282,12 +244,7 @@ pub fn prepare_match(
         return;
     }
 
-    if let Err(error) = config.rules.validate() {
+    if assets.fighters.len() != request.players.len() {
-        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",
@@ -439,7 +396,7 @@ pub fn prepare_match(
         ));
     }
 
-    let session_config = match SessionConfig::from_args(&args, config.players.len()) {
+    let session_config = match SessionConfig::from_args(&args, request.players.len()) {
         Ok(config) => config,
         Err(error) => {
             fail_match(
@@ -449,7 +406,7 @@ pub fn prepare_match(
             return;
         }
     };
-    let session = match create_session(&args, config.players.len()) {
+    let session = match create_session(&args, request.players.len()) {
         Ok(session) => session,
         Err(error) => {
             fail_match(
@@ -463,7 +420,7 @@ pub fn prepare_match(
     let root = commands.spawn((Name::new("Match"), MatchRoot)).id();
 
     let stage_handle = stage_registry
-        .get(config.stage)
+        .get(request.stage)
         .expect("Initialization check should ensure all stages exist");
     let stage_manifest = stage_manifests
         .get(&stage_handle)
@@ -476,11 +433,11 @@ pub fn prepare_match(
         stage_manifest.camera.clone(),
     );
 
-    let mut fighter_roster = Vec::with_capacity(config.players.len());
+    let mut fighter_roster = Vec::with_capacity(request.players.len());
     for (index, (player, (scene, animations, attack_scripts, manifest_handle, model_scale))) in
-        config.players.iter().zip(prepared).enumerate()
+        request.players.iter().zip(prepared).enumerate()
     {
-        let spawn_x = (index as i32 * 2 + 1 - config.players.len() as i32) * 5;
+        let spawn_x = (index as i32 * 2 + 1 - request.players.len() as i32) * 5;
         fighter_roster.push(spawn_fighter(
             &mut commands,
             player.handle,
@@ -494,7 +451,6 @@ pub fn prepare_match(
     }
 
     commands.insert_resource(FighterRoster(fighter_roster));
-    commands.insert_resource(MatchState::from_config(&config));
     commands.insert_resource(session_config);
     commands.insert_resource(ConnectionStatus::default());
     commands.insert_resource::<Session<GGRSCfg>>(session);
@@ -531,8 +487,7 @@ pub fn cleanup_match(
     commands.remove_resource::<ConnectionStatus>();
     commands.remove_resource::<stage::line::StageCollision>();
     commands.remove_resource::<MatchAssets>();
-    commands.remove_resource::<MatchConfig>();
+    commands.remove_resource::<PendingMatch>();
-    commands.remove_resource::<MatchState>();
     commands.remove_resource::<FighterRoster>();
 }
 
@@ -541,8 +496,8 @@ mod tests {
     use super::*;
 
     #[test]
-    fn match_config_keeps_duplicate_fighter_slots() {
+    fn match_request_keeps_duplicate_fighter_slots() {
-        let config = MatchConfig {
+        let request = PendingMatch {
             stage: StageId::TestStage,
             players: vec![
                 MatchPlayer {
@@ -554,13 +509,12 @@ mod tests {
                     fighter: FighterId::TestFighter,
                 },
             ],
-            rules: MatchRules::default(),
         };
 
-        assert_eq!(config.players.len(), 2);
+        assert_eq!(request.players.len(), 2);
-        assert_eq!(config.players[0].handle, 0);
+        assert_eq!(request.players[0].handle, 0);
-        assert_eq!(config.players[1].handle, 1);
+        assert_eq!(request.players[1].handle, 1);
-        assert!(valid_player_handles(&config.players));
+        assert!(valid_player_handles(&request.players));
     }
 
     #[test]
@@ -579,53 +533,6 @@ mod tests {
         assert!(!valid_player_handles(&players));
     }
 
-    #[test]
-    fn match_rules_reject_zero_limits() {
-        assert!(
-            MatchRules::Stock {
-                starting_stocks: 0,
-                time_limit_frames: None,
-            }
-            .validate()
-            .is_err()
-        );
-        assert!(
-            MatchRules::Stock {
-                starting_stocks: 3,
-                time_limit_frames: Some(0),
-            }
-            .validate()
-            .is_err()
-        );
-        assert!(
-            MatchRules::Timed {
-                time_limit_frames: 0,
-            }
-            .validate()
-            .is_err()
-        );
-    }
-
-    #[test]
-    fn match_rules_accept_valid_modes() {
-        assert!(MatchRules::default().validate().is_ok());
-        assert!(
-            MatchRules::Stock {
-                starting_stocks: 3,
-                time_limit_frames: Some(60),
-            }
-            .validate()
-            .is_ok()
-        );
-        assert!(
-            MatchRules::Timed {
-                time_limit_frames: 60,
-            }
-            .validate()
-            .is_ok()
-        );
-    }
-
     #[test]
     fn match_loading_waits_for_attack_scripts() {
         let mut attack_scripts = HashMap::new();

src/match_runtime.rs

@@ -1,102 +0,0 @@
-//! Rollback-simulated state for an active match.
-
-use bevy::prelude::*;
-use bevy_ggrs::prelude::*;
-
-use crate::match_loading::{MatchConfig, MatchRules};
-
-#[derive(Resource, Clone, Debug, Hash, PartialEq, Eq)]
-pub struct MatchState {
-    pub elapsed_frames: u32,
-    /// Indexed by the player's session handle.
-    pub players: Vec<PlayerMatchState>,
-}
-
-#[derive(Clone, Debug, Hash, PartialEq, Eq)]
-pub struct PlayerMatchState {
-    pub stocks_remaining: Option<u8>,
-    pub score: i32,
-    pub deaths: u32,
-}
-
-impl MatchState {
-    pub fn from_config(config: &MatchConfig) -> Self {
-        let stocks_remaining = match &config.rules {
-            MatchRules::Stock {
-                starting_stocks, ..
-            } => Some(*starting_stocks),
-            MatchRules::Timed { .. } => None,
-        };
-
-        Self {
-            elapsed_frames: 0,
-            players: (0..config.players.len())
-                .map(|_| PlayerMatchState {
-                    stocks_remaining,
-                    score: 0,
-                    deaths: 0,
-                })
-                .collect(),
-        }
-    }
-}
-
-pub struct MatchRuntimePlugin;
-
-impl Plugin for MatchRuntimePlugin {
-    fn build(&self, app: &mut App) {
-        app.rollback_resource_with_clone::<MatchState>()
-            .checksum_resource_with_hash::<MatchState>();
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{fighter::FighterId, match_loading::MatchPlayer, stage::manifest::StageId};
-
-    fn config(rules: MatchRules) -> MatchConfig {
-        MatchConfig {
-            stage: StageId::TestStage,
-            players: vec![
-                MatchPlayer {
-                    handle: 1,
-                    fighter: FighterId::TestFighter,
-                },
-                MatchPlayer {
-                    handle: 0,
-                    fighter: FighterId::TestFighter,
-                },
-            ],
-            rules,
-        }
-    }
-
-    #[test]
-    fn stock_state_starts_with_configured_stocks() {
-        let state = MatchState::from_config(&config(MatchRules::Stock {
-            starting_stocks: 4,
-            time_limit_frames: Some(60),
-        }));
-
-        assert_eq!(state.elapsed_frames, 0);
-        assert_eq!(state.players.len(), 2);
-        assert!(state.players.iter().all(|player| {
-            player.stocks_remaining == Some(4) && player.score == 0 && player.deaths == 0
-        }));
-    }
-
-    #[test]
-    fn timed_state_has_no_stock_counter() {
-        let state = MatchState::from_config(&config(MatchRules::Timed {
-            time_limit_frames: 60,
-        }));
-
-        assert!(
-            state
-                .players
-                .iter()
-                .all(|player| player.stocks_remaining.is_none())
-        );
-    }
-}

src/menus/match_config.rs

@@ -3,7 +3,7 @@ use thiserror::Error;
 
 use crate::{
     fighter::FighterId,
-    match_loading::{MatchConfig, MatchPlayer, MatchRules},
+    match_loading::{MatchPlayer, PendingMatch},
     stage::manifest::StageId,
 };
 
@@ -60,7 +60,7 @@ impl MenuMatchConfig {
         !has_unselected_fighter
     }
 
-    pub fn to_match_config(&self) -> Result<MatchConfig, MenuMatchConfigErrors> {
+    pub fn to_pending_match(&self) -> Result<PendingMatch, MenuMatchConfigErrors> {
         let mut match_players = vec![];
 
         let stage = self.stage.ok_or(MenuMatchConfigErrors::StageNotSelected)?;
@@ -78,28 +78,9 @@ impl MenuMatchConfig {
             });
         }
 
-        Ok(MatchConfig {
+        Ok(PendingMatch {
             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());
-    }
-}

src/menus/mod.rs

@@ -6,10 +6,12 @@ use bevy::{
     prelude::*,
 };
 
+use ron_asset_manager::RonAssetPlugin;
+
 use crate::{
     AppState,
     game_settings::CommonAssets,
-    menus::{character_select::CharacterSelectScreen, main_menu::MainMenu},
+    menus::{character_select::CharacterSelectScreen, main_menu::MainMenu, style::FGUiStyle},
 };
 pub mod button;
 pub mod character_select;
@@ -220,6 +222,7 @@ impl Plugin for MenuPlugin {
         //---------
         // STAGE SELECT END
         //---------
+        .add_plugins(RonAssetPlugin::<FGUiStyle>::create("stylesheet.ron"))
         .add_systems(
             Update,
             (

src/menus/stage_select/mod.rs

@@ -77,7 +77,7 @@ pub fn stage_selected(
         initiate_match(
             &mut commands,
             &mut next_state,
-            match_config.to_match_config()?,
+            match_config.to_pending_match()?,
         );
     }
     Ok(())

src/replay.rs

@@ -12,12 +12,16 @@ use clap::ValueEnum;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    AppState, args::Args, input::FighterInputFrame, match_loading::MatchConfig, netcode::GGRSCfg,
+    AppState,
+    args::Args,
+    input::FighterInputFrame,
+    match_loading::{MatchPlayer, PendingMatch},
+    netcode::GGRSCfg,
     schedule::GameplaySet,
 };
 
 const MAGIC: &[u8; 8] = b"SPRPLY01";
-pub const REPLAY_VERSION: u32 = 2;
+pub const REPLAY_VERSION: u32 = 1;
 
 #[derive(Clone, Copy, Debug, Default, Eq, PartialEq, ValueEnum)]
 pub enum ReplayFormat {
@@ -30,11 +34,17 @@ pub enum ReplayFormat {
 pub struct Replay {
     pub replay_version: u32,
     pub game_version: String,
-    pub match_config: MatchConfig,
+    pub match_config: ReplayMatch,
     pub frames: Vec<ReplayFrame>,
     pub checksums: Vec<ReplayChecksum>,
 }
 
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+pub struct ReplayMatch {
+    pub stage: crate::stage::manifest::StageId,
+    pub players: Vec<MatchPlayer>,
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub struct ReplayFrame {
     pub frame: i32,
@@ -257,27 +267,27 @@ fn stop_recording(
     mut commands: Commands,
     stop_request: Option<Res<StopReplayRecording>>,
     runtime: Option<ResMut<ReplayRuntime>>,
-    config: Option<Res<MatchConfig>>,
+    request: Option<Res<PendingMatch>>,
 ) {
     if stop_request.is_none() {
         return;
     }
     commands.remove_resource::<StopReplayRecording>();
-    finish_recording_inner(&mut commands, runtime, config);
+    finish_recording_inner(&mut commands, runtime, request);
 }
 
 fn finish_recording(
     mut commands: Commands,
     runtime: Option<ResMut<ReplayRuntime>>,
-    config: Option<Res<MatchConfig>>,
+    request: Option<Res<PendingMatch>>,
 ) {
-    finish_recording_inner(&mut commands, runtime, config);
+    finish_recording_inner(&mut commands, runtime, request);
 }
 
 fn finish_recording_inner(
     commands: &mut Commands,
     runtime: Option<ResMut<ReplayRuntime>>,
-    config: Option<Res<MatchConfig>>,
+    request: Option<Res<PendingMatch>>,
 ) {
     let Some(mut runtime) = runtime else { return };
     let ReplayMode::Record { path, format } = &runtime.mode else {
@@ -286,13 +296,16 @@ fn finish_recording_inner(
     if runtime.finished || runtime.frames.is_empty() {
         return;
     }
-    let Some(config) = config else { return };
+    let Some(request) = request else { return };
     let path = path.clone();
     let format = *format;
     let replay = Replay {
         replay_version: REPLAY_VERSION,
         game_version: env!("CARGO_PKG_VERSION").into(),
-        match_config: config.as_ref().clone(),
+        match_config: ReplayMatch {
+            stage: request.stage,
+            players: request.players.clone(),
+        },
         frames: runtime
             .frames
             .iter()
@@ -342,7 +355,7 @@ mod tests {
     use super::*;
     use crate::{
         fighter::FighterId,
-        match_loading::{MatchPlayer, MatchRules},
+        match_loading::MatchPlayer,
         math::{int::FGi32, vec::FGVec2},
         stage::manifest::StageId,
     };
@@ -351,15 +364,12 @@ mod tests {
         Replay {
             replay_version: REPLAY_VERSION,
             game_version: "test".into(),
-            match_config: MatchConfig {
+            match_config: ReplayMatch {
                 stage: StageId::TestStage,
                 players: vec![MatchPlayer {
                     handle: 0,
                     fighter: FighterId::TestFighter,
                 }],
-                rules: MatchRules::Timed {
-                    time_limit_frames: 21_600,
-                },
             },
             frames: vec![ReplayFrame {
                 frame: 1,
@@ -396,15 +406,4 @@ mod tests {
         replay.frames[0].inputs.clear();
         assert!(validate(&replay).is_err());
     }
-
-    #[test]
-    fn unsupported_replay_version_is_rejected() {
-        let mut replay = sample();
-        replay.replay_version = 1;
-
-        assert_eq!(
-            validate(&replay).unwrap_err(),
-            "unsupported replay version 1"
-        );
-    }
 }

src/ui/battle_ui.rs

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

src/ui/errors.rs

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

src/ui/fighter_info.rs

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

src/ui/mod.rs

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