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

fix(content): Fix inappropriate vitamin extensions #5861

Conversation

RobbieNeko
Copy link
Collaborator

Checklist

Required

Purpose of change

Animal cooking oil claimed to have veggy in it, all the sandwiches claimed to have the allergens of a deluxe sandwich, and veggy sausage was somehow not actually vegetarian.

copy-from does not overwrite vitamins, but rather extends them.

Describe the solution

  • Remove copy-from from animal cooking oil and veggy sausage
  • Change the sandwiches over to a generic sandwich item to copy from ala the MREs

Describe alternatives you've considered

  • Wait for someone to dive into the clusterfuck that is the inheritance code to fix it from the C++ side and make it behave how you'd expect
  • Implode
  • Sleep

Testing

Load-tested and made sure everything worked appropriately for the vitamins

Additional context

I wouldn't be surprised if there's more questionable allergens elsewhere thanks to the script or weird copy-froms.

At some point we really need to bite the bullet and deal with copy-from not behaving

@github-actions github-actions bot added the JSON related to game datas in JSON format. label Jan 2, 2025
chaosvolt
chaosvolt previously approved these changes Jan 2, 2025
@chaosvolt chaosvolt dismissed their stale review January 2, 2025 06:13

Wait, gotta rerun this failed check to confirm it was a fluke

@RobbieNeko
Copy link
Collaborator Author

Re-running that one test build

@RobbieNeko RobbieNeko merged commit 6cb8977 into cataclysmbnteam:main Jan 2, 2025
13 checks passed
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.

2 participants