Merge pull request #27857 from prestidigitation/fix-food-recipe-portions

Fix junk food recipe portions
CleverRaven · Jan 27, 2019 · fa8ccb2 · fa8ccb2
2 parents b3d915b + a561917
commit fa8ccb2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json
@@ -1099,7 +1099,7 @@
   {
     "type": "COMESTIBLE",
     "id": "hotdogs_frozen",
-    "name": "uncooked hot dogs",
+    "name": "uncooked hot dog",
     "name_plural": "uncooked hot dogs",
     "weight": 43,
     "color": "red",
@@ -1133,7 +1133,7 @@
   {
     "type": "COMESTIBLE",
     "id": "hotdogs_cooked",
-    "name": "cooked hot dogs",
+    "name": "cooked hot dog",
     "name_plural": "cooked hot dogs",
     "weight": 383,
     "color": "red",
@@ -1149,7 +1149,7 @@
     "volume": 2,
     "flags": [ "EATEN_HOT" ],
     "fun": 12,
-    "vitmins": [ [ "vitC", 20 ], [ "calcium", 5 ], [ "iron", 3 ] ],
+    "vitamins": [ [ "vitC", 20 ], [ "calcium", 5 ], [ "iron", 3 ] ],
     "rot_spawn": "GROUP_CARRION",
     "rot_spawn_chance": 15
   },

diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
@@ -3741,7 +3741,7 @@
     "difficulty": 1,
     "time": 2000,
     "autolearn": true,
-    "qualities": [ { "id": "COOK", "level": 1, "amount": 1 } ],
+    "qualities": [ { "id": "COOK", "level": 1 } ],
     "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ],
     "components": [ [ [ "grahmcrackers", 1 ] ], [ [ "marshmallow", 1 ] ], [ [ "chocolate", 1 ] ] ]
   },
@@ -5182,9 +5182,10 @@
     "subcategory": "CSC_FOOD_MEAT",
     "skill_used": "cooking",
     "time": 1000,
+    "charges": 1,
     "autolearn": true,
     "batch_time_factors": [ 67, 5 ],
-    "qualities": [ { "id": "COOK", "level": 1, "amount": 1 } ],
+    "qualities": [ { "id": "COOK", "level": 1 } ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
     "components": [ [ [ "hotdogs_frozen", 1 ] ] ]
   },
@@ -5334,7 +5335,8 @@
     "subcategory": "CSC_FOOD_MEAT",
     "skill_used": "cooking",
     "difficulty": 2,
-    "time": 3500,
+    "time": 1750,
+    "charges": 1,
     "autolearn": true,
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
@@ -5520,10 +5522,11 @@
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_SNACK",
     "skill_used": "cooking",
-    "time": 5000,
+    "time": 2500,
+    "charges": 1,
     "autolearn": true,
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
-    "components": [ [ [ "toasterpastryfrozen", 2 ] ] ]
+    "components": [ [ [ "toasterpastryfrozen", 1 ] ] ]
   },
   {
     "type": "recipe",