From 13c7158df8b8ca06e33ecc17fd38d183c7ed9366 Mon Sep 17 00:00:00 2001 From: Coolthulhu Date: Mon, 20 Mar 2017 15:33:38 +0100 Subject: [PATCH 01/11] Move water boiling tools to a requirement --- data/json/recipes/recipe_food.json | 170 +++------------------- data/json/requirements/cooking_tools.json | 6 + 2 files changed, 29 insertions(+), 147 deletions(-) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index fc457c8814e38..de5c8e6a54de4 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -8,18 +8,8 @@ "time": 5000, "autolearn": true, "batch_time_factors":[80, 4], - "qualities":[ - {"id":"BOIL","level":1} - ], "tools": [ - [ - [ "hotplate", 3 ], - [ "char_smoker", 3 ], - [ "toolset", 3 ], - [ "coffeemaker", 3], - [ "atomic_coffeepot", -1 ], - [ "fire", -1 ] - ] - ], + "qualities":[ {"id":"BOIL","level":1} ], + "tools": [ [ [ "water_boiling_heat", 3, "LIST" ] ] ], "components": [ [ [ "water", 1 ] @@ -35,18 +25,8 @@ "time": 90000, "autolearn": true, "batch_time_factors":[80, 4], - "qualities":[ - {"id":"BOIL","level":1} - ], "tools": [ - [ - [ "hotplate", 3 ], - [ "char_smoker", 3 ], - [ "toolset", 3 ], - [ "coffeemaker", 3], - [ "atomic_coffeepot", -1 ], - [ "fire", -1 ] - ] - ], + "qualities":[ {"id":"BOIL","level":1} ], + "tools": [ [ [ "water_boiling_heat", 3, "LIST" ] ] ], "components": [ [ [ "salt_water", 10 ], @@ -63,18 +43,8 @@ "time": 90000, "autolearn": true, "batch_time_factors":[80, 4], - "qualities":[ - {"id":"BOIL","level":1} - ], "tools": [ - [ - [ "hotplate", 3 ], - [ "char_smoker", 3 ], - [ "toolset", 3 ], - [ "coffeemaker", 3], - [ "atomic_coffeepot", -1 ], - [ "fire", -1 ] - ] - ], + "qualities":[ {"id":"BOIL","level":1} ], + "tools": [ [ [ "water_boiling_heat", 3, "LIST" ] ] ], "components": [ [ [ "material_rocksalt", 1 ] @@ -2151,18 +2121,8 @@ "time": 10000, "autolearn": true, "batch_time_factors":[80, 4], - "qualities":[ - {"id":"BOIL","level":1} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "atomic_coffeepot", -1 ], - [ "fire", -1 ], - [ "coffeemaker", 2] - ] - ], + "qualities":[ {"id":"BOIL","level":1} ], + "tools": [ [ [ "water_boiling_heat", 2, "LIST" ] ] ], "components": [ [ [ "tea_raw", 1 ] @@ -2182,18 +2142,8 @@ "time": 10000, "autolearn": true, "batch_time_factors":[80, 4], - "qualities":[ - {"id":"BOIL","level":1} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "atomic_coffeepot", -1 ], - [ "fire", -1 ], - [ "coffeemaker", 2] - ] - ], + "qualities":[ {"id":"BOIL","level":1} ], + "tools": [ [ [ "water_boiling_heat", 2, "LIST" ] ] ], "components": [ [ [ "wild_herbs", 10 ] @@ -2218,16 +2168,8 @@ "qualities":[ {"id":"CUT","level":1}, {"id":"BOIL","level":1} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "atomic_coffeepot", -1 ], - [ "fire", -1 ], - [ "coffeemaker", 2] - ] ], + "tools": [ [ [ "water_boiling_heat", 2, "LIST" ] ] ], "components": [ [ [ "pine_bough", 1 ] @@ -2251,16 +2193,8 @@ "qualities":[ {"id":"BOIL","level":1}, {"id":"CUT","level":1} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "atomic_coffeepot", -1 ], - [ "fire", -1 ], - [ "coffeemaker", 2] - ] ], + "tools": [ [ [ "water_boiling_heat", 2, "LIST" ] ] ], "components": [ [ [ "raw_dandelion", 1 ] @@ -2343,18 +2277,8 @@ "time": 10000, "autolearn": true, "batch_time_factors":[80, 4], - "qualities":[ - {"id":"BOIL","level":1} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "atomic_coffeepot", -1 ], - [ "coffeemaker", 2], - [ "fire", -1 ] - ] - ], + "qualities":[ {"id":"BOIL","level":1} ], + "tools": [ [ [ "water_boiling_heat", 3, "LIST" ] ] ], "components": [ [ [ "coffee_raw", 1 ], @@ -9621,18 +9545,8 @@ "time": 90000, "autolearn": true, "batch_time_factors":[50, 4], - "qualities":[ - {"id":"BOIL","level":1} - ], "tools": [ - [ - [ "hotplate", 3 ], - [ "char_smoker", 3 ], - [ "toolset", 3 ], - [ "coffeemaker", 3], - [ "atomic_coffeepot", -1 ], - [ "fire", -1 ] - ] - ], + "qualities":[ {"id":"BOIL","level":1} ], + "tools": [ [ [ "water_boiling_heat", 3, "LIST" ] ] ], "components": [ [ [ "sweet_water", 10 ] @@ -10693,16 +10607,8 @@ "qualities" : [ {"id":"BOIL","level":1}, {"id":"CUT","level":1} - ], "tools": [ - [ - [ "hotplate", 8 ], - [ "char_smoker", 8 ], - [ "toolset", 8 ], - [ "coffeemaker", 8], - [ "atomic_coffeepot", -1 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "water_boiling_heat", 8, "LIST" ] ] ], "components": [ [ [ "water", 1 ], @@ -10764,18 +10670,8 @@ "time": 15000, "autolearn": true, "batch_time_factors":[80, 4], - "qualities":[ - {"id":"BOIL","level":1} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "atomic_coffeepot", -1 ], - [ "fire", -1 ], - [ "coffeemaker", 2] - ] - ], + "qualities":[ {"id":"BOIL","level":1} ], + "tools": [ [ [ "water_boiling_heat", 2, "LIST" ] ] ], "components": [ [ [ "tea_raw", 1 ] @@ -10914,18 +10810,8 @@ "difficulty": 5, "time": 15000, "autolearn": true, - "qualities":[ - {"id":"BOIL","level":1} - ], "tools": [ - [ - [ "hotplate", 3 ], - [ "char_smoker", 3 ], - [ "toolset", 3 ], - [ "coffeemaker", 3], - [ "atomic_coffeepot", -1], - [ "fire", -1 ] - ] - ], + "qualities":[ {"id":"BOIL","level":1} ], + "tools": [ [ [ "water_boiling_heat", 3, "LIST" ] ] ], "components": [ [ [ "water", 1 ], @@ -11287,18 +11173,8 @@ "time": 10000, "autolearn": true, "batch_time_factors":[80, 4], - "qualities":[ - {"id":"BOIL","level":1} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "atomic_coffeepot", -1 ], - [ "fire", -1 ], - [ "coffeemaker", 2] - ] - ], + "qualities":[ {"id":"BOIL","level":1} ], + "tools": [ [ [ "water_boiling_heat", 2, "LIST" ] ] ], "components": [ [ [ "bee_balm", 1 ] diff --git a/data/json/requirements/cooking_tools.json b/data/json/requirements/cooking_tools.json index b5f11f3cee500..5a9bf38d582d1 100644 --- a/data/json/requirements/cooking_tools.json +++ b/data/json/requirements/cooking_tools.json @@ -10,5 +10,11 @@ "type": "requirement", "//": "Tools usable for providing heat for frying.", "tools": [ [ [ "hotplate", 1 ], [ "char_smoker", 1 ], [ "toolset", 1 ], [ "fire", -1 ] ] ] + }, + { + "id": "water_boiling_heat", + "type": "requirement", + "//": "Tools usable for providing heat usable for boiling water, but not necessarily for anything else.", + "tools": [ [ [ "hotplate", 1 ], [ "char_smoker", 1 ], [ "toolset", 1 ], [ "coffeemaker", 1 ], [ "atomic_coffeepot", -1 ], [ "fire", -1 ] ] ] } ] From 735fb646fbceb16daa5000c5cf3410441791cb99 Mon Sep 17 00:00:00 2001 From: Coolthulhu Date: Mon, 20 Mar 2017 15:48:49 +0100 Subject: [PATCH 02/11] Replace first third of recipe_food.json heating --- data/json/recipes/recipe_food.json | 525 +++------------------- data/json/requirements/cooking_tools.json | 12 +- 2 files changed, 73 insertions(+), 464 deletions(-) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index de5c8e6a54de4..4c09ac3ed7a3d 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -89,14 +89,7 @@ "batch_time_factors":[67, 5], "qualities":[ {"id":"COOK","level":1} - ], "tools": [ - [ - [ "hotplate", 7 ], - [ "char_smoker", 7 ], - [ "toolset", 7 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ [ [ "meat", 1 ] @@ -118,17 +111,8 @@ {"id":"BOIL","level":2}, {"id":"COOK","level":2} ], "tools": [ - [ - [ "hotplate", 7 ], - [ "char_smoker", 7 ], - [ "toolset", 7 ], - [ "fire", -1 ] - ], - [ - [ "cooking_oil", -1 ], - [ "tallow", -1 ], - [ "lard", -1 ] - ] + [ [ "surface_heat", 7, "LIST" ] ], + [ [ "frying_oil", 7, "LIST" ] ] ], "components": [ [ @@ -172,14 +156,7 @@ "batch_time_factors":[67, 5], "qualities":[ {"id":"COOK","level":1} - ], "tools": [ - [ - [ "hotplate", 7 ], - [ "char_smoker", 7 ], - [ "toolset", 7 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ [ [ "offal", 1 ] @@ -203,7 +180,7 @@ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], - "tools": [ [ [ "hotplate", 10 ], [ "char_smoker", 10 ], [ "toolset", 10 ], [ "fire", -1 ] ] ], + "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "jar_glass", 1 ] ], @@ -255,7 +232,7 @@ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], - "tools": [ [ [ "hotplate", 20 ], [ "char_smoker", 20 ], [ "toolset", 20 ], [ "fire", -1 ] ] ], + "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], "components": [ [ [ "water", 1 ], [ "water_clean", 1 ], [ "salt_water", 1 ], [ "saline", 5 ] ], [ [ "jar_glass", 1 ] ], @@ -274,14 +251,7 @@ "batch_time_factors":[67, 5], "qualities":[ {"id":"BOIL","level":1} - ], "tools": [ - [ - [ "hotplate", 7 ], - [ "char_smoker", 7 ], - [ "toolset", 7 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ [ [ "stomach_large", 1 ] @@ -302,14 +272,7 @@ "batch_time_factors":[67, 5], "qualities":[ {"id":"BOIL","level":1} - ], "tools": [ - [ - [ "hotplate", 7 ], - [ "char_smoker", 7 ], - [ "toolset", 7 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ [ [ "hstomach_large", 1 ] @@ -330,14 +293,8 @@ "batch_time_factors":[67, 5], "qualities":[ {"id":"BOIL","level":1} - ], "tools": [ - [ - [ "hotplate", 5 ], - [ "char_smoker", 5 ], - [ "toolset", 5 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "stomach", 1 ] @@ -358,14 +315,8 @@ "batch_time_factors":[67, 5], "qualities":[ {"id":"BOIL","level":1} - ], "tools": [ - [ - [ "hotplate", 5 ], - [ "char_smoker", 5 ], - [ "toolset", 5 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "hstomach", 1 ] @@ -386,14 +337,8 @@ "batch_time_factors":[67, 5], "qualities":[ {"id":"COOK","level":1} - ], "tools": [ - [ - [ "hotplate", 7 ], - [ "char_smoker", 7 ], - [ "toolset", 7 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ [ [ "fish", 1 ] @@ -413,14 +358,7 @@ {"id":"CUT","level":1}, {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 7 ], - [ "char_smoker", 7 ], - [ "toolset", 7 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ [ [ "fat", 3 ] @@ -444,14 +382,7 @@ {"id":"CUT","level":1}, {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 7 ], - [ "char_smoker", 7 ], - [ "toolset", 7 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ [ [ "fat", 2 ] @@ -470,14 +401,7 @@ {"id":"CUT","level":1}, {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "plant_sac", 1 ], @@ -659,7 +583,7 @@ ], "tools": [ [ [ "frying_oil", 1, "LIST" ] ], - [ [ "frying_heat", 8, "LIST" ] ] + [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "fish", 3 ] ], @@ -680,7 +604,7 @@ ], "tools": [ [ [ "frying_oil", 1, "LIST" ] ], - [ [ "frying_heat", 8, "LIST" ] ] + [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "onion", 1 ] ], @@ -699,14 +623,7 @@ {"id":"COOK","level":2}, {"id":"CONTAIN","level":1} ], - "tools": [ - [ - [ "hotplate", 4 ], - [ "char_smoker", 4 ], - [ "toolset", 4 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 4, "LIST" ] ] ], "components": [ [ [ "water", 1 ], @@ -1103,14 +1020,8 @@ "batch_time_factors":[67, 5], "qualities":[ {"id":"COOK","level":1} - ], "tools": [ - [ - [ "hotplate", 7 ], - [ "char_smoker", 7 ], - [ "toolset", 7 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ [ [ "human_flesh", 1 ] @@ -1178,14 +1089,8 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 6 ], - [ "char_smoker", 6 ], - [ "toolset", 6 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ], "components": [ [ [ "meat", 1 ], @@ -1213,14 +1118,7 @@ {"id":"CUT","level":1}, {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 6 ], - [ "char_smoker", 6 ], - [ "toolset", 6 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ], "components": [ [ [ "meat", 2 ], @@ -1241,14 +1139,8 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":1} - ], "tools": [ - [ - [ "hotplate", 5 ], - [ "char_smoker", 5 ], - [ "toolset", 5 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "veggy", 1 ] @@ -1264,14 +1156,8 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 5 ], - [ "char_smoker", 5 ], - [ "toolset", 5 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "veggy_wild", 1 ] @@ -1291,14 +1177,8 @@ "qualities":[ {"id":"CUT","level":1}, {"id":"COOK","level":1} - ], "tools": [ - [ - [ "hotplate", 5 ], - [ "char_smoker", 5 ], - [ "toolset", 5 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "cattail_stalk", 1 ] @@ -1316,14 +1196,8 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":1} - ], "tools": [ - [ - [ "hotplate", 5 ], - [ "char_smoker", 5 ], - [ "toolset", 5 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "water", 1 ], @@ -1388,14 +1262,8 @@ ["manual_survival", 1], ["survival_book", 1]], "qualities":[ {"id":"COOK","level":1} - ], "tools": [ - [ - [ "hotplate", 5 ], - [ "char_smoker", 5 ], - [ "toolset", 5 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "dahlia_root", 1 ] @@ -1414,14 +1282,8 @@ "qualities":[ {"id":"COOK","level":2}, {"id":"CUT","level":1} - ], "tools": [ - [ - [ "hotplate", 5 ], - [ "char_smoker", 5 ], - [ "toolset", 5 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "raw_dandelion", 2 ] @@ -1489,14 +1351,8 @@ "qualities":[ {"id":"COOK","level":2}, {"id":"CUT","level":1} - ], "tools": [ - [ - [ "hotplate", 5 ], - [ "char_smoker", 5 ], - [ "toolset", 5 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "acorns", 1 ] @@ -1516,14 +1372,8 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 4 ], - [ "char_smoker", 4 ], - [ "toolset", 4 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 4, "LIST" ] ] ], "components": [ [ [ "spaghetti_raw", 1 ], @@ -1543,14 +1393,7 @@ "skill_used": "cooking", "time": 2500, "autolearn": true, - "tools": [ - [ - [ "hotplate", 3 ], - [ "char_smoker", 3 ], - [ "toolset", 3 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], "components": [ [ [ "frozen_burrito", 1 ] @@ -1564,14 +1407,7 @@ "skill_used": "cooking", "time": 5000, "autolearn": true, - "tools": [ - [ - [ "hotplate", 3 ], - [ "char_smoker", 3 ], - [ "toolset", 3 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], "components": [ [ [ "frozen_dinner", 1 ] @@ -1588,14 +1424,8 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 4 ], - [ "char_smoker", 4 ], - [ "toolset", 4 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 4, "LIST" ] ] ], "components": [ [ [ "spaghetti_raw", 1 ], @@ -1623,14 +1453,8 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 4 ], - [ "char_smoker", 4 ], - [ "toolset", 4 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 4, "LIST" ] ] ], "components": [ [ [ "spaghetti_raw", 1 ], @@ -1674,14 +1498,8 @@ "book_learn": [[ "cookbook_human", 1 ]], "qualities":[ {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 4 ], - [ "char_smoker", 4 ], - [ "toolset", 4 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 4, "LIST" ] ] ], "components": [ [ [ "spaghetti_raw", 1 ], @@ -1716,14 +1534,7 @@ {"id":"CUT","level":1}, {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 5 ], - [ "char_smoker", 5 ], - [ "toolset", 5 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "pumpkin", 1 ], @@ -1741,14 +1552,8 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":1} - ], "tools": [ - [ - [ "hotplate", 3 ], - [ "char_smoker", 3 ], - [ "toolset", 3 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], "components": [ [ [ "potato_raw", 1 ], @@ -1768,14 +1573,7 @@ {"id":"CUT","level":1}, {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 3 ], - [ "char_smoker", 3 ], - [ "toolset", 3 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], "components": [ [ [ "potato_raw", 1 ], @@ -1798,14 +1596,7 @@ "qualities" : [ {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 5 ], - [ "char_smoker", 5 ], - [ "toolset", 5 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "seed_weed", 4 ], @@ -1826,14 +1617,7 @@ {"id":"CUT","level":1}, {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 3 ], - [ "char_smoker", 3 ], - [ "toolset", 3 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], "components": [ [ [ "cornmeal", 1 ] @@ -1854,14 +1638,7 @@ {"id":"CUT","level":1}, {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 3 ], - [ "char_smoker", 3 ], - [ "toolset", 3 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], "components": [ [ [ "cheese", 1 ], @@ -1884,14 +1661,7 @@ {"id":"CUT","level":1}, {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 3 ], - [ "char_smoker", 3 ], - [ "toolset", 3 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], "components": [ [ [ "meat", 1], @@ -1916,14 +1686,7 @@ {"id":"CUT","level":1}, {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 3 ], - [ "char_smoker", 3 ], - [ "toolset", 3 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], "components": [ [ [ "meat", 1], @@ -1953,14 +1716,7 @@ {"id":"CUT","level":1}, {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 3 ], - [ "char_smoker", 3 ], - [ "toolset", 3 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], "components": [ [ [ "human_flesh", 1 ], @@ -1982,14 +1738,8 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 3 ], - [ "char_smoker", 3 ], - [ "toolset", 3 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], "components": [ [ [ "human_flesh", 1 ], @@ -2053,14 +1803,7 @@ "qualities" : [ {"id":"CUT","level":1} ], - "tools": [ - [ - [ "hotplate", 3 ], - [ "char_smoker", 3 ], - [ "toolset", 3 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], "components": [ [ [ "cheese", 1 ], @@ -2082,14 +1825,8 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "fire", -1 ] - ] - ], + ], + "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "kernels", 1 ] @@ -2217,14 +1954,8 @@ "batch_time_factors":[80, 4], "qualities":[ {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ ["sweet_fruit_like", 4, "LIST"] @@ -2266,7 +1997,7 @@ "autolearn": true, "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "COOK","level": 2,"amount": 1 } ], - "tools": [ [ [ "hotplate", 8 ], [ "char_smoker", 8 ], [ "toolset", 8 ], [ "fire", -1 ] ] ], + "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "coffee_bean", 1 ] ] ] },{ "type" : "recipe", @@ -2385,14 +2116,8 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "coffee_raw", 5 ] @@ -2714,14 +2439,7 @@ "batch_time_factors":[50, 5], "qualities" : [ {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 7 ], - [ "char_smoker", 7 ], - [ "toolset", 7 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ [ [ "bone", 4 ] @@ -2754,14 +2472,7 @@ "batch_time_factors":[50, 5], "qualities" : [ {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 7 ], - [ "char_smoker", 7 ], - [ "toolset", 7 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ [ [ "veggy", 2 ], @@ -2809,14 +2520,7 @@ "batch_time_factors":[50, 5], "qualities" : [ {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 7 ], - [ "char_smoker", 7 ], - [ "toolset", 7 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ [ [ "bone_human", 4 ] @@ -2840,14 +2544,7 @@ "time": 60000, "autolearn": true, "batch_time_factors":[83, 5], - "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "salt_water", 1 ], @@ -2872,14 +2569,7 @@ "time": 30000, "batch_time_factors":[83, 5], "autolearn": true, - "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "salt_water", 1 ], @@ -2904,14 +2594,7 @@ "time": 30000, "batch_time_factors":[83, 5], "book_learn": [[ "cookbook_human", 3 ]], - "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "salt_water", 1 ], @@ -2938,14 +2621,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "fat", 1 ] @@ -2963,14 +2639,7 @@ "qualities" : [ {"id":"CUT","level":1} ], - "tools": [ - [ - [ "hotplate", 20 ], - [ "char_smoker", 20 ], - [ "toolset", 20 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], "components": [ [ [ "tallow", 2 ], @@ -3125,14 +2794,8 @@ "batch_time_factors":[80, 4], "qualities":[ {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 5 ], - [ "char_smoker", 5 ], - [ "toolset", 5 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "water", 1 ], @@ -3182,14 +2845,8 @@ "batch_time_factors":[80, 4], "qualities":[ {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 6 ], - [ "char_smoker", 6 ], - [ "toolset", 6 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ], "components": [ [ [ "bone", 10 ] @@ -3211,14 +2868,8 @@ "book_learn": [[ "cookbook_human", 1 ]], "qualities":[ {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 6 ], - [ "char_smoker", 6 ], - [ "toolset", 6 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ], "components": [ [ [ "bone_human", 10 ] @@ -3240,14 +2891,8 @@ "batch_time_factors":[80, 4], "qualities":[ {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 5 ], - [ "char_smoker", 5 ], - [ "toolset", 5 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "broth", 1 ] @@ -3359,14 +3004,8 @@ "batch_time_factors":[80, 4], "qualities":[ {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 5 ], - [ "char_smoker", 5 ], - [ "toolset", 5 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "broth", 1 ] @@ -3431,14 +3070,8 @@ "batch_time_factors":[80, 4], "qualities":[ {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 5 ], - [ "char_smoker", 5 ], - [ "toolset", 5 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "broth", 1 ], @@ -3486,14 +3119,8 @@ "batch_time_factors":[80, 4], "qualities":[ {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 5 ], - [ "char_smoker", 5 ], - [ "toolset", 5 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "broth", 1 ], @@ -3573,14 +3200,8 @@ "batch_time_factors":[80, 4], "qualities":[ {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 5 ], - [ "char_smoker", 5 ], - [ "toolset", 5 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "broth", 1 ], @@ -3635,14 +3256,8 @@ "book_learn": [[ "cookbook_human", 2 ]], "qualities":[ {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 5 ], - [ "char_smoker", 5 ], - [ "toolset", 5 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "broth", 1 ], @@ -3687,14 +3302,8 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 5 ], - [ "char_smoker", 5 ], - [ "toolset", 5 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "can_clams", 1 ] diff --git a/data/json/requirements/cooking_tools.json b/data/json/requirements/cooking_tools.json index 5a9bf38d582d1..8b0fe7cf538fb 100644 --- a/data/json/requirements/cooking_tools.json +++ b/data/json/requirements/cooking_tools.json @@ -1,15 +1,15 @@ [ { - "id": "frying_oil", + "id": "surface_heat", "type": "requirement", - "//": "Oil usable for frying. Note: the oil is reusable.", - "tools": [ [ [ "cooking_oil", -1 ], [ "tallow", -1 ], [ "lard", -1 ] ] ] + "//": "Heat usable for heating a surface - for example a pot or frying pan.", + "tools": [ [ [ "hotplate", 1 ], [ "char_smoker", 1 ], [ "toolset", 1 ], [ "fire", -1 ] ] ] }, { - "id": "frying_heat", + "id": "frying_oil", "type": "requirement", - "//": "Tools usable for providing heat for frying.", - "tools": [ [ [ "hotplate", 1 ], [ "char_smoker", 1 ], [ "toolset", 1 ], [ "fire", -1 ] ] ] + "//": "Oil usable for frying. Note: the oil is reusable.", + "tools": [ [ [ "cooking_oil", -1 ], [ "tallow", -1 ], [ "lard", -1 ] ] ] }, { "id": "water_boiling_heat", From b0aa266edce0936d6ce716e60e87d705d5c748df Mon Sep 17 00:00:00 2001 From: Coolthulhu Date: Mon, 20 Mar 2017 15:52:08 +0100 Subject: [PATCH 03/11] Replace second third of recipe_food.json heating --- data/json/recipes/recipe_food.json | 710 ++++------------------------- 1 file changed, 82 insertions(+), 628 deletions(-) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 4c09ac3ed7a3d..562ec7a7ca825 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -3376,14 +3376,8 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 8 ], - [ "char_smoker", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "flour", 3 ] @@ -3405,14 +3399,8 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 8 ], - [ "char_smoker", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ] ], + "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "flour", 3 ] @@ -3491,14 +3479,7 @@ {"id":"BUTCHER","level":20}, {"id":"COOK","level":3}, {"id":"CUT","level":1} - ], "tools": [ - [ - [ "hotplate", 4 ], - [ "char_smoker", 4 ], - [ "toolset", 4 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 4, "LIST" ] ] ], "components": [ [ [ "sugar", 20 ], @@ -3607,14 +3588,7 @@ "qualities":[ {"id":"COOK","level":2}, {"id":"CUT","level":1} - ], "tools": [ - [ - [ "hotplate", 8 ], - [ "char_smoker", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "sugar_beet", 4 ] @@ -3636,14 +3610,7 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 8 ], - [ "char_smoker", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "cooking_oil", 1 ], @@ -3670,14 +3637,7 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 8 ], - [ "char_smoker", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "cornmeal", 3 ] @@ -3699,14 +3659,7 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 16 ], - [ "char_smoker", 16 ], - [ "toolset", 16 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], "components": [ [ [ "flour", 2 ] @@ -3733,14 +3686,7 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 8 ], - [ "char_smoker", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "flour", 2 ] @@ -3766,14 +3712,7 @@ "autolearn": true, "qualities" : [ {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 8 ], - [ "char_smoker", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "cooking_oil", 1 ], @@ -3796,14 +3735,7 @@ "batch_time_factors":[82, 4], "qualities":[ {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "dry_beans", 1 ], @@ -3826,14 +3758,7 @@ "qualities":[ {"id":"COOK","level":2}, {"id":"CUT","level":1} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "can_beans", 1 ], @@ -3882,14 +3807,7 @@ "qualities":[ {"id":"COOK","level":2}, {"id":"CUT","level":1} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "can_beans", 1 ], @@ -3949,14 +3867,7 @@ "batch_time_factors":[82, 4], "qualities":[ {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "dry_rice", 1 ] @@ -3978,14 +3889,7 @@ "qualities":[ {"id":"COOK","level":2}, {"id":"CUT","level":1} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "rice_cooked", 1 ] @@ -4029,14 +3933,7 @@ "qualities":[ {"id":"COOK","level":2}, {"id":"CUT","level":1} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "rice_cooked", 1 ] @@ -4090,14 +3987,7 @@ "batch_time_factors":[82, 4], "qualities":[ {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "dry_beans", 1 ], @@ -4123,14 +4013,7 @@ "qualities":[ {"id":"COOK","level":2}, {"id":"CUT","level":1} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "dry_beans", 1 ], @@ -4184,14 +4067,7 @@ "qualities":[ {"id":"COOK","level":2}, {"id":"CUT","level":1} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "dry_beans", 1 ], @@ -4267,14 +4143,7 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "oatmeal", 1 ] @@ -4294,14 +4163,7 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "oatmeal", 1 ] @@ -4356,14 +4218,7 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "buckwheat", 1 ] @@ -4488,14 +4343,7 @@ "difficulty": 3, "time": 45000, "autolearn": true, - "tools": [ - [ - [ "hotplate", 20 ], - [ "char_smoker", 20 ], - [ "toolset", 20 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], "components": [ [ [ "oatmeal", 4 ], @@ -4532,14 +4380,7 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "powder_eggs", 10 ], @@ -4563,14 +4404,7 @@ "autolearn": true, "qualities":[ {"id":"BOIL","level":1} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "egg_bird", 1 ], @@ -4592,14 +4426,7 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "powder_eggs", 10 ], @@ -4645,14 +4472,7 @@ "autolearn": true, "qualities" : [ {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 8 ], - [ "char_smoker", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "flour", 1 ] @@ -4692,14 +4512,7 @@ "autolearn": true, "qualities" : [ {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 8 ], - [ "char_smoker", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "flour", 1 ] @@ -4745,14 +4558,7 @@ "autolearn": true, "qualities" : [ {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 8 ], - [ "char_smoker", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "flour", 1 ] @@ -4796,14 +4602,7 @@ "autolearn": true, "qualities" : [ {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 8 ], - [ "char_smoker", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "milk", 1 ], @@ -5002,14 +4801,7 @@ {"id":"CUT","level":1}, {"id":"COOK","level":2} ], - "tools" : [ - [ - [ "hotplate", 8 ], - [ "char_smoker", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ] - ], + "tools" : [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ ["sweet_fruit", 1, "LIST"] @@ -5035,14 +4827,7 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 8 ], - [ "char_smoker", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "flour", 1 ], @@ -5086,14 +4871,7 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "roasted_coffee_bean", 1 ] @@ -5114,14 +4892,7 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "pretzels", 6 ] @@ -5141,14 +4912,7 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "salt", 50 ] @@ -5192,14 +4956,7 @@ "qualities":[ {"id":"CUT","level":1}, {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "salt", 20 ] @@ -5226,14 +4983,7 @@ "autolearn": true, "qualities" : [ {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 6 ], - [ "char_smoker", 6 ], - [ "toolset", 6 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ], "components": [ [ [ "flour", 2 ] @@ -5263,14 +5013,7 @@ "autolearn": true, "qualities" : [ {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 6 ], - [ "char_smoker", 6 ], - [ "toolset", 6 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ], "components": [ [ [ "flour", 2 ] @@ -5319,14 +5062,7 @@ "autolearn": true, "qualities" : [ {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 6 ], - [ "char_smoker", 6 ], - [ "toolset", 6 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ], "components": [ [ [ "flour", 2 ] @@ -5359,14 +5095,7 @@ "book_learn": [[ "cookbook_human", 3 ]], "qualities" : [ {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 6 ], - [ "char_smoker", 6 ], - [ "toolset", 6 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ], "components": [ [ [ "flour", 2 ] @@ -5394,14 +5123,7 @@ {"id":"BOIL","level":2}, {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 6 ], - [ "char_smoker", 6 ], - [ "toolset", 6 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ], "components": [ [ [ "flour", 2 ] @@ -5626,14 +5348,7 @@ "book_learn": [[ "cookbook_italian", 2 ]], "qualities" : [ {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 8 ], - [ "char_smoker", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "flour", 2 ] @@ -5684,7 +5399,7 @@ "time": 8000, "autolearn": true, "qualities" : [ { "id" : "COOK","level" : 1,"amount" : 1 } ], - "tools": [ [ [ "hotplate", 8 ], [ "char_smoker", 8 ], [ "toolset", 8 ], [ "fire", -1 ] ] ], + "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "grahmcrackers", 8 ] ], [ [ "marshmallow", 8 ] ], @@ -5729,14 +5444,7 @@ "book_learn": [[ "cookbook_italian", 2 ]], "qualities" : [ {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 8 ], - [ "char_smoker", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "flour", 2 ] @@ -5768,14 +5476,7 @@ "book_learn": [[ "cookbook_italian", 2 ]], "qualities" : [ {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 8 ], - [ "char_smoker", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "flour", 2 ] @@ -5815,14 +5516,7 @@ "book_learn": [[ "cookbook_human", 3 ]], "qualities" : [ {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 8 ], - [ "char_smoker", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "flour", 2 ] @@ -5856,14 +5550,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 6 ], - [ "char_smoker", 6 ], - [ "toolset", 6 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ], "components": [ [ [ "spaghetti_raw", 1 ] @@ -5900,14 +5587,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 6 ], - [ "char_smoker", 6 ], - [ "toolset", 6 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ], "components": [ [ [ "lasagne_raw", 1 ] @@ -5944,14 +5624,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 6 ], - [ "char_smoker", 6 ], - [ "toolset", 6 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ], "components": [ [ [ "lasagne_raw", 1 ] @@ -5986,15 +5659,8 @@ "book_learn": [[ "cookbook_human", 4 ]], "qualities" : [ {"id":"CUT","level":1}, - {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 6 ], - [ "char_smoker", 6 ], - [ "toolset", 6 ], - [ "fire", -1 ] - ] - ], + {"id":"COOK","level":3} + ], "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ], "components": [ [ [ "spaghetti_raw", 1 ] @@ -6030,14 +5696,7 @@ "qualities":[ {"id":"CUT","level":1}, {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 4 ], - [ "char_smoker", 4 ], - [ "toolset", 4 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 4, "LIST" ] ] ], "components": [ [ [ "spaghetti_raw", 1 ] @@ -6275,14 +5934,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "water", 1 ], @@ -6311,14 +5963,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "water", 1 ], @@ -6347,14 +5992,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "water", 1 ], @@ -6383,14 +6021,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "water", 1 ], @@ -6421,14 +6052,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "water", 1 ], @@ -7435,7 +7059,7 @@ "time": 7000, "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], - "tools": [ [ [ "hotplate", 4 ], [ "char_smoker", 4 ], [ "toolset", 4 ], [ "fire", -1 ] ] ], + "tools": [ [ [ "surface_heat", 4, "LIST" ] ] ], "components": [ [ ["meth", 4] ], [ ["cola", 2] ] ] },{ @@ -7468,14 +7092,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "meat", 1 ] @@ -7550,14 +7167,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "fish", 4 ] @@ -7758,14 +7368,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "human_flesh", 1 ] @@ -7804,14 +7407,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "meat", 1 ] @@ -7847,14 +7443,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "meat", 1], @@ -7882,14 +7471,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "human_flesh", 1 ], @@ -7913,14 +7495,7 @@ "autolearn": true, "qualities" : [ {"id":"COOK","level":1} - ], "tools": [ - [ - [ "hotplate", 3 ], - [ "char_smoker", 3 ], - [ "toolset", 3 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], "components": [ [ [ "cheese", 1 ], @@ -7942,9 +7517,7 @@ "batch_time_factors" : [ 67, 5 ], "qualities" : [ { "id" : "COOK","level" : 1,"amount" : 1 } - ], "tools" : [ - [ [ "hotplate", 10], [ "char_smoker", 10], [ "toolset", 10], [ "fire", -1] ] - ], + ], "tools" : [ [ [ "surface_heat", 10, "LIST" ] ] ], "components" : [ [ [ "hotdogs_frozen", 1 ] @@ -7962,14 +7535,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "hotdogs_frozen", 4 ] @@ -8003,14 +7569,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "hotdogs_frozen", 1 ] @@ -8043,14 +7602,7 @@ {"id":"CUT","level":1}, {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "sausage", 1 ], @@ -8086,14 +7638,7 @@ {"id":"CUT","level":1}, {"id":"COOK","level":2} ], - "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "mannwurst", 1 ], @@ -8127,14 +7672,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "sausage", 2 ] @@ -8158,14 +7696,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "hotdogs_frozen", 1 ] @@ -8197,14 +7728,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "mannwurst", 2 ] @@ -8228,14 +7752,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "corndogs_frozen", 1 ] @@ -8253,14 +7770,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "human_flesh", 1 ] @@ -8296,14 +7806,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "flatbread", 2 ], @@ -8336,14 +7839,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "flatbread", 2 ], @@ -8377,14 +7873,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "flatbread", 2 ], @@ -8566,14 +8055,7 @@ "skill_used": "cooking", "time": 5000, "autolearn": true, - "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "toasterpastryfrozen", 2 ] @@ -8592,14 +8074,7 @@ {"id":"CUT","level":1}, {"id":"COOK","level":3} ], - "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "can_tomato", 1 ], @@ -8623,14 +8098,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "can_tomato", 1 ], @@ -8660,14 +8128,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 20 ], - [ "char_smoker", 20 ], - [ "toolset", 20 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], "//" : "Canned tomatoes aren't an option as they've already been preserved.", "components": [ [ @@ -8718,14 +8179,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 20 ], - [ "char_smoker", 20 ], - [ "toolset", 20 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], "components": [ [ [ "water", 1 ], From 62079adccc9a05f0386362cd172aff79edd13b33 Mon Sep 17 00:00:00 2001 From: Coolthulhu Date: Mon, 20 Mar 2017 15:52:44 +0100 Subject: [PATCH 04/11] Replace all simple heating in recipe_food.json --- data/json/recipes/recipe_food.json | 118 ++++------------------------- 1 file changed, 14 insertions(+), 104 deletions(-) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 562ec7a7ca825..acf3422c6621d 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -65,14 +65,7 @@ "batch_time_factors":[67, 5], "qualities":[ {"id":"COOK","level":1} - ], "tools": [ - [ - [ "hotplate", 7 ], - [ "char_smoker", 7 ], - [ "toolset", 7 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ [ [ "mushroom", 1 ] @@ -3336,14 +3329,7 @@ "autolearn": true, "qualities": [ {"id":"COOK","level":3} ], - "tools": [ - [ - [ "hotplate", 8 ], - [ "char_smoker", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "flour", 3 ] @@ -8247,14 +8233,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 20 ], - [ "char_smoker", 20 ], - [ "toolset", 20 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], "components": [ [ [ "water", 1 ], @@ -8288,14 +8267,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 20 ], - [ "char_smoker", 20 ], - [ "toolset", 20 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], "components": [ [ [ "water", 1 ], @@ -8329,14 +8301,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 20 ], - [ "char_smoker", 20 ], - [ "toolset", 20 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], "components": [ [ [ "water", 1 ], @@ -8390,14 +8355,7 @@ "batch_time_factors":[80, 4], "qualities":[ {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "sweet_fruit", 1, "LIST" ] @@ -8461,14 +8419,7 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 8 ], - [ "char_smoker", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "flour", 3 ] @@ -8625,7 +8576,7 @@ "time": 3500, "autolearn": true, "qualities":[ {"id":"COOK","level":2} ], - "tools": [ [ [ "hotplate", 2 ], [ "char_smoker", 2 ], [ "toolset", 2 ], [ "fire", -1 ] ] ], + "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "sugar", 10 ] ], [ @@ -8675,14 +8626,7 @@ "qualities" : [ {"id":"CUT","level":1}, {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "water", 1 ], @@ -9378,14 +9322,7 @@ "batch_time_factors":[67, 5], "qualities":[ {"id":"COOK","level":1} - ], "tools": [ - [ - [ "hotplate", 7 ], - [ "char_smoker", 7 ], - [ "toolset", 7 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ [ [ "meat", 1 ] @@ -9407,14 +9344,7 @@ "autolearn": true, "qualities" : [ {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "flour", 1 ] @@ -9643,14 +9573,7 @@ "autolearn": true, "qualities" : [ {"id":"COOK","level":1} - ], "tools": [ - [ - [ "hotplate", 3 ], - [ "char_smoker", 3 ], - [ "toolset", 3 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], "components": [ [ [ "sandwich_cheese", 1 ] @@ -9934,14 +9857,7 @@ "qualities" : [ {"id":"COOK","level":1}, {"id":"CUT","level":1} - ], "tools": [ - [ - [ "hotplate", 12 ], - [ "char_smoker", 12 ], - [ "toolset", 12 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 12, "LIST" ] ] ], "components": [ [ [ "flour", 2 ] @@ -10262,13 +10178,7 @@ {"id":"CUT","level":1}, {"id":"BOIL","level":2} ], - "tools": [ - [ [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "cooking_oil", 2 ] ], [ [ "mugwort", 2 ] ] From a9171c2c9bae3e2a8eba824a38debda92a89e357 Mon Sep 17 00:00:00 2001 From: Coolthulhu Date: Mon, 20 Mar 2017 15:54:41 +0100 Subject: [PATCH 05/11] Replace 1/3 of recipe_food.json "complex" heating --- data/json/recipes/recipe_food.json | 117 +++++------------------------ 1 file changed, 18 insertions(+), 99 deletions(-) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index acf3422c6621d..11cb7766be380 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -198,7 +198,7 @@ { "id": "COOK", "level": 3 } ], "tools": [ - [ [ "hotplate", 10 ], [ "char_smoker", 10 ], [ "toolset", 10 ], [ "fire", -1 ] ], + [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ], "components": [ @@ -1214,12 +1214,7 @@ {"id":"COOK","level":2} ], "tools": [ - [ - [ "hotplate", 8 ], - [ "char_smoker", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 8, "LIST" ] ], [ [ "cooking_oil", -1 ], [ "tallow", -1 ], @@ -1302,12 +1297,7 @@ {"id":"CUT","level":1} ], "tools": [ - [ - [ "hotplate", 8 ], - [ "char_smoker", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 8, "LIST" ] ], [ [ "cooking_oil", -1 ], [ "tallow", -1 ], @@ -1763,12 +1753,7 @@ {"id":"COOK","level":2} ], "tools": [ - [ - [ "hotplate", 8 ], - [ "char_smoker", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 8, "LIST" ] ], [ [ "cooking_oil", -1 ], [ "tallow", -1 ], @@ -2705,12 +2690,7 @@ "qualities":[ {"id":"COOK","level":3} ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 10, "LIST" ] ], [ [ "vac_sealer", 10 ], [ "makeshift_sealer", 20 ] @@ -8657,12 +8637,7 @@ {"id":"CUT","level":1}, {"id":"COOK","level":3} ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] @@ -8700,12 +8675,7 @@ {"id":"CUT","level":1}, {"id":"COOK","level":3} ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] @@ -8743,12 +8713,7 @@ {"id":"CUT","level":1}, {"id":"COOK","level":3} ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] @@ -8786,12 +8751,7 @@ {"id":"CUT","level":1}, {"id":"COOK","level":3} ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] @@ -8841,12 +8801,7 @@ {"id":"CUT","level":1}, {"id":"COOK","level":3} ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] @@ -8884,12 +8839,7 @@ {"id":"CUT","level":1}, {"id":"COOK","level":3} ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] @@ -8928,12 +8878,7 @@ {"id":"CUT","level":1}, {"id":"COOK","level":3} ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] @@ -9005,12 +8950,7 @@ {"id":"CUT","level":1}, {"id":"COOK","level":3} ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] @@ -9092,12 +9032,7 @@ {"id":"CUT","level":1}, {"id":"COOK","level":3} ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] @@ -9162,12 +9097,7 @@ {"id":"CUT","level":1}, {"id":"COOK","level":3} ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ], "components": [ @@ -9226,12 +9156,7 @@ {"id":"CUT","level":1}, {"id":"COOK","level":3} ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] @@ -9915,14 +9840,8 @@ {"id":"BOIL","level":1}, {"id":"CONTAIN","level":1} ], - "tools": - [ - [ - [ "hotplate", 5 ], - [ "char_smoker", 5 ], - [ "toolset", 5 ], - [ "fire", -1 ] - ], + "tools": [ + [ [ "surface_heat", 5, "LIST" ] ], [ ["rag", -1] ] From 73ced1efdf92686cd4a045666ec2ba6d6eec917e Mon Sep 17 00:00:00 2001 From: Coolthulhu Date: Mon, 20 Mar 2017 15:55:55 +0100 Subject: [PATCH 06/11] Replace most "complex" heating in recipe_food.json --- data/json/recipes/recipe_food.json | 117 ++++++----------------------- 1 file changed, 23 insertions(+), 94 deletions(-) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 11cb7766be380..1781e04389cf3 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -2734,12 +2734,7 @@ {"id":"CONTAIN","level":1} ], "tools": [ - [ - [ "hotplate", 4 ], - [ "char_smoker", 4 ], - [ "toolset", 4 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 4, "LIST" ] ], [ [ "rag", -1 ] ] @@ -2894,12 +2889,7 @@ "qualities":[ {"id":"COOK","level":3} ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 10, "LIST" ] ], [ [ "vac_sealer", 10 ], [ "makeshift_sealer", 20 ] @@ -2937,12 +2927,7 @@ {"id":"CUT","level":1}, {"id":"COOK","level":3} ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] @@ -4096,8 +4081,10 @@ "difficulty": 2, "time": 45000, "autolearn": true, - "tools": [ [ [ "hotplate", 5 ], [ "char_smoker", 5 ], [ "toolset", 5 ], [ "fire", -1 ] ], - [ ["rock_quern", -1], ["clay_quern", -1] ] ], + "tools": [ + [ [ "surface_heat", 5, "LIST" ] ], + [ ["rock_quern", -1], ["clay_quern", -1] ] + ], "components": [ [ ["oats", 2] ] ] },{ "type" : "recipe", @@ -4601,12 +4588,7 @@ "time": 12000, "autolearn": true, "tools": [ - [ - [ "hotplate", 8 ], - [ "char_smoker", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 8, "LIST" ] ], [ [ "waffleiron", -1 ] ] @@ -4652,12 +4634,7 @@ "time": 12000, "autolearn": true, "tools": [ - [ - [ "hotplate", 8 ], - [ "char_smoker", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 8, "LIST" ] ], [ [ "waffleiron", -1 ] ] @@ -4709,12 +4686,7 @@ "time": 12000, "autolearn": true, "tools": [ - [ - [ "hotplate", 8 ], - [ "char_smoker", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 8, "LIST" ] ], [ [ "waffleiron", -1 ] ] @@ -6048,12 +6020,7 @@ "qualities":[ {"id":"COOK","level":3} ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 10, "LIST" ] ], [ [ "vac_sealer", 10 ], [ "makeshift_sealer", 20 ] @@ -6122,12 +6089,7 @@ "qualities":[ {"id":"COOK","level":3} ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 10, "LIST" ] ], [ [ "vac_sealer", 10 ], [ "makeshift_sealer", 20 ] @@ -6188,12 +6150,7 @@ "qualities":[ {"id":"COOK","level":3} ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 10, "LIST" ] ], [ [ "vac_sealer", 10 ], [ "makeshift_sealer", 20 ] @@ -6271,12 +6228,7 @@ "qualities":[ {"id":"COOK","level":3} ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 10, "LIST" ] ], [ [ "vac_sealer", 10 ], [ "makeshift_sealer", 20 ] @@ -6369,12 +6321,7 @@ "qualities":[ {"id":"COOK","level":3} ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 10, "LIST" ] ], [ [ "vac_sealer", 10 ], [ "makeshift_sealer", 20 ] @@ -6433,12 +6380,7 @@ "qualities":[ {"id":"COOK","level":3} ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 10, "LIST" ] ], [ [ "vac_sealer", 10 ], [ "makeshift_sealer", 20 ] @@ -6503,12 +6445,7 @@ "qualities":[ {"id":"COOK","level":3} ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 10, "LIST" ] ], [ [ "vac_sealer", 10 ], [ "makeshift_sealer", 20 ] @@ -6543,12 +6480,7 @@ "qualities":[ {"id":"COOK","level":3} ], "tools": [ - [ - [ "hotplate", 10 ], - [ "char_smoker", 10 ], - [ "toolset", 10 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 10, "LIST" ] ], [ [ "vac_sealer", 10 ], [ "makeshift_sealer", 20 ] @@ -6761,12 +6693,7 @@ "qualities":[ {"id":"COOK","level":3} ], "tools": [ - [ - [ "hotplate", 2 ], - [ "char_smoker", 2 ], - [ "toolset", 2 ], - [ "fire", -1 ] - ], + [ [ "surface_heat", 2, "LIST" ] ], [ [ "vac_sealer", 10 ], [ "makeshift_sealer", 20 ] @@ -6835,8 +6762,10 @@ "time": 45000, "autolearn": true, "batch_time_factors":[83, 3], - "tools": [ [ [ "hotplate", 5 ], [ "char_smoker", 5 ], [ "toolset", 5 ], [ "fire", -1 ] ], - [ ["rock_quern", -1], ["clay_quern", -1] ] ], + "tools": [ + [ [ "surface_heat", 5, "LIST" ] ], + [ ["rock_quern", -1], ["clay_quern", -1] ] + ], "components": [ [ ["corn", 2], ["irradiated_corn", 2] ] ] },{ "type" : "recipe", From 6ae35ea64b4c4be1e9b1f6372ed77c976bdb3a2f Mon Sep 17 00:00:00 2001 From: Coolthulhu Date: Mon, 20 Mar 2017 15:59:13 +0100 Subject: [PATCH 07/11] Some missed cases --- data/json/recipes/recipe_food.json | 66 ++++-------------------------- 1 file changed, 8 insertions(+), 58 deletions(-) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 1781e04389cf3..bb4cfdf058da1 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -4191,14 +4191,7 @@ "difficulty": 1, "time": 6000, "autolearn": true, - "tools": [ - [ - ["hotplate", 5], - ["char_smoker", 5], - ["toolset", 5], - ["fire", -1] - ] - ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [["pinecone", 4]] ] @@ -4231,14 +4224,7 @@ "qualities":[ {"id":"COOK","level":1} ], - "tools": [ - [ - ["hotplate", 5], - ["char_smoker", 5], - ["toolset", 5], - ["fire", -1] - ] - ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ ["hickory_nut_unshelled", 1] @@ -4257,14 +4243,7 @@ {"id":"COOK","level":3}, {"id":"BOIL","level":2} ], - "tools": [ - [ - ["hotplate", 5], - [ "char_smoker", 5 ], - ["toolset", 5], - ["fire", -1] - ] - ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ ["hickory_nut_unshelled", 4] @@ -6727,14 +6706,7 @@ {"id":"CUT","level":1}, {"id":"COOK","level":2} ], - "tools": [ - [ - ["hotplate", 5], - [ "char_smoker", 5 ], - ["toolset", 5], - ["fire", -1] - ] - ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ ["can_spam", 1] @@ -6801,12 +6773,7 @@ "time": 30000, "autolearn": true, "tools": [ - [ - ["hotplate", 25], - [ "char_smoker", 25 ], - ["toolset", 25], - ["fire", -1] - ], + [ [ "surface_heat", 25, "LIST" ] ], [ ["pastaextruder", -1] ] @@ -6825,12 +6792,7 @@ "time": 30000, "autolearn": true, "tools": [ - [ - ["hotplate", 25], - [ "char_smoker", 25 ], - ["toolset", 25], - ["fire", -1] - ], + [ [ "surface_heat", 25, "LIST" ] ], [ ["pastaextruder", -1] ] @@ -6849,12 +6811,7 @@ "time": 30000, "autolearn": true, "tools": [ - [ - ["hotplate", 25], - [ "char_smoker", 25 ], - ["toolset", 25], - ["fire", -1] - ], + [ [ "surface_heat", 25, "LIST" ] ], [ ["pastaextruder", -1] ] @@ -8238,14 +8195,7 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":2} - ], "tools": [ - [ - ["hotplate", 2], - [ "char_smoker", 2 ], - ["toolset", 2], - ["fire", -1] - ] - ], + ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "sweet_fruit", 1, "LIST" ], From 7553df41a5fb909a49111770a32a4d2b85992c26 Mon Sep 17 00:00:00 2001 From: Coolthulhu Date: Mon, 20 Mar 2017 16:04:48 +0100 Subject: [PATCH 08/11] Replace recipes with missing char cooker --- data/json/recipes/recipe_food.json | 86 +++++------------------------- 1 file changed, 13 insertions(+), 73 deletions(-) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index bb4cfdf058da1..2f35a8d1ef9cb 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -5069,13 +5069,7 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "veggy", 2 ], @@ -5119,13 +5113,7 @@ "autolearn": true, "qualities":[ {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "veggy", 2 ], @@ -5162,13 +5150,7 @@ "book_learn": [[ "cookbook_italian", 2 ]], "qualities":[ {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "veggy", 2 ], @@ -5214,13 +5196,7 @@ "book_learn": [[ "cookbook_human", 2 ]], "qualities":[ {"id":"COOK","level":2} - ], "tools": [ - [ - [ "hotplate", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "veggy", 2 ], @@ -5672,13 +5648,7 @@ "autolearn": true, "qualities":[ {"id":"CHEM","level":2} - ], "tools": [ - [ - [ "hotplate", 50 ], - [ "toolset", 50 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 50, "LIST" ] ] ], "components": [ [ [ "lye_powder", 100 ], @@ -5733,13 +5703,7 @@ "autolearn": true, "qualities":[ {"id":"CHEM","level":2} - ], "tools": [ - [ - [ "hotplate", 50 ], - [ "toolset", 50 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 50, "LIST" ] ] ], "components": [ [ ["sweet_fruit_like", 2, "LIST"], @@ -5780,13 +5744,7 @@ "book_learn": [["adv_chemistry", 7] , ["textbook_chemistry", 8] , ["recipe_labchem", 6]], "qualities":[ {"id":"CHEM","level":2} - ], "tools": [ - [ - [ "hotplate", 50 ], - [ "toolset", 50 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 50, "LIST" ] ] ], "components": [ [ [ "pine_bough", 6 ], @@ -6924,7 +6882,7 @@ "time": 7000, "autolearn": true, "qualities":[ { "id": "COOK", "level": 2 } ], - "tools":[ [ [ "hotplate", 20 ], [ "toolset", 20 ], ["fire", -1] ] ], + "tools":[ [ [ "surface_heat", 20, "LIST" ] ] ], "components": [ [ [ "meat_tainted", 12 ] ], [ @@ -8064,13 +8022,7 @@ "batch_time_factors":[67, 5], "qualities":[ {"id":"COOK","level":1} - ], "tools": [ - [ - [ "hotplate", 7 ], - [ "toolset", 7 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ [ [ "sauerkraut", 1 ] @@ -9994,13 +9946,7 @@ {"id":"COOK","level":3}, {"id":"BOIL","level":2} ], - "tools": [ - [ - [ "hotplate", 5 ], - [ "toolset", 5 ], - [ "fire", -1 ] - ] - ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "egg_bird", 2 ], @@ -10033,13 +9979,7 @@ {"id":"COOK","level":3}, {"id":"BOIL","level":2} ], - "tools": [ - [ - ["hotplate", 5], - ["toolset", 5], - ["fire", -1] - ] - ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "egg_bird", 2 ], @@ -10077,7 +10017,7 @@ "autolearn": true, "result_mult": 2, "qualities": [ { "id": "COOK", "level": 3 } ], - "tools": [ [ [ "hotplate", 5 ], [ "toolset", 5 ], [ "fire", -1 ] ] ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "chocolate", 1 ] ], [ [ "milk", 1 ], [ "con_milk", 1 ], [ "milk_powder", 1 ] ], @@ -10096,7 +10036,7 @@ "book_learn": [ [ "family_cookbook", 2 ] ], "result_mult": 2, "qualities": [ { "id": "COOK", "level": 3 } ], - "tools": [ [ [ "hotplate", 5 ], [ "toolset", 5 ], [ "fire", -1 ] ] ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "chocolate", 1 ] ], [ [ "milk", 1 ], [ "con_milk", 1 ], [ "milk_powder", 1 ] ], From de61b88bb1ca65b33a9728ad320665aa51faada6 Mon Sep 17 00:00:00 2001 From: Coolthulhu Date: Mon, 20 Mar 2017 16:16:50 +0100 Subject: [PATCH 09/11] Missed cases part 1 --- data/json/recipes/recipe_food.json | 54 ++++-------------------------- 1 file changed, 6 insertions(+), 48 deletions(-) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 2f35a8d1ef9cb..9f63f5f11b2c1 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -5674,14 +5674,7 @@ {"id":"CUT","level":1}, {"id":"BOIL","level":2} ], - "tools": [ - [ - [ "hotplate", 50 ], - [ "toolset", 50 ], - [ "fire", -1 ], - [ "char_smoker", 5 ] - ] - ], + "tools": [ [ [ "surface_heat", 50, "LIST" ] ] ], "components": [ [ [ "hickory_root", 10 ] @@ -5773,14 +5766,7 @@ { "id": "CONTAIN", "level": 1 }, { "id": "BOIL", "level": 2 }, { "id": "CHEM", "level": 1 } - ], "tools": [ - [ - [ "hotplate", 40 ], - [ "toolset", 40 ], - [ "fire", -1 ], - [ "char_smoker", 4 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 40, "LIST" ] ] ], "components": [ [ [ "sugar_beet", 2 ] @@ -9704,14 +9690,7 @@ {"id":"COOK","level":3}, {"id":"CUT","level":1}, {"id":"SEW","level":1} - ], "tools": [ - [ - [ "hotplate", 5 ], - [ "toolset", 5 ], - [ "char_smoker", 5 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "water", 1 ], @@ -9750,14 +9729,7 @@ {"id":"COOK","level":3}, {"id":"CUT","level":1}, {"id":"SEW","level":1} - ], "tools": [ - [ - [ "hotplate", 5 ], - [ "toolset", 5 ], - [ "char_smoker", 5 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "water", 1 ], @@ -9798,14 +9770,7 @@ "qualities":[ {"id":"COOK","level":3}, {"id":"CUT","level":1} - ], "tools": [ - [ - [ "hotplate", 5 ], - [ "toolset", 5 ], - [ "char_smoker", 5 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "water", 1 ], @@ -9836,14 +9801,7 @@ "qualities":[ {"id":"BOIL","level":1}, {"id":"COOK","level":3} - ], "tools": [ - [ - [ "hotplate", 5 ], - [ "toolset", 5 ], - [ "char_smoker", 5 ], - [ "fire", -1 ] - ] - ], + ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "oatmeal", 1 ], From 00f567af9f17bf08d6213e19214d9a1d4a0e169a Mon Sep 17 00:00:00 2001 From: Coolthulhu Date: Mon, 20 Mar 2017 16:23:50 +0100 Subject: [PATCH 10/11] Last missed cases --- data/json/recipes/recipe_food.json | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 9f63f5f11b2c1..de8182efd7fc7 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -3377,14 +3377,8 @@ "qualities":[ {"id":"BOIL","level":2} ], "tools": [ - [ - [ "rag", -1 ] - ], - [ - [ "hotplate", 12 ], - [ "toolset", 12 ], - [ "fire", -1 ] - ] + [ [ "surface_heat", 12, "LIST" ] ], + [ [ "rag", -1 ] ] ], "components": [ [ @@ -3403,14 +3397,8 @@ "qualities":[ {"id":"BOIL","level":2} ], "tools": [ - [ - [ "thermometer", -1 ] - ], - [ - [ "hotplate", 8 ], - [ "toolset", 8 ], - [ "fire", -1 ] - ] + [ [ "surface_heat", 12, "LIST" ] ], + [ [ "thermometer", -1 ] ] ], "components": [ [ From 462ef74c80fe32960eb7086d0fe9bea09c2d98f9 Mon Sep 17 00:00:00 2001 From: Coolthulhu Date: Mon, 20 Mar 2017 17:29:18 +0100 Subject: [PATCH 11/11] Number fix --- data/json/recipes/recipe_food.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index de8182efd7fc7..45738633ff8f7 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -3397,7 +3397,7 @@ "qualities":[ {"id":"BOIL","level":2} ], "tools": [ - [ [ "surface_heat", 12, "LIST" ] ], + [ [ "surface_heat", 8, "LIST" ] ], [ [ "thermometer", -1 ] ] ], "components": [