passive recipes work

1 files changed, 35 insertions, 6 deletions

diff --git a/server/src/interaction.rs b/server/src/interaction.rs
index fadfe8d9..f2d44dee 100644
--- a/server/src/interaction.rs
+++ b/server/src/interaction.rs
@@ -12,6 +12,7 @@ pub enum Out {
     Put,
     Produce(ItemIndex),
     Consume(usize),
+    SetActive(Option<f32>),
 }
 
 pub fn interact(
@@ -38,16 +39,18 @@ pub fn interact(
         return;
     }
 
-    if !items.is_empty() && hand.is_none() {
+    if active.is_none() && !items.is_empty() && hand.is_none() {
         out(Take(items.len() - 1));
         return;
     }
 
-    if let Some(hi) = hand {
-        if allowed.contains(&hi) {
-            out(Put);
-            items.push(hi);
-            hand = None;
+    if active.is_none() {
+        if let Some(hi) = hand {
+            if allowed.contains(&hi) {
+                out(Put);
+                items.push(hi);
+                hand = None;
+            }
         }
     }
 
@@ -99,3 +102,29 @@ pub fn interact(
         }
     }
 }
+
+pub fn tick_tile(
+    dt: f32,
+    data: &Gamedata,
+    _tile: TileIndex,
+    active: &mut Option<ActiveRecipe>,
+    mut items: Vec<ItemIndex>,
+    mut out: impl FnMut(Out),
+) {
+    if let Some(a) = active {
+        let r = &data.recipes[a.recipe];
+        a.progress += dt / r.action.duration();
+        if a.progress >= 1. {
+            for i in 0..items.len() {
+                out(Consume(i))
+            }
+            for i in &r.outputs {
+                out(Produce(*i));
+            }
+            out(SetActive(None));
+            active.take();
+        } else {
+            out(SetActive(Some(a.progress)));
+        }
+    }
+}