1 files changed, 59 insertions, 5 deletions
diff --git a/server/src/interaction.rs b/server/src/interaction.rs
index 75cd0c84..d43c71da 100644
--- a/server/src/interaction.rs
+++ b/server/src/interaction.rs
@@ -66,15 +66,69 @@ pub fn interact(
     tile: &mut Tile,
     player: &mut Player,
 ) -> Option<InteractEffect> {
+    if player.item.is_none() {
+        if let Some(item) = &mut tile.item {
+            if let Some(active) = &mut item.active {
+                let recipe = &data.recipes[active.recipe];
+                if recipe.supports_tile(tile.kind) {
+                    if let Recipe::Active { outputs, .. } = recipe {
+                        if edge {
+                            active.working += 1;
+                        } else {
+                            active.working -= 1;
+                            if active.progress >= 1. {
+                                player.item = outputs[0].map(|kind| Item { kind, active: None });
+                                tile.item = outputs[1].map(|kind| Item { kind, active: None });
+                                return Some(InteractEffect::Produce);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
     if !edge {
         return None;
     }
 
-    for recipe in &data.recipes {
+    for (ri, recipe) in data.recipes.iter().enumerate() {
         if !recipe.supports_tile(tile.kind) {
             continue;
         }
         match recipe {
+            Recipe::Active { input, .. } => {
+                if player.item.is_none() {
+                    if let Some(item) = &mut tile.item {
+                        if item.kind == *input {
+                            if item.active.is_none() {
+                                item.active = Some(Involvement {
+                                    recipe: ri,
+                                    working: 1,
+                                    progress: 0.,
+                                });
+                            }
+                        }
+                    }
+                }
+                if tile.item.is_none() {
+                    if let Some(item) = &player.item {
+                        if item.kind == *input {
+                            let mut item = player.item.take().unwrap();
+                            if let Some(active) = &mut item.active {
+                                active.working += 1;
+                            } else {
+                                item.active = Some(Involvement {
+                                    recipe: ri,
+                                    working: 1,
+                                    progress: 0.,
+                                });
+                            }
+                            tile.item = Some(item);
+                            return Some(InteractEffect::Put);
+                        }
+                    }
+                }
+            }
             Recipe::Instant {
                 inputs, outputs, ..
             } => {
@@ -119,11 +173,11 @@ pub fn tick_tile(dt: f32, data: &Gamedata, tile: &mut Tile) -> Option<TickEffect
             if r.supports_tile(tile.kind) {
                 a.progress += a.working as f32 * dt / r.duration().unwrap();
                 if a.progress >= 1. {
-                    let Recipe::Passive { output, .. } = &data.recipes[a.recipe] else {
-                        unreachable!()
+                    if let Recipe::Passive { output, .. } = &data.recipes[a.recipe] {
+                        tile.item = output.map(|kind| Item { kind, active: None });
+                        return Some(TickEffect::Produce);
                     };
-                    tile.item = output.map(|kind| Item { kind, active: None });
-                    return Some(TickEffect::Produce);
+                    a.progress = 1.;
                 }
                 return Some(TickEffect::Progress);
             }