Fix warnings and increase recursion

Cargo.toml

@@ -8,7 +8,7 @@ authors = [""]
 
 [features]
 default = ["development", "debug_features"]
-development = ["bevy/dynamic_linking", "bevy/file_watcher", "bevy/embedded_watcher"]
+development = ["bevy/dynamic_linking", "bevy/file_watcher"]
 debug_features = ["bevy/free_camera"]
 
 [dependencies]

src/debug_tools.rs

@@ -109,9 +109,7 @@ impl FighterDebugRowKind {
 enum DebugFlag {
     Network,
     Ecb,
-    BlastZones,
     StageCollision,
-    SpawnPositions,
     AnimationBones,
     AttackHitboxes,
     Hurtboxes,
@@ -175,14 +173,6 @@ 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",
     },
@@ -253,9 +243,7 @@ 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,
@@ -276,9 +264,7 @@ 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,
@@ -342,8 +328,6 @@ 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,
@@ -358,9 +342,7 @@ 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,
@@ -902,14 +884,6 @@ 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,12 +1,22 @@
 use bevy::prelude::*;
 
 use crate::{
-    camera::MatchCamera, fighter::{
+    camera::MatchCamera,
-        FighterECB, FighterFacingDirection, FighterHitboxes, FighterHitstop, FighterHitstopShake, FighterInvulnerabilityState, FighterPendingRespawn, FighterPreviousFacingDirection, FighterPreviousTranslation, FighterSurfaceState, FighterTranslation, FighterVelocity, animation::FighterAnimationFrame, attack::{
+    fighter::{
+        FighterECB, FighterFacingDirection, FighterHitboxes, FighterHitstop, FighterHitstopShake,
+        FighterPreviousFacingDirection, FighterPreviousTranslation, FighterSurfaceState,
+        FighterTranslation, FighterVelocity,
+        animation::FighterAnimationFrame,
+        attack::{
             FighterDamage, FighterKnockbackVelocity, FighterPendingHitReaction, FighterPendingHits,
             FighterSolvedHurtboxes, FighterStaleMoveQueue,
-        }, baked_animation::FighterBoneMatrices, state::FighterState,
+        },
-    }, input::FighterInput, match_runtime::MatchState, player::Player, stage::line::StageCollision,
+        baked_animation::FighterBoneMatrices,
+        state::FighterState,
+    },
+    input::FighterInput,
+    player::Player,
+    stage::line::StageCollision,
 };
 
 #[derive(Resource, Default)]
@@ -19,7 +29,6 @@ struct Checkpoint {
     fighters: Vec<FighterCheckpoint>,
     stage_collision: StageCollision,
     pending_hits: FighterPendingHits,
-    match_state: MatchState,
 }
 
 #[derive(Clone)]
@@ -46,8 +55,6 @@ 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) {
@@ -92,12 +99,10 @@ 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;
@@ -149,12 +154,9 @@ 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;
     }
@@ -186,8 +188,6 @@ 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/fighter/attributes.rs

@@ -44,9 +44,6 @@ 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,
 }
 
 impl FighterAttributes {

src/fighter/baked_animation/mod.rs

@@ -8,7 +8,7 @@ pub use crate::math::fixed_transform::FixedMat4;
 pub use asset_baking::{BakedAnimationAssetProcessingPlugin, BakedAnimationPlugin};
 pub use runtime::{
     BakedAnimationClip, BakedFighterAnimations, FighterBoneIndexMap, FighterBoneMatrices,
-    resample_fighter_bone_matrices, update_fighter_bone_matrices,
+    update_fighter_bone_matrices,
 };
 
 pub const BAKED_ANIMATION_FPS: u32 = 60;
@@ -275,31 +275,6 @@ 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;

src/fighter/baked_animation/runtime.rs

@@ -144,27 +144,6 @@ impl FighterBoneMatrices {
         parents: &[Option<usize>],
         local: &[FixedMat4],
         model_scale: FGi32,
-    ) {
-        self.sample_pose(kind, bone_names, parents, local, model_scale, true);
-    }
-    pub(super) fn resample_pose(
-        &mut self,
-        kind: AnimKind,
-        bone_names: &[String],
-        parents: &[Option<usize>],
-        local: &[FixedMat4],
-        model_scale: FGi32,
-    ) {
-        self.sample_pose(kind, bone_names, parents, local, model_scale, false);
-    }
-    fn sample_pose(
-        &mut self,
-        kind: AnimKind,
-        bone_names: &[String],
-        parents: &[Option<usize>],
-        local: &[FixedMat4],
-        model_scale: FGi32,
-        advance_history: bool,
     ) {
         assert_eq!(
             bone_names.len(),
@@ -188,11 +167,9 @@ impl FighterBoneMatrices {
         self.local_matrices.reserve(local.len());
         self.previous_local_matrices.reserve(local.len());
         self.model_matrices.reserve(local.len());
-        if advance_history {
         std::mem::swap(&mut self.matrices, &mut self.previous_frame_matrices);
-            std::mem::swap(&mut self.local_matrices, &mut self.previous_local_matrices);
-        }
         let animation_changed = self.presentation_kind != Some(kind);
+        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);
@@ -238,56 +215,6 @@ pub fn update_fighter_bone_matrices(
     manifests: Res<Assets<FighterManifest>>,
 ) {
     for (frame, animations, fighter, mut matrices, mut bone_indices) in &mut fighters {
-        sample_fighter_bone_matrices(
-            frame,
-            animations,
-            fighter,
-            &mut matrices,
-            &mut bone_indices,
-            &baked_assets,
-            &manifests,
-            true,
-        );
-    }
-}
-
-/// Resamples the current pose after collision-driven state transitions without
-/// advancing the previous-frame pose used for swept gameplay volumes.
-pub fn resample_fighter_bone_matrices(
-    mut fighters: Query<(
-        &FighterAnimationFrame,
-        &FighterAnimations,
-        &Fighter,
-        &mut FighterBoneMatrices,
-        &mut FighterBoneIndexMap,
-    )>,
-    baked_assets: Res<Assets<BakedFighterAnimations>>,
-    manifests: Res<Assets<FighterManifest>>,
-) {
-    for (frame, animations, fighter, mut matrices, mut bone_indices) in &mut fighters {
-        sample_fighter_bone_matrices(
-            frame,
-            animations,
-            fighter,
-            &mut matrices,
-            &mut bone_indices,
-            &baked_assets,
-            &manifests,
-            false,
-        );
-    }
-}
-
-fn sample_fighter_bone_matrices(
-    frame: &FighterAnimationFrame,
-    animations: &FighterAnimations,
-    fighter: &Fighter,
-    matrices: &mut FighterBoneMatrices,
-    bone_indices: &mut FighterBoneIndexMap,
-    baked_assets: &Assets<BakedFighterAnimations>,
-    manifests: &Assets<FighterManifest>,
-    advance_history: bool,
-) {
         let baked = baked_assets
             .get(&animations.baked)
             .expect("fighter baked animation asset should be loaded before the match starts");
@@ -301,7 +228,6 @@ fn sample_fighter_bone_matrices(
         let manifest = manifests
             .get(&fighter.manifest)
             .expect("fighter manifest should be loaded before the match starts");
-    if advance_history {
         matrices.set_pose(
             frame.kind,
             &baked.bone_names,
@@ -309,15 +235,6 @@ fn sample_fighter_bone_matrices(
             pose,
             manifest.model_scale,
         );
-    } else {
-        matrices.resample_pose(
-            frame.kind,
-            &baked.bone_names,
-            &baked.parents,
-            pose,
-            manifest.model_scale,
-        );
-    }
         if bone_indices.0.is_empty() {
             bone_indices.0.extend(
                 baked
@@ -327,6 +244,7 @@ fn sample_fighter_bone_matrices(
                     .map(|(index, name)| (name.clone(), index)),
             );
         }
+    }
 }
 
 fn resolve_model_transform(

src/fighter/blast_zones.rs

@@ -1,36 +0,0 @@
-//! 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/mod.rs

@@ -20,7 +20,6 @@ pub mod motion;
 pub mod state;
 pub mod surface;
 pub mod visual;
-pub mod blast_zones;
 
 // The fighter components are re-exported so the rest of the crate can say
 // `fighter::FighterVelocity` without caring which file it lives in. Named
@@ -41,8 +40,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, FighterInvulnerabilityVisualState},
+        }, baked_animation::{FighterBoneIndexMap, FighterBoneMatrices}, ecb::FighterECBBoneIndices, manifest::FighterManifest, state::{FighterState, air::AirborneStateCommon, fall::FallState}, visual::FighterAnimations,
-    }, game_settings::GameSettings, input::FighterInput, math::{int::FGi32, vec::FGVec2}, player::Player, schedule::GameplaySet, scripting::FighterAttackScript, stage::line::StageCollision,
+    }, input::FighterInput, math::{int::FGi32, vec::FGVec2}, player::Player, schedule::GameplaySet, scripting::FighterAttackScript, stage::line::StageCollision,
 };
 use state::state_interrupt_system;
 
@@ -85,14 +84,6 @@ pub struct FighterHitstop {
     pub remaining_frames: u32,
 }
 
-#[derive(Component, Default, Copy, Clone, Hash, PartialEq, Eq)]
-pub enum FighterInvulnerabilityState {
-    #[default]
-    Vulnerable,
-    Invulnerable,
-    Intangible
-}
-
 impl FighterFacingDirection {
     fn reverse(&self) -> Self {
         match self {
@@ -137,20 +128,14 @@ 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>,
@@ -192,8 +177,8 @@ impl Plugin for FighterPlugin {
             .add_systems(
                 GgrsSchedule,
                 (
-                    (blast_zones::apply_blast_zones, ecb::update_ecb, ecb::decrement_ecb_lockout, state::state_collision_interrupt_system).chain(),
+                    (ecb::update_ecb, ecb::decrement_ecb_lockout, state::state_collision_interrupt_system).chain(),
-                    baked_animation::resample_fighter_bone_matrices,
+                    baked_animation::update_fighter_bone_matrices,
                 )
                     .chain()
                     .in_set(GameplaySet::Collision),
@@ -235,12 +220,8 @@ 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>()
@@ -268,9 +249,6 @@ 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),
@@ -303,7 +281,6 @@ 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,
@@ -317,7 +294,6 @@ pub fn spawn_fighter(
             Name(format!("Fighter {player_handle}").into()),
             Player {
                 handle: player_handle,
-                controller_port,
             },
             Fighter { manifest: manifest },
             FighterFacingDirection::Right,

src/fighter/state/air_dodge.rs

@@ -1,13 +1,16 @@
 use crate::{
     fighter::{
-        FighterInvulnerabilityState, animation::AnimKind, state::{
+        animation::AnimKind,
+        state::{
             CollisionContext, EnterContext, FighterState, FighterStateImpl, InterruptContext,
             UpdateContext,
             air::{self, AirborneStateCommon},
             fall::FallState,
             land::LandingType,
         },
-    }, input, math::vec::FGVec2,
+    },
+    input,
+    math::vec::FGVec2,
 };
 
 #[derive(Debug, Clone, Hash)]
@@ -29,12 +32,6 @@ 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;
-        } 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(
@@ -65,14 +62,6 @@ 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> {

src/fighter/state/angel.rs

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

src/fighter/state/mod.rs

@@ -15,26 +15,22 @@ use crate::fighter::baked_animation::BakedFighterAnimations;
 use crate::fighter::ecb::FighterPreviousECB;
 use crate::fighter::manifest::FighterManifest;
 use crate::fighter::state::hitstun::HitstunState;
-use crate::fighter::surface::EcbLockPolicy;
 use crate::fighter::visual::FighterAnimations;
 use crate::fighter::{
-    Fighter, FighterDamage, FighterECB, FighterFacingDirection, FighterHitboxes, FighterHitstop, FighterHitstopShake, FighterHitstopShakeKind, FighterHitstopShakeRole, FighterInvulnerabilityState, FighterPendingRespawn, FighterPresentationSnap, FighterPreviousTranslation, FighterSurfaceState, FighterTranslation, FighterVelocity,
+    Fighter, FighterECB, FighterFacingDirection, FighterHitboxes, FighterHitstop,
+    FighterHitstopShake, FighterHitstopShakeKind, FighterHitstopShakeRole,
+    FighterPreviousTranslation, FighterSurfaceState, FighterTranslation, FighterVelocity,
+    FighterPresentationSnap,
 };
+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::player::Player;
 use crate::scripting::FighterAttackScript;
 use crate::stage::line::StageCollision;
-use crate::stage::manifest::{StageManifest, StageManifestRegistry};
 
 pub mod air;
 pub mod air_dodge;
-pub mod angel;
-pub mod crouch;
 pub mod dash;
 pub mod fall;
 pub mod ground;
@@ -42,11 +38,12 @@ 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 {
@@ -170,7 +167,6 @@ impl EnterContext<'_> {
 pub struct ExitContext<'a> {
     pub hitboxes: &'a mut FighterHitboxes,
     pub surface: &'a mut FighterSurfaceState,
-    pub vulnerability: &'a mut FighterInvulnerabilityState,
 }
 
 pub struct UpdateContext<'a> {
@@ -181,7 +177,6 @@ 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,
     pub animation_frame: u32,
     pub fighter_attributes: &'a FighterAttributes,
@@ -215,8 +210,8 @@ impl CollisionContext<'_> {
         &self,
     ) -> Option<crate::fighter::collision::AirCollisionWithStageResult> {
         let ignored_polys = self.surface.ignored_polygon_ids();
-        let ignore_soft_platforms =
+        let ignore_soft_platforms = self.input.get_last_frame().movement.y
-            self.input.get_last_frame().movement.y <= -self.downward_stick_threshold;
+            <= -self.downward_stick_threshold;
         crate::fighter::collision::air_collide_with_stage(
             self.prev_translation,
             self.translation,
@@ -244,7 +239,6 @@ fighter_states! {
     Turn => turn::TurnState,
     GroundAttack => ground_attack::GroundAttackState,
     Hitstun => hitstun::HitstunState,
-    Angel => angel::AngelState,
 }
 
 #[derive(QueryData)]
@@ -263,7 +257,6 @@ 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,
 }
 
@@ -321,7 +314,7 @@ impl<'w, 's> FighterFrameQueryItem<'w, 's> {
             surface: &mut self.surface,
             fighter_attributes: attributes,
             attack_script_assets,
-            game_settings,
+            game_settings
         }
     }
 
@@ -329,7 +322,6 @@ impl<'w, 's> FighterFrameQueryItem<'w, 's> {
         ExitContext {
             hitboxes: &mut self.hitboxes,
             surface: &mut self.surface,
-            vulnerability: &mut self.vulnerability,
         }
     }
 
@@ -350,7 +342,6 @@ impl<'w, 's> FighterFrameQueryItem<'w, 's> {
             knockback_velocity: &mut self.knockback_velocity,
             game_settings,
             animation_frame: self.animation_frame.frame,
-            vulnerability: &mut self.vulnerability,
             fighter_attributes: attributes,
             attack_scripts,
             attack_script_assets,
@@ -373,9 +364,7 @@ impl<'w, 's> FighterFrameQueryItem<'w, 's> {
             ecb: &mut self.ecb,
             prev_ecb: &self.prev_ecb,
             stage_collision,
-            leave_ground_ecb_lock_duration: game_settings
+            leave_ground_ecb_lock_duration: game_settings.fighter_common.leave_ground_ecb_frame_lock_duration,
-                .fighter_common
-                .leave_ground_ecb_frame_lock_duration,
             downward_stick_threshold: game_settings.input_common.run_stick_threshold,
         }
     }
@@ -389,12 +378,9 @@ 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(
@@ -443,9 +429,7 @@ fn transition_state(
     if let SurfacePolicy::Airborne(lock_policy) = next.surface_policy() {
         frame.surface.apply_airborne_policy(
             lock_policy,
-            game_settings
+            game_settings.fighter_common.leave_ground_ecb_frame_lock_duration,
-                .fighter_common
-                .leave_ground_ecb_frame_lock_duration,
         );
     }
     next.on_enter(&mut frame.enter_context(attributes, attack_script_assets, game_settings));
@@ -470,7 +454,6 @@ pub fn state_interrupt_system(
             mut pending_hit_reaction,
             mut hitstop,
             mut hitstop_shake,
-            ..
         } = fighter;
         let manifest = fighter_manifests
             .get(&fighter.manifest)
@@ -533,7 +516,7 @@ pub fn state_interrupt_system(
                 animations,
                 &baked_animations,
                 &manifest.attributes,
-                &stage_collision,
+                &stage_collision
             ))
         };
 
@@ -555,89 +538,25 @@ 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,
-            mut hitstop,
+            hitstop,
-            mut pending_respawn,
-            player,
-            mut damage,
             ..
         } = fighter;
-
-        let manifest = fighter_manifests
-            .get(&fighter.manifest)
-            .expect("Fighter manifest should be valid");
-
-        if pending_respawn.0 {
-            **pending_respawn = false;
-            let respawn_state = FighterState::Angel(angel::AngelState::new(60 * 3));
-
-            // Find the angel platform position
-            let respawn_point = stage_manifest
-                .respawn_points
-                .get(player.controller_port % stage_manifest.respawn_points.len());
-
-            if let None = respawn_point {
-                error!("Couldn't get a respawn point, falling back to the world origin");
-            }
-
-            let respawn_point = respawn_point.copied().unwrap_or(FGVec2::ZERO);
-
-            frame.translation.0 = respawn_point;
-            frame.presentation_snap.0 = true;
-
-            // Clear hitstop
-            hitstop.remaining_frames = 0;
-
-            // subtract one stock
-
-            let player_state = match_state.players.get_mut(player.handle).expect(&format!(
-                "Failed to get fighter for GGRS slot {} (controller port {})",
-                player.handle, player.controller_port
-            ));
-
-            if let Some(stocks_remaining) = &mut player_state.stocks_remaining {
-                *stocks_remaining = stocks_remaining.saturating_sub(1);
-            }
-
-            // reset percentage
-            *damage = FighterDamage::default();
-
-            transition_state(
-                &mut state,
-                respawn_state,
-                &mut frame,
-                &manifest.attributes,
-                attack_script_assets,
-                &game_settings,
-            );
-            continue;
-        }
-
         if hitstop.remaining_frames > 0 {
             continue;
         }
 
-        let new_state = state.check_collision_interrupt(
+        let manifest = fighter_manifests
-            &mut frame.collision_context(&stage_collision, &game_settings),
+            .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 let Some(new_state) = new_state {
             transition_state(
                 &mut state,

src/fighter/visual.rs

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

src/game_settings.rs

@@ -42,9 +42,6 @@ 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,
 }
 #[derive(Reflect, Serialize, Deserialize, Clone)]
 #[reflect(opaque)]

src/input/mod.rs

@@ -28,7 +28,7 @@ pub enum LocalInputSource {
     Gamepad(Entity),
 }
 
-/// Persistent mapping from physical/menu controller slots to input sources.
+/// Maps an input source to a player index
 #[derive(Resource, Clone, Debug, Default, Deref, DerefMut)]
 pub struct LocalInputAssignments(pub Vec<(usize, LocalInputSource)>);
 
@@ -50,16 +50,6 @@ 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;
@@ -254,17 +244,20 @@ fn read_local_inputs(
     input_map: Res<BaseInputMap>,
     gc_ports: Res<gamecube::GcPorts>,
     gamepads: Query<&Gamepad>,
-    assignments: Res<MatchInputAssignments>,
+    assignments: Res<LocalInputAssignments>,
     local_players: Res<LocalPlayers>,
     game_settings: Res<GameSettings>,
 ) {
     let mut local_inputs = HashMap::new();
 
     for handle in &local_players.0 {
-        let assigned = assignments.get_for_handle(*handle);
+        let assigned = assignments
+            .0
+            .iter()
+            .find(|(player_handle, _)| player_handle == handle);
         let gamepad = match assigned {
-            Some(LocalInputSource::Gamepad(entity)) => gamepads.get(entity).ok(),
+            Some((_, LocalInputSource::Gamepad(entity))) => gamepads.get(*entity).ok(),
-            Some(LocalInputSource::Keyboard) => None,
+            Some((_, LocalInputSource::Keyboard)) => None,
             None => gc_ports
                 .entities
                 .get(*handle)
@@ -274,8 +267,8 @@ fn read_local_inputs(
         };
 
         let mut input_frame = match assigned {
-            Some(LocalInputSource::Keyboard) => keyboard::sample_keyboard(&key, &input_map),
+            Some((_, LocalInputSource::Keyboard)) => keyboard::sample_keyboard(&key, &input_map),
-            Some(LocalInputSource::Gamepad(_)) => gamepad
+            Some((_, LocalInputSource::Gamepad(_))) => gamepad
                 .map(|pad| gamepad::sample_gamepad(pad, &input_map))
                 .unwrap_or_default(),
             None => FighterInputFrame::default(),

src/lib.rs

@@ -35,9 +35,8 @@ use ron_asset_manager::RonAssetPlugin;
 
 use crate::{
     camera::MatchCameraPlugin, fighter::manifest::FighterManifest, game_settings::GameSettings,
-    match_runtime::MatchRuntimePlugin, materials::ShinesparkMaterialPlugin,
+    match_runtime::MatchRuntimePlugin, menus::style::FGUiStyle, schedule::GameplaySchedulePlugin,
-    menus::style::FGUiStyle, schedule::GameplaySchedulePlugin, stage::manifest::StageManifest,
+    stage::manifest::StageManifest, ui::InGameUIPlugin,
-    ui::InGameUIPlugin,
 };
 
 mod args;
@@ -50,7 +49,6 @@ pub mod game_settings;
 pub mod input;
 pub mod match_loading;
 pub mod match_runtime;
-pub mod materials;
 mod math;
 pub mod menus;
 pub mod netcode;
@@ -111,7 +109,6 @@ 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(),
@@ -128,8 +125,6 @@ impl Plugin for GamePlugin {
                 MatchCameraPlugin,
                 GameAssetPlugin,
                 InGameUIPlugin,
-                ),
-                ShinesparkMaterialPlugin,
             ))
             .add_plugins(menus::MenuPlugin)
             .add_loading_state(

src/match_loading.rs

@@ -8,7 +8,9 @@ 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},
@@ -16,10 +18,16 @@ use crate::{
         manifest::{FighterManifest, FighterManifestRegistry},
         spawn_fighter,
         visual::FighterAnimations,
-    }, input::{LocalInputAssignments, LocalInputSource, MatchInputAssignments}, match_runtime::MatchState, materials::fighter_material::FighterMaterial, netcode::{
+    },
+    input::{LocalInputAssignments, LocalInputSource},
+    match_runtime::MatchState,
+    math::{int::FGi32, vec::FGVec2},
+    netcode::{
         GGRSCfg,
         session::{ConnectionStatus, SessionConfig, create_session},
-    }, scripting::FighterAttackScript, stage::{
+    },
+    scripting::FighterAttackScript,
+    stage::{
         self,
         manifest::{StageId, StageManifest, StageManifestRegistry},
     },
@@ -27,10 +35,7 @@ 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,
 }
 
@@ -41,22 +46,6 @@ 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 {
@@ -239,7 +228,6 @@ pub fn initiate_default_match(
     let players = (0..args.players)
         .map(|handle| MatchPlayer {
             handle,
-            controller_port: handle,
             fighter: FighterId::TestFighter,
         })
         .collect();
@@ -275,7 +263,6 @@ 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>>,
@@ -290,7 +277,7 @@ pub fn prepare_match(
     if !valid_player_handles(&config.players) {
         fail_match(
             &mut next_state,
-            "player handles must be dense, unique, and non-empty",
+            "player handles must be unique and cover 0..player_count",
         );
         return;
     }
@@ -300,20 +287,6 @@ 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,
@@ -476,8 +449,7 @@ pub fn prepare_match(
         ));
     }
 
-    let session_player_count = player_count_for_handles(&config.players);
+    let session_config = match SessionConfig::from_args(&args, config.players.len()) {
-    let session_config = match SessionConfig::from_args(&args, session_player_count) {
         Ok(config) => config,
         Err(error) => {
             fail_match(
@@ -487,7 +459,7 @@ pub fn prepare_match(
             return;
         }
     };
-    let session = match create_session(&args, session_player_count) {
+    let session = match create_session(&args, config.players.len()) {
         Ok(session) => session,
         Err(error) => {
             fail_match(
@@ -498,13 +470,14 @@ 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,
@@ -514,18 +487,14 @@ 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_point = spawn_positions[spawn_index];
+        let spawn_x = (index as i32 * 2 + 1 - config.players.len() as i32) * 5;
         fighter_roster.push(spawn_fighter(
             &mut commands,
             player.handle,
-            config
+            FGVec2::new(FGi32::from_num(spawn_x), FGi32::lit("12.5")),
-                .controller_port_for_handle(player.handle)
-                .expect("validated match config contains every player handle"),
-            spawn_point,
             manifest_handle.clone(),
             model_scale,
             animations,
@@ -549,30 +518,12 @@ fn fail_match(next_state: &mut NextState<AppState>, message: &str) {
 }
 
 fn valid_player_handles(players: &[MatchPlayer]) -> bool {
-    if players.is_empty() {
+    let mut handles = players
-        return false;
+        .iter()
-    }
+        .map(|player| player.handle)
-
+        .collect::<Vec<_>>();
-    let mut handles = players.iter().map(|player| player.handle).collect::<Vec<_>>();
     handles.sort_unstable();
-    handles.into_iter().eq(0..players.len())
+    handles == (0..players.len()).collect::<Vec<_>>()
-}
-
-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(
@@ -593,7 +544,6 @@ pub fn cleanup_match(
     commands.remove_resource::<MatchAssets>();
     commands.remove_resource::<MatchConfig>();
     commands.remove_resource::<MatchState>();
-    commands.remove_resource::<MatchInputAssignments>();
     commands.remove_resource::<FighterRoster>();
 }
 
@@ -608,12 +558,10 @@ mod tests {
             players: vec![
                 MatchPlayer {
                     handle: 0,
-                    controller_port: 0,
                     fighter: FighterId::TestFighter,
                 },
                 MatchPlayer {
                     handle: 1,
-                    controller_port: 1,
                     fighter: FighterId::TestFighter,
                 },
             ],
@@ -631,12 +579,10 @@ mod tests {
         let players = [
             MatchPlayer {
                 handle: 0,
-                controller_port: 0,
                 fighter: FighterId::TestFighter,
             },
             MatchPlayer {
                 handle: 0,
-                controller_port: 1,
                 fighter: FighterId::TestFighter,
             },
         ];
@@ -644,88 +590,6 @@ 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

@@ -117,12 +117,10 @@ mod tests {
             players: vec![
                 MatchPlayer {
                     handle: 1,
-                    controller_port: 3,
                     fighter: FighterId::TestFighter,
                 },
                 MatchPlayer {
                     handle: 0,
-                    controller_port: 0,
                     fighter: FighterId::TestFighter,
                 },
             ],

src/materials/fighter_material.rs

@@ -1,88 +0,0 @@
-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,
-    
-    // Web examples WebGL2 support: structs must be 16 byte aligned.
-    #[cfg(feature = "webgl2")]
-    #[uniform(100)]
-    _webgl2_padding_8b: u32,
-    #[cfg(feature = "webgl2")]
-    #[uniform(100)]
-    _webgl2_padding_12b: u32,
-    #[cfg(feature = "webgl2")]
-    #[uniform(100)]
-    _webgl2_padding_16b: u32,
-}
-
-const SHADER_ASSET_PATH: &str = "embedded://shinespark/shaders/fighter.wgsl";
-
-impl FighterMaterialExtension {
-    pub fn new(status_color: Color) -> Self {
-        Self {
-            status_color: status_color.into(),
-            status_color_intensity: 0.0,
-            ..default()
-        }
-    }
-
-    pub fn update_status_color(&mut self, status_color: LinearRgba, intensity: f32) {
-        self.status_color = status_color;
-        self.status_color_intensity = intensity;
-    }
-}
-
-impl MaterialExtension for FighterMaterialExtension {
-    fn fragment_shader() -> ShaderRef {
-        SHADER_ASSET_PATH.into()
-    }
-
-    fn deferred_fragment_shader() -> ShaderRef {
-        SHADER_ASSET_PATH.into()
-    }
-}
-
-pub fn bind_fighter_material(
-    scene_ready: On<WorldInstanceReady>,
-    mut commands: Commands,
-    children: Query<&Children>,
-    //color_override: Query<&ColorOverride>,
-    mesh_materials: Query<(Entity, &MeshMaterial3d<StandardMaterial>, &GltfMaterialName)>,
-    mut asset_materials: ResMut<Assets<FighterMaterial>>,
-    original_materials: Res<Assets<StandardMaterial>>,
-) {
-    for descendant in children.iter_descendants(scene_ready.entity) {
-        let Ok((entity, id, material_name)) = mesh_materials.get(descendant) else {
-            continue;
-        };
-
-        dbg!(material_name);
-
-        if !material_name.starts_with("Fighter_") {
-            continue;
-        }
-
-        let Some(original_material) = original_materials.get(id.id()) else {
-            continue;
-        };
-
-        commands.entity(entity).insert((MeshMaterial3d(asset_materials.add(ExtendedMaterial {
-            base: StandardMaterial {
-                // can be used in forward or deferred mode
-                ..original_material.clone()
-            },
-            extension: FighterMaterialExtension::new(bevy::color::palettes::css::BLUE.into())
-        })), FighterMesh { fighter: scene_ready.entity  }));
-    }
-}

src/materials/mod.rs

@@ -1,32 +0,0 @@
-use bevy::{
-    asset::embedded_asset, gltf::GltfMaterialName, material::OpaqueRendererMethod, pbr::ExtendedMaterial, prelude::*, world_serialization::WorldInstanceReady,
-};
-
-use bevy::{
-    color::palettes::basic::RED,
-    pbr::{MaterialExtension},
-    prelude::*,
-    render::render_resource::*,
-    shader::ShaderRef,
-};
-
-use crate::materials::fighter_material::{FighterMaterial, FighterMaterialExtension};
-
-pub mod fighter_material;
-
-pub struct ShinesparkMaterialPlugin;
-
-pub fn startup_test(asset_server: Res<AssetServer>) {
-    let test: Handle<Shader> = asset_server.load("embedded://shinespark/shaders/fighter.wgsl");
-    dbg!(test);
-}
-
-impl Plugin for ShinesparkMaterialPlugin {
-    fn build(&self, app: &mut App) {
-        let omit_prefix = "";
-        embedded_asset!(app, omit_prefix, "shaders/fighter.wgsl");
-        app.add_systems(Startup, startup_test)
-            .add_observer(fighter_material::bind_fighter_material)
-            .add_plugins(MaterialPlugin::<fighter_material::FighterMaterial>::default());
-    }
-}

src/materials/shaders/fighter.wgsl

@@ -1,67 +0,0 @@
-#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/match_config.rs

@@ -65,10 +65,7 @@ impl MenuMatchConfig {
 
         let stage = self.stage.ok_or(MenuMatchConfigErrors::StageNotSelected)?;
 
-        let mut players = self.players.iter().collect::<Vec<_>>();
+        for player in self.players.iter() {
-        players.sort_unstable_by_key(|player| player.slot);
-
-        for (handle, player) in players.into_iter().enumerate() {
             let fighter_id =
                 player
                     .fighter
@@ -77,8 +74,7 @@ impl MenuMatchConfig {
                     ))?;
             match_players.push(MatchPlayer {
                 fighter: fighter_id,
-                handle,
+                handle: player.slot,
-                controller_port: player.slot,
             });
         }
 
@@ -106,27 +102,4 @@ 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/player.rs

@@ -10,8 +10,5 @@ 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 = 3;
+pub const REPLAY_VERSION: u32 = 2;
 
 #[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 be unique".into());
+        return Err("replay player handles must cover 0..player_count".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.is_empty() || !handles.into_iter().eq(0..self.match_config.players.len())
+        handles != (0..handles.len()).collect::<Vec<_>>()
     }
 
     fn frame(&self, frame: i32) -> Option<&ReplayFrame> {
@@ -374,7 +374,6 @@ mod tests {
                 stage: StageId::TestStage,
                 players: vec![MatchPlayer {
                     handle: 0,
-                    controller_port: 0,
                     fighter: FighterId::TestFighter,
                 }],
                 rules: MatchRules::Timed {

src/stage/debug.rs

@@ -1,11 +1,6 @@
 use bevy::{color::palettes::css::RED, prelude::*};
 
-use crate::{
+use crate::stage::line::StageCollision;
-    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() {
@@ -21,52 +16,3 @@ 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, HashSet};
+use std::collections::HashMap;
 
 use bevy_asset_loader::asset_collection::AssetCollection;
 use ron_asset_manager::prelude::RonAsset;
@@ -7,10 +7,14 @@ 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::*;
 
@@ -83,17 +87,6 @@ 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)]
@@ -169,13 +162,6 @@ 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,
@@ -200,73 +186,6 @@ 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::{match_loading::MatchConfig, stage::{line::StageCollision, manifest::StageCameraProfile}};
+use crate::stage::{line::StageCollision, manifest::StageCameraProfile};
 
 /// Owns the stage geometry: which scene gets spawned and how it is drawn.
 #[derive(Default)]
@@ -20,17 +20,9 @@ impl Plugin for StagePlugin {
     fn build(&self, app: &mut App) {
         app.add_systems(
             Update,
-            (
+            debug::debug_draw_scene
-                (debug::debug_draw_scene
                 .run_if(resource_exists::<line::StageCollision>)
-                    .run_if(crate::debug_tools::stage_collision_enabled)),
+                .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),),
-            ),
         );
     }
 }