Despawns player arrows when they hit walls

game/src/game/attack/mod.rs

@@ -3,9 +3,11 @@ pub mod particles;
 
 use std::mem;
 
+use arc_attack::Arrow;
+use rapier2d::prelude::InteractionGroups;
 use theseeker_engine::gent::Gent;
 use theseeker_engine::physics::{
-    update_sprite_colliders, Collider, PhysicsWorld, GROUND,
+    update_sprite_colliders, Collider, PhysicsWorld, GROUND, PLAYER_ATTACK,
 };
 
 use super::enemy::{Defense, EnemyGfx, EnemyStateSet, JustGotHitMarker};
@@ -60,6 +62,7 @@ impl Plugin for AttackPlugin {
                 // cleanup
                 attack_tick,
                 despawn_projectile,
+                despawn_player_arrows,
                 attack_cleanup,
             )
                 .chain()
@@ -417,6 +420,32 @@ pub fn despawn_projectile(
     }
 }
 
+pub fn despawn_player_arrows(
+    query: Query<(Entity, &Transform, &Collider), With<Arrow>>,
+    spatial_query: Res<PhysicsWorld>,
+    mut commands: Commands,
+) {
+    for (entity, transform, collider) in query.iter() {
+        let is_arrow_intersecting_with_ground = !spatial_query
+            .intersect(
+                transform.translation.xy(),
+                collider.0.shape(),
+                InteractionGroups {
+                    memberships: PLAYER_ATTACK,
+                    filter: GROUND,
+                },
+                None,
+            )
+            .is_empty();
+
+        if is_arrow_intersecting_with_ground {
+            // Note: purposefully does not despawn child entities, nor remove the
+            // reference, so that child particle systems have the option of lingering
+            commands.entity(entity).despawn();
+        }
+    }
+}
+
 pub fn kill_on_damage(
     query: Query<(Entity, &Health), With<Gent>>,
     mut damage_events: EventReader<DamageInfo>,