Require cooked rice/beans/lentils/edamame for recipes

3 files changed, 235 insertions, 12 deletions

diff --git a/Readme.txt b/Readme.txt
index b94b79d..760a877 100644
--- a/Readme.txt
+++ b/Readme.txt
@@ -14,8 +14,25 @@ Cheeseburgers were able to.
 
 --
 
+Stop allowing dried rice, raw/dried beans, and raw/dried lentils, in dishes:
+Tofu Fried Rice, Tofu Stirfry, Bean and Rice, Deluxe Beans and Rice, 
+Deluxe Veggy Beans and Rice, Curry with Meat, Curry, Homemade Burrito,
+Chili
+
+These should really be cooked first. If you are desperate enough to be
+willing to eat these raw/dried, you don't have the time to cook a 
+proper dish anyway.
+
+--
+
+Add a cooked edamame recipe
+
+Edamame has so few uses in game, it may as well be used properly.
+
+--
+
 Curry with Meat can now be made with:
-raw edamame, tofu, raw tofu
+cooked edamame, tofu, raw tofu
 
 Curry without Meat could be made using these for the vegetable. Veggy 
 haters were not willing to eat this dish already.
@@ -52,8 +69,3 @@ Comparable .223, 5.56mm , and 762x39mm could use these.
 
 Peanut Butter can now be preserved.
 
---
-
-Tofu Fried Rice now requires cooked rice.
-Just like the other two fried rice dishes do.
-
diff --git a/json/items/comestible/other.json b/json/items/comestible/other.json
new file mode 100644
index 0000000..b39cb5e
--- /dev/null
+++ b/json/items/comestible/other.json
@@ -0,0 +1,19 @@
+[
+  {
+    "type": "COMESTIBLE",
+    "id": "edamame_cooked",
+    "name": { "str": "cooked edamame", "str_pl": "cooked edamame" },
+    "weight": "198 g",
+    "copy-from": "raw_edamame",
+    "color": "light_gray",
+    "spoils_in": "5 days",
+    "quench": 1,
+    "description": "Some delicious cooked edamame.  Humble but nutrient-rich.",
+    "price": 0,
+    "volume": "250 ml",
+    "fun": 1,
+    "flags": [ "EATEN_HOT" ],
+    "rot_spawn": "GROUP_ROTTING_PLANT",
+    "rot_spawn_chance": 5
+  }
+]
diff --git a/json/recipes/recipe_food.json b/json/recipes/recipe_food.json
index 90c266d..f2463dd 100644
--- a/json/recipes/recipe_food.json
+++ b/json/recipes/recipe_food.json
@@ -1,6 +1,19 @@
 [
   {
     "type": "recipe",
+    "result": "tofu_rice",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_OTHER",
+    "skill_used": "cooking",
+    "difficulty": 1,
+    "time": "3 m",
+    "autolearn": true,
+    "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ],
+    "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ],
+    "components": [ [ [ "rice_cooked", 1 ] ], [ [ "tofu", 1 ], [ "dry_tofu", 1 ] ], [ [ "cooking_oil", 1 ] ] ]
+  },
+  {
+    "type": "recipe",
     "result": "tofu_stirfry",
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_VEGGI",
@@ -29,6 +42,119 @@
   },
   {
     "type": "recipe",
+    "result": "beansnrice",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_VEGGI",
+    "skill_used": "cooking",
+    "difficulty": 1,
+    "time": "6 m",
+    "autolearn": true,
+    "batch_time_factors": [ 82, 4 ],
+    "qualities": [ { "id": "COOK", "level": 2 } ],
+    "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ],
+    "components": [
+      [ [ "can_beans", 1 ], [ "beans_cooked", 1 ] ],
+      [ [ "rice_cooked", 1 ] ],
+      [ [ "water", 1 ], [ "water_clean", 1 ] ]
+    ]
+  },
+  {
+    "type": "recipe",
+    "result": "deluxe_beansnrice",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_OTHER",
+    "skill_used": "cooking",
+    "difficulty": 2,
+    "time": "9 m",
+    "autolearn": true,
+    "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ],
+    "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ],
+    "components": [
+      [ [ "can_beans", 1 ], [ "beans_cooked", 1 ] ],
+      [ [ "rice_cooked", 1 ] ],
+      [
+        [ "meat_red", 1, "LIST" ],
+        [ "meat_smoked", 1 ],
+        [ "dry_meat", 1 ],
+        [ "can_chicken", 1 ],
+        [ "can_spam", 2 ],
+        [ "fish", 1 ],
+        [ "fish_smoked", 1 ],
+        [ "dry_fish", 1 ],
+        [ "rehydrated_fish", 1 ],
+        [ "fish_canned", 1 ],
+        [ "can_salmon", 1 ],
+        [ "can_tuna", 1 ],
+        [ "sausage", 2 ],
+        [ "sausage_cooked", 2 ],
+        [ "bratwurst_sausage", 2 ],
+        [ "bacon", 2 ],
+        [ "powder_eggs", 2 ],
+        [ "eggs_bird", 2, "LIST" ],
+        [ "egg_reptile", 2 ]
+      ],
+      [ [ "salt", 1 ], [ "soysauce", 1 ], [ "seasoning_salt", 1 ], [ "garlic_clove", 1 ], [ "pepper", 1 ] ],
+      [ [ "water", 1 ], [ "water_clean", 1 ] ]
+    ]
+  },
+  {
+    "type": "recipe",
+    "result": "deluxe_veggy_beansnrice",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_VEGGI",
+    "skill_used": "cooking",
+    "difficulty": 2,
+    "time": "9 m",
+    "autolearn": true,
+    "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ],
+    "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ],
+    "components": [
+      [ [ "can_beans", 1 ], [ "beans_cooked", 1 ] ],
+      [ [ "rice_cooked", 1 ] ],
+      [
+        [ "veggy_any", 1, "LIST" ],
+        [ "mushroom", 1 ],
+        [ "tofu", 1 ],
+        [ "dry_mushroom", 1 ],
+        [ "morel_cooked", 1 ],
+        [ "mushroom_cooked", 1 ]
+      ],
+      [ [ "salt", 1 ], [ "soysauce", 1 ], [ "seasoning_salt", 1 ], [ "garlic_clove", 1 ], [ "pepper", 1 ] ],
+      [ [ "water", 1 ], [ "water_clean", 1 ] ]
+    ]
+  },
+  {
+    "type": "recipe",
+    "result": "chili",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_MEAT",
+    "skill_used": "cooking",
+    "difficulty": 2,
+    "time": "20 m",
+    "charges": 2,
+    "book_learn": [ [ "cookbook_italian", 2 ] ],
+    "qualities": [ { "id": "COOK", "level": 2 } ],
+    "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ],
+    "components": [
+      [
+        [ "veggy", 2 ],
+        [ "veggy_wild", 2 ],
+        [ "veggy_salted", 2 ],
+        [ "rehydrated_veggy", 2 ],
+        [ "mushroom", 2 ],
+        [ "dry_mushroom", 2 ],
+        [ "morel_cooked", 2 ],
+        [ "mushroom_cooked", 2 ],
+        [ "dry_veggy", 2 ]
+      ],
+      [ [ "tomato", 1 ], [ "irradiated_tomato", 1 ], [ "can_tomato", 1 ] ],
+      [ [ "meat_red", 1, "LIST" ], [ "dry_meat", 1 ], [ "can_chicken", 1 ] ],
+      [ [ "can_beans", 1 ], [ "beans_cooked", 1 ] ],
+      [ [ "chilly-p", 2 ], [ "chili_pepper", 1 ] ]
+    ]
+  },
+  {
+    "type": "recipe",
     "result": "frenchtoast",
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_BREAD",
@@ -78,20 +204,53 @@
         [ "morel_cooked", 2 ],
         [ "mushroom_cooked", 2 ],
         [ "can_beans", 1 ],
-        [ "dry_beans", 1 ],
-        [ "raw_beans", 1 ],
+        [ "beans_cooked", 1 ],
         [ "tofu", 1 ],
         [ "dry_tofu", 1 ],
-        [ "raw_edamame", 1 ],
-        [ "dry_lentils", 1 ],
-        [ "raw_lentils", 1 ],
-        [ "dry_rice", 1 ]
+        [ "edamame_cooked", 1 ],
+        [ "lentils_cooked", 1 ],
+        [ "rice_cooked", 1 ]
       ],
       [ [ "tomato", 1 ], [ "irradiated_tomato", 1 ], [ "can_tomato", 1 ] ],
       [ [ "meat_red", 1, "LIST" ], [ "dry_meat", 1 ], [ "can_chicken", 1 ] ],
       [ [ "curry_powder", 4 ], [ "chilly-p", 4 ] ]
     ]
   },
+  {
+    "type": "recipe",
+    "result": "curry_veggy",
+    "charges": 1,
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_VEGGI",
+    "skill_used": "cooking",
+    "difficulty": 2,
+    "time": "20 m",
+    "autolearn": true,
+    "qualities": [ { "id": "COOK", "level": 2 } ],
+    "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ],
+    "components": [
+      [
+        [ "veggy", 2 ],
+        [ "veggy_wild", 2 ],
+        [ "veggy_salted", 2 ],
+        [ "rehydrated_veggy", 2 ],
+        [ "dry_veggy", 2 ],
+        [ "mushroom", 2 ],
+        [ "dry_mushroom", 2 ],
+        [ "morel_cooked", 2 ],
+        [ "mushroom_cooked", 2 ],
+        [ "can_beans", 1 ],
+        [ "beans_cooked", 1 ],
+        [ "tofu", 1 ],
+        [ "dry_tofu", 1 ],
+        [ "edamame_cooked", 1 ],
+        [ "lentils_cooked", 1 ],
+        [ "rice_cooked", 1 ]
+      ],
+      [ [ "tomato", 1 ], [ "irradiated_tomato", 1 ], [ "can_tomato", 1 ] ],
+      [ [ "curry_powder", 4 ], [ "chilly-p", 4 ] ]
+    ]
+  },
   { 
     "type": "recipe",
     "result": "pizza_meat",
@@ -335,5 +494,38 @@
       [ [ "cinnamon", 1 ] ],
       [ [ "water", 6 ], [ "water_clean", 6 ] ]
     ]
+  },
+  {
+    "type": "recipe",
+    "result": "homemade_burrito",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_MEAT",
+    "skill_used": "cooking",
+    "difficulty": 4,
+    "charges": 3,
+    "time": "30 m",
+    "autolearn": true,
+    "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ],
+    "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
+    "components": [
+      [ [ "meat_red", 1, "LIST" ], [ "dry_meat", 1 ], [ "can_chicken", 1 ], [ "meat_smoked", 1 ] ],
+      [ [ "tortilla_corn", 3 ] ],
+      [
+        [ "lentils_cooked", 1 ],
+        [ "rice_cooked", 1 ],
+        [ "can_beans", 1 ],
+        [ "beans_cooked", 1 ]
+      ],
+      [
+        [ "lettuce", 2 ],
+        [ "irradiated_lettuce", 2 ],
+        [ "dandelion_cooked", 2 ],
+        [ "veggy_wild_cooked", 2 ],
+        [ "irradiated_cabbage", 2 ],
+        [ "cabbage", 2 ]
+      ],
+      [ [ "tomato", 1 ], [ "irradiated_tomato", 1 ], [ "can_tomato", 1 ], [ "onion", 1 ], [ "irradiated_onion", 1 ] ],
+      [ [ "pepper", 20 ], [ "chilly-p", 20 ], [ "garlic_clove", 6 ], [ "chili_pepper", 2 ] ]
+    ]
   }
 ]