fix: return deselect on use feature for the hotbar (#59)

Author: ssouthcity

src/gameplay/hud/hotbar.rs

@@ -6,7 +6,7 @@ use bevy::{
 use bevy_aseprite_ultra::prelude::*;
 
 use crate::{
-    gameplay::{FactorySystems, structure::assets::StructureDef},
+    gameplay::{FactorySystems, structure::assets::StructureDef, world::tilemap::TileClicked},
     screens::Screen,
 };
 
@@ -43,6 +43,11 @@ pub fn plugin(app: &mut App) {
             highlight_selected_slot.in_set(FactorySystems::UI),
         ),
     );
+
+    app.add_systems(
+        PostUpdate,
+        deselect_on_use.run_if(on_message::<TileClicked>),
+    );
 }
 
 #[derive(SystemParam)]
@@ -121,6 +126,10 @@ pub enum HotbarActionKind {
 #[reflect(Component)]
 struct HotbarShortcut(KeyCode);
 
+#[derive(Component, Reflect, Debug)]
+#[reflect(Component)]
+struct HotbarPersistAfterUse;
+
 fn spawn_hotbar(mut commands: Commands) {
     commands.spawn((
         Name::new("Hotbar"),
@@ -200,6 +209,7 @@ fn assign_hotbar_paths(
         ChildOf(hotbar_slot),
         HotbarActionOf(hotbar_slot),
         HotbarActionKind::PlacePath,
+        HotbarPersistAfterUse,
         Pickable::IGNORE,
         Node::default(),
         children![(
@@ -252,3 +262,23 @@ fn select_on_keyboard_shortcuts(
         }
     }
 }
+
+fn deselect_on_use(
+    mut selector: HotbarSelector,
+    hotbar_actions: Query<&HotbarAction>,
+    persisted_actions: Query<Entity, With<HotbarPersistAfterUse>>,
+) {
+    let Some(selected) = selector.selection.0 else {
+        return;
+    };
+
+    let Ok(HotbarAction(action)) = hotbar_actions.get(selected) else {
+        return;
+    };
+
+    if persisted_actions.contains(*action) {
+        return;
+    }
+
+    selector.select(None);
+}