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: add UNSAFE_CONSUME to all raw meat items #4417

Merged

Conversation

chaosvolt
Copy link
Member

Purpose of change

Fix getting parasites from having raw fish in your auto-eat zone:
image

Along the way I decided to just also add the relevant flag to all raw items that can grant parasites. While the low fun value may stop auto-eat due to the code checking the fun level, it doesn't stop you from hitting the wrong key and instantly getting parasites from that.

Describe the solution

  1. Set the flesh abstract to have UNSAFE_CONSUME on it.
  2. Converted raw fish, and to add SMOKABLE to its flag list via extend instead of fully overriding the flags.
  3. Set pickled and canned offal, jerky, salted fish, various cooked offal items to delete UNSAFE_CONSUME from flags.
  4. Added RAW and UNSAFE_CONSUME to raw fat like tainted fat has.
  5. Misc: Fixed cooked meat scraps lacking EATEN_HOT.

Describe alternatives you've considered

screm

Testing

Checked affected files for syntax and lint errors.

Additional context

Checklist

@github-actions github-actions bot added the data PRs related to datas. Won't crash game (probably) label Mar 31, 2024
@KheirFerrum
Copy link
Collaborator

Is there a reason RAW doesn't do this by default?

@Lamandus Lamandus merged commit 767418b into cataclysmbnteam:main Mar 31, 2024
10 checks passed
@chaosvolt
Copy link
Member Author

Is there a reason RAW doesn't do this by default?

Most likely because RAW is commonly used on a lot of veggy items that don't have parasites or otherwise cause any harm when eaten, and its only effects are a calorie reduction.

@chaosvolt chaosvolt deleted the do-not-magnetically-hoover-up-sashimi branch March 31, 2024 22:02
@KheirFerrum
Copy link
Collaborator

Is there a reason RAW doesn't do this by default?

Most likely because RAW is commonly used on a lot of veggy items that don't have parasites or otherwise cause any harm when eaten, and its only effects are a calorie reduction.

How does it affect raw meat but not raw veggy? Is it a tandem effect?

@chaosvolt
Copy link
Member Author

How does it affect raw meat but not raw veggy? Is it a tandem effect?

Because uncooked meat has a non-zero parasites value defined and uncooked veggies don't. It has nothing to do with the RAW flag itself.

@KheirFerrum
Copy link
Collaborator

How does it affect raw meat but not raw veggy? Is it a tandem effect?

Because uncooked meat has a non-zero parasites value defined and uncooked veggies don't. It has nothing to do with the RAW flag itself.

🤔 Couldn't we use that then?

@chaosvolt
Copy link
Member Author

🤔 Couldn't we use that then?

Checking for non-zero parasites could also work, just requires hardcoding it in, whereas this was a relatively quick JSON solution.

@KheirFerrum
Copy link
Collaborator

🤔 Couldn't we use that then?

Checking for non-zero parasites could also work, just requires hardcoding it in, whereas this was a relatively quick JSON solution.

Fair, may be a good idea to do that someday.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
data PRs related to datas. Won't crash game (probably)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants