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): Arthropod Overhaul Part 1, Dragonfly #4177

Merged
merged 12 commits into from
Jan 31, 2024

Conversation

Zlorthishen
Copy link
Contributor

@Zlorthishen Zlorthishen commented Jan 30, 2024

Purpose of change

ports over dda changes:
CleverRaven/Cataclysm-DDA#40733 by https://github.com/ymber
CleverRaven/Cataclysm-DDA#44779 by https://github.com/Venera3

Describe the solution

  • adds new insect organs
  • adds new text snippets
  • changes harvests to allow for these new snippets and items
  • add new variations of dragonfly species
  • add new INSECT_FLYING faction

Describe alternatives you've considered

Testing

image

image

image

Additional context

Checklist

@github-actions github-actions bot added the JSON related to game datas in JSON format. label Jan 30, 2024
@Zlorthishen Zlorthishen changed the title feat(content,port), Arthropod Overhaul Part 1, Dragonfly feat(content,port): Arthropod Overhaul Part 1, Dragonfly Jan 30, 2024
Copy link
Contributor

autofix-ci bot commented Jan 30, 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 January 30, 2024 03:54
@chaosvolt
Copy link
Member

Is it supposed to print so many snippets at once?

data/json/harvest.json Outdated Show resolved Hide resolved
Zlorthishen and others added 3 commits January 30, 2024 16:14
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
almost missed the firefly
data/json/harvest.json Outdated Show resolved Hide resolved
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
chaosvolt
chaosvolt previously approved these changes Jan 31, 2024
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 everything aside from hopefully creating snippets for bees and wasps in a future PR, per discussion on discord.

Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
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.

stonks

@scarf005
Copy link
Member

scarf005 commented Jan 31, 2024

awesome. next time maybe could we add Co-authored-by to individual commits? this helps properly attributing original authors. for example:

Co-authored-by: ymber <mtaylor1252dev@gmail.com>
Co-authored-by: Venera3 <72006894+Venera3@users.noreply.github.com>

for now, I'll add attribution to squashed commit.

@scarf005 scarf005 merged commit dca69f1 into cataclysmbnteam:main Jan 31, 2024
8 of 9 checks passed
@Zlorthishen Zlorthishen deleted the Arthropod-Overhaul-Part1 branch January 31, 2024 23:42
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