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(UI, port): Port hiding traits/mutations from DDA #5754

Merged
merged 4 commits into from
Nov 23, 2024

Conversation

RobbieNeko
Copy link
Contributor

Checklist

Required

Optional

  • This PR ports commits from DDA or other cataclysm forks.
    • I have attributed original authors in the commit messages adding Co-Authored-By in the commit message.
    • I have linked the URL of original PR(s) in the description.
  • This is a C++ PR that modifies JSON loading or behavior.

Purpose of change

Much like with hiding clothing, hiding traits and mutations is a much-desired feature for various reasons. Considering how much it's desired and how simple it was to port, I see no reason not to bring it in.

Describe the solution

Ports CleverRaven/Cataclysm-DDA#52058 from DDA.

Describe alternatives you've considered

  • Reinvent the wheel
  • Implode
  • Explode
  • Wait for someone else to do it

Testing

It builds, it works (on my machine anyway)
image
image

Additional context

2/3 of the hiding visuals ports that RoyalFox threw at us done. Next up, Bionics! (For whoever ends up taking that one on)

Don't worry Chaos, this time I made sure the keybind was BN-ified the first time ;P

RobbieNeko and others added 2 commits November 22, 2024 19:30
Oops, apparently we have two switches
@github-actions github-actions bot added src changes related to source code. JSON related to game datas in JSON format. labels Nov 23, 2024
Copy link
Contributor

autofix-ci bot commented Nov 23, 2024

Autofix has formatted code style violation in this PR.

I edit commits locally (e.g: git, github desktop) and want to keep autofix
  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.

RoyalFox2140
RoyalFox2140 previously approved these changes Nov 23, 2024
Copy link
Collaborator

@RoyalFox2140 RoyalFox2140 left a comment

Choose a reason for hiding this comment

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

Needs a windows user for testing but this should be fine, it builds off the previous PR.

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.

Compiled and tested, it works but has a spelling error.
image

src/mutation_ui.cpp Outdated Show resolved Hide resolved
src/mutation_ui.cpp Outdated Show resolved Hide resolved
src/mutation_ui.cpp Outdated Show resolved Hide resolved
src/mutation_ui.cpp Outdated Show resolved Hide resolved
src/mutation_ui.cpp Outdated Show resolved Hide resolved
@chaosvolt chaosvolt merged commit ba05695 into cataclysmbnteam:main Nov 23, 2024
12 checks passed
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