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

added dairy tag to several foods #26462

Merged
merged 1 commit into from
Nov 5, 2018
Merged

Conversation

robdit
Copy link

@robdit robdit commented Oct 30, 2018

Summary

SUMMARY: Bugfixes "Adds dairy tag to several food items."

Purpose of change

Fixes #24097 - Added dairy tag to a bunch of food items that used dairy.

Describe the solution

Added dairy tag to the material section of items that were missing it in the JSON.

Describe alternatives you've considered

Milk tag might be suitable enough in most cases since all dairy products contain milk.

Additional context

New recipes might be need to address recipes that can use coconut milk as an alternative to dairy milk.

@Theundyingcode
Copy link
Contributor

I feel that needed to list milk and dairy is redundant. Milk should imply dairy but good job fixing this anyways.

@robdit
Copy link
Author

robdit commented Oct 31, 2018

I was thinking the same thing but since the issue was still open I assumed it still needed to be worked on.

@mlangsdorf mlangsdorf added Info / User Interface Game - player communication, menus, etc. [JSON] Changes (can be) made in JSON labels Nov 1, 2018
@ZhilkinSerg ZhilkinSerg merged commit 90e0112 into CleverRaven:master Nov 5, 2018
@AMurkin
Copy link
Contributor

AMurkin commented Nov 5, 2018

Two misformatted lines. Fix is in #26539.

@AMurkin
Copy link
Contributor

AMurkin commented Nov 5, 2018

Hmm. Looks like this was done wrong.
Dairy is a name for the milk material:

  {
    "type": "material",
    "ident": "milk",
    "name": "Dairy",

Now game does this many times at load:

 DEBUG    : invalid material id "dairy"
 
 FUNCTION : const T& generic_factory<T>::obj(const string_id<T>&) const [with T = material_type]
 FILE     : src/generic_factory.h
 LINE     : 358

@AMurkin
Copy link
Contributor

AMurkin commented Nov 5, 2018

I made #26540 to fix it.

@robdit robdit deleted the issue-24097 branch November 18, 2018 07:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Info / User Interface Game - player communication, menus, etc. [JSON] Changes (can be) made in JSON
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add missing 'Dairy' tag to several foods
5 participants