Fix Rust CI cache reuse

.cargo/config.toml

@@ -1,7 +1,7 @@
 # for Linux
 [target.x86_64-unknown-linux-gnu]
 linker = "clang"
-rustflags = ["-C", "link-arg=-fuse-ld=/usr/bin/mold", "-Zshare-generics=y", ]
+rustflags = ["-C", "link-arg=-fuse-ld=/usr/bin/mold", "-Zshare-generics=y", "-D", "warnings", ]
 
 [unstable]
 codegen-backend = true
@@ -10,4 +10,4 @@ codegen-backend = true
 codegen-backend = "llvm"
 
 [profile.dev.package."*"]
-codegen-backend = "llvm"
+codegen-backend = "llvm"

.gitea/workflows/ci.yml

@@ -25,6 +25,7 @@ jobs:
       - name: Cache Rust dependencies and build artifacts
         uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
         with:
+          prefix-key: v1-rust
           shared-key: linux-nightly
           cache-bin: false
 
@@ -45,7 +46,7 @@ jobs:
             pkg-config
 
       - name: Build
-        run: RUSTFLAGS="-D warnings" cargo build --locked -j 4
+        run: cargo build --locked -j 4
 
       - name: Run unit tests
         run: cargo test --locked --lib -j 4

src/debug_tools/save_state.rs

@@ -8,8 +8,8 @@ use crate::{
         FighterVelocity, Grounded,
         animation::FighterAnimationFrame,
         attack::{
-            FighterDamage, FighterKnockbackVelocity, FighterPendingHitReaction, FighterPendingHits,
-            FighterSolvedHurtboxes, FighterStaleMoveQueue,
+            FighterDamage, FighterKnockbackVelocity, FighterPendingHitReaction,
+            FighterReceivedAttacks, FighterSolvedHurtboxes, FighterStaleMoveQueue,
         },
         baked_animation::FighterBoneMatrices,
         state::FighterState,
@@ -28,7 +28,6 @@ pub(super) struct DebugSaveState {
 struct Checkpoint {
     fighters: Vec<FighterCheckpoint>,
     stage_collision: StageCollision,
-    pending_hits: FighterPendingHits,
 }
 
 #[derive(Clone)]
@@ -51,6 +50,7 @@ struct FighterCheckpoint {
     knockback_velocity: FighterKnockbackVelocity,
     stale_moves: FighterStaleMoveQueue,
     hitboxes: FighterHitboxes,
+    received_attacks: FighterReceivedAttacks,
     solved_hurtboxes: FighterSolvedHurtboxes,
     bone_matrices: FighterBoneMatrices,
     grounded: bool,
@@ -97,11 +97,9 @@ pub(super) fn save_or_restore(world: &mut World) {
             };
             checkpoint_fighters.push(checkpoint);
         }
-        let pending_hits = world.resource::<FighterPendingHits>().clone();
         world.resource_mut::<DebugSaveState>().checkpoint = Some(Checkpoint {
             fighters: checkpoint_fighters,
             stage_collision,
-            pending_hits,
         });
         info!("Saved debug game state");
         return;
@@ -149,6 +147,7 @@ pub(super) fn save_or_restore(world: &mut World) {
         entity.insert(saved.knockback_velocity);
         entity.insert(saved.stale_moves.clone());
         entity.insert(saved.hitboxes.clone());
+        entity.insert(saved.received_attacks.clone());
         entity.insert(saved.solved_hurtboxes.clone());
         entity.insert(saved.bone_matrices.clone());
         if saved.grounded {
@@ -157,7 +156,6 @@ pub(super) fn save_or_restore(world: &mut World) {
             entity.remove::<Grounded>();
         }
     }
-    world.insert_resource(checkpoint.pending_hits.clone());
     world.insert_resource(checkpoint.stage_collision);
     for mut match_camera in world.query::<&mut MatchCamera>().iter_mut(world) {
         match_camera.needs_snap = true;
@@ -186,6 +184,7 @@ fn capture_fighter(world: &World, entity: Entity) -> Option<FighterCheckpoint> {
         knockback_velocity: *fighter.get::<FighterKnockbackVelocity>()?,
         stale_moves: fighter.get::<FighterStaleMoveQueue>()?.clone(),
         hitboxes: fighter.get::<FighterHitboxes>()?.clone(),
+        received_attacks: fighter.get::<FighterReceivedAttacks>()?.clone(),
         solved_hurtboxes: fighter.get::<FighterSolvedHurtboxes>()?.clone(),
         bone_matrices: fighter.get::<FighterBoneMatrices>()?.clone(),
         grounded: fighter.contains::<Grounded>(),

src/fighter/attack.rs

@@ -1,19 +1,18 @@
 use std::collections::{HashMap, VecDeque};
 
-mod reaction;
-
-use bevy::ecs::entity::{EntityMapper, MapEntities};
 use bevy::prelude::*;
-use bevy_ggrs::{Rollback, RollbackApp, prelude::GgrsSchedule};
+use bevy_ggrs::{Rollback, prelude::GgrsSchedule};
+use fixed_math::SinCos;
 use serde::{Deserialize, Serialize};
 
 use crate::{
     fighter::{
-        Fighter, FighterAttributes, FighterFacingDirection, FighterHitboxes,
+        Fighter, FighterAttributes, FighterFacingDirection, FighterHitboxes, FighterHitstop,
         FighterPreviousFacingDirection, FighterPreviousTranslation, FighterRoster,
         FighterTranslation,
         animation::{AnimKind, FighterAnimationFrame},
         baked_animation::{FighterBoneIndexMap, FighterBoneMatrices, FixedMat4},
+        errors::FighterErrors,
         hurtbox::{FixedAffineCapsule, FixedCapsule},
         manifest::FighterManifest,
     },
@@ -433,26 +432,15 @@ pub struct FighterAttackScriptAssets {
 #[derive(Component, Clone, Debug, Default, Hash)]
 pub struct FighterSolvedHurtboxes(pub Vec<FighterSolvedHurtbox>);
 
-#[derive(Clone, Debug, Hash)]
-pub struct FighterHit {
-    pub attacker: Entity,
-    pub defender: Entity,
-    pub attack_script: Handle<FighterAttackScript>,
-    pub attack_kind: AttackKind,
-    pub hitbox_index: usize,
-}
-
-#[derive(Resource, Clone, Debug, Default, Hash)]
-pub struct FighterPendingHits(pub Vec<FighterHit>);
-
-impl MapEntities for FighterPendingHits {
-    fn map_entities<M: EntityMapper>(&mut self, entity_mapper: &mut M) {
-        for hit in &mut self.0 {
-            hit.attacker = entity_mapper.get_mapped(hit.attacker);
-            hit.defender = entity_mapper.get_mapped(hit.defender);
-        }
-    }
-}
+#[derive(Component, Clone, Debug, Default, Hash, DerefMut, Deref)]
+pub struct FighterReceivedAttacks(
+    pub  Vec<(
+        /* attacker */ Entity,
+        Handle<FighterAttackScript>,
+        AttackKind,
+        /* hitbox_idx */ usize,
+    )>,
+);
 
 pub fn solve_hurtboxes(
     mut query: Query<(
@@ -510,14 +498,19 @@ pub fn intersect_attacks_with_hurtboxes(
         &Player,
         &FighterStaleMoveQueue,
     )>,
-    query_attacked: Query<(Entity, &FighterSolvedHurtboxes)>,
-    mut pending_hits: ResMut<FighterPendingHits>,
+    mut query_attacked: Query<(
+        Entity,
+        &FighterSolvedHurtboxes,
+        &Player,
+        &Fighter,
+        &mut FighterReceivedAttacks,
+    )>,
     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, _, _receiving_fighter, mut received_attacks)) =
+            query_attacked.get_mut(entity_receiving)
+        else {
             continue;
         };
 
@@ -558,13 +551,12 @@ pub fn intersect_attacks_with_hurtboxes(
                 continue;
             };
 
-            pending_hits.0.push(FighterHit {
-                attacker: entity_hurting,
-                defender: entity_receiving,
-                attack_script: active_attack.script.clone(),
-                attack_kind: active_attack.kind,
-                hitbox_index: hitting_hitbox_idx,
-            });
+            received_attacks.push((
+                entity_hurting,
+                active_attack.script.clone(),
+                active_attack.kind,
+                hitting_hitbox_idx,
+            ));
             info!("Hit by hitbox {}!!!!", hitting_hitbox_idx);
 
             active_attack.hit_fighters.push(entity_receiving);
@@ -572,21 +564,140 @@ pub fn intersect_attacks_with_hurtboxes(
     }
 }
 
+pub fn calculate_received_attacks_trajectories(
+    mut attacker: Query<(
+        &mut FighterStaleMoveQueue,
+        &FighterFacingDirection,
+        &FighterHitboxes,
+        &Player,
+        &mut FighterHitstop,
+    )>,
+    receiver: Query<(
+        &mut FighterReceivedAttacks,
+        &mut FighterDamage,
+        &Fighter,
+        &mut FighterPendingHitReaction,
+    )>,
+    attack_scripts: Res<Assets<FighterAttackScript>>,
+    game_settings: Res<GameSettings>,
+    fighter_manifests: Res<Assets<FighterManifest>>,
+) -> Result {
+    for (mut received_attacks, mut receiver_damage, fighter, mut pending_reactions) in receiver {
+        if received_attacks.is_empty() {
+            continue;
+        }
+
+        // we got attacked, time to calculate the total damage
+
+        let damage_data = received_attacks
+            .iter()
+            .filter_map(|(from_entity, attack_script, attack_kind, hitbox_idx)| {
+                let Ok((stale_move_queue, facing_dir, _hitboxes, player, _attacker_hitstop)) =
+                    attacker.get(*from_entity)
+                else {
+                    return None;
+                };
+
+                let Some(attack_script) = attack_scripts.get(attack_script) else {
+                    return None;
+                };
+
+                let hitbox = &attack_script.hitboxes[*hitbox_idx];
+
+                let damage_received =
+                    stale_move_queue.get_attack_damage_multiplier(*attack_kind) * hitbox.damage.0;
+
+                Some((
+                    from_entity,
+                    damage_received,
+                    hitbox,
+                    attack_script,
+                    matches!(facing_dir, FighterFacingDirection::Left),
+                    player.handle,
+                ))
+            })
+            .collect::<Vec<_>>();
+
+        let total_damage_received_this_frame = damage_data
+            .iter()
+            .map(|(_, damage, ..)| damage)
+            .sum::<FGi32>();
+
+        let fighter_manifest = fighter_manifests
+            .get(&fighter.manifest)
+            .ok_or(FighterErrors::FighterManifestNotFound)?;
+
+        let mut reactions = vec![];
+
+        for (attacker_entity, attack_damage, hitbox, _attack_script, facing_left, attacker_slot) in
+            damage_data
+        {
+            let knockback = hitbox.calculate_knockback(
+                &fighter_manifest.attributes,
+                *receiver_damage,
+                FighterDamage(total_damage_received_this_frame),
+                false,
+                false,
+            );
+
+            let angle = match &hitbox.angle {
+                AttackAngle::Normal(angle) => *angle,
+                AttackAngle::Sakurai => FGi32::lit("32.0"),
+            };
+
+            let launch_angle = if facing_left {
+                FGi32::lit("180.0") - angle
+            } else {
+                angle
+            };
+            let (sin, cos) = launch_angle.sin_cos();
+            let launch_direction = FGVec2::new(cos, sin);
+            let hitstop = HitStop::calculate(FighterDamage(attack_damage), false);
+            reactions.push((
+                *attacker_entity,
+                attacker_slot,
+                FighterHitReaction {
+                    launch_velocity: launch_direction * knockback.get_launch_speed(&game_settings),
+                    hitstun_frames: knockback.get_hitstun_frames(&game_settings),
+                    hitstop_frames: hitstop,
+                    kind: HitReactionKind::Flinch,
+                },
+            ));
+        }
+
+        receiver_damage.0 += total_damage_received_this_frame;
+
+        for (attacker_entity, _, reaction) in reactions.iter() {
+            let Ok((.., mut hitstop)) = attacker.get_mut(*attacker_entity) else {
+                continue;
+            };
+
+            hitstop.remaining_frames = reaction.hitstop_frames.max(hitstop.remaining_frames);
+        }
+
+        // Pick attack by port priority
+        pending_reactions.0 = reactions
+            .into_iter()
+            .min_by(|(_, port_a, _), (_, port_b, _)| port_a.cmp(port_b))
+            .map(|(_, _, reaction)| reaction);
+
+        received_attacks.clear();
+    }
+
+    Ok(())
+}
+
 pub struct FighterAttackPlugin;
 
 impl Plugin for FighterAttackPlugin {
     fn build(&self, app: &mut App) {
-        app.init_resource::<FighterPendingHits>()
-            .add_plugins(reaction::FighterReactionPlugin)
-            .rollback_resource_with_clone::<FighterPendingHits>()
-            .update_resource_with_map_entities::<FighterPendingHits>()
-            .checksum_resource_with_hash::<FighterPendingHits>();
         app.add_systems(
             GgrsSchedule,
             (
                 solve_hurtboxes,
                 solve_hitboxes,
                 intersect_attacks_with_hurtboxes,
+                calculate_received_attacks_trajectories,
             )
                 .chain()
                 .after(crate::fighter::baked_animation::update_fighter_bone_matrices)

src/fighter/attack/reaction.rs

@@ -1,145 +0,0 @@
-use bevy::prelude::*;
-use bevy_ggrs::prelude::GgrsSchedule;
-use fixed_math::SinCos;
-
-use super::*;
-use crate::{
-    fighter::{
-        Fighter, FighterFacingDirection, FighterHitboxes, FighterHitstop,
-        FighterPendingHitReaction, FighterStaleMoveQueue, errors::FighterErrors,
-        manifest::FighterManifest,
-    },
-    game_settings::GameSettings,
-    math::{int::FGi32, vec::FGVec2},
-    player::Player,
-    schedule::GameplaySet,
-    scripting::FighterAttackScript,
-};
-
-pub fn resolve_fighter_hits(
-    mut pending_hits: ResMut<FighterPendingHits>,
-    mut attacker: Query<(
-        &FighterStaleMoveQueue,
-        &FighterFacingDirection,
-        &FighterHitboxes,
-        &Player,
-        &mut FighterHitstop,
-    )>,
-    mut receiver: Query<(&mut FighterDamage, &Fighter, &mut FighterPendingHitReaction)>,
-    attack_scripts: Res<Assets<FighterAttackScript>>,
-    game_settings: Res<GameSettings>,
-    fighter_manifests: Res<Assets<FighterManifest>>,
-) -> Result {
-    let hits = std::mem::take(&mut pending_hits.0);
-    let mut hit_offset = 0;
-
-    while hit_offset < hits.len() {
-        let defender = hits[hit_offset].defender;
-        let next_defender = hits[hit_offset..]
-            .iter()
-            .position(|hit| hit.defender != defender)
-            .map_or(hits.len(), |offset| hit_offset + offset);
-
-        let Ok((mut receiver_damage, fighter, mut pending_reaction)) = receiver.get_mut(defender)
-        else {
-            hit_offset = next_defender;
-            continue;
-        };
-
-        let damage_data = hits[hit_offset..next_defender]
-            .iter()
-            .filter_map(|hit| {
-                let Ok((stale_move_queue, facing_dir, _hitboxes, player, _)) =
-                    attacker.get(hit.attacker)
-                else {
-                    return None;
-                };
-                let attack_script = attack_scripts.get(&hit.attack_script)?;
-                let hitbox = attack_script.hitboxes.get(hit.hitbox_index)?;
-                let damage_received = stale_move_queue
-                    .get_attack_damage_multiplier(hit.attack_kind)
-                    * hitbox.damage.0;
-
-                Some((
-                    hit.attacker,
-                    damage_received,
-                    hitbox,
-                    matches!(facing_dir, FighterFacingDirection::Left),
-                    player.handle,
-                ))
-            })
-            .collect::<Vec<_>>();
-
-        let total_damage_received_this_frame = damage_data
-            .iter()
-            .map(|(_, damage, ..)| damage)
-            .sum::<FGi32>();
-        let fighter_manifest = fighter_manifests
-            .get(&fighter.manifest)
-            .ok_or(FighterErrors::FighterManifestNotFound)?;
-        let mut reactions = Vec::with_capacity(damage_data.len());
-
-        for (attacker_entity, attack_damage, hitbox, facing_left, attacker_slot) in damage_data {
-            let knockback = hitbox.calculate_knockback(
-                &fighter_manifest.attributes,
-                *receiver_damage,
-                FighterDamage(total_damage_received_this_frame),
-                false,
-                false,
-            );
-            let angle = match &hitbox.angle {
-                AttackAngle::Normal(angle) => *angle,
-                AttackAngle::Sakurai => FGi32::lit("32.0"),
-            };
-            let launch_angle = if facing_left {
-                FGi32::lit("180.0") - angle
-            } else {
-                angle
-            };
-            let (sin, cos) = launch_angle.sin_cos();
-            let launch_direction = FGVec2::new(cos, sin);
-            let hitstop = HitStop::calculate(FighterDamage(attack_damage), false);
-            reactions.push((
-                attacker_entity,
-                attacker_slot,
-                FighterHitReaction {
-                    launch_velocity: launch_direction * knockback.get_launch_speed(&game_settings),
-                    hitstun_frames: knockback.get_hitstun_frames(&game_settings),
-                    hitstop_frames: hitstop,
-                    kind: HitReactionKind::Flinch,
-                },
-            ));
-        }
-
-        receiver_damage.0 += total_damage_received_this_frame;
-
-        for (attacker_entity, _, reaction) in &reactions {
-            let Ok((.., mut hitstop)) = attacker.get_mut(*attacker_entity) else {
-                continue;
-            };
-            hitstop.remaining_frames = reaction.hitstop_frames.max(hitstop.remaining_frames);
-        }
-
-        pending_reaction.0 = reactions
-            .into_iter()
-            .min_by(|(_, port_a, _), (_, port_b, _)| port_a.cmp(port_b))
-            .map(|(_, _, reaction)| reaction);
-
-        hit_offset = next_defender;
-    }
-
-    Ok(())
-}
-
-pub struct FighterReactionPlugin;
-
-impl Plugin for FighterReactionPlugin {
-    fn build(&self, app: &mut App) {
-        app.add_systems(
-            GgrsSchedule,
-            resolve_fighter_hits
-                .in_set(GameplaySet::Attacks)
-                .after(super::intersect_attacks_with_hurtboxes),
-        );
-    }
-}

src/fighter/mod.rs

@@ -37,8 +37,8 @@ use crate::{
     fighter::{
         attack::{
             AttackKind, FighterAttackPlugin, FighterAttackScriptAssets, FighterDamage,
-            FighterKnockbackVelocity, FighterPendingHitReaction, FighterSolvedHurtboxes,
-            FighterStaleMoveQueue,
+            FighterKnockbackVelocity, FighterPendingHitReaction, FighterReceivedAttacks,
+            FighterSolvedHurtboxes, FighterStaleMoveQueue,
         },
         baked_animation::{FighterBoneIndexMap, FighterBoneMatrices},
         manifest::FighterManifest,
@@ -116,6 +116,7 @@ pub struct FighterVisual;
 
 #[derive(Component)]
 #[require(
+    FighterReceivedAttacks,
     FighterStaleMoveQueue,
     FighterDamage,
     FighterPendingHitReaction,
@@ -198,6 +199,8 @@ impl Plugin for FighterPlugin {
             .checksum_component_with_hash::<FighterHitstop>()
             .rollback_component_with_copy::<FighterKnockbackVelocity>()
             .checksum_component_with_hash::<FighterKnockbackVelocity>()
+            .rollback_component_with_clone::<FighterReceivedAttacks>()
+            .checksum_component_with_hash::<FighterReceivedAttacks>()
             .rollback_resource_with_reflect::<StageCollision>()
             // Debug views.
             .add_systems(

src/fighter/state/dash.rs

@@ -1,5 +1,3 @@
-use std::hash::Hasher;
-
 use super::{
     CollisionContext, EnterContext, FighterStateImpl, InterruptContext, UpdateContext, ground, run,
     wait, walk,
@@ -11,18 +9,12 @@ use crate::fighter::state::fall::FallState;
 use crate::fighter::state::ground::{GroundedMotionResult, GroundedStateCommon};
 use crate::input::FighterCommands::{SmashMoveLeft, SmashMoveRight};
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Hash)]
 pub struct DashState {
     direction: FighterFacingDirection,
     pub ground_common: GroundedStateCommon,
 }
 
-impl std::hash::Hash for DashState {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.direction.hash(state);
-    }
-}
-
 impl DashState {
     pub fn new(direction: FighterFacingDirection, ground_common: GroundedStateCommon) -> Self {
         Self {