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): Wasp overhaul #4255

Merged
merged 9 commits into from
Feb 26, 2024
Merged

Conversation

Zlorthishen
Copy link
Contributor

@Zlorthishen Zlorthishen commented Feb 25, 2024

Purpose of change

port over dda pr

Describe the solution

added new species 'WASP', and new monster_faction wasp
added several new monstrous wasps
added some wasp spawning locations where they would forage (lumberyards, candy store, sugar house, ect)

Describe alternatives you've considered

Testing

👍

Additional context

Checklist

Co-Authored-By: Venera3 <72006894+venera3@users.noreply.github.com>
@github-actions github-actions bot added src changes related to source code. JSON related to game datas in JSON format. labels Feb 25, 2024
Copy link
Contributor

autofix-ci bot commented Feb 25, 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.

@Zlorthishen Zlorthishen marked this pull request as ready for review February 25, 2024 20:11
Zlorthishen and others added 4 commits February 25, 2024 14:15
Co-Authored-By: Venera3 <72006894+venera3@users.noreply.github.com>
Co-Authored-By: Venera3 <72006894+venera3@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 5326323 into cataclysmbnteam:main Feb 26, 2024
13 checks passed
@Zlorthishen Zlorthishen deleted the wasps branch February 26, 2024 22:45
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. src changes related to source code.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants