Attack system revamp #82
@@ -20,7 +20,6 @@ pub fn resolve_fighter_hits(
|
|||||||
mut pending_hits: ResMut<FighterPendingHits>,
|
mut pending_hits: ResMut<FighterPendingHits>,
|
||||||
mut attacker: Query<(
|
mut attacker: Query<(
|
||||||
&mut FighterStaleMoveQueue,
|
&mut FighterStaleMoveQueue,
|
||||||
&FighterFacingDirection,
|
|
||||||
&mut FighterHitboxes,
|
&mut FighterHitboxes,
|
||||||
&Player,
|
&Player,
|
||||||
&mut FighterHitstop,
|
&mut FighterHitstop,
|
||||||
@@ -67,7 +66,7 @@ pub fn resolve_fighter_hits(
|
|||||||
let damage_data = hits[hit_offset..next_defender]
|
let damage_data = hits[hit_offset..next_defender]
|
||||||
.iter()
|
.iter()
|
||||||
.filter_map(|hit| {
|
.filter_map(|hit| {
|
||||||
let Ok((stale_move_queue, facing_dir, _, player, _, _, attacker_translation)) =
|
let Ok((stale_move_queue, _, player, _, _, attacker_translation)) =
|
||||||
attacker.get(hit.attacker)
|
attacker.get(hit.attacker)
|
||||||
else {
|
else {
|
||||||
return None;
|
return None;
|
||||||
@@ -185,7 +184,7 @@ pub fn resolve_fighter_hits(
|
|||||||
}
|
}
|
||||||
|
|
||||||
for hit in hits {
|
for hit in hits {
|
||||||
let Ok((mut stale_move_queue, _facing_direction, mut hitboxes, ..)) =
|
let Ok((mut stale_move_queue, mut hitboxes, ..)) =
|
||||||
attacker.get_mut(hit.attacker)
|
attacker.get_mut(hit.attacker)
|
||||||
else {
|
else {
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
Reference in New Issue
Block a user