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

fix: heat and acid armor work #4294

Merged
merged 2 commits into from
Mar 4, 2024

Conversation

LordZanos
Copy link
Contributor

@LordZanos LordZanos commented Mar 4, 2024

Purpose of change

Describe the solution

Truthiness of a std::optional will always evaluate to true if the optional is not null. Need to check if DT_ACID/DT_HEAT exist in the optional instead.

Describe alternatives you've considered

Feet melting off, idk

Testing

Changed ANBC armor json to have some funny numbers and some normal ones, loaded game:

Spot checked armors that weren't overridden, they looked fine.

Additional context

ow my feat

@github-actions github-actions bot added the src changes related to source code. label Mar 4, 2024
Copy link
Contributor

autofix-ci bot commented Mar 4, 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.

@scarf005
Copy link
Member

scarf005 commented Mar 4, 2024

@scarf005 scarf005 merged commit c9cb384 into cataclysmbnteam:main Mar 4, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
src changes related to source code.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Acid and Fire Protection on Armors Does Not Work
2 participants