refactor: recipe module code touch ups (#89)

Author: ssouthcity

src/gameplay/recipe/mod.rs

@@ -13,15 +13,3 @@ pub fn plugin(app: &mut App) {
         select::plugin,
     ));
 }
-
-#[derive(Component, Reflect, Debug)]
-#[reflect(Component)]
-pub struct Input {
-    pub quantity: u32,
-}
-
-#[derive(Component, Reflect, Debug)]
-#[reflect(Component)]
-pub struct Output {
-    pub quantity: u32,
-}

src/gameplay/recipe/process.rs

@@ -6,8 +6,6 @@ use crate::gameplay::{
     recipe::{assets::Recipe, select::SelectedRecipe},
 };
 
-use super::progress::on_progress_state_add;
-
 pub fn plugin(app: &mut App) {
     app.add_systems(
         FixedUpdate,
@@ -19,24 +17,13 @@ pub fn plugin(app: &mut App) {
 
 #[derive(Component, Reflect, Default)]
 #[reflect(Component)]
-#[component(on_add = on_progress_state_add)]
 pub enum ProcessState {
     #[default]
     InsufficientInput,
     Working(Timer),
     Completed,
 }
 
-impl ProcessState {
-    pub fn progress(&self) -> f32 {
-        match self {
-            Self::InsufficientInput => 0.0,
-            Self::Working(timer) => timer.fraction(),
-            Self::Completed => 1.0,
-        }
-    }
-}
-
 fn consume_input(
     query: Query<(&mut ProcessState, &mut Inventory, &SelectedRecipe)>,
     recipes: Res<Assets<Recipe>>,
@@ -50,25 +37,11 @@ fn consume_input(
             continue;
         };
 
-        if !recipe.input.iter().all(|(item_id, required_amount)| {
-            inventory
-                .items
-                .get(item_id)
-                .is_some_and(|quantity| quantity >= required_amount)
-        }) {
+        if !can_afford_recipe(recipe, &inventory) {
             continue;
         }
 
-        for (item_id, required_amount) in recipe.input.iter() {
-            inventory
-                .items
-                .entry(*item_id)
-                .and_modify(|quantity| *quantity -= required_amount);
-        }
-
-        let Some(recipe) = recipes.get(&selected_recipe.0) else {
-            continue;
-        };
+        consume_recipe_input(recipe, &mut inventory);
 
         let timer = Timer::new(recipe.duration, TimerMode::Once);
 
@@ -103,14 +76,36 @@ fn produce_output(
             continue;
         };
 
-        for (item_id, amount) in recipe.output.iter() {
-            inventory
-                .items
-                .entry(*item_id)
-                .and_modify(|quantity| *quantity += amount)
-                .or_insert(*amount);
-        }
+        produce_recipe_output(recipe, &mut inventory);
 
         *state = ProcessState::InsufficientInput;
     }
 }
+
+fn can_afford_recipe(recipe: &Recipe, inventory: &Inventory) -> bool {
+    recipe.input.iter().all(|(item_id, required_amount)| {
+        inventory
+            .items
+            .get(item_id)
+            .is_some_and(|quantity| quantity >= required_amount)
+    })
+}
+
+fn consume_recipe_input(recipe: &Recipe, inventory: &mut Inventory) {
+    for (item_id, required_amount) in recipe.input.iter() {
+        inventory
+            .items
+            .entry(*item_id)
+            .and_modify(|quantity| *quantity -= required_amount);
+    }
+}
+
+fn produce_recipe_output(recipe: &Recipe, inventory: &mut Inventory) {
+    for (item_id, amount) in recipe.output.iter() {
+        inventory
+            .items
+            .entry(*item_id)
+            .and_modify(|quantity| *quantity += amount)
+            .or_insert(*amount);
+    }
+}

src/gameplay/recipe/progress.rs

@@ -1,34 +1,32 @@
-use bevy::{
-    ecs::{lifecycle::HookContext, world::DeferredWorld},
-    prelude::*,
-    sprite::Anchor,
-};
+use bevy::{prelude::*, sprite::Anchor};
 
 use super::process::ProcessState;
 
 pub fn plugin(app: &mut App) {
+    app.add_observer(on_proess_state_add);
+
     app.add_systems(Update, update_progress_bars);
 }
 
 #[derive(Component, Reflect)]
 #[reflect(Component)]
 #[relationship_target(relationship = ProgressBarFillOf, linked_spawn)]
-pub struct ProgressBarFill(Entity);
+struct ProgressBarFill(Entity);
 
 #[derive(Component, Reflect)]
 #[reflect(Component)]
 #[relationship(relationship_target = ProgressBarFill)]
-pub struct ProgressBarFillOf(Entity);
+struct ProgressBarFillOf(Entity);
 
-pub fn on_progress_state_add(mut world: DeferredWorld, HookContext { entity, .. }: HookContext) {
-    world.commands().spawn((
+fn on_proess_state_add(add: On<Add, ProcessState>, mut commands: Commands) {
+    commands.spawn((
         Name::new("Progress Bar"),
-        ChildOf(entity),
+        ChildOf(add.entity),
         Transform::from_xyz(0.0, 48.0, 100.0),
         Sprite::from_color(Color::BLACK, Vec2::new(64.0, 16.0)),
         children![(
             Name::new("Progress Bar Fill"),
-            ProgressBarFillOf(entity),
+            ProgressBarFillOf(add.entity),
             Transform::from_xyz(-32.0, 0.0, 1.0),
             Sprite {
                 color: Color::linear_rgb(0.0, 0.8, 0.1),
@@ -41,8 +39,8 @@ pub fn on_progress_state_add(mut world: DeferredWorld, HookContext { entity, ..
 }
 
 fn update_progress_bars(
-    work_states: Query<&ProcessState>,
     progress_bars: Query<(&mut Sprite, &ProgressBarFillOf)>,
+    work_states: Query<&ProcessState>,
 ) {
     for (mut sprite, progress_bar_of) in progress_bars {
         let Ok(state) = work_states.get(progress_bar_of.0) else {
@@ -53,6 +51,12 @@ fn update_progress_bars(
             continue;
         };
 
-        sprite.custom_size = Some(Vec2::new(rect.width() * state.progress(), rect.height()));
+        let progress = match state {
+            ProcessState::InsufficientInput => 0.0,
+            ProcessState::Working(timer) => timer.fraction(),
+            ProcessState::Completed => 1.0,
+        };
+
+        sprite.custom_size = Some(Vec2::new(rect.width() * progress, rect.height()));
     }
 }