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.

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

Conversation

Coolthulhu
Copy link
Contributor

The total diff line looks scary, but the additions are around 300 so it's perfectly readable. Plus, vast majority of the changes are almost trivial in nature.
Almost 1.5k lines of repeated boilerplate json purged in one of the biggest cleanups in the history of the repo.

This also fixes some bad recipes where charcoal smoker was unusable for some recipes it should be usable for. Any recipe that allows both fire and hotplate must also allow charcoal smoker unless there is a good reason for why shouldn't it be the case (I can't think of any).
Recipes can allow only hotplate and no fire if they require precise heating or fire and no hotplate if it requires open flame, but if it allows both, it allows charcoal smoker.

Some water recipes also allow coffeemaker. Those got a different list.

[ "toolset", 8 ],
[ "fire", -1 ]
]
[ [ "surface_heat", 12, "LIST" ] ],
Copy link
Contributor

Choose a reason for hiding this comment

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

copy paste error, should be "surface_heat", 8, "LIST"

]
],
"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

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.

@kevingranade kevingranade merged commit f2adfcb into CleverRaven:master Mar 25, 2017
@Coolthulhu Coolthulhu deleted the boil-list branch June 15, 2020 17:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants