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 not displaying mutant + cbm encumbrance #36121

Merged
merged 3 commits into from
Dec 18, 2019

Conversation

Ramza13
Copy link
Contributor

@Ramza13 Ramza13 commented Dec 15, 2019

Summary

SUMMARY: Bugfixes "Fixed display to show mutation and cbm encumbrance"

Purpose of change

Fixes #23928

Describe the solution

Changed encumbrance to add mutation and cbm encumbrance. Previously was showing only armor encumbrance in first number now is showing total minus layering.

Describe alternatives you've considered

Testing

Additional context

@KorGgenT KorGgenT added [C++] Changes (can be) made in C++. Previously named `Code` Info / User Interface Game - player communication, menus, etc. labels Dec 15, 2019
Co-Authored-By: Kevin Granade <[email protected]>
@kevingranade
Copy link
Member

The comment specifically says accumulated encumbrance from clothing, plus extra encumbrance from layering, why did you decide to back out the layering penalty?

@Ramza13
Copy link
Contributor Author

Ramza13 commented Dec 18, 2019

The comment specifically says accumulated encumbrance from clothing, plus extra encumbrance from layering, why did you decide to back out the layering penalty?

Because the comment was wrong it used to just show armor_encumbrance which does not include layering penalty. Also to me the plus sign between the two numbers indicated that you had to add them to get the total encumbrance so it made more sense this way.

While trying to fix this the first solution I tried was to either list just the total or the armor encumbrance, cbm encumbrance, mutant encumbrance and layer penalty with an option to change between them. I also tried total encumbrance and layer penalty with changing the plus sign to a |. I then decided these were overkill and it made more sense to just work how I had assumed it worked.

That said I don't mind changing it if it makes more sense the other way.

@kevingranade
Copy link
Member

OK that's cool then.

@kevingranade kevingranade merged commit e9e50b3 into CleverRaven:master Dec 18, 2019
@Ramza13 Ramza13 deleted the enc_display branch November 17, 2021 17:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[C++] Changes (can be) made in C++. Previously named `Code` Info / User Interface Game - player communication, menus, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Mutations with encumbrance_always don't show increased encumbrance in ENCUMBRANCE AND WARMTH menu
3 participants