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): lobsterfest #4251

Merged
merged 2 commits into from
Feb 25, 2024

Conversation

arvay5
Copy link
Contributor

@arvay5 arvay5 commented Feb 25, 2024

-Made lobsters drop lobster when harvested.

-Added items and recipes for lobster, cooked lobster, smoked lobster, dehydrated lobster/rehydrated lobster, pickled lobster, salted lobster, canned lobster, lobster soup, and lobster rolls

-Food item groups updated to include lobster-based items at a reduced chance compared to fish.

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context

Checklist

-Made lobsters drop lobster when harvested.

-Added items and recipes for lobster, cooked lobster, smoked lobster, dehydrated lobster/rehydrated lobster, pickled lobster, salted lobster, canned lobster, lobster soup, and lobster rolls

-Food item groups updated to include lobster-based items at a reduced chance compared to fish.
@github-actions github-actions bot added the JSON related to game datas in JSON format. label Feb 25, 2024
@scarf005 scarf005 changed the title Lobsterfest feat(content): lobsterfest Feb 25, 2024
@scarf005 scarf005 requested a review from chaosvolt February 25, 2024 07:07
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 hate the comestible tests weh

{
"type": "COMESTIBLE",
"id": "lobster_roll",
"name": { "str": "lobster roll", "str_pl": "lobster rolls" },
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"name": { "str": "lobster roll", "str_pl": "lobster rolls" },
"name": { "str": "lobster roll" },

"container": "wrapper",
"comestible_type": "FOOD",
"symbol": "%",
"calories": 500,
Copy link
Member

Choose a reason for hiding this comment

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

This might, hopefully, fix the jankiness with the comestible test.

Suggested change
"calories": 500,
"calories": 850,

-Made lobsters drop lobster when harvested.

-Added items and recipes for lobster, cooked lobster, smoked lobster, dehydrated lobster/rehydrated lobster, pickled lobster, salted lobster, canned lobster, lobster soup, and lobster rolls

-Food item groups updated to include lobster-based items at a reduced chance compared to fish.

Fixed Lobster roll calories I think so github will stop throwing a fit. Also made it only cost 1 butter.

-Changes to soup, broth, and curry fun values because they're very inconsistent Soup is good
@chaosvolt chaosvolt merged commit 9ae281d into cataclysmbnteam:main Feb 25, 2024
10 checks passed
@chaosvolt
Copy link
Member

Uncredited port of CleverRaven/Cataclysm-DDA#56121 by @LyleSY in addition to not being fully implemented, being reverted in light of that.

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