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): Triffid Regrowth #4154

Merged
merged 12 commits into from
Jan 25, 2024

Conversation

Zlorthishen
Copy link
Contributor

@Zlorthishen Zlorthishen commented Jan 23, 2024

Purpose of change

ports dda pr CleverRaven/Cataclysm-DDA#47787 by https://github.com/Mom-Bun

Describe the solution

JSONizes the triffid grove and removes hardcoding

Describe alternatives you've considered

triffids must be updated

Testing

locally compiled the modified code, modified data/json files, and ran a new player.

Additional context

Checklist

Co-Authored-By: Mom-Bun <43492737+mom-bun@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 Jan 23, 2024
Copy link
Contributor

autofix-ci bot commented Jan 23, 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 23, 2024 23:30
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.

could make some bits less clunk this way mebbe

data/json/effects.json Outdated Show resolved Hide resolved
data/json/effects.json Outdated Show resolved Hide resolved
data/json/field_type.json Outdated Show resolved Hide resolved
data/json/field_type.json Outdated Show resolved Hide resolved
data/json/furniture_and_terrain/furniture-triffid.json Outdated Show resolved Hide resolved
data/json/furniture_and_terrain/furniture-triffid.json Outdated Show resolved Hide resolved
data/json/furniture_and_terrain/terrain-triffid.json Outdated Show resolved Hide resolved
data/json/furniture_and_terrain/terrain-triffid.json Outdated Show resolved Hide resolved
@scarf005
Copy link
Member

cc @Vollch

Zlorthishen and others added 8 commits January 23, 2024 20:29
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>
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>
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.

3 participants