Updated for 0.6.0 to revert the forever foods change.

20 files changed, 762 insertions, 2 deletions

diff --git a/Readme.txt b/Readme.txt
index e35460c..1505212 100644
--- a/Readme.txt
+++ b/Readme.txt
@@ -177,3 +177,6 @@ Every other soup is either 1 or 2, so 10 must be a typo.
 Add recipe to craft hardened steel plates.
 
 --
+Revert the upstream changes that make every food with a shelflife of over a month to last forever.
+
+--
diff --git a/json/items/comestible/bread.json b/json/items/comestible/bread.json
new file mode 100644
index 0000000..e9b230a
--- /dev/null
+++ b/json/items/comestible/bread.json
@@ -0,0 +1,23 @@
+[
+  {
+    "type": "COMESTIBLE",
+    "id": "hardtack",
+    "name": "hardtack",
+    "weight": "80 g",
+    "color": "white",
+    "spoils_in": "364 days",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "quench": -2,
+    "calories": 240,
+    "description": "A dry and virtually tasteless bread product capable of remaining edible without spoilage for vast lengths of time.",
+    "price": "125 cent",
+    "price_postapoc": "150 cent",
+    "material": "wheat",
+    "volume": "250 ml",
+    "charges": 2,
+    "vitamins": [ [ "calcium", 2 ], [ "iron", 15 ] ],
+    "stack_size": 20,
+    "fun": -1
+  }
+]
diff --git a/json/items/comestible/carnivore.json b/json/items/comestible/carnivore.json
new file mode 100644
index 0000000..c6911c4
--- /dev/null
+++ b/json/items/comestible/carnivore.json
@@ -0,0 +1,50 @@
+[
+  { 
+    "id": "jerky",
+    "copy-from": "jerky",
+    "type": "COMESTIBLE",
+    "name": { "str_sp": "meat jerky" },
+    "conditional_names": [
+      { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "jerk jerky" } },
+      { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "monster jerky" } }
+    ],
+    "spoils_in": "182 days",
+    "//": "Increase from 24 to 182 days."
+  },
+  {
+    "id": "salted_fish",
+    "copy-from": "salted_fish",
+    "type": "COMESTIBLE",
+    "name": { "str_sp": "salted fish" },
+    "spoils_in": "182 days",
+    "//": "Increase from 24 to 182 days."
+  },
+  { 
+    "id": "meat_smoked",
+    "copy-from": "meat_smoked",
+    "type": "COMESTIBLE",
+    "name": "smoked meat",
+    "conditional_names": [
+      { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "smoked sucker" } },
+      { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "%s, mutant" } }
+    ],
+    "spoils_in": "182 days",
+    "//": "Increase from 24 to 182 days."
+  },
+  { 
+    "id": "fish_smoked",
+    "copy-from": "fish_smoked",
+    "type": "COMESTIBLE",
+    "name": { "str_sp": "smoked fish" },
+    "spoils_in": "182 days",
+    "//": "Increase from 24 to 182 days."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "tallow",
+    "copy-from": "tallow",
+    "name": "tallow",
+    "spoils_in": "60 days",
+    "//": "Restore original spoils_in."
+  }
+]
diff --git a/json/items/comestible/dairy.json b/json/items/comestible/dairy.json
new file mode 100644
index 0000000..cb8477e
--- /dev/null
+++ b/json/items/comestible/dairy.json
@@ -0,0 +1,18 @@
+[
+  {
+    "type": "COMESTIBLE",
+    "id": "ghee",
+    "copy-from": "ghee",
+    "name": { "str_sp": "ghee" },
+    "spoils_in": "91 days",
+    "//": "Restore original spoils_in."
+  }.
+  {
+    "type": "COMESTIBLE",
+    "id": "ghee",
+    "copy-from": "ghee",
+    "name": { "str_sp": "hard cheese" },
+    "spoils_in": "182 days",
+    "//": "Restore original spoils_in."
+  }
+]
diff --git a/json/items/comestible/drink.json b/json/items/comestible/drink.json
new file mode 100644
index 0000000..3c3dec5
--- /dev/null
+++ b/json/items/comestible/drink.json
@@ -0,0 +1,34 @@
+[
+  {
+    "type": "COMESTIBLE",
+    "id": "bee_balm_tea",
+    "copy-from": "bee_balm_tea",
+    "name": { "str_sp": "bee balm tea" },
+    "spoils_in": "10 days",
+    "//": "Restore original spoils_in."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "chamomile_tea",
+    "copy-from": "chamomile_tea",
+    "name": { "str_sp": "chamomile tea" },
+    "spoils_in": "10 days",
+    "//": "Restore original spoils_in."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "lotus_tea",
+    "copy-from": "lotus_tea",
+    "name": { "str_sp": "lotus tea" },
+    "spoils_in": "10 days",
+    "//": "Restore original spoils_in."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "spurge_tea",
+    "copy-from": "spurge_tea",
+    "name": { "str_sp": "spurge tea" },
+    "spoils_in": "10 days",
+    "//": "Restore original spoils_in."
+  }
+]
diff --git a/json/items/comestible/drink_other.json b/json/items/comestible/drink_other.json
new file mode 100644
index 0000000..b5c2781
--- /dev/null
+++ b/json/items/comestible/drink_other.json
@@ -0,0 +1,11 @@
+[
+  {
+    "type": "COMESTIBLE",
+    "id": "peanutbutter",
+    "copy-from": "peanutbutter",
+    "name": { "str": "peanut butter" },
+    "spoils_in": "182 days",
+    "//": "Restore original spoils_in."
+  }
+]
+
diff --git a/json/items/comestible/fruit_dishes.json b/json/items/comestible/fruit_dishes.json
new file mode 100644
index 0000000..9e8535f
--- /dev/null
+++ b/json/items/comestible/fruit_dishes.json
@@ -0,0 +1,18 @@
+[
+  {
+    "type": "COMESTIBLE",
+    "id": "fruit_leather",
+    "copy-from": "fruit_leather",
+    "name": { "str": "fruit leather" },
+    "spoils_in": "364 days",
+    "//": "Restore original spoils_in."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "dry_fruit",
+    "copy-from": "dry_fruit",
+    "name": { "str_sp": "dehydrated fruit" },
+    "spoils_in": "364 days",
+    "//": "Restore original spoils_in."
+  },
+]
diff --git a/json/items/comestible/junkfood.json b/json/items/comestible/junkfood.json
new file mode 100644
index 0000000..0456b7e
--- /dev/null
+++ b/json/items/comestible/junkfood.json
@@ -0,0 +1,194 @@
+[
+  {
+    "type": "COMESTIBLE",
+    "id": "toastem",
+    "copy-from": "toastem",
+    "name": { "str": "toast-em" },
+    "spoils_in": "91 days",
+    "//": "Restore original spoils_in."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "popcorn",
+    "copy-from": "popcorn",
+    "name": { "str_sp": "popcorn" },
+    "spoils_in": "364 days",
+    "//": "Restore original spoils_in."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "pretzels",
+    "copy-from": "pretzels",
+    "name": { "str_sp": "pretzels" },
+    "spoils_in": "91 days",
+    "//": "Restore original spoils_in."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "chocpretzels",
+    "copy-from": "chocpretzels",
+    "name": { "str": "chocolate-covered pretzel" },
+    "spoils_in": "91 days",
+    "//": "Restore original spoils_in."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "chocolate",
+    "copy-from": "chocolate",
+    "name": { "str": "chocolate bar" },
+    "spoils_in": "364 days",
+    "//": "Restore original spoils_in."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "marshmallow",
+    "copy-from": "marshmallow",
+    "name": { "str_sp": "marshmallows" },
+    "spoils_in": "91 days",
+    "//": "Restore original spoils_in."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "smores",
+    "copy-from": "smores",
+    "name": { "str_sp": "s'mores" },
+    "spoils_in": "91 days",
+    "//": "Restore original spoils_in."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "candy",
+    "copy-from": "candy",
+    "name": { "str": "peanut butter candy", "str_pl": "peanut butter candies" },
+    "spoils_in": "364 days",
+    "//": "Restore original spoils_in."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "candy2",
+    "copy-from": "candy2",
+    "name": { "str": "chocolate candy", "str_pl": "chocolate candies" },
+    "spoils_in": "364 days",
+    "//": "Restore original spoils_in."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "candy3",
+    "copy-from": "candy3",
+    "name": { "str_sp": "chewy candy", "str_pl": "chewy candies" },
+    "spoils_in": "364 days",
+    "//": "Restore original spoils_in."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "powder_candy",
+    "copy-from": "powder_candy",
+    "name": { "str_sp": "powder candy sticks" },
+    "spoils_in": "364 days",
+    "//": "Restore original spoils_in."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "maple_candy",
+    "copy-from": "maple_candy",
+    "name": { "str": "maple syrup candy", "str_pl": "maple syrup candies" },
+    "spoils_in": "364 days",
+    "//": "Restore original spoils_in."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "grahmcrackers",
+    "copy-from": "grahmcrackers",
+    "name": { "str": "graham cracker" },
+    "spoils_in": "91 days",
+    "//": "Restore original spoils_in."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "cookies",
+    "copy-from": "cookies",
+    "name": { "str": "cookie" },
+    "spoils_in": "91 days",
+    "//": "Restore original spoils_in."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "choco_coffee_beans",
+    "copy-from": "choco_coffee_beans",
+    "name": { "str": "chocolate-covered coffee bean" },
+    "spoils_in": "364 days",
+    "//": "Restore original spoils_in."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "mintpatties",
+    "copy-from": "mintpatties",
+    "name": { "str": "peppermint patty", "str_pl": "peppermint patties" },
+    "spoils_in": "182 days",
+    "//": "Restore original spoils_in."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "neccowafers",
+    "copy-from": "neccowafers",
+    "name": { "str_sp": "Necco wafers" },
+    "spoils_in": "182 days",
+    "//": "Restore original spoils_in."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "candycigarette",
+    "copy-from": "candycigarette",
+    "name": { "str": "candy cigarette" },
+    "spoils_in": "182 days",
+    "//": "Restore original spoils_in."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "chips",
+    "copy-from": "chips",
+    "name": { "str": "potato chips" },
+    "spoils_in": "30 days",
+    "//": "Restore original spoils_in."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "cereal",
+    "copy-from": "cereal",
+    "name": { "str": "sugary cereal" },
+    "spoils_in": "91 days",
+    "//": "Restore original spoils_in."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "cereal3",
+    "copy-from": "cereal3",
+    "name": { "str": "corn cereal" },
+    "spoils_in": "91 days",
+    "//": "Restore original spoils_in."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "nachos",
+    "copy-from": "nachos",
+    "name": { "str_sp": "tortilla chips" },
+    "spoils_in": "30 days",
+    "//": "Restore original spoils_in."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "porkstick",
+    "copy-from": "porkstick",
+    "name": { "str": "pork stick" },
+    "spoils_in": "182 days",
+    "//": "Increase from 24 to 182 days."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "maltballs",
+    "copy-from": "maltballs",
+    "name": { "str": "malted milk ball" },
+    "spoils_in": "182 days",
+    "//": "Restore original spoils_in."
+  },
+]
diff --git a/json/items/comestible/meat_dishes.json b/json/items/comestible/meat_dishes.json
index db021ab..7674b98 100644
--- a/json/items/comestible/meat_dishes.json
+++ b/json/items/comestible/meat_dishes.json
@@ -5,5 +5,95 @@
     "copy-from": "chili",
     "name": { "str": "chili con carne", "str_pl": "chilis con carne" },
     "phase": "liquid"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "sausage",
+    "copy-from": "sausage",
+    "name": "smoked sausage",
+    "conditional_names": [
+      { "type": "FLAG", "condition": "CANNIBALISM", "name": "smoked Mannwurst" },
+      { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "sinister %s" } }
+    ],
+    "spoils_in": "182 days",
+    "//": "Increase from 24 to 182 days."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "potted_meat",
+    "copy-from": "potted_meat",
+    "name": { "str_sp": "potted meat" },
+    "conditional_names": [
+      { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "potted person" } },
+      { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "potted freak" } }
+    ],
+    "spoils_in": "60 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "bacon",
+    "copy-from": "bacon",
+    "name": { "str": "bacon", "str_pl": "pieces of bacon" },
+    "spoils_in": "182 days",
+    "//": "Increase from 24 to 182 days."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "sausage_wasteland",
+    "copy-from": "sausage_wasteland",
+    "name": "smoked wasteland sausage",
+    "conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "wayward %s" } } ],
+    "spoils_in": "182 days",
+    "//": "Increase from 24 to 182 days."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "cracklins",
+    "copy-from": "cracklins",
+    "name": { "str_sp": "cracklins" },
+    "spoils_in": "7 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "dry_fish",
+    "copy-from": "dry_fish",
+    "name": { "str_sp": "dehydrated fish" },
+    "spoils_in": "364 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "lutefisk",
+    "copy-from": "lutefisk",
+    "name": { "str": "lutefisk" },
+    "spoils_in": "364 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "pemmican",
+    "copy-from": "pemmican",
+    "name": { "str_sp": "pemmican" },
+    "conditional_names": [
+      { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "prepper %s" } },
+      { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "pernicious %s" } }
+    ],
+    "spoils_in": "364 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "dry_meat",
+    "copy-from": "dry_meat",
+    "name": "dehydrated meat",
+    "conditional_names": [
+      { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "%s, human" } },
+      { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "%s, mutant" } }
+    ],
+    "spoils_in": "364 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "dry_meat_tainted",
+    "copy-from": "dry_meat_tainted",
+    "name": { "str": "dehydrated tainted meat" },
+    "spoils_in": "364 days"
   }
 ]
diff --git a/json/items/comestible/med.json b/json/items/comestible/med.json
new file mode 100644
index 0000000..2840c57
--- /dev/null
+++ b/json/items/comestible/med.json
@@ -0,0 +1,16 @@
+[
+  {
+    "type": "COMESTIBLE",
+    "id": "mugwort_oil",
+    "copy-from": "mugwort_oil",
+    "name": { "str_sp": "mugwort oil" },
+    "spoils_in": "28 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "thyme_oil",
+    "copy-from": "thyme_oil",
+    "name": { "str_sp": "thyme oil" },
+    "spoils_in": "28 days"
+  }
+]
diff --git a/json/items/comestible/mushroom.json b/json/items/comestible/mushroom.json
new file mode 100644
index 0000000..0e81602
--- /dev/null
+++ b/json/items/comestible/mushroom.json
@@ -0,0 +1,9 @@
+[
+  {
+    "type": "COMESTIBLE",
+    "id": "dry_mushroom",
+    "copy-from": "dry_mushroom",
+    "name": { "str": "dried mushroom" },
+    "spoils_in": "364 days"
+  }
+]
diff --git a/json/items/comestible/nuts.json b/json/items/comestible/nuts.json
new file mode 100644
index 0000000..9658abf
--- /dev/null
+++ b/json/items/comestible/nuts.json
@@ -0,0 +1,107 @@
+[
+  {
+    "type": "COMESTIBLE",
+    "id": "pine_nuts",
+    "copy-from": "pine_nuts",
+    "name": { "str_sp": "pine nuts" },
+    "spoils_in": "1092 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "pistachio",
+    "copy-from": "pistachio",
+    "name": { "str_sp": "pistachios" },
+    "spoils_in": "91 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "almond",
+    "copy-from": "almond",
+    "name": { "str_sp": "almonds" },
+    "spoils_in": "303 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "almond_pulp",
+    "copy-from": "almond_pulp",
+    "name": { "str_sp": "almond pulp" },
+    "spoils_in": "303 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "cashew",
+    "copy-from": "cashew",
+    "name": { "str_sp": "cashews" },
+    "spoils_in": "242 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "pecan",
+    "copy-from": "pecan",
+    "name": { "str_sp": "pecans" },
+    "spoils_in": "182 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "peanut",
+    "copy-from": "peanut",
+    "name": { "str_sp": "peanuts" },
+    "spoils_in": "242 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "beech_nuts",
+    "copy-from": "beech_nuts",
+    "name": { "str_sp": "beech nuts" },
+    "spoils_in": "91 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "walnut",
+    "copy-from": "walnut",
+    "name": { "str_sp": "walnuts" },
+    "spoils_in": "182 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "chestnut",
+    "copy-from": "chestnut",
+    "name": { "str_sp": "chestnuts" },
+    "spoils_in": "182 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "hazelnut",
+    "copy-from": "hazelnut",
+    "name": { "str_sp": "hazelnuts" },
+    "spoils_in": "150 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "edamame_roasted",
+    "copy-from": "edamame_roasted",
+    "name": { "str_sp": "roasted edamame" },
+    "spoils_in": "242 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "soy_nuts",
+    "copy-from": "soy_nuts",
+    "name": { "str_sp": "roasted soy nuts" },
+    "spoils_in": "242 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "hickory_nut",
+    "copy-from": "hickory_nut",
+    "name": { "str_sp": "hickory nuts" },
+    "spoils_in": "182 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "acorns",
+    "copy-from": "acorns",
+    "name": { "str_sp": "acorns" },
+    "spoils_in": "242 days"
+  }
+]
diff --git a/json/items/comestible/offal_dishes.json b/json/items/comestible/offal_dishes.json
new file mode 100644
index 0000000..7e85769
--- /dev/null
+++ b/json/items/comestible/offal_dishes.json
@@ -0,0 +1,9 @@
+[
+  {
+    "type": "COMESTIBLE",
+    "id": "leverpostej",
+    "copy-from": "leverpostej",
+    "name": { "str_sp": "leverpostej" },
+    "spoils_in": "364 days"
+  }
+]
diff --git a/json/items/comestible/other.json b/json/items/comestible/other.json
index e143f05..497696f 100644
--- a/json/items/comestible/other.json
+++ b/json/items/comestible/other.json
@@ -15,5 +15,33 @@
     "flags": [ "EATEN_HOT" ],
     "rot_spawn": "GROUP_ROTTING_PLANT",
     "rot_spawn_chance": 5
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "dry_beans",
+    "copy-from": "dry_beans",
+    "name": { "str_sp": "dried beans" },
+    "spoils_in": "364 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "dry_tofu",
+    "copy-from": "dry_tofu",
+    "name": { "str_sp": "dehydrated tofu" },
+    "spoils_in": "364 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "soybean",
+    "copy-from": "soybean",
+    "name": { "str_sp": "soybeans" },
+    "spoils_in": "364 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "cattlefodder",
+    "copy-from": "cattlefodder",
+    "name": { "str_sp": "cattle fodder" },
+    "spoils_in": "728 days"
   }
 ]
diff --git a/json/items/comestible/raw_fruit.json b/json/items/comestible/raw_fruit.json
new file mode 100644
index 0000000..e47da1b
--- /dev/null
+++ b/json/items/comestible/raw_fruit.json
@@ -0,0 +1,16 @@
+[
+  {
+    "type": "COMESTIBLE",
+    "id": "cacao_pod",
+    "copy-from": "cacao_pod",
+    "name": { "str_sp": "cacao pod" },
+    "spoils_in": "364 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "coconut",
+    "copy-from": "coconut",
+    "name": { "str": "coconut" },
+    "spoils_in": "364 days"
+  }
+]
diff --git a/json/items/comestible/raw_veggy.json b/json/items/comestible/raw_veggy.json
new file mode 100644
index 0000000..4b07ad9
--- /dev/null
+++ b/json/items/comestible/raw_veggy.json
@@ -0,0 +1,16 @@
+[
+  {
+    "type": "COMESTIBLE",
+    "id": "garlic",
+    "copy-from": "garlic",
+    "name": { "str": "garlic bulb" },
+    "spoils_in": "364 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "sugar_beet",
+    "copy-from": "sugar_beet",
+    "name": { "str": "sugar beet" },
+    "spoils_in": "91 days"
+  }
+]
diff --git a/json/items/comestible/seed.json b/json/items/comestible/seed.json
new file mode 100644
index 0000000..142826e
--- /dev/null
+++ b/json/items/comestible/seed.json
@@ -0,0 +1,9 @@
+[
+  {
+    "type": "COMESTIBLE",
+    "id": "garlic_clove",
+    "copy-from": "garlic_clove",
+    "name": { "str": "garlic clove" },
+    "spoils_in": "364 days"
+  }
+]
diff --git a/json/items/comestible/veggy_dishes.json b/json/items/comestible/veggy_dishes.json
new file mode 100644
index 0000000..ab4db88
--- /dev/null
+++ b/json/items/comestible/veggy_dishes.json
@@ -0,0 +1,44 @@
+[
+  {
+    "type": "COMESTIBLE",
+    "id": "garlic_roasted",
+    "copy-from": "garlic_roasted",
+    "name": { "str_sp": "roasted garlic" },
+    "spoils_in": "182 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "cornmeal",
+    "copy-from": "cornmeal",
+    "name": { "str_sp": "cornmeal" },
+    "spoils_in": "364 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "dry_rice",
+    "copy-from": "dry_rice",
+    "name": { "str_sp": "dried rice" },
+    "spoils_in": "364 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "dry_veggy",
+    "copy-from": "dry_veggy",
+    "name": { "str": "dehydrated vegetable" },
+    "spoils_in": "364 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "dried_salad",
+    "copy-from": "dried_salad",
+    "name": { "str": "dried salad" },
+    "spoils_in": "364 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "sauerkraut",
+    "copy-from": "sauerkraut",
+    "name": { "str_sp": "sauerkraut" },
+    "spoils_in": "30 days"
+  }
+]
diff --git a/json/items/comestible/wheat.json b/json/items/comestible/wheat.json
new file mode 100644
index 0000000..11c507b
--- /dev/null
+++ b/json/items/comestible/wheat.json
@@ -0,0 +1,65 @@
+[
+  {
+    "type": "COMESTIBLE",
+    "id": "cereal2",
+    "copy-from": "cereal2",
+    "name": { "str": "wheat cereal" },
+    "spoils_in": "91 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "spaghetti_raw",
+    "copy-from": "spaghetti_raw",
+    "name": { "str_sp": "raw spaghetti pasta" },
+    "spoils_in": "364 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "lasagne_raw",
+    "copy-from": "lasagne_raw",
+    "name": { "str_sp": "raw lasagne pasta" },
+    "spoils_in": "364 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "macaroni_raw",
+    "copy-from": "macaroni_raw",
+    "name": { "str_sp": "raw macaroni" },
+    "spoils_in": "364 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "flour",
+    "copy-from": "flour",
+    "name": { "str_sp": "flour" },
+    "spoils_in": "364 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "oatmeal",
+    "copy-from": "oatmeal",
+    "name": { "str_sp": "oatmeal" },
+    "spoils_in": "364 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "cracker",
+    "copy-from": "cracker",
+    "name": { "str": "cracker" },
+    "spoils_in": "91 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "granola",
+    "copy-from": "granola",
+    "name": { "str_sp": "granola" },
+    "spoils_in": "182 days"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "noodles_fast",
+    "copy-from": "noodles_fast",
+    "name": { "str_sp": "fast noodles" },
+    "spoils_in": "364 days"
+  }
+]
diff --git a/json/recipes/electronics/other.json b/json/recipes/electronics/other.json
index a8fe1aa..64b5934 100644
--- a/json/recipes/electronics/other.json
+++ b/json/recipes/electronics/other.json
@@ -18,8 +18,8 @@
       [ [ "superglue", 1 ] ],
       [ [ "cable", 5 ] ],
       [ [ "small_lcd_screen", 1 ] ],
-      [ [ "ai_module", 1 ] ],
-      [ [ "sensor_module", 1 ] ]
+      [ [ "ai_module_basic", 1 ], [ "ai_module", 1 ], [ "ai_module_advanced", 1 ] ],
+      [ [ "omnicamera", 1 ], [ "sensor_module", 1 ], [ "camera", 1 ], [ "camera_pro", 1 ] ]
     ]
   }
 ]