Rendo/spacorium
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Faction check is now optional

Browse source
This commit is contained in:
Rendo 2025-11-15 23:06:41 +05:00
commit fba4745162
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/projectile.rs
View file

@ -75,15 +75,17 @@ pub fn observe_collision(
collision: On<Collided>, collision: On<Collided>,
mut commands: Commands, mut commands: Commands,
projectile_query: Query<&Projectile>, projectile_query: Query<&Projectile>,
mut collision_query: Query<(&mut Damagable, &Factions)>, mut damagable_query: Query<(&mut Damagable, Option<&Factions>)>,
) { ) {
let Ok(projectile) = projectile_query.get(collision.entity) else { let Ok(projectile) = projectile_query.get(collision.entity) else {
return; return;
}; };
let Ok((mut collided, faction)) = collision_query.get_mut(collision.with) else { let Ok((mut collided, faction)) = damagable_query.get_mut(collision.with) else {
return; return;
}; };
if projectile.faction.can_damage(faction) == false { if let Some(f) = faction
&& projectile.faction.can_damage(f) == false
{
return; return;
} }