primary enemy follows player

src/droid/ai.rs

@@ -1,3 +1,4 @@
+use crate::player::PlayerMarker;
 use crate::weapon::PROJECTILE_SPEED;
 use crate::{droid::WeaponState, weapon::Projectile};
 use bevy::{
@@ -90,6 +91,18 @@ pub struct EnemyEvaluation {
     direction: Vec2,
 }
 
+fn enemy_select_system(
+    mut query: Query<&mut PrimaryEnemy>,
+
+    player_query: Query<Entity, With<PlayerMarker>>,
+) {
+    let Some(enemy) = player_query.iter().next() else {
+        return;
+    };
+    for mut primary_enemy in &mut query {
+        primary_enemy.enemy = enemy;
+    }
+}
 fn enemy_evaluation_system(
     mut query: Query<(&mut EnemyEvaluation, &PrimaryEnemy, &Transform)>,
     droid_query: Query<&Transform>,
@@ -327,6 +340,7 @@ impl Plugin for AiPlugin {
         //         .with_system(incomping_projectile_evaluation_system),
         // );
 
+        app.add_systems(PreUpdate, enemy_select_system);
         app.add_systems(
             Update,
             (

src/player.rs

@@ -30,7 +30,7 @@ pub struct PlayerMarker;
 fn enter_droid(
     mut commands: Commands,
     query: Query<(Entity, &Transform), With<DroidMarker>>,
-    ship_query: Query<&Transform, (With<PlayerMarker>, With<ShipMarker>)>,
+    ship_query: Query<&Transform, /*(With<PlayerMarker>,*/ With<ShipMarker>>,
 ) {
     let Ok(ship_transform) = ship_query.get_single() else {
         return;
@@ -76,12 +76,13 @@ fn exit_droid(
 #[allow(clippy::type_complexity)]
 fn enter_ship(
     mut commands: Commands,
-    query: Query<Entity, (With<PlayerMarker>, With<ShipMarker>)>,
+    query: Query<Entity, /*(With<PlayerMarker>, */ With<ShipMarker>>,
 ) {
     for entity in &query {
         commands
             .entity(entity)
-            .insert(PrimaryPlayerBundle::default());
+            .insert(PrimaryPlayerBundle::default())
+            .insert(PlayerMarker);
     }
 }
 
@@ -94,7 +95,10 @@ fn exit_ship(
     >,
 ) {
     for (entity, mut ship_input) in &mut query {
-        commands.entity(entity).remove::<PrimaryPlayerBundle>();
+        commands
+            .entity(entity)
+            .remove::<PrimaryPlayerBundle>()
+            .remove::<PlayerMarker>();
         *ship_input = ShipInput::default();
     }
 }