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,port): Add mutated forest creatures #4474

Merged
merged 7 commits into from
Apr 14, 2024

Conversation

Zlorthishen
Copy link
Contributor

@Zlorthishen Zlorthishen commented Apr 12, 2024

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context

does not port over the iridescent cat, what will be another PR
image

Checklist

Co-Authored-By: Kanexan <51104434+kanexan@users.noreply.github.com>
@github-actions github-actions bot added the JSON related to game datas in JSON format. label Apr 12, 2024
Copy link
Contributor

autofix-ci bot commented Apr 12, 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.

@Zlorthishen Zlorthishen marked this pull request as ready for review April 12, 2024 23:18
@chaosvolt
Copy link
Member

Eheheheh, Cerbearus

@scarf005 scarf005 self-requested a review April 13, 2024 14:07
@scarf005 scarf005 self-assigned this Apr 13, 2024
@Lamandus
Copy link
Contributor

grafik
grafik
grafik
looks fine as is, but we also have "mutant organs" I am not sure if other mutants in our game are using regular offal or the mutated version. If not mutated, then it is fine.

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 based these off mammal_large_chitin, which has brains and stomach but replaces all other organs with mutant offal at a ratio equal to twice the mass of the brains.

Increasing the mutant offal mass ratios a bit to account for there being fewer organ entries could be done if desired, though probably low priority since generic mutant offal is less useful recipe-wise than generic mutant meat, and probably less useful than any of the individual non-mutant organs either, making it less problematic that you get less of them from scaled bears anyway.

data/json/harvest.json Outdated Show resolved Hide resolved
data/json/harvest.json Outdated Show resolved Hide resolved
data/json/harvest.json Outdated Show resolved Hide resolved
data/json/harvest.json Outdated Show resolved Hide resolved
data/json/harvest.json Outdated Show resolved Hide resolved
Zlorthishen and others added 5 commits April 13, 2024 20:57
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
@chaosvolt chaosvolt merged commit f8bb891 into cataclysmbnteam:main Apr 14, 2024
10 checks passed
@Zlorthishen Zlorthishen deleted the mutated_forest_animals branch April 14, 2024 14:16
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.

4 participants