Jsonize Weight capacity modifier for armor and CBM #33394
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BevapDin
reviewed
Aug 20, 2019
BevapDin
reviewed
Aug 20, 2019
BevapDin
reviewed
Aug 20, 2019
BevapDin
reviewed
Aug 20, 2019
ZhilkinSerg
added
<Bugfix>
BevapDin
reviewed
Aug 21, 2019
BevapDin
reviewed
Aug 21, 2019
BevapDin
reviewed
Aug 21, 2019
added 2 commits
August 21, 2019 21:42
misterprimus
pushed a commit
to misterprimus/Cataclysm-DDA
that referenced
this pull request
Sep 21, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
SUMMARY: Infrastructure "Jsonize Weight capacity modifier for armor and CBM"Purpose of change
Add weight capacity modifier a float that multiply the base weight capacity of a character
Add weight capacity bonus a flat value in kg that's added to weight capacity
Update description of items to show those value
Update description of CBMs to show those value plus EP and encumbrance
Fixes #32942
Describe the solution
Two new fields weight_capacity_modifier and weight_capacity_bonus that are used in get_weight_capacity()
Describe alternatives you've considered
Additional context
Updated weight_cbm to use json instead of hardcode for the weight capacity bonus