2 files changed, 45 insertions, 90 deletions

diff --git a/data/recipes.yaml b/data/recipes.yaml
index c35bee30..de8de444 100644
--- a/data/recipes.yaml
+++ b/data/recipes.yaml
@@ -1,86 +1,78 @@
-# tomato pipeline
-- tile: counter
+- tile: floor
+  action: !never # tomato pipeline
+
+- tile: meat-spawn
+  action: !instant
+  outputs: [raw-meat]
+
+
+- tile: table
   inputs: [tomato]
   outputs: [sliced-tomato]
-  action: hold
-  duration: 3
-- tile: counter
-  inputs: [sliced-tomato,plate]
+  action: !active 3
+- tile: table
+  inputs: [sliced-tomato, plate]
   outputs: [sliced-tomato-meal]
-  action: instant
-  duration: 0
+  action: !instant # bread pipeline
 
-# bread pipeline
-- tile: counter
+
+- tile: table
   inputs: [flour]
   outputs: [dough]
-  action: hold
-  duration: 5
+  action: !active 5
 - tile: oven
   inputs: [dough]
   outputs: [bread]
-  action: wait
-  duration: 20
-- tile: counter
-  inputs: [bread,plate]
+  action: !passive 20
+- tile: table
+  inputs: [bread, plate]
   outputs: [bread-meal]
-  action: instant
-  duration: 0
+  action: !instant # steak pipeline
 
-# steak pipeline
-- tile: oven
+
+- tile: pan
   inputs: [raw-steak]
   outputs: [steak]
-  action: wait
-  duration: 15
-- tile: counter
-  inputs: [steak,plate]
+  action: !passive 15
+- tile: table
+  inputs: [steak, plate]
   outputs: [steak-meal]
-  action: instant
-  duration: 0
+  action: !instant # combination meals
+
 
-# combination meals
-- tile: counter
-  inputs: [steak-meal,bread]
+- tile: table
+  inputs: [steak-meal, bread]
   outputs: [burger-meal]
-  action: instant
-  duration: 0
-- tile: counter
-  inputs: [steak-meal,tomato]
+  action: !instant
+- tile: table
+  inputs: [steak-meal, tomato]
   outputs: [tomatosteak-meal]
-  action: instant
-  duration: 0
-- tile: counter
-  inputs: [burger-meal,tomato]
+  action: !instant
+- tile: table
+  inputs: [burger-meal, tomato]
   outputs: [tomatoburger-meal]
-  action: instant
-  duration: 0
-- tile: counter
-  inputs: [tomatosteak-meal,bread]
+  action: !instant
+- tile: table
+  inputs: [tomatosteak-meal, bread]
   outputs: [tomatoburger-meal]
-  action: instant
-  duration: 0
+  action: !instant # cups
+
 
-# cups
 - tile: watercooler
   inputs: [glass]
   outputs: [water]
-  action: wait
-  duration: 2
+  action: !passive 2
 - tile: sink
   inputs: [water]
   outputs: [glass]
-  action: instant
-  duration: 0
+  action: !instant # cleaning
+
 
-# cleaning
 - tile: sink
   inputs: [dirty-glass]
   outputs: [glass]
-  action: hold
-  duration: 5
+  action: !active 5
 - tile: sink
   inputs: [dirty-plate]
   outputs: [plate]
-  action: hold
-  duration: 5
+  action: !active 5
diff --git a/data/recipes_raw.yaml b/data/recipes_raw.yaml
deleted file mode 100644
index 75939c11..00000000
--- a/data/recipes_raw.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-- tile: cutting-plate
-  inputs: [tomato]
-  outputs: [sliced-tomato]
-  duration: 3
-  active: true
-
-- tile: sink
-  inputs: [empty-bottle]
-  outputs: [water-bottle]
-  instant: true
-
-- tile: dishwasher
-  inputs: [dirty-dish]
-  output: [empty-dish]
-  duration: 10
-
-- tile: table
-  inputs: [steak, herbs]
-  outputs: [steak-with-herbs]
-  ordered: true
-  instant: true
-
-- tile: table
-  inputs: [apple-juice-bottle, carbonated-water-bottle]
-  outputs: [apply-soda-bottle, empty-bottle]
-  instant: true
-
-- tile: table
-  inputs: [empty-cup, <a>-bottle]
-  outputs: [<a>-cup, empty-bottle]
-  instant: true
-
-- tile: flour-bag
-  outputs: [flour]
-  instant: true
-