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

feat(content): fruit products (jam, juice, cooked) will inherit name from component used #4737

Merged
merged 9 commits into from
Jun 4, 2024

Conversation

Lamandus
Copy link
Contributor

@Lamandus Lamandus commented Jun 4, 2024

Purpose of change

Fruit jams, juices, pies, waffles, milkshakes, fruit slices, cookies, kompot, granola canned fruit and cooked fruit will now use the corresponding name of what it is made from.
If juice is made from apples it will be apple juice.
If jam is made from oranges, it will be orange jam.

Orange juice (oj) recipes and cranberry juice recipes got obsoleted due to being covered by the juice crafting.

the items themselves didn't get obsoleted. So dedicated cranberry or orange juice can still spawn.

(and egg names got corrected)

Describe the solution

Describe alternatives you've considered

Testing

Additional context

Checklist

@github-actions github-actions bot added the JSON related to game datas in JSON format. label Jun 4, 2024
chaosvolt
chaosvolt previously approved these changes Jun 4, 2024
Copy link
Member

@chaosvolt chaosvolt left a comment

Choose a reason for hiding this comment

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

I had to check and confirm that yes, sweet_fruit_fresh and sweet_fruit_irradiated do indeed contain orange and cranberry, or else this PR would've needed that fixed. Looks good, just is a big-ass bunch of changes to sift through.

I wish component names could be an array though, so that you could condense the fresh and irradiated names into a single line, I assume that's not an option currently though.

@Lamandus
Copy link
Contributor Author

Lamandus commented Jun 4, 2024

I had to check and confirm that yes, sweet_fruit_fresh and sweet_fruit_irradiated do indeed contain orange and cranberry, or else this PR would've needed that fixed. Looks good, just is a big-ass bunch of changes to sift through.

I wish component names could be an array though, so that you could condense the fresh and irradiated names into a single line, I assume that's not an option currently though.

I had the problem with peanut butter in my other PR, that lead to with butter, when using peanut butter. Maybe I can cut it down a bit.

And yes, orange and cranberry are in it.

@Lamandus
Copy link
Contributor Author

Lamandus commented Jun 4, 2024

yea, irritated can be cut out. I will correct it now, don't merge it yet

@chaosvolt
Copy link
Member

Oh that's a fun one, you can mix the different types of juices and it only tracks one of the component names instead of just erasing it and calling it juice...
image

chaosvolt
chaosvolt previously approved these changes Jun 4, 2024
sadly wine is also not working. Due vat transformation.

Pulp is a byproduct, doesn't inherit anything.

Comment fix

Update drink.json

extra names

Update recipes.json

Update recipes.json

Update egg.json

fixes and completion
@Lamandus Lamandus changed the title feat(content): fruit products (jam, wine, juice, cooked) will inherit name from component used feat(content): fruit products (jam, juice, cooked) will inherit name from component used Jun 4, 2024
@Lamandus
Copy link
Contributor Author

Lamandus commented Jun 4, 2024

Vat transformation does kill the fruit wine changes.
same with pulp, it is a byproduct, which doesn't inherit anything from the original.

Lamandus and others added 3 commits June 4, 2024 22:12

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Copy link
Contributor

autofix-ci bot commented Jun 4, 2024

Autofix has formatted code style violation in this PR.

I edit commits locally (e.g: git, github desktop) and want to keep autofix
  1. Run git pull. this will merge the automated commit into your local copy of the PR branch.
  2. Continue working.
I do not want the automated commit
  1. Format your code locally, then commit it.
  2. Run git push --force to force push your branch. This will overwrite the automated commit on remote with your local one.
  3. Continue working.

If you don't do this, your following commits will be based on the old commit, and cause MERGE CONFLICT.

Lamandus added 5 commits June 4, 2024 22:43
…into jam-fruit
@Lamandus
Copy link
Contributor Author

Lamandus commented Jun 4, 2024

I am done, no more changes

@chaosvolt chaosvolt merged commit f4aaffd into cataclysmbnteam:main Jun 4, 2024
10 checks passed
@Lamandus Lamandus deleted the jam-fruit branch September 4, 2024 23:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
JSON related to game datas in JSON format.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants