Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace food_recipe.json heating inlined lists with requirements #20611

Merged
merged 13 commits into from
Mar 25, 2017
Merged

Replace food_recipe.json heating inlined lists with requirements #20611

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
13c7158
Move water boiling tools to a requirement
Coolthulhu Mar 20, 2017
735fb64
Replace first third of recipe_food.json heating
Coolthulhu Mar 20, 2017
b0aa266
Replace second third of recipe_food.json heating
Coolthulhu Mar 20, 2017
62079ad
Replace all simple heating in recipe_food.json
Coolthulhu Mar 20, 2017
a9171c2
Replace 1/3 of recipe_food.json "complex" heating
Coolthulhu Mar 20, 2017
73ced1e
Replace most "complex" heating in recipe_food.json
Coolthulhu Mar 20, 2017
6ae35ea
Some missed cases
Coolthulhu Mar 20, 2017
7553df4
Replace recipes with missing char cooker
Coolthulhu Mar 20, 2017
de61b88
Missed cases part 1
Coolthulhu Mar 20, 2017
00f567a
Last missed cases
Coolthulhu Mar 20, 2017
462ef74
Number fix
Coolthulhu Mar 20, 2017
cb452b9
Merge branch 'master' into boil-list
Coolthulhu Mar 23, 2017
f2adfcb
Merge branch 'boil-list' of https://github.com/Coolthulhu/Cataclysm-D…
Coolthulhu Mar 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
170 changes: 23 additions & 147 deletions data/json/recipes/recipe_food.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]
Expand All @@ -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 ],
Expand All @@ -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 ]
Expand Down Expand Up @@ -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 ]
Expand All @@ -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 ]
Expand All @@ -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 ]
Expand All @@ -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 ]
Expand Down Expand Up @@ -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" ] ] ],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be "water_boiling_heat", 2, "LIST"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2 is for teas.
If we're talking balance/realism, it should be 10 or so.

Copy link
Contributor

@kolsurma kolsurma Mar 20, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eh, I was just pointing out that it was previously 2. If it should be changed to something more, that's fine. Should it be done in this PR though?

IMO It should at a minimum be whatever boiling water is.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like you got the wrong line.

I think I replaced one 2 with 3 for consistency, but it was somewhere else.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or it may be github which got the line wrong - it looks different in the email quote.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wouldn't doubt it. Thank you github for making this weird.

"type" : "recipe",
   "result": "coffee",
   "category": "CC_FOOD",
   "subcategory": "CSC_FOOD_DRINKS",
   "skill_used": "cooking",
    "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" ] ] ],

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That said, leave it at 3, it makes sense that it would take as much energy as boiling water.

"components": [
[
[ "coffee_raw", 1 ],
Expand Down Expand Up @@ -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 ]
Expand Down Expand Up @@ -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 ],
Expand Down Expand Up @@ -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 ]
Expand Down Expand Up @@ -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 ],
Expand Down Expand Up @@ -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 ]
Expand Down
6 changes: 6 additions & 0 deletions data/json/requirements/cooking_tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] ] ]
}
]