From e33882b348514d121484aadbf6390593fd958a5b Mon Sep 17 00:00:00 2001
From: extrawurst <mail@rusticorn.com>
Date: Tue, 22 Apr 2025 23:54:25 +0200
Subject: [PATCH] character hierarchy system param

---
 src/abilities/mod.rs | 13 +++++--------
 src/character.rs     | 16 +++++++++++++++-
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/abilities/mod.rs b/src/abilities/mod.rs
index 85f5006..f6c4d77 100644
--- a/src/abilities/mod.rs
+++ b/src/abilities/mod.rs
@@ -4,7 +4,7 @@ mod thrown;
 
 use crate::{
     aim::AimTarget,
-    character::ProjectileOrigin,
+    character::CharacterHierarchy,
     global_observer,
     heads::ActiveHeads,
     heads_database::HeadsDatabase,
@@ -86,8 +86,7 @@ fn on_trigger_state(
     mut active_heads: Query<&mut ActiveHeads, With<Player>>,
     heads_db: Res<HeadsDatabase>,
     time: Res<Time>,
-    descendants: Query<&Children>,
-    projectile_origin: Query<&GlobalTransform, With<ProjectileOrigin>>,
+    character: CharacterHierarchy,
 ) {
     if matches!(trigger.event(), TriggerState::Active) {
         let Ok(mut active_heads) = active_heads.get_single_mut() else {
@@ -107,15 +106,13 @@ fn on_trigger_state(
             return;
         };
 
-        let Some(transform) = descendants
-            .iter_descendants(player)
-            .find_map(|child| projectile_origin.get(child).ok())
+        let Some(projectile_origin) = character
+            .projectile_origin(player)
+            .map(|origin| origin.translation())
         else {
             return;
         };
 
-        let projectile_origin = transform.translation();
-
         let Some((rot, dir)) = player_rot.iter().next().map(|t| (t.rotation, t.forward())) else {
             return;
         };
diff --git a/src/character.rs b/src/character.rs
index d27d4d8..6e27262 100644
--- a/src/character.rs
+++ b/src/character.rs
@@ -1,5 +1,5 @@
 use crate::{GameState, heads_database::HeadsDatabase, loading_assets::GameAssets};
-use bevy::{prelude::*, utils::HashMap};
+use bevy::{ecs::system::SystemParam, prelude::*, utils::HashMap};
 use std::time::Duration;
 
 #[derive(Component, Debug)]
@@ -8,6 +8,20 @@ pub struct ProjectileOrigin;
 #[derive(Component, Debug)]
 pub struct AnimatedCharacter(pub usize);
 
+#[derive(SystemParam)]
+pub struct CharacterHierarchy<'w, 's> {
+    descendants: Query<'w, 's, &'static Children>,
+    projectile_origin: Query<'w, 's, &'static GlobalTransform, With<ProjectileOrigin>>,
+}
+
+impl CharacterHierarchy<'_, '_> {
+    pub fn projectile_origin(&self, entity: Entity) -> Option<&GlobalTransform> {
+        self.descendants
+            .iter_descendants(entity)
+            .find_map(|child| self.projectile_origin.get(child).ok())
+    }
+}
+
 #[derive(Component, Debug, Reflect)]
 #[reflect(Component)]
 pub struct CharacterAnimations {