feat: add harvesting and rework inputs/outputs (#71)

Author: ssouthcity

Cargo.toml

@@ -70,3 +70,8 @@ codegen-units = 4
 
 [profile.ci.package."*"]
 opt-level = 0
+
+[lints.clippy]
+too_many_arguments = "allow"
+type_complexity = "allow"
+nonstandard_macro_braces = "warn"

assets/manifests/deposits/fauna_a.deposit.toml

@@ -1,4 +1,5 @@
 id = "fauna_a"
 name = "Fauna A Deposit"
-recipe_id = "fauna_a"
+item_id = "fauna_a"
+taxonomy = "Fauna"
 seed = 463724

assets/manifests/deposits/flora_a.deposit.toml

@@ -1,4 +1,5 @@
 id = "flora_a"
 name = "Flora A Deposit"
-recipe_id = "flora_a"
+item_id = "flora_a"
+taxonomy = "Flora"
 seed = 821954

assets/manifests/structures/harvester.structure.toml

@@ -1,3 +1,2 @@
 id = "harvester"
 name = "Harvester"
-default_recipe = "flora_a"

src/gameplay/hud/inspect/info.rs

@@ -4,7 +4,8 @@ use crate::{
     assets::indexing::IndexMap,
     gameplay::{
         hud::inspect::{InspectedEntity, InspectionMenuState},
-        recipe::{Inputs, Outputs, assets::RecipeDef, select::SelectedRecipe},
+        item::inventory::Slots,
+        recipe::{Input, Output, assets::RecipeDef, select::SelectedRecipe},
     },
     widgets::{
         self,
@@ -24,16 +25,17 @@ pub fn plugin(app: &mut App) {
 #[reflect(Component)]
 pub struct HeldRelic(Entity);
 
-#[allow(clippy::too_many_arguments)]
 pub fn open_recipe_menu(
     mut commands: Commands,
     inspected_entity: Res<InspectedEntity>,
-    structure_query: Query<(&SelectedRecipe, &Inputs, &Outputs)>,
+    structure_query: Query<(&SelectedRecipe, &Slots)>,
+    input_query: Query<(), With<Input>>,
+    output_query: Query<(), With<Output>>,
     recipes: Res<Assets<RecipeDef>>,
     recipe_index: Res<IndexMap<RecipeDef>>,
     held_relics: Query<&HeldRelic>,
 ) {
-    let Ok((selected_recipe, inputs, outputs)) = structure_query.get(inspected_entity.0) else {
+    let Ok((selected_recipe, slots)) = structure_query.get(inspected_entity.0) else {
         return;
     };
 
@@ -117,7 +119,7 @@ pub fn open_recipe_menu(
         ))
         .id();
 
-    for input in inputs.iter() {
+    for input in slots.iter().filter(|s| input_query.contains(*s)) {
         let slot = commands
             .spawn((ChildOf(input_list_id), widgets::slot::slot_container()))
             .id();
@@ -190,7 +192,7 @@ pub fn open_recipe_menu(
         ))
         .id();
 
-    for output in outputs.iter() {
+    for output in slots.iter().filter(|s| output_query.contains(*s)) {
         let slot = commands
             .spawn((ChildOf(output_list_id), widgets::slot::slot_container()))
             .id();

src/gameplay/item/assets.rs

@@ -27,7 +27,8 @@ pub struct ItemDef {
     pub transport: Transport,
 }
 
-#[derive(Clone, Debug, Deserialize, Reflect)]
+#[derive(Component, Clone, Debug, Deserialize, Reflect, PartialEq, Eq)]
+#[reflect(Component)]
 pub enum Taxonomy {
     Fauna,
     Flora,

src/gameplay/item/compendium.rs

@@ -0,0 +1,13 @@
+use bevy::prelude::*;
+
+pub(super) fn plugin(_app: &mut App) {}
+
+#[derive(Component, Reflect, Debug)]
+#[reflect(Component)]
+#[relationship_target(relationship = SlotOf, linked_spawn)]
+pub struct Slots(Vec<Entity>);
+
+#[derive(Component, Reflect, Debug)]
+#[reflect(Component)]
+#[relationship(relationship_target = Slots)]
+pub struct SlotOf(pub Entity);

src/gameplay/item/inventory.rs

@@ -1,9 +1,9 @@
 use bevy::prelude::*;
 
 pub mod assets;
-pub mod compendium;
+pub mod inventory;
 pub mod stack;
 
 pub fn plugin(app: &mut App) {
-    app.add_plugins((assets::plugin, compendium::plugin, stack::plugin));
+    app.add_plugins((assets::plugin, inventory::plugin, stack::plugin));
 }

src/gameplay/item/mod.rs

@@ -2,9 +2,7 @@ use bevy::prelude::*;
 
 use crate::gameplay::item::assets::ItemDef;
 
-pub(super) fn plugin(app: &mut App) {
-    app.add_systems(Update, mark_full_stacks);
-}
+pub(super) fn plugin(_app: &mut App) {}
 
 #[derive(Component, Reflect, Debug, Clone)]
 #[reflect(Component)]
@@ -24,27 +22,3 @@ impl Stack {
         Stack { item, quantity }
     }
 }
-
-#[derive(Component, Reflect)]
-#[reflect(Component)]
-#[component(storage = "SparseSet")]
-pub struct Full;
-
-fn mark_full_stacks(
-    query: Query<(Entity, &Stack)>,
-    item_defs: Res<Assets<ItemDef>>,
-    mut commands: Commands,
-) {
-    for (entity, stack) in query {
-        let stack_size = item_defs
-            .get(&stack.item)
-            .map(|def| def.stack_size)
-            .unwrap_or(1);
-
-        if stack.quantity >= stack_size {
-            commands.entity(entity).insert(Full);
-        } else {
-            commands.entity(entity).remove::<Full>();
-        }
-    }
-}