Implement up smash, dacus and further improve input system. (#88)

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

Cargo.toml

@@ -7,21 +7,23 @@ authors = [""]
 [workspace]
 
 [features]
-default = ["development", "debug_features"]
-development = ["bevy/dynamic_linking", "bevy/file_watcher"]
+default = ["development", "debug_features", "gamecube-adapter"]
+development = ["bevy/dynamic_linking", "bevy/file_watcher", "bevy/embedded_watcher", "hitbox-viewer"]
+tracy = ["bevy/trace_tracy"]
 debug_features = ["bevy/free_camera"]
+gamecube-adapter = ["dep:gc-adapter-neo"]
+hitbox-viewer = ["bevy/bevy_dev_tools", "dep:egui_extras"]
 
 [dependencies]
-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.
+bevy = { version = "0.19.1", features = ["asset_processor", "basis-universal", "compressed_image_saver", "bevy_settings"] }
 blake3 = { version = "1.8.5", features = [ "pure" ] }
+itertools = "0.15.0"
 thiserror = "2"
 avian3d = "0.7"
 arrayvec = "0.7.8"
 bevy-inspector-egui = "0.37.0"
 bevy_egui = "0.40.0"
+egui_extras = { version =  "0.34.3", optional = true}
 bevy_ggrs = { git = "https://github.com/gschup/bevy_ggrs" }
 serde = "1.0.229"
 serde_json = "1.0.145"
@@ -34,7 +36,6 @@ 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"] }
 rhai = "1.26.0"
 enum_cycling = "0.2.1"
 enum_cycling_derive = "0.2.1"
@@ -44,8 +45,21 @@ fixed_math = "0.4.1"
 [profile.dev.package."*"]
 opt-level = 3
 
+# The rollback simulation runs multiple times per rendered frame in sync-test
+# mode, so optimizing the game crate is important even for development builds.
+[profile.dev]
+opt-level = 1
+
 [profile.production]
 inherits = "release"
 lto = "thin"
 codegen-units = 1
 strip = "symbols"
+
+[target.'cfg(not(target_os = "windows"))'.dependencies]
+gc-adapter-neo = { version = "1.1.1", features = ["libusb"], optional = true }
+
+[[bin]]
+name = "hitbox-editor"
+path = "src/bin/hitbox-editor.rs"
+required-features = ["hitbox-viewer"]

README.md

@@ -23,6 +23,19 @@ cargo run -- --debug-match --players 2 --local-port 7001 \
   --net-player 0=127.0.0.1:7000 --net-player 1=local
 ```
 
+## Hitbox viewer
+
+Run the live attack-script previewer with a fighter manifest and attack:
+
+```sh
+cargo run --bin hitbox-editor -- \
+  --manifest fighters/test/test.fighter.ron --attack jab
+```
+
+The timeline is read-only and refreshes through Bevy's asset hot reloading.
+Press Space to pause or resume, use the arrow keys to step, or click and drag
+the timeline to scrub.
+
 ## Production Build
 
 ```sh

src/bin/hitbox-editor.rs

@@ -0,0 +1,37 @@
+use bevy::{
+    asset::{AssetMode, AssetPlugin},
+    gltf::GltfPlugin,
+    image::{ImageAddressMode, ImagePlugin, ImageSamplerDescriptor},
+    prelude::*,
+};
+use bevy_egui::EguiPlugin;
+use clap::Parser;
+use shinespark::hitbox_viewer::{HitboxViewerArgs, HitboxViewerPlugin};
+
+fn main() -> AppExit {
+    let args = HitboxViewerArgs::parse();
+    let default_sampler = ImageSamplerDescriptor::linear()
+        .set_address_mode(ImageAddressMode::Repeat)
+        .set_anisotropic_filter(16)
+        .clone();
+    let default_plugins = DefaultPlugins
+        .set(ImagePlugin {
+            default_sampler: default_sampler.clone(),
+        })
+        .set(GltfPlugin {
+            default_sampler,
+            ..default()
+        })
+        .set(AssetPlugin {
+            mode: AssetMode::Processed,
+            use_asset_processor_override: Some(cfg!(feature = "development")),
+            ..default()
+        });
+
+    App::new()
+        .add_plugins(default_plugins)
+        .add_plugins(EguiPlugin::default())
+        .insert_resource(args)
+        .add_plugins(HitboxViewerPlugin)
+        .run()
+}

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

@@ -109,7 +109,9 @@ impl FighterDebugRowKind {
 enum DebugFlag {
     Network,
     Ecb,
+    BlastZones,
     StageCollision,
+    SpawnPositions,
     AnimationBones,
     AttackHitboxes,
     Hurtboxes,
@@ -173,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",
     },
@@ -243,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,
@@ -264,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,
@@ -328,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,
@@ -342,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,
@@ -884,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,
-    fighter::{
-        FighterECB, FighterFacingDirection, FighterHitboxes, FighterHitstop, FighterHitstopShake,
-        FighterPreviousFacingDirection, FighterPreviousTranslation, FighterSurfaceState,
-        FighterTranslation, FighterVelocity,
-        animation::FighterAnimationFrame,
-        attack::{
+    camera::MatchCamera, fighter::{
+        FighterECB, FighterFacingDirection, FighterHitboxes, FighterHitstop, FighterHitstopShake, FighterInvulnerabilityState, FighterPendingRespawn, FighterPreviousFacingDirection, FighterPreviousTranslation, FighterSurfaceState, FighterTranslation, FighterVelocity, animation::FighterAnimationFrame, attack::{
             FighterDamage, FighterKnockbackVelocity, FighterPendingHitReaction, FighterPendingHits,
             FighterSolvedHurtboxes, FighterStaleMoveQueue,
-        },
-        baked_animation::FighterBoneMatrices,
-        state::FighterState,
-    },
-    input::FighterInput,
-    player::Player,
-    stage::line::StageCollision,
+        }, baked_animation::FighterBoneMatrices, state::FighterState,
+    }, input::FighterInput, match_runtime::MatchState, 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)]
@@ -55,6 +46,8 @@ struct FighterCheckpoint {
     solved_hurtboxes: FighterSolvedHurtboxes,
     bone_matrices: FighterBoneMatrices,
     surface: FighterSurfaceState,
+    pending_respawn: FighterPendingRespawn,
+    invulnerability_state: FighterInvulnerabilityState,
 }
 
 pub(super) fn save_or_restore(world: &mut World) {
@@ -99,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;
@@ -154,9 +149,12 @@ pub(super) fn save_or_restore(world: &mut World) {
         entity.insert(saved.solved_hurtboxes.clone());
         entity.insert(saved.bone_matrices.clone());
         entity.insert(saved.surface.clone());
+        entity.insert(saved.pending_respawn.clone());
+        entity.insert(saved.invulnerability_state.clone());
     }
     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;
     }
@@ -188,6 +186,8 @@ fn capture_fighter(world: &World, entity: Entity) -> Option<FighterCheckpoint> {
         solved_hurtboxes: fighter.get::<FighterSolvedHurtboxes>()?.clone(),
         bone_matrices: fighter.get::<FighterBoneMatrices>()?.clone(),
         surface: fighter.get::<FighterSurfaceState>()?.clone(),
+        pending_respawn: fighter.get::<FighterPendingRespawn>()?.clone(),
+        invulnerability_state: fighter.get::<FighterInvulnerabilityState>()?.clone(),
     })
 }
 

src/egui_color_convert.rs

@@ -0,0 +1,16 @@
+use bevy_egui::egui::Color32;
+
+pub trait ColorToEgui {
+    fn to_egui(&self) -> Color32;
+}
+
+impl ColorToEgui for bevy::color::Srgba {
+    fn to_egui(&self) -> Color32 {
+        Color32::from_rgba_unmultiplied(
+            (self.red * 255.0) as u8,
+            (self.green * 255.0) as u8,
+            (self.blue * 255.0) as u8,
+            (self.alpha * 255.0) as u8,
+        )
+    }
+}

src/fighter/animation.rs

@@ -98,4 +98,8 @@ pub enum AnimKind {
     AttackUpTilt,
     AttackForwardTilt,
     AttackDownTilt,
+    AttackNeutralAir,
+    AttackForwardAir,
+    AttackDash,
+    AttackUpSmash,
 }

src/fighter/attack/mod.rs

@@ -8,6 +8,7 @@ use bevy::prelude::*;
 use bevy_ggrs::{Rollback, RollbackApp, prelude::GgrsSchedule};
 use serde::{Deserialize, Serialize};
 
+use crate::fighter::FighterInvulnerabilityState;
 use crate::{
     fighter::{
         Fighter, FighterAttributes, FighterFacingDirection, FighterHitboxes,
@@ -32,7 +33,7 @@ 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, PartialEq, Eq, PartialOrd, Ord)]
 pub struct FighterDamage(FGi32);
 
 impl std::fmt::Display for FighterDamage {
@@ -51,7 +52,8 @@ pub enum HitReactionKind {
 pub struct FighterHitReaction {
     pub launch_velocity: FGi32,
     pub launch_angle: FGi32,
-    pub hitstop_frames: HitStop,
+    pub victim_hitstop_frames: HitStop,
+    pub attacker_hitstop_frames: HitStop,
     pub hitstun_frames: u32,
     pub kind: HitReactionKind,
     pub damage: FighterDamage,
@@ -79,7 +81,7 @@ impl HitStop {
         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 a = (attack_damage_stalled.0 / FGi32::lit("3.0") + FGi32::lit("3.0")).round_to_zero();
         let crouch_cancelling_factor = if crouch_cancelling {
             FGi32::lit("0.66666666")
         } else {
@@ -96,6 +98,12 @@ impl HitStop {
     }
 }
 
+impl std::fmt::Display for HitStop {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
 #[derive(Clone, Copy, Debug, Serialize, Deserialize)]
 pub enum KnockbackType {
     Normal,
@@ -112,9 +120,15 @@ impl KnockbackType {
     }
 }
 
-#[derive(Debug, Default, Clone, Serialize, Deserialize)]
+#[derive(Debug, Default, Clone, Copy, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
 pub struct Knockback(FGi32);
 
+impl std::fmt::Display for Knockback {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{:.2}", self.0)
+    }
+}
+
 impl Knockback {
     pub fn lit(val: &str) -> Self {
         Self(FGi32::lit(val))
@@ -143,6 +157,15 @@ pub enum AttackAngle {
     Sakurai,
 }
 
+impl std::fmt::Display for AttackAngle {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            AttackAngle::Normal(fixed_i32) => write!(f, "{:.2}º", fixed_i32),
+            AttackAngle::Sakurai => write!(f, "Sakurai"),
+        }
+    }
+}
+
 impl Default for AttackAngle {
     fn default() -> Self {
         AttackAngle::Normal(FGi32::lit("0"))
@@ -157,6 +180,30 @@ impl AttackAngle {
     pub fn make_sakurai() -> Self {
         Self::Sakurai
     }
+
+    pub fn get_angle(&self, knockback: &Knockback, is_receiver_grounded: bool, game_settings: &GameSettings) -> FGi32 {
+        match self {
+            AttackAngle::Normal(angle) => {
+                *angle
+            },
+            AttackAngle::Sakurai => {
+                if !is_receiver_grounded {
+                    game_settings.fighter_common.sakurai_angle_aerial_angle
+                } else if knockback.0 > game_settings.fighter_common.sakurai_angle_knockback_threshold {
+                    game_settings.fighter_common.sakurai_angle_high_knockback_angle
+                } else {
+                    game_settings.fighter_common.sakurai_angle_low_knockback_angle
+                }
+            },
+        }
+    }
+
+    pub fn to_melee_angle_representation(&self) -> FGi32 {
+        match self {
+            AttackAngle::Normal(fixed_i32) => *fixed_i32,
+            AttackAngle::Sakurai => FGi32::lit("361"),
+        }
+    }
 }
 
 #[derive(Serialize, Deserialize, Reflect, PartialEq, Eq, Hash, Clone, Debug, Default, Copy)]
@@ -174,23 +221,25 @@ pub enum AttackKind {
     UpSmash,
     DownSmash,
     ForwardSmash,
+    DashAttack,
 }
 
 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,
+            AttackKind::ForwardAir => AnimKind::AttackForwardAir,
             AttackKind::BackAir => AnimKind::AttackUpTilt,
             AttackKind::DownAir => AnimKind::AttackUpTilt,
             AttackKind::UpAir => AnimKind::AttackUpTilt,
             AttackKind::DownTilt => AnimKind::AttackDownTilt,
             AttackKind::ForwardTilt => AnimKind::AttackForwardTilt,
-            AttackKind::UpSmash => AnimKind::AttackUpTilt,
+            AttackKind::UpSmash => AnimKind::AttackUpSmash,
             AttackKind::DownSmash => AnimKind::AttackUpTilt,
             AttackKind::ForwardSmash => AnimKind::AttackUpTilt,
+            AttackKind::DashAttack => AnimKind::AttackDash,
         }
     }
 }
@@ -199,6 +248,7 @@ impl AttackKind {
 #[reflect(opaque)]
 pub struct AttackHitbox {
     pub id: u32,
+    pub group: u32,
     pub bone: String,
     pub damage: FighterDamage,
     pub offset: FGVec3,
@@ -211,6 +261,14 @@ pub struct AttackHitbox {
     pub end_frame: u32,
 }
 
+static ATTACK_HITBOX_ID_PALETTE: [bevy::color::Srgba; 5] = [
+    bevy::color::palettes::tailwind::RED_500,
+    bevy::color::palettes::tailwind::GREEN_500,
+    bevy::color::palettes::tailwind::BLUE_500,
+    bevy::color::palettes::tailwind::FUCHSIA_500,
+    bevy::color::palettes::tailwind::ORANGE_500,
+];
+
 const STALE_MOVE_QUEUE_COUNT: usize = 9;
 
 #[derive(Component, Hash, Clone, Default)]
@@ -258,6 +316,10 @@ impl FighterStaleMoveQueue {
 }
 
 impl AttackHitbox {
+    pub fn get_debug_draw_color(&self) -> bevy::color::Srgba {
+        ATTACK_HITBOX_ID_PALETTE[self.id as usize % ATTACK_HITBOX_ID_PALETTE.len()]
+    }
+
     pub fn validate(&self) -> Result<(), String> {
         if self.bone.trim().is_empty() {
             return Err("bone name is empty".into());
@@ -351,6 +413,36 @@ pub fn update_active_hitbox_list(script: &FighterAttackScript, list: &mut Vec<us
     );
 }
 
+/// Updates both the currently active hitbox intervals and the lifetime of
+/// their per-group victim histories. A group remains immune only while at
+/// least one hitbox belonging to that group is active.
+pub fn update_active_attack(
+    script: &FighterAttackScript,
+    attack: &mut super::FighterActiveAttack,
+    frame: u32,
+) {
+    update_active_hitbox_list(script, &mut attack.active_hitboxes, frame);
+
+    let mut active_groups = Vec::new();
+    for &index in &attack.active_hitboxes {
+        let group = script.hitboxes[index].group;
+        if !active_groups.contains(&group) {
+            active_groups.push(group);
+        }
+    }
+
+    attack.hit_groups.retain(|state| active_groups.contains(&state.group));
+    for group in active_groups {
+        if !attack.hit_groups.iter().any(|state| state.group == group) {
+            attack.hit_groups.push(super::FighterHitGroupState {
+                group,
+                hit_fighters: Vec::new(),
+            });
+        }
+    }
+    attack.hit_groups.sort_unstable_by_key(|state| state.group);
+}
+
 #[derive(Clone, Debug, PartialEq, Hash)]
 pub struct FighterSolvedHurtbox {
     pub hurtbox_idx: usize,
@@ -526,31 +618,33 @@ pub fn intersect_attacks_with_hurtboxes(
         &Player,
         &FighterStaleMoveQueue,
     )>,
-    query_attacked: Query<(Entity, &FighterSolvedHurtboxes)>,
+    query_attacked: Query<(Entity, &FighterSolvedHurtboxes, &FighterInvulnerabilityState)>,
     mut pending_hits: ResMut<FighterPendingHits>,
     attack_scripts: Res<Assets<FighterAttackScript>>,
 ) {
     pending_hits.0.clear();
 
     for &entity_receiving in &roster.0 {
-        let Ok((_, hurtboxes)) = query_attacked.get(entity_receiving) else {
+        let Ok((_, hurtboxes, invuln_state)) = query_attacked.get(entity_receiving) else {
             continue;
         };
 
+        if matches!(*invuln_state, FighterInvulnerabilityState::Intangible { .. }) {
+            continue;
+        }
+
         for &entity_hurting in &roster.0 {
             if entity_hurting == entity_receiving {
                 continue;
             }
+
+
             let Ok((_, mut hitboxes, _, _, _)) = query_attacker.get_mut(entity_hurting) else {
                 continue;
             };
             let Some(active_attack) = hitboxes.0.as_mut() else {
                 continue;
             };
-            if active_attack.hit_fighters.contains(&entity_receiving) {
-                continue;
-            }
-
             let attack_script = attack_scripts
                 .get(&active_attack.script)
                 .expect("Attack script should be valid");
@@ -560,6 +654,15 @@ pub fn intersect_attacks_with_hurtboxes(
                 for solved_hitbox in active_attack.solved_hitboxes.iter() {
                     if hurtbox.capsule.intersects(solved_hitbox.capsule) {
                         let candidate = solved_hitbox.hitbox_idx;
+                        let group = attack_script.hitboxes[candidate].group;
+                        let already_hit = active_attack
+                            .hit_groups
+                            .iter()
+                            .find(|state| state.group == group)
+                            .is_some_and(|state| state.hit_fighters.contains(&entity_receiving));
+                        if already_hit {
+                            continue;
+                        }
                         if hitting_hitbox_idx.is_none_or(|current: usize| {
                             attack_script.hitboxes[candidate].id
                                 < attack_script.hitboxes[current].id
@@ -581,9 +684,15 @@ pub fn intersect_attacks_with_hurtboxes(
                 attack_kind: active_attack.kind,
                 hitbox_index: hitting_hitbox_idx,
             });
-            info!("Hit by hitbox {}!!!!", hitting_hitbox_idx);
             
-            active_attack.hit_fighters.push(entity_receiving);
+            let group = attack_script.hitboxes[hitting_hitbox_idx].group;
+            if let Some(state) = active_attack
+                .hit_groups
+                .iter_mut()
+                .find(|state| state.group == group)
+            {
+                state.hit_fighters.push(entity_receiving);
+            }
         }
     }
 }

src/fighter/attack/reaction.rs

@@ -4,21 +4,37 @@ use bevy_ggrs::prelude::GgrsSchedule;
 use super::*;
 use crate::{
     fighter::{
-        Fighter, FighterFacingDirection, FighterHitboxes, FighterHitstop, FighterHitstopShake, FighterHitstopShakeKind, FighterHitstopShakeRole, FighterPendingHitReaction, FighterStaleMoveQueue, errors::FighterErrors, manifest::FighterManifest, state::FighterState,
-    }, game_settings::GameSettings, math::{int::FGi32}, player::Player, schedule::GameplaySet, scripting::FighterAttackScript,
+        Fighter, FighterHitboxes, FighterHitstop, FighterHitstopShake,
+        FighterHitstopShakeKind, FighterHitstopShakeRole, FighterPendingHitReaction,
+        FighterStaleMoveQueue, FighterSurfaceState, errors::FighterErrors,
+        manifest::FighterManifest, state::FighterState,
+    },
+    game_settings::GameSettings,
+    math::int::FGi32,
+    player::Player,
+    schedule::GameplaySet,
+    scripting::FighterAttackScript,
 };
 
 pub fn resolve_fighter_hits(
     mut pending_hits: ResMut<FighterPendingHits>,
     mut attacker: Query<(
         &mut FighterStaleMoveQueue,
-        &FighterFacingDirection,
         &mut FighterHitboxes,
         &Player,
         &mut FighterHitstop,
         &mut FighterHitstopShake,
+        &FighterTranslation,
+    )>,
+    mut receiver: Query<(
+        &mut FighterDamage,
+        &Fighter,
+        &mut FighterPendingHitReaction,
+        &FighterState,
+        &FighterInvulnerabilityState,
+        &FighterSurfaceState,
+        &FighterTranslation,
     )>,
-    mut receiver: Query<(&mut FighterDamage, &Fighter, &mut FighterPendingHitReaction, &FighterState)>,
     attack_scripts: Res<Assets<FighterAttackScript>>,
     game_settings: Res<GameSettings>,
     fighter_manifests: Res<Assets<FighterManifest>>,
@@ -33,7 +49,15 @@ 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_state)) = receiver.get_mut(defender)
+        let Ok((
+            mut receiver_damage,
+            fighter,
+            mut pending_reaction,
+            receiver_state,
+            invuln_state,
+            receiver_surface_state,
+            receiver_translation,
+        )) = receiver.get_mut(defender)
         else {
             hit_offset = next_defender;
             continue;
@@ -42,7 +66,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, _, player, _, _, attacker_translation)) =
                     attacker.get(hit.attacker)
                 else {
                     return None;
@@ -52,12 +76,13 @@ pub fn resolve_fighter_hits(
                 let damage_received = stale_move_queue
                     .get_attack_damage_multiplier(hit.attack_kind)
                     * hitbox.damage.0;
+                let angle_flip = receiver_translation.0.x <= attacker_translation.0.x;
                 Some((
                     hit.attacker,
                     damage_received,
                     hitbox,
-                    matches!(facing_dir, FighterFacingDirection::Left),
                     player.handle,
+                    angle_flip,
                 ))
             })
             .collect::<Vec<_>>();
@@ -71,26 +96,35 @@ pub fn resolve_fighter_hits(
             .ok_or(FighterErrors::FighterManifestNotFound)?;
         let mut reactions = Vec::with_capacity(damage_data.len());
 
-        for (attacker_entity, attack_damage, hitbox, facing_left, attacker_slot) in damage_data {
+        let crouch_canceling = if let FighterState::Crouch(crouch_state) = &receiver_state {
+            crouch_state.is_crouch_cancelling()
+        } else {
+            false
+        };
+
+        for (attacker_entity, attack_damage, hitbox, attacker_slot, angle_flip) in damage_data {
             let knockback = hitbox.calculate_knockback(
                 &fighter_manifest.attributes,
                 *receiver_damage,
                 FighterDamage(total_damage_received_this_frame),
                 false,
-                false,
+                crouch_canceling,
             );
-            let angle = match &hitbox.angle {
-                AttackAngle::Normal(angle) => *angle,
-                AttackAngle::Sakurai => FGi32::lit("32.0"),
-            };
-            let launch_angle = if facing_left {
-                FGi32::lit("180.0") - angle
+            let launch_angle = hitbox.angle.get_angle(
+                &knockback,
+                receiver_surface_state.is_grounded(),
+                &game_settings,
+            );
+
+            let launch_angle = if angle_flip {
+                FGi32::lit("180.0") - launch_angle
             } else {
-                angle
+                launch_angle
             };
 
             // Attacker hitstop and data
-            let hitstop = HitStop::calculate(FighterDamage(attack_damage), false);
+            let victim_hitstop_frames = HitStop::calculate(FighterDamage(attack_damage), crouch_canceling);
+            let attacker_hitstop_frames = HitStop::calculate(FighterDamage(attack_damage), false);
             reactions.push((
                 attacker_entity,
                 attacker_slot,
@@ -98,28 +132,37 @@ pub fn resolve_fighter_hits(
                     launch_velocity: knockback.get_launch_speed(&game_settings),
                     launch_angle,
                     hitstun_frames: knockback.get_hitstun_frames(&game_settings),
-                    hitstop_frames: hitstop,
+                    victim_hitstop_frames,
+                    attacker_hitstop_frames,
                     kind: HitReactionKind::Flinch,
-                    damage: FighterDamage(attack_damage)
+                    damage: FighterDamage(attack_damage),
                 },
             ));
         }
 
-        receiver_damage.0 += total_damage_received_this_frame;
+        match invuln_state {
+            FighterInvulnerabilityState::Vulnerable => {
+                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;
             };
 
-            if hitstop.remaining_frames < reaction.hitstop_frames.0 {
+            if hitstop.remaining_frames < reaction.attacker_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.remaining_frames = reaction.attacker_hitstop_frames.0;
+                let shake_frames = reaction
+                    .attacker_hitstop_frames
+                    .calculate_shake_frames(&game_settings);
                 hitstop_shake.total_frames = shake_frames;
                 hitstop_shake.remaining_frames = shake_frames;
                 hitstop_shake.kind = shake_kind;
@@ -127,16 +170,23 @@ pub fn resolve_fighter_hits(
             }
         }
 
-        pending_reaction.0 = reactions
-            .into_iter()
-            .min_by(|(_, port_a, _), (_, port_b, _)| port_a.cmp(port_b))
-            .map(|(_, _, reaction)| reaction);
+        match invuln_state {
+            FighterInvulnerabilityState::Vulnerable => {
+                pending_reaction.0 = reactions
+                    .into_iter()
+                    .min_by(|(_, port_a, _), (_, port_b, _)| port_a.cmp(port_b))
+                    .map(|(_, _, reaction)| reaction);
+            }
+            _ => (),
+        }
 
         hit_offset = next_defender;
     }
 
     for hit in hits {
-        let Ok((mut stale_move_queue, _facing_direction, mut hitboxes, ..)) = attacker.get_mut(hit.attacker) else {
+        let Ok((mut stale_move_queue, mut hitboxes, ..)) =
+            attacker.get_mut(hit.attacker)
+        else {
             continue;
         };
 

src/fighter/attributes.rs

@@ -9,6 +9,10 @@ use crate::{input::FighterInputFrame, math::int::FGi32};
 #[derive(Asset, Clone, Copy, Reflect, Serialize, Deserialize)]
 #[reflect(opaque)]
 pub struct FighterAttributes {
+    /// Fixed horizontal offset of the fighter's grounded pushbox center.
+    pub pushbox_offset: FGi32,
+    /// Fixed horizontal radius used for grounded fighter-to-fighter pushing.
+    pub pushbox_radius: FGi32,
     pub base_walk_accel: FGi32,
     pub stick_walk_accel: FGi32,
     pub max_walk_vel: FGi32,
@@ -44,6 +48,11 @@ pub struct FighterAttributes {
     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,
+
+    pub dash_attack_cancel_window: u32,
 }
 
 impl FighterAttributes {
@@ -51,6 +60,9 @@ impl FighterAttributes {
         if self.weight <= FGi32::ZERO {
             return Err("weight must be positive".into());
         }
+        if self.pushbox_radius <= FGi32::ZERO {
+            return Err("pushbox radius must be positive".into());
+        }
         Ok(())
     }
 

src/fighter/baked_animation/asset_baking.rs

@@ -154,6 +154,7 @@ type FighterBakeProcessor = LoadTransformAndSave<
 >;
 
 pub struct BakedAnimationPlugin;
+pub struct BakedAnimationVisualPlugin;
 
 pub struct BakedAnimationAssetProcessingPlugin;
 
@@ -172,17 +173,27 @@ impl Plugin for BakedAnimationAssetProcessingPlugin {
 
 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);
+        app.add_plugins((
+            BakedAnimationAssetProcessingPlugin,
+            BakedAnimationVisualPlugin,
+        ))
+        .add_systems(
+            bevy_ggrs::prelude::GgrsSchedule,
+            super::runtime::update_fighter_bone_matrices
+                .in_set(super::BakedAnimationSamplingSet)
+                .in_set(crate::schedule::GameplaySet::Animation),
+        );
+    }
+}
+
+impl Plugin for BakedAnimationVisualPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_systems(
+            Update,
+            super::visual_binding::apply_baked_fighter_visual_pose
+                .after(super::BakedAnimationSamplingSet),
+        )
+        .add_observer(super::visual_binding::bind_fighter_visual_bones);
     }
 }
 

src/fighter/baked_animation/mod.rs

@@ -5,12 +5,17 @@ mod runtime;
 mod visual_binding;
 
 pub use crate::math::fixed_transform::FixedMat4;
-pub use asset_baking::{BakedAnimationAssetProcessingPlugin, BakedAnimationPlugin};
+pub use asset_baking::{
+    BakedAnimationAssetProcessingPlugin, BakedAnimationPlugin, BakedAnimationVisualPlugin,
+};
 pub use runtime::{
     BakedAnimationClip, BakedFighterAnimations, FighterBoneIndexMap, FighterBoneMatrices,
-    update_fighter_bone_matrices,
+    resample_fighter_bone_matrices, update_fighter_bone_matrices,
 };
 
+#[derive(bevy::prelude::SystemSet, Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct BakedAnimationSamplingSet;
+
 pub const BAKED_ANIMATION_FPS: u32 = 60;
 
 #[cfg(test)]
@@ -275,6 +280,31 @@ mod tests {
         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;
@@ -296,6 +326,115 @@ mod tests {
         );
     }
 
+    #[test]
+    fn root_motion_delta_is_scaled_and_zero_on_initial_sample() {
+        let names = ["root".into()];
+        let parents = [None];
+        let mut first = FixedMat4::IDENTITY;
+        first.translate(FGVec3::lit("1", "0", "0"));
+        let mut second = FixedMat4::IDENTITY;
+        second.translate(FGVec3::lit("3", "0", "0"));
+        let mut matrices = FighterBoneMatrices::default();
+        let frame = crate::fighter::animation::FighterAnimationFrame::new(AnimKind::Wait, false);
+
+        matrices.set_pose_with_frame(
+            frame,
+            "root",
+            FGVec3::ZERO,
+            None,
+            AnimKind::Wait,
+            &names,
+            &parents,
+            &[first],
+            FGi32::lit("2"),
+        );
+        assert_eq!(matrices.root_motion_delta(), FGVec3::ZERO);
+
+        matrices.set_pose_with_frame(
+            crate::fighter::animation::FighterAnimationFrame { frame: 1, ..frame },
+            "root",
+            FGVec3::ZERO,
+            None,
+            AnimKind::Wait,
+            &names,
+            &parents,
+            &[second],
+            FGi32::lit("2"),
+        );
+        assert_eq!(matrices.root_motion_delta(), FGVec3::lit("4", "0", "0"));
+    }
+
+    #[test]
+    fn root_motion_translation_is_removed_from_published_pose() {
+        let names = ["root".into(), "hand".into()];
+        let parents = [None, Some(0)];
+        let mut root = FixedMat4::IDENTITY;
+        root.translate(FGVec3::lit("3", "4", "5"));
+        let mut hand = FixedMat4::IDENTITY;
+        hand.translate(FGVec3::lit("1", "2", "0"));
+        let mut matrices = FighterBoneMatrices::default();
+        let frame = crate::fighter::animation::FighterAnimationFrame::new(AnimKind::Wait, false);
+
+        matrices.set_pose_with_frame(
+            frame,
+            "root",
+            FGVec3::ZERO,
+            None,
+            AnimKind::Wait,
+            &names,
+            &parents,
+            &[root, hand],
+            FGi32::ONE,
+        );
+
+        assert_eq!(matrices.root_motion_delta(), FGVec3::ZERO);
+        assert_eq!(matrices.local(0).unwrap().get_translation(), FGVec3::ZERO);
+        assert_eq!(matrices.get_current("root").unwrap().get_translation(), FGVec3::ZERO);
+        assert_eq!(
+            matrices.get_current("hand").unwrap().get_translation(),
+            FGVec3::lit("1", "2", "0")
+        );
+    }
+
+    #[test]
+    fn repeating_root_motion_preserves_cycle_displacement_at_wrap() {
+        let names = ["root".into()];
+        let parents = [None];
+        let pose = |x| FixedMat4::IDENTITY.with_translation(FGVec3::lit(x, "0", "0"));
+        let mut matrices = FighterBoneMatrices::default();
+        let frame = |frame| crate::fighter::animation::FighterAnimationFrame {
+            kind: AnimKind::Wait,
+            frame,
+            repeat: true,
+        };
+
+        for (frame_number, x) in [(0, "0"), (1, "1")] {
+            matrices.set_pose_with_frame(
+                frame(frame_number),
+                "root",
+                FGVec3::lit("2", "0", "0"),
+                Some(2),
+                AnimKind::Wait,
+                &names,
+                &parents,
+                &[pose(x)],
+                FGi32::ONE,
+            );
+        }
+        matrices.set_pose_with_frame(
+            frame(2),
+            "root",
+            FGVec3::lit("2", "0", "0"),
+            Some(2),
+            AnimKind::Wait,
+            &names,
+            &parents,
+            &[pose("0")],
+            FGi32::ONE,
+        );
+        assert_eq!(matrices.root_motion_delta(), FGVec3::lit("1", "0", "0"));
+    }
+
     #[test]
     fn fixed_matrix_transforms_points() {
         let transform = FixedMat4 {

src/fighter/baked_animation/runtime.rs

@@ -1,6 +1,7 @@
 use std::collections::HashMap;
 
 use bevy::prelude::*;
+use bevy_ggrs::Rollback;
 use serde::{Deserialize, Serialize};
 
 use super::BAKED_ANIMATION_FPS;
@@ -14,6 +15,7 @@ use crate::{
     },
     math::fixed_transform::FixedMat4,
     math::int::FGi32,
+    math::vec3::FGVec3,
 };
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
@@ -55,6 +57,54 @@ impl BakedFighterAnimations {
     pub fn frame_count(&self, kind: AnimKind) -> Option<u32> {
         self.clip(kind).map(|clip| clip.frames.len() as u32)
     }
+    pub fn root_motion_cycle_delta(
+        &self,
+        kind: AnimKind,
+        bone: &str,
+        model_scale: FGi32,
+    ) -> Option<FGVec3> {
+        let last = self.frame_count(kind)?.saturating_sub(1);
+        let first = FighterAnimationFrame {
+            kind,
+            frame: 0,
+            repeat: false,
+        };
+        let last = FighterAnimationFrame {
+            kind,
+            frame: last,
+            repeat: false,
+        };
+        Some(
+            self.sample_bone_model_transform(&last, bone, model_scale)?
+                .get_translation()
+                - self
+                    .sample_bone_model_transform(&first, bone, model_scale)?
+                    .get_translation(),
+        )
+    }
+    /// Samples one bone in model space without depending on the runtime's
+    /// previous-frame buffers. Tooling uses this when the user scrubs between
+    /// unrelated frames.
+    pub fn sample_bone_model_transform(
+        &self,
+        frame: &FighterAnimationFrame,
+        bone: &str,
+        model_scale: FGi32,
+    ) -> Option<FixedMat4> {
+        let local = self.sample_pose(frame)?;
+        let index = self.bone_names.iter().position(|name| name == bone)?;
+        let mut model = vec![None; local.len()];
+        resolve_model_transform(index, &self.parents, local, &mut model).ok()?;
+        let 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],
+            ],
+        };
+        Some(scale.mul(model[index]?))
+    }
     pub(super) fn clip(&self, kind: AnimKind) -> Option<&BakedAnimationClip> {
         self.clip_indices
             .get(&kind)
@@ -62,7 +112,8 @@ impl BakedFighterAnimations {
     }
 }
 
-#[derive(Component, Clone, Debug, Default)]
+#[derive(Component, Clone, Debug, Default, Hash)]
+#[require(Rollback)]
 pub struct FighterBoneMatrices {
     bone_names: Vec<String>,
     parents: Vec<Option<usize>>,
@@ -72,12 +123,44 @@ pub struct FighterBoneMatrices {
     previous_local_matrices: Vec<FixedMat4>,
     model_matrices: Vec<Option<FixedMat4>>,
     presentation_kind: Option<AnimKind>,
+    previous_animation_frame: Option<FighterAnimationFrame>,
+    /// The raw, scaled model-space root translation used as the baseline for
+    /// root-motion extraction.  This is kept separately because the published
+    /// pose has the root translation removed.
+    previous_root_motion_translation: Option<FGVec3>,
+    root_motion_delta: crate::math::vec3::FGVec3,
+    cached_root_motion_kind: Option<AnimKind>,
+    cached_root_motion_cycle_delta: FGVec3,
 }
 
 #[derive(Component, Clone, Debug, Default)]
 pub struct FighterBoneIndexMap(pub HashMap<String, usize>);
 
 impl FighterBoneMatrices {
+    /// Samples a baked pose for a preview or other non-gameplay caller.
+    pub fn sample_baked_pose(
+        &mut self,
+        baked: &BakedFighterAnimations,
+        frame: &FighterAnimationFrame,
+        model_scale: FGi32,
+    ) -> bool {
+        let Some(pose) = baked.sample_pose(frame) else {
+            return false;
+        };
+        self.set_pose_with_frame(
+            *frame,
+            "root",
+            FGVec3::ZERO,
+            None,
+            frame.kind,
+            &baked.bone_names,
+            &baked.parents,
+            pose,
+            model_scale,
+        );
+        true
+    }
+
     #[cfg(test)]
     pub(super) fn buffer_capacities(&self) -> [usize; 5] {
         [
@@ -115,6 +198,11 @@ impl FighterBoneMatrices {
     pub fn get_current_index(&self, index: usize) -> Option<FixedMat4> {
         self.matrices.get(index).copied()
     }
+    /// Translation of the configured root-motion bone since the previous
+    /// simulation animation frame, in scaled model-space units.
+    pub fn root_motion_delta(&self) -> FGVec3 {
+        self.root_motion_delta
+    }
     pub fn iter(&self) -> impl Iterator<Item = (&str, FixedMat4)> {
         self.bone_names
             .iter()
@@ -137,6 +225,7 @@ impl FighterBoneMatrices {
             .unwrap_or(current);
         Some(interpolate_transform(previous, current, overstep_fraction))
     }
+    #[cfg(test)]
     pub(super) fn set_pose(
         &mut self,
         kind: AnimKind,
@@ -144,6 +233,102 @@ impl FighterBoneMatrices {
         parents: &[Option<usize>],
         local: &[FixedMat4],
         model_scale: FGi32,
+    ) {
+        self.set_pose_with_frame(
+            FighterAnimationFrame::new(kind, false),
+            "",
+            FGVec3::ZERO,
+            None,
+            kind,
+            bone_names,
+            parents,
+            local,
+            model_scale,
+        );
+    }
+    pub(super) fn set_pose_with_frame(
+        &mut self,
+        animation_frame: FighterAnimationFrame,
+        root_motion_bone: &str,
+        root_motion_cycle_delta: FGVec3,
+        root_motion_loop_frame_count: Option<u32>,
+        kind: AnimKind,
+        bone_names: &[String],
+        parents: &[Option<usize>],
+        local: &[FixedMat4],
+        model_scale: FGi32,
+    ) {
+        self.sample_pose(
+            animation_frame,
+            root_motion_bone,
+            root_motion_cycle_delta,
+            root_motion_loop_frame_count,
+            kind,
+            bone_names,
+            parents,
+            local,
+            model_scale,
+            true,
+        );
+    }
+    #[cfg(test)]
+    pub(super) fn resample_pose(
+        &mut self,
+        kind: AnimKind,
+        bone_names: &[String],
+        parents: &[Option<usize>],
+        local: &[FixedMat4],
+        model_scale: FGi32,
+    ) {
+        self.resample_pose_with_frame(
+            FighterAnimationFrame::new(kind, false),
+            "",
+            FGVec3::ZERO,
+            None,
+            kind,
+            bone_names,
+            parents,
+            local,
+            model_scale,
+        );
+    }
+    pub(super) fn resample_pose_with_frame(
+        &mut self,
+        animation_frame: FighterAnimationFrame,
+        root_motion_bone: &str,
+        _root_motion_cycle_delta: FGVec3,
+        _root_motion_loop_frame_count: Option<u32>,
+        kind: AnimKind,
+        bone_names: &[String],
+        parents: &[Option<usize>],
+        local: &[FixedMat4],
+        model_scale: FGi32,
+    ) {
+        self.sample_pose(
+            animation_frame,
+            root_motion_bone,
+            FGVec3::ZERO,
+            None,
+            kind,
+            bone_names,
+            parents,
+            local,
+            model_scale,
+            false,
+        );
+    }
+    fn sample_pose(
+        &mut self,
+        animation_frame: FighterAnimationFrame,
+        root_motion_bone: &str,
+        root_motion_cycle_delta: FGVec3,
+        root_motion_loop_frame_count: Option<u32>,
+        kind: AnimKind,
+        bone_names: &[String],
+        parents: &[Option<usize>],
+        local: &[FixedMat4],
+        model_scale: FGi32,
+        advance_history: bool,
     ) {
         assert_eq!(
             bone_names.len(),
@@ -155,6 +340,7 @@ impl FighterBoneMatrices {
             parents.len(),
             "baked bone parents do not match names"
         );
+        let animation_changed = self.presentation_kind != Some(kind);
         if self.bone_names.is_empty() {
             self.bone_names.extend_from_slice(bone_names);
             self.parents.extend_from_slice(parents);
@@ -167,17 +353,23 @@ impl FighterBoneMatrices {
         self.local_matrices.reserve(local.len());
         self.previous_local_matrices.reserve(local.len());
         self.model_matrices.reserve(local.len());
-        std::mem::swap(&mut self.matrices, &mut self.previous_frame_matrices);
-        let animation_changed = self.presentation_kind != Some(kind);
-        std::mem::swap(&mut self.local_matrices, &mut self.previous_local_matrices);
+        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);
+        }
         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 root_index = if root_motion_bone.is_empty() {
+            None
+        } else {
+            Some(
+                self.bone_names
+                    .iter()
+                    .position(|name| name == root_motion_bone)
+                    .expect("configured root motion bone should exist"),
+            )
+        };
         let model_scale = FixedMat4 {
             cols: [
                 [model_scale, FGi32::ZERO, FGi32::ZERO, FGi32::ZERO],
@@ -186,12 +378,61 @@ impl FighterBoneMatrices {
                 [FGi32::ZERO, FGi32::ZERO, FGi32::ZERO, FGi32::ONE],
             ],
         };
+        // Root motion only needs the configured bone's model transform. Resolve
+        // that ancestry first, then do the normal full-pose pass once below.
+        // Previously the complete hierarchy was resolved once before removing
+        // root translation and once afterwards.
+        let raw_root_motion_translation = root_index.map(|root_index| {
+            self.model_matrices.resize(local.len(), None);
+            self.model_matrices.fill(None);
+            let root = resolve_model_transform(root_index, parents, local, &mut self.model_matrices)
+                .expect("baked bone hierarchy should be valid");
+            model_scale.mul(root).get_translation()
+        });
+
+        // Gameplay owns the root's displacement.  Keep rotation and scale in
+        // the animation, but remove its translation before publishing the pose
+        // used by visuals and gameplay volumes.
+        if let Some(root_index) = root_index {
+            self.local_matrices[root_index].translate(FGVec3::ZERO);
+        }
+        self.model_matrices.resize(local.len(), None);
+        self.model_matrices.fill(None);
+        for index in 0..local.len() {
+            resolve_model_transform(index, parents, &self.local_matrices, &mut self.model_matrices)
+                .expect("baked bone hierarchy should be valid");
+        }
         self.matrices.clear();
         self.matrices.extend(
             self.model_matrices.iter().map(|matrix| {
                 model_scale.mul(matrix.expect("baked bone hierarchy should be valid"))
             }),
         );
+        self.root_motion_delta = if advance_history
+            && !animation_changed
+            && self.previous_animation_frame.is_some()
+            && let (Some(current), Some(previous)) = (
+                raw_root_motion_translation,
+                self.previous_root_motion_translation,
+            )
+        {
+            let mut delta = current - previous;
+            if animation_frame.repeat
+                && self.previous_animation_frame.is_some_and(|previous| {
+                    previous.frame.saturating_add(1) == animation_frame.frame
+                })
+                && root_motion_loop_frame_count == Some(animation_frame.frame)
+            {
+                delta = delta + root_motion_cycle_delta;
+            }
+            delta
+        } else {
+            FGVec3::ZERO
+        };
+        self.previous_root_motion_translation = raw_root_motion_translation;
+        if advance_history {
+            self.previous_animation_frame = Some(animation_frame);
+        }
         // 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.
@@ -215,35 +456,115 @@ pub fn update_fighter_bone_matrices(
     manifests: Res<Assets<FighterManifest>>,
 ) {
     for (frame, animations, fighter, mut matrices, mut bone_indices) in &mut fighters {
-        let baked = baked_assets
-            .get(&animations.baked)
-            .expect("fighter baked animation asset should be loaded before the match starts");
-        assert_eq!(
-            baked.frame_rate, BAKED_ANIMATION_FPS,
-            "fighter baked animation rate does not match the simulation rate"
+        sample_fighter_bone_matrices(
+            frame,
+            animations,
+            fighter,
+            &mut matrices,
+            &mut bone_indices,
+            &baked_assets,
+            &manifests,
+            true,
         );
-        let pose = baked
-            .sample_pose(frame)
-            .expect("fighter animation frame should select a baked pose");
-        let manifest = manifests
-            .get(&fighter.manifest)
-            .expect("fighter manifest should be loaded before the match starts");
-        matrices.set_pose(
+    }
+}
+
+/// 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");
+    let root_motion_cycle_delta = if matrices.cached_root_motion_kind == Some(frame.kind) {
+        matrices.cached_root_motion_cycle_delta
+    } else {
+        let delta = baked
+            .root_motion_cycle_delta(frame.kind, &manifest.root_motion_bone, manifest.model_scale)
+            .unwrap_or(FGVec3::ZERO);
+        matrices.cached_root_motion_kind = Some(frame.kind);
+        matrices.cached_root_motion_cycle_delta = delta;
+        delta
+    };
+    let root_motion_loop_frame_count = baked
+        .frame_count(frame.kind)
+        .map(|count| count.saturating_sub(1).max(1));
+    if advance_history {
+        matrices.set_pose_with_frame(
+            *frame,
+            &manifest.root_motion_bone,
+            root_motion_cycle_delta,
+            root_motion_loop_frame_count,
             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)),
-            );
-        }
+    } else {
+        matrices.resample_pose_with_frame(
+            *frame,
+            &manifest.root_motion_bone,
+            FGVec3::ZERO,
+            None,
+            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)),
+        );
     }
 }
 

src/fighter/baked_animation/visual_binding.rs

@@ -92,9 +92,12 @@ pub(super) fn bind_fighter_visual_bones(
 pub(super) fn apply_baked_fighter_visual_pose(
     mut nodes: Query<(&mut Transform, &BakedFighterBone)>,
     fighters: Query<&FighterBoneMatrices>,
-    timing: Res<GgrsFrameTiming>,
+    timing: Option<Res<GgrsFrameTiming>>,
 ) {
-    let overstep_fraction = timing.overstep_fraction();
+    let overstep_fraction = timing
+        .as_deref()
+        .map(GgrsFrameTiming::overstep_fraction)
+        .unwrap_or(0.0);
     for (mut transform, bone) in &mut nodes {
         let Ok(matrices) = fighters.get(bone.fighter) else {
             continue;

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)>,
@@ -45,6 +45,7 @@ pub fn air_collide_with_stage(
     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(),
@@ -55,7 +56,10 @@ pub fn air_collide_with_stage(
         .stage_polys
         .iter()
         .enumerate()
-        .filter(|(poly_idx, _)| !ignored_polys.contains(poly_idx))
+        .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| {
                 (
@@ -95,6 +99,18 @@ mod tests {
         )
     }
 
+    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 {
@@ -122,10 +138,93 @@ mod tests {
             &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,10 +1,9 @@
 //! Fighter debug views: gizmos and the egui inspector window.
 
-use std::sync::OnceLock;
 
-use bevy::color::palettes::css::ORANGE;
-use bevy::{color::palettes::css::YELLOW, prelude::*};
-use bevy_egui::{EguiContexts, egui};
+use bevy::color::palettes::css::{ORANGE, ORANGE_RED, WHITE};
+use bevy::prelude::*;
+use bevy_egui::{egui, EguiContexts};
 
 use crate::debug_tools::{DebugSettings, FighterDebugRowKind};
 use crate::fighter::animation::FighterAnimationFrame;
@@ -15,20 +14,21 @@ use crate::fighter::attack::{
 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;
+use crate::scripting::FighterAttackScript;
 
 pub fn debug_draw_ecb(
     ecbs: Query<(
@@ -38,6 +38,7 @@ pub fn debug_draw_ecb(
         &FighterPreviousTranslation,
     )>,
     mut gizmos: Gizmos,
+    mut filled_gizmos: FilledGizmos,
 ) {
     for (ecb, trf, ecb_prev, trf_prev) in ecbs {
         gizmos.cross(
@@ -46,15 +47,18 @@ pub fn debug_draw_ecb(
             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);
-        let prev_transformed = ecb_prev.to_3d_lineloop(Transform::from_xyz(
-            trf_prev.x.to_num(),
-            trf_prev.y.to_num(),
-            -0.1,
-        ));
-        gizmos.lineloop(prev_transformed, ORANGE);
+        filled_gizmos.polygon(&transformed, ORANGE);
+        gizmos.lineloop(transformed, WHITE);
+
     }
 }
 pub fn fighter_debug(
@@ -145,6 +149,8 @@ pub fn fighter_debug(
                                     last_frame.movement.x, last_frame.movement.y
                                 ));
                             });
+
+                            ui.label(format!("Flick age Y {}", input.peek_movement_flick_dbg()));
                         }
                         FighterDebugRowKind::Position => {
                             ui.label(format!("Position: {:?}", translation.0));
@@ -183,15 +189,23 @@ pub fn animation_debug(
     }
 }
 
-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,
@@ -213,9 +227,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,
 }
@@ -223,9 +237,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();
@@ -306,7 +320,7 @@ fn capsule_wireframe() -> &'static CapsuleWireframe {
 
         CapsuleWireframe { vertices, lines }
     })
-}
+}*/
 
 #[cfg(test)]
 mod capsule_debug_tests {
@@ -326,7 +340,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
@@ -344,7 +358,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(
@@ -356,6 +370,8 @@ pub fn attack_debug(
         &FighterAnimationFrame,
     )>,
     mut gizmos: Gizmos,
+    mut filled_gizmos: FilledGizmos,
+    attack_scripts: Res<Assets<FighterAttackScript>>
 ) {
     for (hitboxes, _matrices, _translation, _facing_direction, _frame) in query {
         if let Some(active_attack) = &hitboxes.0 {
@@ -366,21 +382,35 @@ pub fn attack_debug(
                     (solved_hitbox.capsule.start + solved_hitbox.capsule.end) * FGi32::lit("0.5");
                 let length = (start - end).length();
 
-                let attack_capsule = Capsule3d {
-                    half_length: length * 0.5,
-                    radius: solved_hitbox.capsule.radius.to_num(),
-                };
-
                 let aim_dir = (end - start).normalize_or(Vec3::Y);
 
                 let mut capsule_draw_trf = Transform::IDENTITY;
                 capsule_draw_trf.translation = center.to_vec3();
                 capsule_draw_trf.align(Dir3::Y, aim_dir, Dir3::X, aim_dir.any_orthonormal_vector());
 
+                let Some(script) = attack_scripts.get(&active_attack.script) else {
+                    continue;
+                };
+
+                let hitbox_color =  script.hitboxes.get(solved_hitbox.hitbox_idx).expect("This hitbox should be valid").get_debug_draw_color();
+                /*
+                let attack_capsule = Capsule3d {
+                    half_length: length * 0.5,
+                    radius: solved_hitbox.capsule.radius.to_num(),
+                };
                 gizmos.primitive_3d(
                     &attack_capsule,
                     capsule_draw_trf.to_isometry(),
-                    bevy::color::palettes::css::RED,
+                    hitbox_color,
+                );*/
+
+                let hitbox_inner_color = bevy::color::Srgba { alpha: 0.18, ..hitbox_color };
+
+                filled_gizmos.capsule(
+                    capsule_draw_trf.to_isometry(),
+                    solved_hitbox.capsule.radius.to_num(),
+                    length * 0.5,
+                    hitbox_inner_color,
                 );
 
                 gizmos.cross(start, 1.0, bevy::color::palettes::css::GREEN);

src/fighter/manifest.rs

@@ -62,12 +62,19 @@ pub struct FighterManifest {
     pub icon: TextureReference,
     pub attributes: FighterAttributes,
     pub camera: FighterCameraProfile,
+    /// Bone whose model-space translation drives gameplay root motion.
+    #[serde(default = "default_root_motion_bone")]
+    pub root_motion_bone: String,
     pub animations: HashMap<AnimKind, String>,
     pub attack_scripts: HashMap<AttackKind, String>,
     pub hurtboxes: Vec<FighterHurtbox>,
     pub ecb_bones: Vec<String>,
 }
 
+fn default_root_motion_bone() -> String {
+    "root".into()
+}
+
 #[derive(Resource)]
 pub struct FighterManifestAssets(pub Vec<Handle<FighterManifest>>);
 

src/fighter/mod.rs

@@ -17,9 +17,11 @@ pub mod errors;
 pub mod hurtbox;
 pub mod manifest;
 pub mod motion;
+pub mod push;
 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
@@ -29,7 +31,8 @@ pub use attributes::FighterAttributes;
 pub use ecb::FighterECB;
 pub use manifest::FighterId;
 pub use motion::{
-    FighterPreviousFacingDirection, FighterPreviousTranslation, FighterTranslation, FighterVelocity,
+    FighterPresentationSnap, FighterPreviousFacingDirection, FighterPreviousTranslation,
+    FighterTranslation, FighterVelocity,
 };
 pub use surface::FighterSurfaceState;
 
@@ -39,8 +42,8 @@ use crate::{
             AttackKind, FighterAttackPlugin, FighterAttackScriptAssets, FighterDamage,
             FighterKnockbackVelocity, FighterPendingHitReaction, FighterSolvedHurtboxes,
             FighterStaleMoveQueue,
-        }, baked_animation::{FighterBoneIndexMap, FighterBoneMatrices}, ecb::FighterECBBoneIndices, manifest::FighterManifest, state::{FighterState, air::AirborneStateCommon, fall::FallState}, visual::FighterAnimations,
-    }, input::FighterInput, math::{int::FGi32, vec::FGVec2}, player::Player, schedule::GameplaySet, scripting::FighterAttackScript, stage::line::StageCollision,
+        }, baked_animation::FighterBoneIndexMap, ecb::FighterECBBoneIndices, manifest::FighterManifest, state::{FighterState, air::AirborneStateCommon, fall::FallState}, visual::{FighterAnimations, FighterInvulnerabilityVisualState},
+    }, game_settings::GameSettings, input::FighterInput, math::{int::FGi32, vec::FGVec2}, player::Player, schedule::GameplaySet, scripting::FighterAttackScript,
 };
 use state::state_interrupt_system;
 
@@ -83,6 +86,14 @@ pub struct FighterHitstop {
     pub remaining_frames: u32,
 }
 
+#[derive(Component, Default, Copy, Clone, Hash)]
+pub enum FighterInvulnerabilityState {
+    #[default]
+    Vulnerable,
+    Invulnerable { frames_remaining: Option<u32> },
+    Intangible { frames_remaining: Option<u32> }
+}
+
 impl FighterFacingDirection {
     fn reverse(&self) -> Self {
         match self {
@@ -127,14 +138,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,
-    FighterTranslation
+    FighterTranslation,
+    FighterInvulnerabilityState,
+    FighterInvulnerabilityVisualState,
 )]
 pub struct Fighter {
     pub manifest: Handle<FighterManifest>,
@@ -147,6 +164,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,
                 (
@@ -159,7 +180,7 @@ impl Plugin for FighterPlugin {
             )
             .add_systems(
                 GgrsSchedule,
-                (state::state_update_system, decay_hitstop)
+                (state::state_update_system, decay_hitstop, decay_invulnerability)
                     .chain()
                     .in_set(GameplaySet::StateUpdate),
             )
@@ -172,12 +193,18 @@ impl Plugin for FighterPlugin {
             .add_systems(
                 GgrsSchedule,
                 (
-                    (ecb::update_ecb, ecb::decrement_ecb_lockout, state::state_collision_interrupt_system).chain(),
-                    baked_animation::update_fighter_bone_matrices,
+                    (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(
+                GgrsSchedule,
+                push::apply_grounded_pushes
+                    .before(state::state_update_system)
+                    .in_set(GameplaySet::StateUpdate),
+            )
             .add_systems(
                 PostUpdate,
                 (
@@ -202,6 +229,8 @@ 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>()
@@ -213,11 +242,16 @@ impl Plugin for FighterPlugin {
             .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>()
+            .rollback_component_with_clone::<baked_animation::FighterBoneMatrices>()
+            .checksum_component_with_hash::<baked_animation::FighterBoneMatrices>()
             // Debug views.
             .add_systems(
                 FixedPostUpdate,
@@ -242,17 +276,17 @@ 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),
             )
             .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>()
             .checksum_component_with_hash::<FighterState>()
             .checksum_component_with_hash::<FighterFacingDirection>()
             .register_type::<FighterFacingDirection>();
@@ -264,16 +298,23 @@ pub struct FighterActiveAttack {
     pub script: Handle<FighterAttackScript>,
     pub active_hitboxes: Vec<usize>,
     pub solved_hitboxes: Vec<attack::FighterSolvedHitbox>,
-    pub hit_fighters: Vec<Entity>,
+    pub hit_groups: Vec<FighterHitGroupState>,
     pub stalled: bool,
 }
 
+#[derive(Clone, Debug, Hash)]
+pub struct FighterHitGroupState {
+    pub group: u32,
+    pub hit_fighters: Vec<Entity>,
+}
+
 #[derive(Component, Clone, Debug, Default, Hash)]
 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,
@@ -287,6 +328,7 @@ pub fn spawn_fighter(
             Name(format!("Fighter {player_handle}").into()),
             Player {
                 handle: player_handle,
+                controller_port,
             },
             Fighter { manifest: manifest },
             FighterFacingDirection::Right,
@@ -304,6 +346,7 @@ pub fn spawn_fighter(
                 FighterVelocity::default(),
                 FighterTranslation(spawn_position),
                 FighterPreviousTranslation(spawn_position),
+                FighterPresentationSnap::default(),
             ),
             visual_root,
             animations,
@@ -328,3 +371,34 @@ pub fn decay_hitstop(query: Query<(&mut FighterHitstop, &mut FighterHitstopShake
         hitstop_shake.remaining_frames = hitstop_shake.remaining_frames.saturating_sub(1);
     }
 }
+
+pub fn decay_invulnerability(query: Query<&mut FighterInvulnerabilityState>) {
+    for invuln_state in query {
+        let invuln_state = invuln_state.into_inner();
+        let frames_remaining = match invuln_state {
+            FighterInvulnerabilityState::Vulnerable => None,
+            FighterInvulnerabilityState::Invulnerable { frames_remaining } => {
+                if let Some(frames_remaining) = frames_remaining {
+                    *frames_remaining = frames_remaining.saturating_sub(1);
+                    Some(*frames_remaining)
+                } else {
+                    None
+                }
+            },
+            FighterInvulnerabilityState::Intangible { frames_remaining } => {
+                if let Some(frames_remaining) = frames_remaining {
+                    *frames_remaining = frames_remaining.saturating_sub(1);
+                    Some(*frames_remaining)
+                } else {
+                    None
+                }
+            },
+        };
+
+        if let Some(frames_remaining) = frames_remaining {
+            if frames_remaining == 0 {
+                *invuln_state = FighterInvulnerabilityState::Vulnerable;
+            }
+        }
+    }
+}

src/fighter/motion.rs

@@ -21,6 +21,11 @@ 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);
@@ -52,10 +57,31 @@ 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,
+        &FighterPresentationSnap,
         &FighterHitstopShake,
         &mut Transform,
     )>,
@@ -64,12 +90,13 @@ pub fn apply_fighter_translation_to_visuals(
     game_settings: Res<GameSettings>,
 ) {
     let overstep_fraction = timing.overstep_fraction();
-    for (translation, previous_translation, hitstop_shake, mut transform) in query {
-        let translation = sample_presentation_translation(
+    for (translation, previous_translation, presentation_snap, hitstop_shake, mut transform) in query {
+        let translation = sample_presentation_translation_with_snap(
             *previous_translation,
             *translation,
             overstep_fraction,
             debug_settings.motion_sampling,
+            *presentation_snap,
         );
         transform.translation = Vec3::new(
             translation.x,
@@ -169,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/push.rs

@@ -0,0 +1,213 @@
+//! fighter-to-fighter pushing
+
+use bevy::prelude::*;
+
+use crate::{
+    fighter::{
+        Fighter, FighterFacingDirection, FighterRoster, FighterSurfaceState, FighterTranslation,
+        manifest::FighterManifest,
+    },
+    game_settings::GameSettings,
+    math::int::FGi32,
+    stage::line::{StageCollision, StageLineID, StagePoly},
+};
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+struct Pushbox {
+    center: FGi32,
+    radius: FGi32,
+    line_id: StageLineID,
+}
+
+fn can_interact(stage: &StageCollision, first: StageLineID, second: StageLineID) -> bool {
+    if first.polygon != second.polygon {
+        return false;
+    }
+    if first.segment == second.segment {
+        return true;
+    }
+
+    let Some(poly) = stage.stage_polys.get(first.polygon) else {
+        return false;
+    };
+    adjacent_segment(poly, first.segment, second.segment)
+}
+
+fn adjacent_segment(poly: &StagePoly, first: usize, second: usize) -> bool {
+    poly.get_next_segment_index(first) == Some(second)
+        || poly.get_prev_segment_index(first) == Some(second)
+}
+
+fn push_delta(first: Pushbox, second: Pushbox, nudge: FGi32) -> FGi32 {
+    if (first.center - second.center).abs() >= first.radius + second.radius {
+        return FGi32::ZERO;
+    }
+    (first.center - second.center).signum() * nudge
+}
+
+fn calculate_push_deltas(
+    pushboxes: &[Option<Pushbox>],
+    stage: &StageCollision,
+    nudge: FGi32,
+) -> Vec<FGi32> {
+    let mut deltas = vec![FGi32::ZERO; pushboxes.len()];
+    for first in 0..pushboxes.len() {
+        let Some(first_pushbox) = pushboxes[first] else {
+            continue;
+        };
+        for second in 0..pushboxes.len() {
+            if first == second {
+                continue;
+            }
+            let Some(second_pushbox) = pushboxes[second] else {
+                continue;
+            };
+            if can_interact(stage, first_pushbox.line_id, second_pushbox.line_id) {
+                deltas[first] += push_delta(first_pushbox, second_pushbox, nudge);
+            }
+        }
+    }
+    deltas
+}
+
+pub fn apply_grounded_pushes(
+    roster: Res<FighterRoster>,
+    mut fighters: Query<(
+        &Fighter,
+        &mut FighterTranslation,
+        &FighterFacingDirection,
+        &FighterSurfaceState,
+    )>,
+    manifests: Res<Assets<FighterManifest>>,
+    settings: Res<GameSettings>,
+    stage: Res<StageCollision>,
+) {
+    let pushboxes = roster
+        .0
+        .iter()
+        .map(|entity| {
+            let Ok((fighter, translation, facing, surface)) = fighters.get(*entity) else {
+                return None;
+            };
+            let Some(line_id) = surface.line_id() else {
+                return None;
+            };
+            let manifest = manifests.get(&fighter.manifest)?;
+            let attributes = &manifest.attributes;
+            Some(Pushbox {
+                center: translation.x + facing.to_sign() * attributes.pushbox_offset,
+                radius: attributes.pushbox_radius,
+                line_id,
+            })
+        })
+        .collect::<Vec<_>>();
+    let deltas = calculate_push_deltas(
+        &pushboxes,
+        &stage,
+        settings.fighter_common.grounded_push_nudge,
+    );
+
+    for (entity, delta) in roster.0.iter().zip(deltas) {
+        if delta == FGi32::ZERO {
+            continue;
+        }
+        if let Ok((_, mut translation, _, _)) = fighters.get_mut(*entity) {
+            translation.x += delta;
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::math::vec::FGVec2;
+    use crate::stage::line::{StagePolyLineSegmentType, StagePolyType};
+
+    fn stage() -> StageCollision {
+        StageCollision {
+            stage_polys: vec![StagePoly::build(
+                StagePolyType::Platform,
+                &[
+                    (FGVec2::lit("0", "0"), StagePolyLineSegmentType::Floor),
+                    (FGVec2::lit("10", "0"), StagePolyLineSegmentType::Floor),
+                    (FGVec2::lit("20", "0"), StagePolyLineSegmentType::Floor),
+                    (FGVec2::lit("30", "0"), StagePolyLineSegmentType::Floor),
+                ],
+            )],
+        }
+    }
+
+    fn box_at(x: &str, segment: usize) -> Pushbox {
+        Pushbox {
+            center: FGi32::lit(x),
+            radius: FGi32::lit("1"),
+            line_id: StageLineID {
+                polygon: 0,
+                segment,
+            },
+        }
+    }
+
+    #[test]
+    fn overlapping_pair_gets_opposite_fixed_nudges() {
+        let deltas = calculate_push_deltas(
+            &[Some(box_at("0", 0)), Some(box_at("1", 0))],
+            &stage(),
+            FGi32::lit("0.3"),
+        );
+        assert_eq!(deltas, vec![FGi32::lit("-0.3"), FGi32::lit("0.3")]);
+    }
+
+    #[test]
+    fn touching_pushboxes_do_not_nudge() {
+        let deltas = calculate_push_deltas(
+            &[Some(box_at("0", 0)), Some(box_at("2", 0))],
+            &stage(),
+            FGi32::lit("0.3"),
+        );
+        assert_eq!(deltas, vec![FGi32::ZERO, FGi32::ZERO]);
+    }
+
+    #[test]
+    fn adjacent_segments_can_push_and_unrelated_segments_cannot() {
+        let adjacent = calculate_push_deltas(
+            &[Some(box_at("9.5", 0)), Some(box_at("10", 1))],
+            &stage(),
+            FGi32::lit("0.3"),
+        );
+        assert_eq!(adjacent, vec![FGi32::lit("-0.3"), FGi32::lit("0.3")]);
+
+        let unrelated = calculate_push_deltas(
+            &[Some(box_at("1", 0)), Some(box_at("2", 2))],
+            &stage(),
+            FGi32::lit("0.3"),
+        );
+        assert_eq!(unrelated, vec![FGi32::ZERO, FGi32::ZERO]);
+    }
+
+    #[test]
+    fn multiple_overlaps_accumulate() {
+        let deltas = calculate_push_deltas(
+            &[
+                Some(box_at("0", 0)),
+                Some(box_at("0.5", 0)),
+                Some(box_at("1", 0)),
+            ],
+            &stage(),
+            FGi32::lit("0.3"),
+        );
+        assert_eq!(
+            deltas,
+            vec![FGi32::lit("-0.6"), FGi32::ZERO, FGi32::lit("0.6")]
+        );
+    }
+
+    #[test]
+    fn system_parameters_initialize_without_query_conflicts() {
+        let mut world = World::new();
+        let mut schedule = Schedule::default();
+        schedule.add_systems(apply_grounded_pushes);
+
+        schedule.initialize(&mut world).unwrap();
+    }
+}

src/fighter/state/air.rs

@@ -1,5 +1,8 @@
+use crate::fighter::state::jump::{self};
 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;
 
@@ -105,24 +108,32 @@ pub fn update_standard_motion(
         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> {
+    jump::check_input_double_jump(ctx).or_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)?;
     let diff = res.hit_position - ctx.translation.0;
     ctx.ecb.bottom -= diff;
     ctx.ecb.top -= diff;
     ctx.ecb.left -= diff;
     ctx.ecb.right -= diff;
     ctx.translation.0 = res.hit_position;
+    ctx.presentation_snap.0 = true;
     ctx.surface.land(res.line_id);
     Some(FighterState::Land(LandingState::create(landing_type)))
 }
@@ -137,6 +148,8 @@ mod tests {
 
     fn test_attributes() -> FighterAttributes {
         FighterAttributes {
+            pushbox_offset: FGi32::ZERO,
+            pushbox_radius: FGi32::ONE,
             base_walk_accel: FGi32::ZERO,
             stick_walk_accel: FGi32::ZERO,
             max_walk_vel: FGi32::ZERO,
@@ -167,6 +180,9 @@ mod tests {
             air_dodge_duration: 0,
             air_dodge_velocity: FGi32::ZERO,
             air_dodge_decay: FGi32::ZERO,
+            air_dodge_intangible_duration: 29,
+            air_dodge_intangible_start: 4,
+            dash_attack_cancel_window: 3,
         }
     }
 

src/fighter/state/air_attack.rs

@@ -0,0 +1,168 @@
+use bevy::log::error;
+
+use crate::fighter::{
+    attack::{AttackKind, FighterAttackScriptAssets, update_active_attack}, state::{
+        CollisionContext, EnterContext, ExitContext, FighterState, FighterStateImpl, InterruptContext, UpdateContext, air::{self, AirborneStateCommon}, air_attack, fall::FallState, jump,
+    },
+};
+
+#[derive(Clone, Debug, Hash)]
+pub struct AirAttackState {
+    pub attack_kind: AttackKind,
+    pub airborne_state_common: AirborneStateCommon,
+    pub is_in_autocancel_window: bool,
+}
+
+impl FighterStateImpl for AirAttackState {
+    const NAME: &'static str = "AirAttack";
+
+    fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
+        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 {
+            if let Some(iasa_frame) = script.iasa_frame {
+                if animation_frame >= iasa_frame {
+                    let new_state = jump::check_input_double_jump(state_context).or_else(|| air_attack::check_interrupt(state_context, &self.airborne_state_common));
+                    if let Some(new_state) = new_state {
+                        return Some(new_state);
+                    }
+                }
+            }
+        }
+
+        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_attack(
+                script,
+                state_context
+                    .hitboxes
+                    .0
+                    .as_mut()
+                    .expect("ground attack must have active hitboxes"),
+                animation_frame,
+            );
+            if let Some((autocancel_start, autocancel_end)) = script.wont_autocancel_window {
+                self.is_in_autocancel_window =
+                    animation_frame < autocancel_start || animation_frame > autocancel_end;
+            }
+        }
+
+        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_groups: 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> {
+        let coll_interrupt = air::collision_interrupt(
+            state_context,
+            crate::fighter::state::land::LandingType::Normal,
+            false,
+        );
+
+        coll_interrupt.map(|state| {
+            if self.is_in_autocancel_window {
+                state
+            } else {
+                // TODO: Implement proper landing lag
+                state
+            }
+        })
+    }
+
+    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,
+                is_in_autocancel_window: false,
+            })
+        } 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,5 +1,6 @@
 use crate::{
     fighter::{
+        FighterInvulnerabilityState,
         animation::AnimKind,
         state::{
             CollisionContext, EnterContext, FighterState, FighterStateImpl, InterruptContext,
@@ -32,6 +33,12 @@ impl FighterStateImpl for AirDodgeState {
     }
 
     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 { frames_remaining: Some(state_context.fighter_attributes.air_dodge_intangible_duration) };
+        } 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(
@@ -45,12 +52,19 @@ 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;
     }
@@ -62,13 +76,28 @@ impl FighterStateImpl for AirDodgeState {
     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,54 @@
+use crate::{fighter::{FighterInvulnerabilityState, 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;
+        *state_context.vulnerability = FighterInvulnerabilityState::Invulnerable { frames_remaining: Some(state_context.game_settings.fighter_common.angel_platform_invulnerability_duration) };
+    }
+    
+    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

@@ -148,6 +148,15 @@ impl FighterStateImpl for CrouchState {
     }
 }
 
+impl CrouchState {
+    pub fn is_crouch_cancelling(&self) -> bool {
+        match self.sub_state {
+            CrouchSubState::Entering { .. } | CrouchSubState::Idle => true,
+            CrouchSubState::Exiting => false,
+        }
+    }
+}
+
 pub fn check_input(state_context: &InterruptContext) -> Option<FighterState> {
     let input_frame = state_context.input.get_last_frame();
 

src/fighter/state/dash.rs

@@ -4,7 +4,7 @@ use super::{
 };
 use crate::fighter::FighterFacingDirection;
 use crate::fighter::animation::AnimKind;
-use crate::fighter::state::FighterState;
+use crate::fighter::state::{FighterState, ground_attack};
 use crate::input::FighterCommands::{SmashMoveLeft, SmashMoveRight};
 
 #[derive(Debug, Clone, Hash)]
@@ -23,6 +23,16 @@ impl FighterStateImpl for DashState {
     fn check_interrupt(&self, ctx: &mut InterruptContext) -> Option<FighterState> {
         let attributes = ctx.fighter_attributes;
 
+        if ctx.get_current_animation_frame() <= 2 || ctx.input.get_last_frame().movement.x.signum() != self.direction.to_sign() {
+            if let Some(state) = ground_attack::check_interrupt(ctx) {
+                return Some(state);
+            }
+        } else {
+            if let Some(state) = ground_attack::check_interrupt_dash_attack(ctx) {
+                return Some(state);
+            }
+        }
+
         // A reverse dash can interrupt before IASA
         if let Some(direction) =
             check_smash_input_with_dir(ctx).filter(|direction| *direction != self.direction)
@@ -89,7 +99,6 @@ impl FighterStateImpl for DashState {
         ground::apply_grounded_motion(
             state_context.velocity,
             state_context.translation,
-            state_context.prev_translation,
         );
     }
 

src/fighter/state/fall.rs

@@ -1,7 +1,7 @@
 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};
+use crate::fighter::state::{FighterState, air, air_attack, jump};
 
 #[derive(Debug, Clone, Copy, Hash, Default)]
 pub struct FallState {
@@ -20,7 +20,7 @@ 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) {
@@ -38,6 +38,7 @@ impl FighterStateImpl for FallState {
         air::collision_interrupt(
             state_context,
             crate::fighter::state::land::LandingType::Normal,
+            true,
         )
     }
     

src/fighter/state/ground.rs

@@ -6,7 +6,7 @@ use crate::fighter::state::{
     CollisionContext, FighterState, InterruptContext, air, crouch, dash, fall, ground_attack, turn, wait, walk,
 };
 use crate::fighter::{
-    FighterAttributes, FighterPreviousTranslation, FighterTranslation, FighterVelocity,
+    FighterAttributes, FighterTranslation, FighterVelocity,
 };
 use crate::game_settings::GameSettings;
 use crate::math::int::{FGWide, FGi32};
@@ -149,10 +149,8 @@ fn resolve_grounded_position(
 pub fn apply_grounded_motion(
     velocity: &FighterVelocity,
     translation: &mut FighterTranslation,
-    prev_translation: &mut FighterPreviousTranslation,
 ) {
     // Vertical velocity should be 0 on the ground
-    prev_translation.0 = translation.0;
     translation.0 += FGVec2::new(velocity.0.x, FGi32::ZERO);
 }
 
@@ -169,7 +167,7 @@ pub fn update_friction_motion(ctx: &mut crate::fighter::state::UpdateContext) {
 
     let ground_velocity = ctx.velocity.x;
     ctx.velocity.x += apply_grounded_friction(friction, ground_velocity);
-    apply_grounded_motion(ctx.velocity, ctx.translation, ctx.prev_translation);
+    apply_grounded_motion(ctx.velocity, ctx.translation);
 }
 
 pub fn collide_with_stage_grounded(
@@ -246,8 +244,9 @@ pub fn collision_interrupt(ctx: &mut CollisionContext, can_walk_off: bool) -> Op
 mod tests {
     use super::*;
     use crate::fighter::ecb::FighterPreviousECB;
-    use crate::fighter::{FighterECB, FighterSurfaceState};
+    use crate::fighter::{FighterECB, FighterPreviousTranslation, FighterSurfaceState};
     use crate::stage::line::StagePolyType;
+    use crate::input::FighterInput;
 
     fn two_segment_floor() -> StagePoly {
         StagePoly::build(
@@ -375,15 +374,19 @@ mod tests {
             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!(
@@ -426,15 +429,19 @@ mod tests {
             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!(

src/fighter/state/ground_attack.rs

@@ -1,20 +1,39 @@
-use crate::fighter::{
-    attack::{AttackKind, update_active_hitbox_list},
-    state::{
-        CollisionContext, EnterContext, ExitContext, FighterState, FighterStateImpl,
-        InterruptContext, UpdateContext, wait::WaitState,
+use bevy::{asset::Assets, log::error};
+
+use crate::{
+    fighter::{
+        attack::{AttackKind, FighterAttackScriptAssets, update_active_attack},
+        state::{
+            CollisionContext, EnterContext, ExitContext, FighterState, FighterStateImpl,
+            InterruptContext, UpdateContext, ground, wait::WaitState,
+        },
     },
+    scripting::FighterAttackScript,
 };
 
 #[derive(Clone, Debug, Hash)]
 pub struct GroundAttackState {
     pub attack_kind: AttackKind,
+    pub use_root_motion: bool,
 }
 
 impl FighterStateImpl for GroundAttackState {
     const NAME: &'static str = "GroundAttack";
 
     fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
+        // Allow interrupting dash attack only into an up/down smash
+        if let AttackKind::DashAttack = self.attack_kind {
+            if state_context.get_current_animation_frame() < state_context.fighter_attributes.dash_attack_cancel_window {
+                if let Some(state) = check_interrupt(state_context) {
+                    if let FighterState::GroundAttack(state) = state {
+                        if matches!(state.attack_kind, AttackKind::UpSmash) || matches!(state.attack_kind, AttackKind::DownSmash) {
+                            return Some(FighterState::GroundAttack(state));
+                        }
+                    }
+                }
+            }
+        }
+
         if state_context.is_current_animation_finished() {
             Some(FighterState::Wait(WaitState))
         } else {
@@ -28,28 +47,41 @@ impl FighterStateImpl for GroundAttackState {
             .attack_scripts
             .get(&state_context.attack_script_assets.scripts[&self.attack_kind]);
         if let Some(script) = script {
-            update_active_hitbox_list(
+            update_active_attack(
                 script,
-                &mut state_context
+                state_context
                     .hitboxes
                     .0
                     .as_mut()
-                    .expect("ground attack must have active hitboxes")
-                    .active_hitboxes,
+                    .expect("ground attack must have active hitboxes"),
                 animation_frame,
             );
+
+            // root motion
+            if script.use_root_motion {
+                state_context.velocity.0.x = state_context.animation_root_motion_delta.x;
+                ground::apply_grounded_motion(
+                    state_context.velocity,
+                    state_context.translation,
+                );
+            } else {
+                ground::update_friction_motion(state_context);
+            }
         }
     }
 
     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,
+            script: script.clone(),
             active_hitboxes: Vec::new(),
             solved_hitboxes: Vec::new(),
-            hit_fighters: Vec::new(),
+            hit_groups: Vec::new(),
             stalled: false,
         });
     }
@@ -60,9 +92,9 @@ impl FighterStateImpl for GroundAttackState {
 
     fn check_collision_interrupt(
         &mut self,
-        _state_context: &mut CollisionContext,
+        state_context: &mut CollisionContext,
     ) -> Option<FighterState> {
-        None
+        ground::collision_interrupt(state_context, !self.use_root_motion)
     }
 
     fn is_visually_grounded<'a>(&'a self) -> bool {
@@ -70,6 +102,51 @@ impl FighterStateImpl for GroundAttackState {
     }
 }
 
+impl GroundAttackState {
+    fn create(
+        attack_kind: AttackKind,
+        attack_script_assets: &FighterAttackScriptAssets,
+        attack_scripts: &Assets<FighterAttackScript>,
+    ) -> Result<Self, AirAttackStateCreateError> {
+        let asset_script = attack_script_assets.scripts.get(&attack_kind).ok_or(
+            AirAttackStateCreateError::AttackScriptAssetNotFound {
+                attack: attack_kind,
+            },
+        )?;
+
+        let script = attack_scripts.get(asset_script).ok_or(
+            AirAttackStateCreateError::AttackScriptNotFound {
+                attack: attack_kind,
+            },
+        )?;
+
+        Ok(Self {
+            attack_kind,
+            use_root_motion: script.use_root_motion
+        })
+    }
+}
+
+#[derive(thiserror::Error, Debug)]
+pub enum AirAttackStateCreateError {
+    #[error("Attack script: {attack:?} not found")]
+    AttackScriptNotFound { attack: AttackKind },
+    #[error("Attack script asset: {attack:?} not found")]
+    AttackScriptAssetNotFound { attack: AttackKind },
+}
+
+pub fn check_interrupt_shared(state_context: &InterruptContext, attack_kind: AttackKind) -> Option<FighterState> {
+    let state = GroundAttackState::create(attack_kind, state_context.attack_script_assets, state_context.attack_scripts);
+
+    match state {
+        Ok(state) => Some(FighterState::GroundAttack(state)),
+        Err(create_error) => {
+            error!("{}", create_error);
+            None
+        },
+    }
+}
+
 pub fn check_interrupt(state_context: &InterruptContext) -> Option<FighterState> {
     if state_context
         .input
@@ -79,9 +156,18 @@ pub fn check_interrupt(state_context: &InterruptContext) -> Option<FighterState>
             .input
             .get_attack_command_type()
             .to_attack_kind_grounded();
-        Some(FighterState::GroundAttack(GroundAttackState {
-            attack_kind,
-        }))
+        check_interrupt_shared(state_context, attack_kind)
+    } else {
+        None
+    }
+}
+
+pub fn check_interrupt_dash_attack(state_context: &InterruptContext) -> Option<FighterState> {
+    if state_context
+        .input
+        .has_command(crate::input::FighterCommands::Attack)
+    {
+        check_interrupt_shared(state_context, AttackKind::DashAttack)
     } else {
         None
     }

src/fighter/state/hitstun.rs

@@ -11,8 +11,7 @@ use crate::{
             land::LandingType,
             wait::WaitState,
         },
-    },
-    math::int::FGi32,
+    }, math::{int::FGi32, vec::FGVec2},
 };
 
 #[derive(Clone, Debug, Hash)]
@@ -103,6 +102,7 @@ impl FighterStateImpl for HitstunState {
             HitstopStateKind::Airborne => AnimKind::FlinchAir,
         };
         state_context.play_animation(animation, false);
+        state_context.velocity.0 = FGVec2::ZERO;
     }
 
     fn on_exit(&mut self, _state_context: &mut ExitContext) {}
@@ -114,7 +114,7 @@ impl FighterStateImpl for HitstunState {
         match &mut self.hitstop_kind {
             HitstopStateKind::Grounded => collision_interrupt(state_context, true),
             HitstopStateKind::Airborne => {
-                air::collision_interrupt(state_context, LandingType::Normal)
+                air::collision_interrupt(state_context, LandingType::Normal, false)
             }
         }
     }

src/fighter/state/jump.rs

@@ -1,18 +1,10 @@
-use bevy::prelude::*;
 
 use crate::{
     fighter::{
-        animation::AnimKind,
-        state::{
-            CollisionContext, EnterContext, FighterState, FighterStateImpl, InterruptContext,
-            UpdateContext,
-            air::{self, AirborneStateCommon},
-            air_dodge::{self, AirDodgeState},
-            ground,
+        animation::AnimKind, state::{
+            CollisionContext, EnterContext, FighterState, FighterStateImpl, InterruptContext, UpdateContext, air::{self, AirborneStateCommon}, air_dodge::AirDodgeState, ground, ground_attack,
         },
-    },
-    input::FighterCommands,
-    math::{int::FGi32, vec::FGVec2},
+    }, input::{DigitalAction, FighterCommands}, math::{int::FGi32, vec::FGVec2},
 };
 #[derive(Debug, Hash, Clone, Copy)]
 pub enum JumpType {
@@ -21,21 +13,30 @@ pub enum JumpType {
     DoubleJump,
 }
 
+#[derive(Debug, Clone, Hash)]
+pub enum JumpStateInitiator {
+    Tap,
+    Button,
+}
+
 #[derive(Debug, Clone, Hash)]
 pub struct JumpState {
-    jump_type: JumpType,
-    airborne_state_common: AirborneStateCommon,
+    pub jump_type: JumpType,
+    pub airborne_state_common: AirborneStateCommon,
+    pub initiator: JumpStateInitiator,
 }
 
 #[derive(Debug, Clone, Hash)]
 pub struct JumpSquatState {
     pub duration_counter: u32,
+    pub initiator: JumpStateInitiator,
 }
 
 impl JumpSquatState {
-    pub fn create() -> Self {
+    pub fn create(initiator: JumpStateInitiator) -> Self {
         Self {
             duration_counter: 0,
+            initiator,
         }
     }
 }
@@ -44,6 +45,9 @@ impl FighterStateImpl for JumpSquatState {
     const NAME: &'static str = "JumpSquat";
 
     fn check_interrupt(&self, state_context: &mut InterruptContext) -> Option<FighterState> {
+        if let Some(state) = ground_attack::check_interrupt(state_context) {
+            return Some(state);
+        }
         // Special handling for wavedash from jump squat
         if state_context.input.has_command(FighterCommands::Shield) {
             // If aiming sideways and in the deadzone, do a perfect wavedash
@@ -68,8 +72,18 @@ 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);
-            let jump_type = if state_context.input.get_last_frame().jump {
+            let tap_jump_held = matches!(self.initiator, JumpStateInitiator::Tap)
+                && state_context.input.get_last_frame().movement.y
+                    > state_context
+                        .game_settings
+                        .input_common
+                        .smash_input_axis_threshold;
+            let jump_type = if tap_jump_held
+                || state_context
+                    .input
+                    .get_last_frame()
+                    .is_held(DigitalAction::Jump)
+            {
                 JumpType::LongJump
             } else {
                 JumpType::ShortHop
@@ -77,6 +91,7 @@ impl FighterStateImpl for JumpSquatState {
             Some(FighterState::Jump(JumpState {
                 jump_type,
                 airborne_state_common: AirborneStateCommon::default(),
+                initiator: self.initiator.clone(),
             }))
         } else {
             None
@@ -97,7 +112,13 @@ impl FighterStateImpl for JumpSquatState {
 
     fn on_enter(&mut self, state_context: &mut EnterContext) {
         state_context.play_animation(AnimKind::JumpSquat, false);
+        state_context.input.enable_hold_all(10);
         state_context.input.clear_command(FighterCommands::Jump);
+        state_context.input.clear_command(FighterCommands::TapJump);
+    }
+
+    fn on_exit(&mut self, state_context: &mut crate::fighter::state::ExitContext) {
+        state_context.input.disable_hold_all();
     }
 
     fn is_visually_grounded<'a>(&'a self) -> bool {
@@ -108,14 +129,7 @@ impl FighterStateImpl for JumpSquatState {
 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) {
-            Some(FighterState::Jump(JumpState {
-                jump_type: JumpType::DoubleJump,
-                airborne_state_common: AirborneStateCommon::default(),
-            }))
-        } else {
-            air_dodge::check_input(state_context)
-        }
+        air::air_interrupts_common(state_context, &self.airborne_state_common)
     }
 
     fn update(&mut self, state_context: &mut UpdateContext) {
@@ -180,6 +194,7 @@ impl FighterStateImpl for JumpState {
         air::collision_interrupt(
             state_context,
             crate::fighter::state::land::LandingType::Normal,
+            true,
         )
     }
 
@@ -199,20 +214,33 @@ impl FighterStateImpl for JumpState {
 }
 
 pub fn check_input(state_context: &InterruptContext) -> Option<FighterState> {
-    state_context
-        .input
-        .has_command(FighterCommands::Jump)
-        .then(|| FighterState::JumpSquat(JumpSquatState::create()))
+    if state_context.input.has_command(FighterCommands::Jump) {
+        Some(FighterState::JumpSquat(JumpSquatState::create(
+            JumpStateInitiator::Button,
+        )))
+    } else if state_context.input.has_command(FighterCommands::TapJump) {
+        Some(FighterState::JumpSquat(JumpSquatState::create(
+            JumpStateInitiator::Tap,
+        )))
+    } else {
+        None
+    }
 }
 
 pub fn check_input_double_jump(state_context: &InterruptContext) -> Option<FighterState> {
-    state_context
-        .input
-        .has_command(FighterCommands::Jump)
-        .then(|| {
-            FighterState::Jump(JumpState {
-                jump_type: JumpType::DoubleJump,
-                airborne_state_common: AirborneStateCommon::default(),
-            })
-        })
+    if state_context.input.has_command(FighterCommands::Jump) {
+        Some(FighterState::Jump(JumpState {
+            jump_type: JumpType::DoubleJump,
+            airborne_state_common: AirborneStateCommon::default(),
+            initiator: JumpStateInitiator::Button,
+        }))
+    } else if state_context.input.has_command(FighterCommands::TapJump) {
+        Some(FighterState::Jump(JumpState {
+            jump_type: JumpType::DoubleJump,
+            airborne_state_common: AirborneStateCommon::default(),
+            initiator: JumpStateInitiator::Tap,
+        }))
+    } else {
+        None
+    }
 }

src/fighter/state/mod.rs

@@ -11,25 +11,35 @@ use crate::fighter::attack::{
     FighterStaleMoveQueue, HitStop,
 };
 use crate::fighter::attributes::FighterAttributes;
-use crate::fighter::baked_animation::BakedFighterAnimations;
+use crate::fighter::baked_animation::{BakedFighterAnimations, FighterBoneMatrices};
 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,
     FighterHitstopShake, FighterHitstopShakeKind, FighterHitstopShakeRole,
+    FighterInvulnerabilityState, FighterPendingRespawn, FighterPresentationSnap,
     FighterPreviousTranslation, FighterSurfaceState, FighterTranslation, FighterVelocity,
 };
-use crate::fighter::surface::EcbLockPolicy;
 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::math::vec3::FGVec3;
+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;
@@ -37,12 +47,11 @@ 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;
-pub mod crouch;
-pub mod platform_pass;
 
 #[derive(Clone, Copy, Debug, Hash, PartialEq, Eq)]
 pub enum SurfacePolicy {
@@ -131,6 +140,8 @@ pub struct InterruptContext<'a> {
     pub surface: &'a FighterSurfaceState,
     pub animation: AnimationStatus,
     pub stage_collision: &'a StageCollision,
+    pub attack_scripts: &'a Assets<FighterAttackScript>,
+    pub attack_script_assets: &'a FighterAttackScriptAssets,
 }
 
 impl InterruptContext<'_> {
@@ -152,6 +163,7 @@ pub struct EnterContext<'a> {
     pub facing_direction: &'a mut FighterFacingDirection,
     pub animation_frame: &'a mut FighterAnimationFrame,
     pub surface: &'a mut FighterSurfaceState,
+    pub vulnerability: &'a mut FighterInvulnerabilityState,
     pub fighter_attributes: &'a FighterAttributes,
     pub attack_script_assets: &'a FighterAttackScriptAssets,
     pub game_settings: &'a GameSettings,
@@ -164,8 +176,10 @@ 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> {
@@ -176,7 +190,11 @@ pub struct UpdateContext<'a> {
     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,
+    /// Root motion in the fighter's gameplay plane: X is world-right and Y is
+    /// world-up. Animation +Z is forward and is mirrored by facing direction.
+    pub animation_root_motion_delta: FGVec2,
     pub animation_frame: u32,
     pub fighter_attributes: &'a FighterAttributes,
     pub attack_scripts: &'a Assets<FighterAttackScript>,
@@ -184,6 +202,13 @@ pub struct UpdateContext<'a> {
     pub facing_direction: &'a FighterFacingDirection,
 }
 
+fn animation_root_motion_to_gameplay(
+    delta: FGVec3,
+    facing_direction: &FighterFacingDirection,
+) -> FGVec2 {
+    FGVec2::new(delta.z * facing_direction.to_sign(), delta.y)
+}
+
 impl UpdateContext<'_> {
     pub fn get_current_animation_frame(&self) -> u32 {
         self.animation_frame
@@ -193,19 +218,25 @@ 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 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,
@@ -213,6 +244,7 @@ impl CollisionContext<'_> {
             self.ecb,
             self.stage_collision,
             &ignored_polys,
+            ignore_soft_platforms,
         )
     }
 }
@@ -232,6 +264,8 @@ fighter_states! {
     Turn => turn::TurnState,
     GroundAttack => ground_attack::GroundAttackState,
     Hitstun => hitstun::HitstunState,
+    Angel => angel::AngelState,
+    AirAttack => air_attack::AirAttackState,
 }
 
 #[derive(QueryData)]
@@ -239,6 +273,7 @@ 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,
@@ -249,7 +284,9 @@ pub struct FighterFrameQuery {
     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,
+    pub bone_matrices: &'static FighterBoneMatrices,
 }
 
 impl<'w, 's> FighterFrameQueryItem<'w, 's> {
@@ -276,6 +313,8 @@ impl<'w, 's> FighterFrameQueryItem<'w, 's> {
         baked_animations: &'a Assets<BakedFighterAnimations>,
         attributes: &'a FighterAttributes,
         stage_collision: &'a StageCollision,
+        attack_scripts: &'a Assets<FighterAttackScript>,
+        attack_script_assets: &'a FighterAttackScriptAssets,
     ) -> InterruptContext<'a> {
         let animation = self.animation_status(animations, baked_animations);
         InterruptContext {
@@ -286,6 +325,8 @@ impl<'w, 's> FighterFrameQueryItem<'w, 's> {
             animation,
             surface: &self.surface,
             stage_collision,
+            attack_script_assets: attack_script_assets,
+            attack_scripts,
         }
     }
 
@@ -304,16 +345,19 @@ impl<'w, 's> FighterFrameQueryItem<'w, 's> {
             facing_direction: &mut self.facing_direction,
             animation_frame: &mut self.animation_frame,
             surface: &mut self.surface,
+            vulnerability: &mut self.vulnerability,
             fighter_attributes: attributes,
             attack_script_assets,
-            game_settings
+            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,
         }
     }
 
@@ -333,7 +377,12 @@ impl<'w, 's> FighterFrameQueryItem<'w, 's> {
             surface: &mut self.surface,
             knockback_velocity: &mut self.knockback_velocity,
             game_settings,
+            animation_root_motion_delta: animation_root_motion_to_gameplay(
+                self.bone_matrices.root_motion_delta(),
+                &self.facing_direction,
+            ),
             animation_frame: self.animation_frame.frame,
+            vulnerability: &mut self.vulnerability,
             fighter_attributes: attributes,
             attack_scripts,
             attack_script_assets,
@@ -349,12 +398,17 @@ impl<'w, 's> FighterFrameQueryItem<'w, 's> {
         CollisionContext {
             translation: &mut self.translation,
             prev_translation: &self.prev_translation,
+            presentation_snap: &mut self.presentation_snap,
+            input: &self.input,
             velocity: &mut self.velocity,
             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
+            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,
         }
     }
 }
@@ -367,9 +421,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(
@@ -418,7 +475,9 @@ fn transition_state(
     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,
+            game_settings
+                .fighter_common
+                .leave_ground_ecb_frame_lock_duration,
         );
     }
     next.on_enter(&mut frame.enter_context(attributes, attack_script_assets, game_settings));
@@ -431,6 +490,7 @@ pub fn state_interrupt_system(
     game_settings: Res<GameSettings>,
     baked_animations: Res<Assets<BakedFighterAnimations>>,
     fighter_manifests: Res<Assets<FighterManifest>>,
+    attack_scripts: Res<Assets<FighterAttackScript>>,
     stage_collision: Res<StageCollision>,
 ) {
     for fighter in &mut query {
@@ -443,15 +503,16 @@ pub fn state_interrupt_system(
             mut pending_hit_reaction,
             mut hitstop,
             mut hitstop_shake,
+            ..
         } = fighter;
         let manifest = fighter_manifests
             .get(&fighter.manifest)
             .expect("Fighter manifest should be valid");
 
         let new_state = if let Some(reaction) = pending_hit_reaction.take() {
-            hitstop.remaining_frames = *reaction.hitstop_frames;
+            hitstop.remaining_frames = *reaction.victim_hitstop_frames;
             let shake_frames = reaction
-                .hitstop_frames
+                .victim_hitstop_frames
                 .calculate_shake_frames(&game_settings);
             hitstop_shake.role = FighterHitstopShakeRole::Receiver;
             hitstop_shake.total_frames = shake_frames;
@@ -470,7 +531,7 @@ pub fn state_interrupt_system(
 
             if let hitstun::HitstopStateKind::Grounded = hitstop_kind {
                 let straight_up_angle = FGi32::lit("90.0");
-                if reaction.hitstop_frames
+                if reaction.victim_hitstop_frames
                     >= HitStop::new(game_settings.fighter_common.tumble_bounce_hitstop_threshold)
                 {
                     hitstop_kind = hitstun::HitstopStateKind::Airborne;
@@ -505,7 +566,9 @@ pub fn state_interrupt_system(
                 animations,
                 &baked_animations,
                 &manifest.attributes,
-                &stage_collision
+                &stage_collision,
+                &attack_scripts,
+                attack_script_assets,
             ))
         };
 
@@ -527,25 +590,93 @@ pub fn state_collision_interrupt_system(
     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, &game_settings));
+
+        if pending_respawn.0 {
+            **pending_respawn = false;
+            let respawn_state = FighterState::Angel(angel::AngelState::new(
+                game_settings
+                    .fighter_common
+                    .angel_platform_invulnerability_duration,
+            ));
+
+            // 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,

src/fighter/state/platform_pass.rs

@@ -46,6 +46,7 @@ impl FighterStateImpl for PlatformPassState {
         air::collision_interrupt(
             state_context,
             crate::fighter::state::land::LandingType::Normal,
+            true,
         )
     }
     

src/fighter/state/run.rs

@@ -48,7 +48,6 @@ impl FighterStateImpl for RunState {
         ground::apply_grounded_motion(
             state_context.velocity,
             state_context.translation,
-            state_context.prev_translation,
         );
     }
 

src/fighter/state/walk.rs

@@ -3,7 +3,7 @@ use super::{
     ground, wait,
 };
 use crate::fighter::animation::AnimKind;
-use crate::fighter::state::FighterState;
+use crate::fighter::state::{self, FighterState};
 
 #[derive(Debug, Clone, Hash)]
 pub struct WalkState;
@@ -14,7 +14,7 @@ impl FighterStateImpl for WalkState {
         if let Some(state) = ground::grounded_movement_common_interrupts(state_context) {
             return Some(state);
         }
-        wait::check_input(state_context).or_else(|| dash::check_input(state_context))
+        wait::check_input(state_context).or_else(|| dash::check_input(state_context)).or_else(|| state::ground_attack::check_interrupt(state_context))
     }
 
     fn on_enter(&mut self, state_context: &mut EnterContext) {
@@ -40,7 +40,6 @@ impl FighterStateImpl for WalkState {
         ground::apply_grounded_motion(
             state_context.velocity,
             state_context.translation,
-            state_context.prev_translation,
         );
     }
 

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,82 @@ pub struct FighterAnimations {
     /// The single animation source for gameplay and the visual skeleton.
     pub baked: Handle<BakedFighterAnimations>,
 }
+
+#[derive(Clone, Copy, Default, PartialEq)]
+pub enum LastKnownInvulnerabilityState {
+    #[default]
+    Vulnerable,
+    Intangible,
+    Invulnerable,
+}
+
+impl From<&FighterInvulnerabilityState> for LastKnownInvulnerabilityState {
+    fn from(value: &FighterInvulnerabilityState) -> Self {
+        match value {
+            FighterInvulnerabilityState::Vulnerable => Self::Vulnerable,
+            FighterInvulnerabilityState::Invulnerable { .. } => Self::Invulnerable,
+            FighterInvulnerabilityState::Intangible { .. } => Self::Intangible,
+        }
+    }
+}
+
+#[derive(Component, Clone, Default)]
+pub struct FighterInvulnerabilityVisualState {
+    pub last_known_state: LastKnownInvulnerabilityState,
+    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 {
+        let curr_state = invuln_state.into();
+        let last_known_state = invuln_state_visual.last_known_state;
+        if curr_state != last_known_state {
+            invuln_state_visual.last_known_state = curr_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 {
+            LastKnownInvulnerabilityState::Vulnerable => bevy::color::palettes::css::WHITE.into(),
+            LastKnownInvulnerabilityState::Invulnerable => {
+                game_settings.fighter_common.intangible_color
+            }
+            LastKnownInvulnerabilityState::Intangible => {
+                game_settings.fighter_common.intangible_color
+            }
+        };
+
+        let intensity = match invuln_state_visual.last_known_state {
+            LastKnownInvulnerabilityState::Vulnerable => 0.0,
+            LastKnownInvulnerabilityState::Invulnerable | LastKnownInvulnerabilityState::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

@@ -10,6 +10,9 @@ use crate::{math::int::FGi32, menus::style::FGUiStyle};
 pub struct FighterSettingsCommon {
     pub walk_speed_ease: FGi32,
 
+    /// Horizontal position nudge applied to each overlapping grounded fighter.
+    pub grounded_push_nudge: FGi32,
+
     /// Maximum allowed horizontal velocity
     pub ground_max_horizontal_velocity: FGi32,
 
@@ -42,6 +45,20 @@ pub struct FighterSettingsCommon {
     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,
+
+    pub angel_platform_invulnerability_duration: u32,
+
+    /// When hit while the receiver is in the air, use this angle
+    pub sakurai_angle_aerial_angle: FGi32,
+    /// When hit while the receiver is in the ground and at low knockback, use this angle
+    pub sakurai_angle_low_knockback_angle: FGi32,
+    /// When hit while the receiver is in the ground and at high knockback, use this angle
+    pub sakurai_angle_high_knockback_angle: FGi32,
+    /// past this threshold, the knockback is considered high, so it will use [sakurai_angle_high_knockback_angle]
+    pub sakurai_angle_knockback_threshold: FGi32,
 }
 #[derive(Reflect, Serialize, Deserialize, Clone)]
 #[reflect(opaque)]

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 shield: bool,
-    pub attack: bool,
+    pub bindings: DigitalActionBindings,
+}
+
+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/bridge.rs

@@ -7,7 +7,8 @@ use bevy::input::gamepad::{
 };
 use bevy::prelude::*;
 
-use super::poll::{GcAdapterSnapshot, GcPortState};
+use super::GcPorts;
+use super::poll::GcAdapterSnapshot;
 
 /// GameCube adapters report 4 ports.
 pub const GC_PORT_COUNT: usize = 4;
@@ -23,15 +24,6 @@ const GC_ADAPTER_PID: u16 = 0x0337;
 #[derive(Component, Debug, Clone, Copy)]
 pub struct GcPort(pub u8);
 
-/// Tracks which entity (if any) represents each of the 4 adapter ports,
-/// and the last snapshot seen, so both systems below can diff instead of
-/// re-deriving state every frame.
-#[derive(Resource, Default)]
-pub struct GcPorts {
-    pub entities: [Option<Entity>; GC_PORT_COUNT],
-    last: [GcPortState; GC_PORT_COUNT],
-}
-
 fn passthrough_gamepad_settings() -> GamepadSettings {
     let mut settings = GamepadSettings::default();
     for axis in GamepadAxis::all() {

src/input/gamecube/mod.rs

@@ -1,10 +1,23 @@
+#[cfg(all(feature = "gamecube-adapter", not(target_os = "windows")))]
 pub mod bridge;
+#[cfg(all(feature = "gamecube-adapter", not(target_os = "windows")))]
 pub mod poll;
 
-pub use bridge::{GC_PORT_COUNT, GcPort, GcPorts};
+#[cfg(all(feature = "gamecube-adapter", not(target_os = "windows")))]
+pub use bridge::{GC_PORT_COUNT, GcPort};
+#[cfg(all(feature = "gamecube-adapter", not(target_os = "windows")))]
 pub use poll::{GcAdapterSnapshot, GcPortState};
 
+#[derive(Resource, Default)]
+pub struct GcPorts {
+    pub entities: [Option<Entity>; 4],
+    #[cfg(all(feature = "gamecube-adapter", not(target_os = "windows")))]
+    pub(super) last: [poll::GcPortState; 4],
+}
+
+#[cfg(all(feature = "gamecube-adapter", not(target_os = "windows")))]
 use bevy::input::InputSystems;
+#[cfg(all(feature = "gamecube-adapter", not(target_os = "windows")))]
 use bevy::input::gamepad::{gamepad_connection_system, gamepad_event_processing_system};
 use bevy::prelude::*;
 
@@ -15,21 +28,24 @@ impl Plugin for GamecubeAdapterPlugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<GcPorts>();
 
-        let Ok(snapshot) = poll::spawn_poll_thread() else {
-            // No adapter connected; leave GcPorts empty and skip wiring the
-            // polling systems.
-            return;
-        };
+        #[cfg(all(feature = "gamecube-adapter", not(target_os = "windows")))]
+        {
+            let Ok(snapshot) = poll::spawn_poll_thread() else {
+                // No adapter connected; leave GcPorts empty and skip wiring the
+                // polling systems.
+                return;
+            };
 
-        app.insert_resource(snapshot).add_systems(
-            PreUpdate,
-            (
-                bridge::gc_connection_system.before(gamepad_connection_system),
-                bridge::gc_event_system
-                    .after(gamepad_connection_system)
-                    .before(gamepad_event_processing_system),
-            )
-                .in_set(InputSystems),
-        );
+            app.insert_resource(snapshot).add_systems(
+                PreUpdate,
+                (
+                    bridge::gc_connection_system.before(gamepad_connection_system),
+                    bridge::gc_event_system
+                        .after(gamepad_connection_system)
+                        .before(gamepad_event_processing_system),
+                )
+                    .in_set(InputSystems),
+            );
+        }
     }
 }

src/input/gamepad.rs

@@ -9,15 +9,19 @@ use crate::math::vec::FGVec2;
 pub fn sample_gamepad(pad: &Gamepad, input_map: &BaseInputMap) -> FighterInputFrame {
     let mut input_frame = FighterInputFrame::default();
     let mut movement = Vec2::ZERO;
+    let mut directional_attack = Vec2::ZERO;
 
     for gamepad_element in &input_map.gamepad {
         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::Shield => input_frame.shield |= pressed,
-                    InputMapAction::Attack => input_frame.attack |= pressed,
+                    InputMapAction::Jump | InputMapAction::Shield | InputMapAction::Attack => {}
                     // 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.
@@ -31,12 +35,24 @@ pub fn sample_gamepad(pad: &Gamepad, input_map: &BaseInputMap) -> FighterInputFr
                             movement.y += sign as f32
                         }
                     }
+                    InputMapAction::AttackXDir(sign) => {
+                        if pressed {
+                            directional_attack.x += sign as f32;
+                        }
+                    }
+                    InputMapAction::AttackYDir(sign) => {
+                        if pressed {
+                            directional_attack.y += sign as f32;
+                        }
+                    }
                 }
             }
             // gamepad does not have a separate axis for left and right, so sign here should be 1
             GamepadBinding::Axis(axis, sign) => {
                 let value = pad.get(*axis).unwrap_or(0.0) * (*sign as f32);
                 match gamepad_element.action {
+                    InputMapAction::AttackXDir(_) => directional_attack.x += value,
+                    InputMapAction::AttackYDir(_) => directional_attack.y += value,
                     InputMapAction::MovementXDir(_) => movement.x += value,
                     InputMapAction::MovementYDir(_) => movement.y += value,
                     _ => {}
@@ -46,6 +62,10 @@ pub fn sample_gamepad(pad: &Gamepad, input_map: &BaseInputMap) -> FighterInputFr
     }
 
     input_frame.movement = FGVec2::new(FGi32::from_num(movement.x), FGi32::from_num(movement.y));
+    input_frame.directional_attack = FGVec2::new(
+        FGi32::from_num(directional_attack.x),
+        FGi32::from_num(directional_attack.y),
+    );
 
     input_frame
 }

src/input/keyboard.rs

@@ -30,9 +30,21 @@ 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::Shield => input_frame.shield = action_strength != FGi32::ZERO,
-            InputMapAction::Attack => input_frame.attack = action_strength != FGi32::ZERO,
+            InputMapAction::Jump | InputMapAction::Shield | InputMapAction::Attack => {
+                if let Some(action) = keyboard_elment.action.digital_action() {
+                    input_frame.bindings.set(
+                        action,
+                        keyboard_elment.binding_slot,
+                        action_strength != FGi32::ZERO,
+                    );
+                }
+            }
+            InputMapAction::AttackXDir(sign) => {
+                input_frame.directional_attack.x += (sign) * action_strength;
+            }
+            InputMapAction::AttackYDir(sign) => {
+                input_frame.directional_attack.y += (sign) * action_strength;
+            }
         }
     }
 

src/input/map.rs

@@ -12,6 +12,8 @@ pub enum InputActionState {
 
 #[derive(Debug)]
 pub enum InputMapAction {
+    AttackXDir(i32),
+    AttackYDir(i32),
     MovementXDir(i32),
     MovementYDir(i32),
     Jump,
@@ -19,6 +21,18 @@ 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,
+            Self::AttackYDir(_) | Self::AttackXDir(_) => None,
+        }
+    }
+}
+
 #[derive(Debug)]
 pub enum MenuInputMapAction {
     MovementXDir(i32),
@@ -32,6 +46,7 @@ pub enum MenuInputMapAction {
 pub struct KeyboardInputMapElement {
     pub key: KeyCode,
     pub action: InputMapAction,
+    pub binding_slot: u8,
 }
 
 #[derive(Debug)]
@@ -44,6 +59,7 @@ pub enum GamepadBinding {
 pub struct GamepadInputMapElement {
     pub binding: GamepadBinding,
     pub action: InputMapAction,
+    pub binding_slot: u8,
 }
 
 #[derive(Debug)]

src/input/mod.rs

@@ -14,8 +14,8 @@ pub mod gamepad;
 pub mod keyboard;
 pub mod map;
 
-pub use buffer::{FighterCommands, FighterInput};
-pub use frame::FighterInputFrame;
+pub use buffer::{FighterCommands, FighterInput, FlickDirection};
+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,50 @@ 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,
-                },
-                // shield/airdodge -- both shoulder buttons, Melee-style
-                GamepadInputMapElement {
-                    binding: GamepadBinding::Button(GamepadButton::LeftTrigger),
-                    action: InputMapAction::Shield,
+                    binding_slot: 0,
                 },
                 GamepadInputMapElement {
-                    binding: GamepadBinding::Button(GamepadButton::RightTrigger),
+                    binding: GamepadBinding::Button(GamepadButton::West),
+                    action: InputMapAction::Jump,
+                    binding_slot: 1,
+                },
+                GamepadInputMapElement {
+                    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,
+                },
+                //C-stick
+                GamepadInputMapElement {
+                    binding: GamepadBinding::Axis(GamepadAxis::RightStickX, 1),
+                    action: InputMapAction::AttackXDir(1),
+                    binding_slot: 0,
+                },
+                GamepadInputMapElement {
+                    binding: GamepadBinding::Axis(GamepadAxis::RightStickY, 1),
+                    action: InputMapAction::AttackYDir(1),
+                    binding_slot: 0,
                 },
             ],
         })
@@ -237,6 +275,13 @@ fn preprocess_input_frame(frame: &mut FighterInputFrame, game_settings: &GameSet
     if frame.movement.y.abs() < game_settings.input_common.stick_deadzone {
         frame.movement.y = FGi32::ZERO;
     }
+
+    if frame.directional_attack.x.abs() < game_settings.input_common.stick_deadzone {
+        frame.directional_attack.x = FGi32::ZERO;
+    }
+    if frame.directional_attack.y.abs() < game_settings.input_common.stick_deadzone {
+        frame.directional_attack.y = FGi32::ZERO;
+    }
 }
 
 fn read_local_inputs(
@@ -245,20 +290,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
-            .0
-            .iter()
-            .find(|(player_handle, _)| player_handle == handle);
+        let assigned = assignments.get_for_handle(*handle);
         let gamepad = match assigned {
-            Some((_, LocalInputSource::Gamepad(entity))) => gamepads.get(*entity).ok(),
-            Some((_, LocalInputSource::Keyboard)) => None,
+            Some(LocalInputSource::Gamepad(entity)) => gamepads.get(entity).ok(),
+            Some(LocalInputSource::Keyboard) => None,
             None => gc_ports
                 .entities
                 .get(*handle)
@@ -268,8 +310,8 @@ fn read_local_inputs(
         };
 
         let mut input_frame = match assigned {
-            Some((_, LocalInputSource::Keyboard)) => keyboard::sample_keyboard(&key, &input_map),
-            Some((_, LocalInputSource::Gamepad(_))) => gamepad
+            Some(LocalInputSource::Keyboard) => keyboard::sample_keyboard(&key, &input_map),
+            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::*,
@@ -33,8 +35,9 @@ use ron_asset_manager::RonAssetPlugin;
 
 use crate::{
     camera::MatchCameraPlugin, fighter::manifest::FighterManifest, game_settings::GameSettings,
-    match_runtime::MatchRuntimePlugin, menus::style::FGUiStyle, schedule::GameplaySchedulePlugin,
-    stage::manifest::StageManifest, ui::InGameUIPlugin,
+    match_runtime::MatchRuntimePlugin, materials::ShinesparkMaterialPlugin,
+    menus::style::FGUiStyle, schedule::GameplaySchedulePlugin, stage::manifest::StageManifest,
+    ui::InGameUIPlugin,
 };
 
 mod args;
@@ -42,10 +45,14 @@ 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;
+#[cfg(feature = "hitbox-viewer")]
+pub mod hitbox_viewer;
 pub mod match_loading;
 pub mod match_runtime;
+pub mod materials;
 mod math;
 pub mod menus;
 pub mod netcode;
@@ -56,6 +63,7 @@ pub mod scripting;
 pub mod stage;
 pub mod texture_reference;
 pub mod ui;
+pub mod egui_color_convert;
 
 #[derive(States, Debug, Clone, Copy, Eq, PartialEq, Hash, Default)]
 pub enum AppState {
@@ -74,6 +82,7 @@ pub enum AppState {
     LoadingMatch,
     PreparingMatch,
     InMatch,
+    MatchResults,
     MatchDisconnected,
     MatchLoadFailed,
 }
@@ -106,21 +115,25 @@ impl Plugin for GamePlugin {
         // game-level content and configuration.
         app.init_state::<AppState>()
             .add_plugins((
-                SettingsPlugin::new("moe.eirteam.shinespark.debug_settings"),
-                // Brings up GGRS (and with it `GgrsSchedule`), so it goes first.
-                netcode::FighterNetcodePlugin::default(),
-                GameplaySchedulePlugin,
-                MatchRuntimePlugin,
-                input::FighterInputPlugin,
-                replay::ReplayPlugin,
-                debug_tools::DebugToolsPlugin,
-                fighter::FighterPlugin,
-                fighter::baked_animation::BakedAnimationPlugin,
-                scripting::importer::FighterScriptImportPlugin,
-                stage::StagePlugin,
-                MatchCameraPlugin,
-                GameAssetPlugin,
-                InGameUIPlugin,
+                (
+                    SettingsPlugin::new("moe.eirteam.shinespark.debug_settings"),
+                    // 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,
+                    GameAssetPlugin,
+                    InGameUIPlugin,
+                ),
+                ShinesparkMaterialPlugin,
             ))
             .add_plugins(menus::MenuPlugin)
             .add_loading_state(

src/match_loading.rs

@@ -8,9 +8,7 @@ use bevy_ggrs::prelude::Session;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    AppState,
-    args::Args,
-    fighter::{
+    AppState, args::Args, fighter::{
         FighterId, FighterRoster,
         animation::AnimKind,
         attack::{AttackKind, FighterAttackScriptAssets},
@@ -18,16 +16,10 @@ use crate::{
         manifest::{FighterManifest, FighterManifestRegistry},
         spawn_fighter,
         visual::FighterAnimations,
-    },
-    input::{LocalInputAssignments, LocalInputSource},
-    match_runtime::MatchState,
-    math::{int::FGi32, vec::FGVec2},
-    netcode::{
+    }, input::{LocalInputAssignments, LocalInputSource, MatchInputAssignments}, match_runtime::MatchState, netcode::{
         GGRSCfg,
         session::{ConnectionStatus, SessionConfig, create_session},
-    },
-    scripting::FighterAttackScript,
-    stage::{
+    }, scripting::FighterAttackScript, stage::{
         self,
         manifest::{StageId, StageManifest, StageManifestRegistry},
     },
@@ -35,7 +27,10 @@ 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,
 }
 
@@ -46,6 +41,22 @@ pub struct MatchConfig {
     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 {
@@ -228,6 +239,7 @@ pub fn initiate_default_match(
     let players = (0..args.players)
         .map(|handle| MatchPlayer {
             handle,
+            controller_port: handle,
             fighter: FighterId::TestFighter,
         })
         .collect();
@@ -263,6 +275,7 @@ pub fn initiate_default_match(
 pub fn prepare_match(
     mut commands: Commands,
     config: Res<MatchConfig>,
+    input_assignments: Res<LocalInputAssignments>,
     assets: Res<MatchAssets>,
     gltfs: Res<Assets<Gltf>>,
     baked_animations: Res<Assets<BakedFighterAnimations>>,
@@ -277,7 +290,7 @@ pub fn prepare_match(
     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;
     }
@@ -287,6 +300,20 @@ pub fn prepare_match(
         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,
@@ -336,6 +363,16 @@ pub fn prepare_match(
             );
             return;
         }
+        if !baked.contains_bone(&manifest.root_motion_bone) {
+            fail_match(
+                &mut next_state,
+                &format!(
+                    "{:?} references missing root motion bone {:?}",
+                    character.fighter, manifest.root_motion_bone
+                ),
+            );
+            return;
+        }
 
         let ecb_bone_indices = baked.bone_names.iter().enumerate().filter_map(|(idx, name)| {
             if manifest.ecb_bones.contains(name) {
@@ -449,7 +486,8 @@ pub fn prepare_match(
         ));
     }
 
-    let session_config = match SessionConfig::from_args(&args, config.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(
@@ -459,7 +497,7 @@ pub fn prepare_match(
             return;
         }
     };
-    let session = match create_session(&args, config.players.len()) {
+    let session = match create_session(&args, session_player_count) {
         Ok(session) => session,
         Err(error) => {
             fail_match(
@@ -470,14 +508,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(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");
     stage::spawn_stage(
         &mut commands,
         root,
@@ -487,14 +524,18 @@ pub fn prepare_match(
     );
 
     let mut fighter_roster = Vec::with_capacity(config.players.len());
-    for (index, (player, (scene, animations, attack_scripts, manifest_handle, model_scale, ecb_bone_indices))) in
+
+    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 - config.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,
@@ -518,12 +559,30 @@ fn fail_match(next_state: &mut NextState<AppState>, message: &str) {
 }
 
 fn valid_player_handles(players: &[MatchPlayer]) -> bool {
-    let mut handles = players
-        .iter()
-        .map(|player| player.handle)
-        .collect::<Vec<_>>();
+    if players.is_empty() {
+        return false;
+    }
+
+    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(
@@ -544,6 +603,7 @@ pub fn cleanup_match(
     commands.remove_resource::<MatchAssets>();
     commands.remove_resource::<MatchConfig>();
     commands.remove_resource::<MatchState>();
+    commands.remove_resource::<MatchInputAssignments>();
     commands.remove_resource::<FighterRoster>();
 }
 
@@ -558,10 +618,12 @@ mod tests {
             players: vec![
                 MatchPlayer {
                     handle: 0,
+                    controller_port: 0,
                     fighter: FighterId::TestFighter,
                 },
                 MatchPlayer {
                     handle: 1,
+                    controller_port: 1,
                     fighter: FighterId::TestFighter,
                 },
             ],
@@ -579,10 +641,12 @@ mod tests {
         let players = [
             MatchPlayer {
                 handle: 0,
+                controller_port: 0,
                 fighter: FighterId::TestFighter,
             },
             MatchPlayer {
                 handle: 0,
+                controller_port: 1,
                 fighter: FighterId::TestFighter,
             },
         ];
@@ -590,6 +654,88 @@ 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!(

src/match_runtime.rs

@@ -1,15 +1,22 @@
 //! Rollback-simulated state for an active match.
 
+use bevy::input::InputSystems;
 use bevy::prelude::*;
-use bevy_ggrs::prelude::*;
+use bevy_ggrs::{ConfirmedFrameCount, RollbackFrameCount, RunGgrsSystems, prelude::*};
 
-use crate::match_loading::{MatchConfig, MatchRules};
+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)]
@@ -19,6 +26,11 @@ pub struct PlayerMatchState {
     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 {
@@ -37,8 +49,66 @@ impl MatchState {
                     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;
@@ -46,7 +116,80 @@ pub struct MatchRuntimePlugin;
 impl Plugin for MatchRuntimePlugin {
     fn build(&self, app: &mut App) {
         app.rollback_resource_with_clone::<MatchState>()
-            .checksum_resource_with_hash::<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);
     }
 }
 
@@ -61,10 +204,12 @@ mod tests {
             players: vec![
                 MatchPlayer {
                     handle: 1,
+                    controller_port: 3,
                     fighter: FighterId::TestFighter,
                 },
                 MatchPlayer {
                     handle: 0,
+                    controller_port: 0,
                     fighter: FighterId::TestFighter,
                 },
             ],
@@ -80,6 +225,7 @@ mod tests {
         }));
 
         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
@@ -99,4 +245,74 @@ mod tests {
                 .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,75 @@
+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;
+        };
+
+        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,20 @@
+use bevy::{
+    asset::embedded_asset, prelude::*,
+};
+
+
+
+pub mod fighter_material;
+
+pub struct ShinesparkMaterialPlugin;
+
+
+impl Plugin for ShinesparkMaterialPlugin {
+    fn build(&self, app: &mut App) {
+        let omit_prefix = "";
+        embedded_asset!(app, omit_prefix, "shaders/fighter.wgsl");
+        app
+            .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/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

@@ -65,7 +65,10 @@ impl MenuMatchConfig {
 
         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,7 +77,8 @@ impl MenuMatchConfig {
                     ))?;
             match_players.push(MatchPlayer {
                 fighter: fighter_id,
-                handle: player.slot,
+                handle,
+                controller_port: player.slot,
             });
         }
 
@@ -102,4 +106,27 @@ mod tests {
 
         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

@@ -18,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;
@@ -77,11 +78,8 @@ pub fn despawn_menu(
     mut commands: Commands,
 ) {
     if let Some(entity) = existing_menu {
-        commands
-            .entity(entity.into_inner())
-            .despawn();
+        commands.entity(entity.into_inner()).despawn();
     }
-
 }
 
 pub fn spawn_menu(
@@ -90,9 +88,7 @@ pub fn spawn_menu(
     menu: impl Scene,
 ) {
     if let Some(entity) = existing_menu {
-        commands
-            .entity(entity.into_inner())
-            .despawn();
+        commands.entity(entity.into_inner()).despawn();
     }
     commands.queue_spawn_scene(wrap_menu(menu));
 }
@@ -117,115 +113,126 @@ where
 
 impl Plugin for MenuPlugin {
     fn build(&self, app: &mut App) {
-        app.add_systems(
-            OnEnter(AppState::MainMenu),
-            build_menu::<MainMenu>,
-        )
-        .add_message::<character_select::PlayerSlotAssigned>()
-        .init_resource::<navigation::UINavigationActionState>()
-        .init_resource::<navigation::UINavigationRepeat>()
-        .init_resource::<input::MenuInputState>()
-        .insert_resource(InputFocusVisible(true))
-        .insert_resource(GlobalUiDebugOptions {
-            enabled: true,
-            ..default()
-        })
-        // Configure auto-navigation behavior
-        .insert_resource(AutoNavigationConfig {
-            // Require at least 10% overlap in perpendicular axis for cardinal directions
-            min_alignment_factor: 0.1,
-            // Don't connect nodes more than 500 pixels apart between their closest edges
-            max_search_distance: Some(500.0),
-            // Prefer nodes that are well-aligned
-            prefer_aligned: true,
-        })
-        .add_plugins(DirectionalNavigationPlugin)
-        .add_systems(
-            PreUpdate,
-            (
-                navigation::give_default_focus,
-                scaling::ui_scaling_system,
-                button::button_setup,
-                button::button_style_system.after(bevy::picking::PickingSystems::Hover),
-                button::button_focus_style_system,
+        app.add_systems(OnEnter(AppState::MainMenu), build_menu::<MainMenu>)
+            .add_message::<character_select::PlayerSlotAssigned>()
+            .init_resource::<navigation::UINavigationActionState>()
+            .init_resource::<navigation::UINavigationRepeat>()
+            .init_resource::<input::MenuInputState>()
+            .insert_resource(InputFocusVisible(true))
+            .insert_resource(GlobalUiDebugOptions { ..default() })
+            // Configure auto-navigation behavior
+            .insert_resource(AutoNavigationConfig {
+                // Require at least 10% overlap in perpendicular axis for cardinal directions
+                min_alignment_factor: 0.1,
+                // Don't connect nodes more than 500 pixels apart between their closest edges
+                max_search_distance: Some(500.0),
+                // Prefer nodes that are well-aligned
+                prefer_aligned: true,
+            })
+            .add_plugins(DirectionalNavigationPlugin)
+            .add_systems(
+                PreUpdate,
+                (
+                    navigation::give_default_focus,
+                    scaling::ui_scaling_system,
+                    button::button_setup,
+                    button::button_style_system.after(bevy::picking::PickingSystems::Hover),
+                    button::button_focus_style_system,
+                )
+                    .run_if(resource_exists::<CommonAssets>),
             )
-                .run_if(resource_exists::<CommonAssets>),
-        )
-        .add_systems(Startup, scaling::ui_update_scale_on_startup)
-        // CURSOR
-        .add_systems(
-            PreUpdate,
-            (cursor::cursor_input).before(bevy::picking::PickingSystems::ProcessInput),
-        )
-        .add_systems(
-            Update,
-            (cursor::copy_mouse_input, cursor::update_cursor_transform),
-        )
-        .add_systems(
-            PreUpdate,
-            input::sample_menu_inputs
-                .before(cursor::cursor_input)
-                .run_if(resource_exists::<crate::input::MenuInputMap>),
-        )
-        //---------
-        // CHARACTER SELECT START
-        //---------
-        .add_systems(
-            OnEnter(AppState::CharacterSelect),
-            character_select::setup_character_select,
-        )
-        .add_systems(
-            PostUpdate,
-            character_select::copy_cursor_transform_to_token
-                .run_if(in_state(AppState::CharacterSelect))
-                .run_if(any_with_component::<CharacterSelectScreen>),
-        )
-        .add_systems(
-            PreUpdate,
-            (
-                character_select::css_auto_assign_slots,
-                character_select::handle_fighter_slot_addition,
+            .add_systems(Startup, scaling::ui_update_scale_on_startup)
+            // CURSOR
+            .add_systems(
+                PreUpdate,
+                (cursor::cursor_input).before(bevy::picking::PickingSystems::ProcessInput),
             )
-                .chain()
-                .run_if(in_state(AppState::CharacterSelect))
-                .run_if(any_with_component::<CharacterSelectScreen>),
-        )
-        .add_systems(
-            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::update_start_banner_visibility
-                .run_if(in_state(AppState::CharacterSelect)),
-        )
-        //---------
-        // CHARACTER SELECT END
-        //---------
-        //---------
-        // STAGE SELECT START
-        //---------
-        .add_systems(
-            OnEnter(AppState::StageSelect),
-            stage_select::setup_stage_select,
-        )
-        .add_observer(stage_select::stage_selected.run_if(in_state(AppState::StageSelect)))
-        .add_systems(
-            OnExit(AppState::StageSelect),
-            (cursor::despawn_cursors, despawn_menu),
-        )
-        //---------
-        // STAGE SELECT END
-        //---------
-        .add_systems(
-            Update,
-            (
-                navigation::process_inputs,
-                navigation::navigate,
-                navigation::interact_with_focused_button,
+            .add_systems(
+                Update,
+                (cursor::copy_mouse_input, cursor::update_cursor_transform),
             )
-                .chain(),
-        )
-        .init_resource::<InputFocus>();
+            .add_systems(
+                PreUpdate,
+                input::sample_menu_inputs
+                    .before(cursor::cursor_input)
+                    .run_if(resource_exists::<crate::input::MenuInputMap>),
+            )
+            //---------
+            // CHARACTER SELECT START
+            //---------
+            .add_systems(
+                OnEnter(AppState::CharacterSelect),
+                character_select::setup_character_select,
+            )
+            .add_systems(
+                PostUpdate,
+                character_select::copy_cursor_transform_to_token
+                    .run_if(in_state(AppState::CharacterSelect))
+                    .run_if(any_with_component::<CharacterSelectScreen>),
+            )
+            .add_systems(
+                PreUpdate,
+                (
+                    character_select::css_auto_assign_slots,
+                    character_select::handle_fighter_slot_addition,
+                )
+                    .chain()
+                    .run_if(in_state(AppState::CharacterSelect))
+                    .run_if(any_with_component::<CharacterSelectScreen>),
+            )
+            .add_systems(
+                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::update_start_banner_visibility
+                    .run_if(in_state(AppState::CharacterSelect)),
+            )
+            //---------
+            // CHARACTER SELECT END
+            //---------
+            //---------
+            // STAGE SELECT START
+            //---------
+            .add_systems(
+                OnEnter(AppState::StageSelect),
+                stage_select::setup_stage_select,
+            )
+            .add_observer(stage_select::stage_selected.run_if(in_state(AppState::StageSelect)))
+            .add_systems(
+                OnExit(AppState::StageSelect),
+                (cursor::despawn_cursors, despawn_menu),
+            )
+            //---------
+            // STAGE SELECT END
+            //---------
+            //---------
+            // 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,
+                (
+                    navigation::process_inputs,
+                    navigation::navigate,
+                    navigation::interact_with_focused_button,
+                )
+                    .chain(),
+            )
+            .init_resource::<InputFocus>();
     }
 }

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);
@@ -153,8 +153,8 @@ pub fn navigate(
             Ok(_entity) => {
                 // Successfully navigated
             }
-            Err(e) => {
-                error!("Navigation error: {}", e)
+            Err(_e) => {
+                //error!("Navigation error: {}", e)
             }
         }
     }

src/netcode/session.rs

@@ -42,6 +42,15 @@ pub enum SessionConfigError {
 }
 
 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);
@@ -196,6 +205,13 @@ mod tests {
             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]
@@ -207,6 +223,7 @@ mod tests {
         .unwrap();
         assert!(matches!(config.players[0], PlayerConnection::Local));
         assert!(matches!(config.players[1], PlayerConnection::Remote(_)));
+        assert!(config.is_multiplayer());
     }
 
     #[test]

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,
 }

src/replay.rs

@@ -17,7 +17,7 @@ use crate::{
 };
 
 const MAGIC: &[u8; 8] = b"SPRPLY01";
-pub const REPLAY_VERSION: u32 = 2;
+pub const REPLAY_VERSION: u32 = 3;
 
 #[derive(Clone, Copy, Debug, Default, Eq, PartialEq, ValueEnum)]
 pub enum ReplayFormat {
@@ -140,7 +140,7 @@ fn validate(replay: &Replay) -> Result<(), String> {
         ));
     }
     if replay.players_are_invalid() {
-        return Err("replay player handles must cover 0..player_count".into());
+        return Err("replay player handles must be unique".into());
     }
     if replay.frames.is_empty() {
         return Err("replay must contain at least one frame".into());
@@ -185,7 +185,7 @@ impl Replay {
             .map(|player| player.handle)
             .collect();
         handles.sort_unstable();
-        handles != (0..handles.len()).collect::<Vec<_>>()
+        handles.is_empty() || !handles.into_iter().eq(0..self.match_config.players.len())
     }
 
     fn frame(&self, frame: i32) -> Option<&ReplayFrame> {
@@ -374,6 +374,7 @@ mod tests {
                 stage: StageId::TestStage,
                 players: vec![MatchPlayer {
                     handle: 0,
+                    controller_port: 0,
                     fighter: FighterId::TestFighter,
                 }],
                 rules: MatchRules::Timed {

src/schedule.rs

@@ -9,22 +9,26 @@
 use bevy::prelude::*;
 use bevy_ggrs::prelude::*;
 
+use crate::match_runtime::match_is_ongoing;
+
 #[derive(SystemSet, Debug, Clone, PartialEq, Eq, Hash)]
 pub enum GameplaySet {
     /// Turn this frame's netcode inputs into per-fighter input state.
     Input,
     /// Decide whether the current fighter state hands off to another one.
     Interrupt,
+    /// Sample the animation pose selected by the interrupt pass.
+    Animation,
     /// Run the fighter state that survived the interrupt pass.
     StateUpdate,
     /// Integrate velocities into positions.
     Physics,
     /// Resolve the integrated positions against the stage.
     Collision,
-    /// Solve collision boxes
-    Animation,
     /// Resolve attacks
     Attacks,
+    /// Advance match rules and detect the end of the match.
+    MatchRules,
 }
 
 /// Declares the order of [`GameplaySet`] inside [`GgrsSchedule`]. Added by
@@ -38,13 +42,15 @@ impl Plugin for GameplaySchedulePlugin {
             (
                 GameplaySet::Input,
                 GameplaySet::Interrupt,
+                GameplaySet::Animation,
                 GameplaySet::StateUpdate,
                 GameplaySet::Physics,
-                GameplaySet::Animation,
                 GameplaySet::Collision,
                 GameplaySet::Attacks,
+                GameplaySet::MatchRules,
             )
-                .chain(),
+                .chain()
+                .run_if(match_is_ongoing),
         );
     }
 }

src/scripting/mod.rs

@@ -1,6 +1,5 @@
 use bevy::prelude::*;
 use serde::{Deserialize, Serialize};
-use std::collections::HashSet;
 
 use crate::{fighter::attack::AttackHitbox, math::int::FGi32};
 
@@ -15,22 +14,38 @@ pub enum MoveAngleKind {
 #[derive(Asset, Reflect, Serialize, Deserialize)]
 pub struct FighterAttackScript {
     pub hitboxes: Vec<AttackHitbox>,
-    pub iasa_frame: u32,
-    pub wont_autocancel_window: (u32, u32),
+    pub iasa_frame: Option<u32>,
+    pub wont_autocancel_window: Option<(u32, u32)>,
+    pub landing_duration: Option<u32>,
+    pub use_root_motion: bool
 }
 
 impl FighterAttackScript {
     pub fn validate(&self) -> Result<(), String> {
-        let mut ids = HashSet::with_capacity(self.hitboxes.len());
         for hitbox in &self.hitboxes {
             hitbox.validate()?;
-            if !ids.insert(hitbox.id) {
-                return Err(format!("duplicate hitbox id {}", hitbox.id));
+        }
+        for (index, left) in self.hitboxes.iter().enumerate() {
+            for right in self.hitboxes.iter().skip(index + 1) {
+                if left.id == right.id
+                    && left.start_frame < right.end_frame
+                    && right.start_frame < left.end_frame
+                {
+                    return Err(format!(
+                        "hitbox id {} has overlapping intervals {}..{} and {}..{}",
+                        left.id, left.start_frame, left.end_frame, right.start_frame,
+                        right.end_frame
+                    ));
+                }
             }
         }
-        if self.wont_autocancel_window.0 > self.wont_autocancel_window.1 {
-            return Err("autocancel window end precedes its start".into());
+        
+        if let Some(wont_autocancel_window) = self.wont_autocancel_window {
+            if wont_autocancel_window.0 > wont_autocancel_window.1 {
+                return Err("autocancel window end precedes its start".into());
+            }
         }
+
         Ok(())
     }
 }

src/scripting/move_compiler.rs

@@ -1,6 +1,7 @@
 use std::{cell::RefCell, collections::HashMap, rc::Rc};
 
 use rhai::EvalAltResult;
+use serde::{Deserialize, Serialize};
 
 use crate::{
     fighter::attack::{self, AttackAngle, FighterDamage, Knockback, KnockbackType},
@@ -10,11 +11,40 @@ use crate::{
 
 #[derive(Debug, Default)]
 struct MoveCompiler {
-    hitboxes: HashMap<u32, attack::AttackHitbox>,
-    active_hitboxes: Vec<u32>,
+    hitboxes: Vec<attack::AttackHitbox>,
+    active_hitboxes: HashMap<u32, usize>,
     wont_autocancel_window: Option<(u32, u32)>,
     iasa_frame: Option<u32>,
+    landing_duration: Option<u32>,
     cursor: u32,
+    use_root_motion: bool,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct SharedHitboxInfo {
+    damage: FighterDamage,
+    angle: AttackAngle,
+    knockback_type: KnockbackType,
+    knockback: Knockback,
+    knockback_growth: FGi32,
+}
+
+impl SharedHitboxInfo {
+    pub fn make(
+        damage: FighterDamage,
+        angle: AttackAngle,
+        knockback_type: KnockbackType,
+        knockback: Knockback,
+        knockback_growth: FGi32,
+    ) -> Self {
+        Self {
+            damage,
+            angle,
+            knockback_type,
+            knockback,
+            knockback_growth,
+        }
+    }
 }
 
 fn rhai_u32(value: i64, parameter: &str) -> Result<u32, Box<EvalAltResult>> {
@@ -43,28 +73,18 @@ impl MoveCompiler {
     }
 
     fn remove_hitbox(&mut self, id: u32) -> Result<(), Box<EvalAltResult>> {
-        let hb = self
-            .hitboxes
-            .get_mut(&id)
+        let hitbox_index = *self
+            .active_hitboxes
+            .get(&id)
             .ok_or(format!("Can't remove hitbox with {id}: Hitbox not found"))?;
-
-        let active_hbox_position =
-            self.active_hitboxes
-                .iter()
-                .position(|i| *i == id)
-                .ok_or(format!(
-                    "Can't remove hitbox with ID {id}: Hitbox was not active"
-                ))?;
-
-        hb.end_frame = self.cursor;
-
-        self.active_hitboxes.remove(active_hbox_position);
+        self.hitboxes[hitbox_index].end_frame = self.cursor;
+        self.active_hitboxes.remove(&id);
 
         Ok(())
     }
     fn remove_all_hitboxes(&mut self) -> Result<(), Box<EvalAltResult>> {
         // We are gonna modify the array, so take a copy...
-        for hitbox_id in self.active_hitboxes.clone() {
+        for hitbox_id in self.active_hitboxes.keys().copied().collect::<Vec<_>>() {
             self.remove_hitbox(hitbox_id)?;
         }
 
@@ -95,16 +115,21 @@ impl MoveCompiler {
         self.iasa_frame = Some(iasa_frame);
     }
 
+    fn enable_root_motion(&mut self) {
+        self.use_root_motion = true;
+    }
+
     fn into_attack_script(mut self) -> Result<FighterAttackScript, String> {
         self.remove_all_hitboxes().map_err(|err| err.to_string())?;
-        let mut hitboxes: Vec<_> = self.hitboxes.into_values().collect();
-        hitboxes.sort_unstable_by_key(|hitbox| hitbox.id);
-        let iasa_frame = self.iasa_frame.unwrap_or(100000);
-        let wont_autocancel_window = self.wont_autocancel_window.unwrap_or((0, 100000));
+        let mut hitboxes = self.hitboxes;
+        hitboxes.sort_unstable_by_key(|hitbox| (hitbox.id, hitbox.start_frame));
+
         Ok(FighterAttackScript {
             hitboxes,
-            iasa_frame,
-            wont_autocancel_window,
+            iasa_frame: self.iasa_frame,
+            wont_autocancel_window: self.wont_autocancel_window,
+            landing_duration: self.landing_duration,
+            use_root_motion: self.use_root_motion,
         })
     }
 }
@@ -117,7 +142,9 @@ pub fn register_common_types(engine: &mut rhai::Engine) {
         .register_fn("knockback_normal", KnockbackType::make_normal)
         .register_fn("knockback_fixed", KnockbackType::make_fixed)
         .register_type_with_name::<AttackAngle>("Angle")
-        .register_fn("angle", AttackAngle::make_normal)
+        .register_fn("angle", |str: &str| {
+            AttackAngle::make_normal(FGi32::lit(str))
+        })
         .register_fn("angle_sakurai", AttackAngle::make_sakurai)
         .register_type_with_name::<Knockback>("Knockback")
         .register_fn("knockback", Knockback::lit)
@@ -128,6 +155,17 @@ pub fn register_common_types(engine: &mut rhai::Engine) {
         .register_type_with_name::<FGVec3>("Vec3")
         .register_fn("vec3", FGVec3::lit)
         .register_type_with_name::<FighterDamage>("FighterDamage")
+        .register_type_with_name::<SharedHitboxInfo>("SharedHitboxInfo")
+        .register_fn(
+            "make_hitbox_info",
+            |damage: FighterDamage,
+             angle: AttackAngle,
+             knockback_type: KnockbackType,
+             knockback: Knockback,
+             knockback_growth: FGi32| {
+                SharedHitboxInfo::make(damage, angle, knockback_type, knockback, knockback_growth)
+            },
+        )
         .register_fn("damage", FighterDamage::lit);
 }
 
@@ -200,6 +238,48 @@ pub fn compile_script(text: &str) -> Result<FighterAttackScript, String> {
             );
         }
 
+        {
+            let mc = mc.clone();
+            engine.register_fn(
+                "enable_root_motion",
+                move || -> Result<(), Box<EvalAltResult>> {
+                    let mut b = mc.borrow_mut();
+                    b.enable_root_motion();
+                    Ok(())
+                },
+            );
+        }
+
+        {
+            let mc = mc.clone();
+            engine.register_fn(
+                "hitbox",
+                move |id: i64,
+                      group: i64,
+                      bone: &str,
+                      offset: FGVec3,
+                      radius: FGi32,
+                      shared: SharedHitboxInfo|
+                      -> Result<(), Box<EvalAltResult>> {
+                    add_hitbox(
+                        &mc,
+                        id,
+                        group,
+                        bone,
+                        shared.damage,
+                        offset,
+                        radius,
+                        shared.angle.clone(),
+                        shared.knockback_type,
+                        shared.knockback,
+                        shared.knockback_growth,
+                    )
+                },
+            );
+        }
+
+        // Keep the original script syntax working. Melee's default collision
+        // group is shared by all hitbox slots in an attack.
         {
             let mc = mc.clone();
             engine.register_fn(
@@ -214,18 +294,11 @@ pub fn compile_script(text: &str) -> Result<FighterAttackScript, String> {
                       knockback: Knockback,
                       knockback_growth: FGi32|
                       -> Result<(), Box<EvalAltResult>> {
-                    let mut b = mc.borrow_mut();
-
-                    // Rhai does not have first class u32 support, so we have to do this.
-                    let id = rhai_u32(id, "hitbox id")?;
-
-                    if b.hitboxes.contains_key(&id) {
-                        return Err(format!("Hitbox with ID {} already existed!", id).into());
-                    }
-
-                    let hitbox = attack::AttackHitbox {
+                    add_hitbox(
+                        &mc,
                         id,
-                        bone: bone.to_owned(),
+                        0,
+                        bone,
                         damage,
                         offset,
                         radius,
@@ -233,46 +306,110 @@ pub fn compile_script(text: &str) -> Result<FighterAttackScript, String> {
                         knockback_type,
                         knockback,
                         knockback_growth,
-                        start_frame: b.cursor,
-                        end_frame: b.cursor,
-                    };
+                    )
+                },
+            );
+        }
 
-                    b.hitboxes.insert(id, hitbox);
-                    b.active_hitboxes.push(id);
-
-                    Ok(())
+        {
+            let mc = mc.clone();
+            engine.register_fn(
+                "hitbox",
+                move |id: i64,
+                      group: i64,
+                      bone: &str,
+                      damage: FighterDamage,
+                      offset: FGVec3,
+                      radius: FGi32,
+                      angle: AttackAngle,
+                      knockback_type: KnockbackType,
+                      knockback: Knockback,
+                      knockback_growth: FGi32|
+                      -> Result<(), Box<EvalAltResult>> {
+                    add_hitbox(
+                        &mc,
+                        id,
+                        group,
+                        bone,
+                        damage,
+                        offset,
+                        radius,
+                        angle,
+                        knockback_type,
+                        knockback,
+                        knockback_growth,
+                    )
                 },
             );
         }
         engine.run(&text)
     };
-
-    result
+    let script = result
         .map(|_| {
             Rc::into_inner(mc)
                 .unwrap()
                 .into_inner()
                 .into_attack_script()
         })
-        .map_err(|err| err.to_string())?
+        .map_err(|err| err.to_string())??;
+    script.validate().map(|()| script)
+}
+
+fn add_hitbox(
+    mc: &Rc<RefCell<MoveCompiler>>,
+    raw_id: i64,
+    raw_group: i64,
+    bone: &str,
+    damage: FighterDamage,
+    offset: FGVec3,
+    radius: FGi32,
+    angle: AttackAngle,
+    knockback_type: KnockbackType,
+    knockback: Knockback,
+    knockback_growth: FGi32,
+) -> Result<(), Box<EvalAltResult>> {
+    let mut b = mc.borrow_mut();
+    let id = rhai_u32(raw_id, "hitbox id")?;
+    let group = rhai_u32(raw_group, "hitbox group")?;
+    if b.active_hitboxes.contains_key(&id) {
+        return Err(format!("Hitbox with ID {} is already active!", id).into());
+    }
+    let hitbox_index = b.hitboxes.len();
+    let frame = b.cursor;
+    b.hitboxes.push(attack::AttackHitbox {
+        id,
+        group,
+        bone: bone.to_owned(),
+        damage,
+        offset,
+        radius,
+        angle,
+        knockback_type,
+        knockback,
+        knockback_growth,
+        start_frame: frame,
+        end_frame: frame,
+    });
+    b.active_hitboxes.insert(id, hitbox_index);
+    Ok(())
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
 
-    const HITBOX: &str = "hitbox(0, \"hand_l\", damage(\"1\"), vec3(\"0\", \"0\", \"0\"), fg32(\"1\"), angle(fg32(\"0\")), knockback_normal(), knockback(\"1\"), fg32(\"1\"));";
+    const HITBOX: &str = "hitbox(0, \"hand_l\", damage(\"1\"), vec3(\"0\", \"0\", \"0\"), fg32(\"1\"), angle(\"0\"), knockback_normal(), knockback(\"1\"), fg32(\"1\"));";
 
     #[test]
     fn compiled_hitboxes_are_sorted_by_authored_id() {
         let script = compile_script(
             r#"
                 frame(1);
-                hitbox(20, "hand_l", damage("1"), vec3("0", "0", "0"), fg32("1"), angle(fg32("0")), knockback_normal(), knockback("1"), fg32("1"));
+                hitbox(20, "hand_l", damage("1"), vec3("0", "0", "0"), fg32("1"), angle("0"), knockback_normal(), knockback("1"), fg32("1"));
                 frame(2);
-                hitbox(3, "hand_l", damage("2"), vec3("0", "0", "0"), fg32("1"), angle(fg32("0")), knockback_normal(), knockback("1"), fg32("1"));
+                hitbox(3, "hand_l", damage("2"), vec3("0", "0", "0"), fg32("1"), angle("0"), knockback_normal(), knockback("1"), fg32("1"));
                 frame(3);
-                hitbox(10, "hand_l", damage("3"), vec3("0", "0", "0"), fg32("1"), angle(fg32("0")), knockback_normal(), knockback("1"), fg32("1"));
+                hitbox(10, "hand_l", damage("3"), vec3("0", "0", "0"), fg32("1"), angle("0"), knockback_normal(), knockback("1"), fg32("1"));
                 frame(4);
             "#,
         )
@@ -316,4 +453,44 @@ mod tests {
         assert_eq!(script.hitboxes[0].start_frame, 1);
         assert_eq!(script.hitboxes[0].end_frame, 2);
     }
+
+    #[test]
+    fn hitbox_ids_can_be_reused_after_removal() {
+        let script = compile_script(&format!(
+            "frame(1); {HITBOX} frame(2); remove_hitbox(0); frame(4); {HITBOX} frame(5);"
+        ))
+        .unwrap();
+
+        assert_eq!(script.hitboxes.len(), 2);
+        assert_eq!(script.hitboxes[0].start_frame, 1);
+        assert_eq!(script.hitboxes[0].end_frame, 2);
+        assert_eq!(script.hitboxes[1].start_frame, 4);
+        assert_eq!(script.hitboxes[1].end_frame, 5);
+    }
+
+    #[test]
+    fn explicit_hitbox_group_is_compiled() {
+        let script = compile_script(
+            r#"frame(1); hitbox(7, 3, "hand_l", damage("1"), vec3("0", "0", "0"), fg32("1"), angle("0"), knockback_normal(), knockback("1"), fg32("1")); frame(2);"#,
+        )
+        .unwrap();
+
+        assert_eq!(script.hitboxes[0].id, 7);
+        assert_eq!(script.hitboxes[0].group, 3);
+    }
+
+    #[test]
+    fn legacy_hitboxes_share_the_default_collision_group() {
+        let script = compile_script(
+            r#"
+                frame(1);
+                hitbox(0, "hand_l", damage("1"), vec3("0", "0", "0"), fg32("1"), angle("0"), knockback_normal(), knockback("1"), fg32("1"));
+                hitbox(1, "hand_l", damage("1"), vec3("0", "0", "0"), fg32("1"), angle("0"), knockback_normal(), knockback("1"), fg32("1"));
+                frame(2);
+            "#,
+        )
+        .unwrap();
+
+        assert_eq!(script.hitboxes.iter().map(|hitbox| hitbox.group).collect::<Vec<_>>(), vec![0, 0]);
+    }
 }

src/stage/debug.rs

@@ -1,6 +1,11 @@
 use bevy::{color::palettes::css::RED, prelude::*};
 
-use crate::stage::line::StageCollision;
+use crate::{
+    match_loading::MatchConfig, math::{int::FGi32, vec3::FGVec3}, stage::{
+        line::StageCollision,
+        manifest::{StageManifest, StageManifestRegistry},
+    },
+};
 
 pub fn debug_draw_scene(mut gizmos: Gizmos, stage_collision: Res<StageCollision>) {
     for poly in stage_collision.stage_polys.iter() {
@@ -16,3 +21,52 @@ pub fn debug_draw_scene(mut gizmos: Gizmos, stage_collision: Res<StageCollision>
         }
     }
 }
+
+pub fn debug_draw_blast_zones(
+    mut gizmos: Gizmos,
+    stage_registry: Res<StageManifestRegistry>,
+    stage_manifests: Res<Assets<StageManifest>>,
+    match_config: Res<MatchConfig>,
+) {
+    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;
+    };
+
+    let top_left = stage_manifest.blast_zone_top_left.to_vec2();
+    let bottom_right = stage_manifest.blast_zone_bottom_right.to_vec2();
+    let center = (top_left + bottom_right) / 2.0;
+    let size = (bottom_right - top_left).abs();
+
+    gizmos.rect(
+        Vec3::new(center.x, center.y, 0.0),
+        size,
+        bevy::color::palettes::css::BLUE,
+    );
+}
+
+pub fn debug_draw_spawn_positions(
+    mut gizmos: Gizmos,
+    stage_registry: Res<StageManifestRegistry>,
+    stage_manifests: Res<Assets<StageManifest>>,
+    match_config: Res<MatchConfig>,
+) {
+    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 spawn_point in stage_manifest.spawn_points.iter() {
+        gizmos.cross(FGVec3::new(spawn_point.x, spawn_point.y, FGi32::ZERO).to_vec3(), 2.0, bevy::color::palettes::css::BLUE);
+    }
+
+    for respawn_point in stage_manifest.respawn_points.iter() {
+        gizmos.cross(FGVec3::new(respawn_point.x, respawn_point.y, FGi32::ZERO).to_vec3(), 2.0, bevy::color::palettes::css::HOT_PINK);
+    }
+}

src/stage/manifest.rs

@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
 
 use bevy_asset_loader::asset_collection::AssetCollection;
 use ron_asset_manager::prelude::RonAsset;
@@ -7,14 +7,10 @@ use strum::IntoEnumIterator;
 use strum_macros::EnumIter;
 
 use crate::{
-    AppState,
-    game_settings::GameSettings,
-    math::vec::FGVec2,
-    stage::{
+    AppState, game_settings::GameSettings, math::{vec::FGVec2}, stage::{
         StagePoly,
         line::{StageCollision, StagePolyLineSegmentType, StagePolyType},
-    },
-    texture_reference::TextureReference,
+    }, texture_reference::TextureReference,
 };
 use bevy::prelude::*;
 
@@ -87,6 +83,17 @@ pub struct StageManifest {
     pub icon: TextureReference,
     pub camera: StageCameraProfile,
     pub polygons: Vec<StagePolyDefinition>,
+
+    #[reflect(ignore)]
+    pub blast_zone_top_left: FGVec2,
+    #[reflect(ignore)]
+    pub blast_zone_bottom_right: FGVec2,
+
+    #[reflect(ignore)]
+    pub spawn_points: Vec<FGVec2>,
+    pub neutral_spawn_point_sets: Vec<Vec<usize>>,
+    #[reflect(ignore)]
+    pub respawn_points: Vec<FGVec2>,
 }
 
 #[derive(Resource)]
@@ -162,6 +169,13 @@ pub fn prepare_stage_manifests(
             );
             return;
         }
+        if let Err(error) = manifest.validate_spawn_points() {
+            fail(
+                &mut next_state,
+                &format!("{:?} has invalid spawn points: {error}", manifest.id),
+            );
+            return;
+        }
         if registry.insert(manifest.id, handle.clone()).is_some() {
             fail(
                 &mut next_state,
@@ -186,6 +200,73 @@ pub fn prepare_stage_manifests(
 }
 
 impl StageManifest {
+    pub fn neutral_spawn_positions(&self, player_count: usize) -> Result<Vec<FGVec2>, String> {
+        if player_count == 0 {
+            return Err("a match must contain at least one player".to_owned());
+        }
+
+        let layout = self
+            .neutral_spawn_point_sets
+            .get(player_count - 1)
+            .ok_or_else(|| format!("no spawn layout for {player_count} players"))?;
+
+        if layout.len() != player_count {
+            return Err(format!(
+                "the {player_count}-player layout contains {} positions",
+                layout.len()
+            ));
+        }
+
+        layout
+            .iter()
+            .map(|&index| {
+                self.spawn_points.get(index).copied().ok_or_else(|| {
+                    format!("the {player_count}-player layout references spawn point {index}")
+                })
+            })
+            .collect()
+    }
+
+    fn validate_spawn_points(&self) -> Result<(), String> {
+        if self.spawn_points.is_empty() {
+            return Err("no spawn points are configured".to_owned());
+        }
+
+        if self.respawn_points.is_empty() {
+            return Err("no respawn points are configured".to_owned());
+        }
+
+        if self.neutral_spawn_point_sets.is_empty() {
+            return Err("no neutral spawn layouts are configured".to_owned());
+        }
+
+        for (layout_index, layout) in self.neutral_spawn_point_sets.iter().enumerate() {
+            let player_count = layout_index + 1;
+            if layout.len() != player_count {
+                return Err(format!(
+                    "the {player_count}-player layout contains {} positions",
+                    layout.len()
+                ));
+            }
+
+            let mut unique_indices = HashSet::with_capacity(layout.len());
+            for &spawn_point_index in layout {
+                if spawn_point_index >= self.spawn_points.len() {
+                    return Err(format!(
+                        "the {player_count}-player layout references spawn point {spawn_point_index}"
+                    ));
+                }
+                if !unique_indices.insert(spawn_point_index) {
+                    return Err(format!(
+                        "the {player_count}-player layout uses spawn point {spawn_point_index} more than once"
+                    ));
+                }
+            }
+        }
+
+        Ok(())
+    }
+
     pub fn to_collision(&self) -> StageCollision {
         let stage_polys: Vec<StagePoly> = self
             .polygons

src/stage/mod.rs

@@ -10,7 +10,7 @@ pub mod scene;
 
 pub use line::{StagePlaneIntersectResult, StagePoly};
 
-use crate::stage::{line::StageCollision, manifest::StageCameraProfile};
+use crate::{match_loading::MatchConfig, stage::{line::StageCollision, manifest::StageCameraProfile}};
 
 /// Owns the stage geometry: which scene gets spawned and how it is drawn.
 #[derive(Default)]
@@ -20,9 +20,17 @@ impl Plugin for StagePlugin {
     fn build(&self, app: &mut App) {
         app.add_systems(
             Update,
-            debug::debug_draw_scene
-                .run_if(resource_exists::<line::StageCollision>)
-                .run_if(crate::debug_tools::stage_collision_enabled),
+            (
+                (debug::debug_draw_scene
+                    .run_if(resource_exists::<line::StageCollision>)
+                    .run_if(crate::debug_tools::stage_collision_enabled)),
+                (debug::debug_draw_blast_zones
+                    .run_if(resource_exists::<MatchConfig>)
+                    .run_if(crate::debug_tools::blast_zones_enabled),),
+                (debug::debug_draw_spawn_positions
+                    .run_if(resource_exists::<MatchConfig>)
+                    .run_if(crate::debug_tools::spawn_positions_enabled),),
+            ),
         );
     }
 }

src/ui/mod.rs

@@ -3,7 +3,7 @@ use bevy::prelude::*;
 use crate::{
     AppState,
     match_loading::{MatchConfig, MatchRules},
-    match_runtime::MatchState,
+    match_runtime::{MatchState, PauseState},
 };
 
 pub mod battle_ui;
@@ -11,6 +11,9 @@ pub mod errors;
 pub mod fighter_info;
 pub mod stock_icon;
 
+#[derive(Component)]
+pub struct PauseOverlay;
+
 #[derive(Default)]
 pub struct InGameUIPlugin;
 
@@ -30,8 +33,56 @@ impl Plugin for InGameUIPlugin {
                             } else {
                                 false
                             }
-                        }),
+                    }),
                 ),
-            );
+            )
+            .add_systems(Update, sync_pause_overlay);
+    }
+}
+
+pub fn sync_pause_overlay(
+    pause: Res<PauseState>,
+    overlay: Query<Entity, With<PauseOverlay>>,
+    mut commands: Commands,
+) {
+    if !pause.is_changed() {
+        return;
+    }
+
+    if pause.paused {
+        if overlay.is_empty() {
+            commands.spawn((
+                PauseOverlay,
+                Node {
+                    position_type: PositionType::Absolute,
+                    left: px(0),
+                    right: px(0),
+                    top: px(0),
+                    bottom: px(0),
+                    align_items: AlignItems::Center,
+                    justify_content: JustifyContent::Center,
+                    flex_direction: FlexDirection::Column,
+                    ..default()
+                },
+                BackgroundColor(Color::srgba(0.0, 0.0, 0.0, 0.7)),
+                ZIndex(100),
+                children![
+                    (
+                        Text::new("Paused"),
+                        TextFont::from_font_size(crate::menus::style::H1_SIZE as f32),
+                        TextColor(Color::WHITE),
+                    ),
+                    (
+                        Text::new("Press Esc or Start to resume"),
+                        TextFont::from_font_size(crate::menus::style::TEXT_SIZE as f32),
+                        TextColor(Color::WHITE),
+                    ),
+                ],
+            ));
+        }
+    } else {
+        for entity in &overlay {
+            commands.entity(entity).despawn();
+        }
     }
 }