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): Centipede overhaul #4246

Merged
merged 9 commits into from
Feb 24, 2024

Conversation

Zlorthishen
Copy link
Contributor

@Zlorthishen Zlorthishen commented Feb 22, 2024

Purpose of change

ports in the following dda pull requests

Describe the solution

adds several new varieties of centipedes, as well as removing an obsolete variety
creates a monster_faction and species for centipedes
also ports over elements of Diversified Venoms too

Describe alternatives you've considered

Testing

Additional context

Checklist

Co-Authored-By: Venera3 <[email protected]>
@github-actions github-actions bot added the JSON related to game datas in JSON format. label Feb 22, 2024
Copy link
Contributor

autofix-ci bot commented Feb 22, 2024

The Autofix app has found code style violation and automatically formatted this Pull Request.

I locally edit my commits (e.g: git, github desktop)

Please choose following options:

I'd like to accept the automated commit
  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.

This PR is complete and I don't want to edit it anymore

It's safe to ignore this message.

I edit this PR through web UI

You can ignore this message and continue working.

I have no idea what this message is talking about

You can ignore this message and continue working. If you find any problem, please ask for help and ping @scarf005.

Copy link
Member

@scarf005 scarf005 left a comment

Choose a reason for hiding this comment

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

please add co-authors to each commits.

@Zlorthishen
Copy link
Contributor Author

please add co-authors to each commits.

image

@chaosvolt
Copy link
Member

The only commit that isn't co-auth'd is auto-format, which does not really count in my opinion. The actual content commit was co-auth'd appropriately.

@Zlorthishen Zlorthishen marked this pull request as ready for review February 22, 2024 02:49
@scarf005
Copy link
Member

Screenshot_2024-02-22-12-38-31-080_com.github.android.jpg

sorry @Zlorthishen, i didn't know that github mobile lacked commit details/co-author display like on browser.

data/json/effects.json Show resolved Hide resolved
data/json/effects.json Show resolved Hide resolved
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.

Think that's good for now far as I can tell, venom effects probably will need some playing around with to ensure they aren't wacky but.

@scarf005 scarf005 merged commit a53f154 into cataclysmbnteam:main Feb 24, 2024
10 checks passed
@Zlorthishen Zlorthishen deleted the centipedes branch February 25, 2024 00:25
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.

3 participants