Refactor gm-unit: DRY up appearance modifier logic in editor_body.lua - #1594
Open
sizzlins wants to merge 7 commits into
Open
Refactor gm-unit: DRY up appearance modifier logic in editor_body.lua#1594sizzlins wants to merge 7 commits into
sizzlins wants to merge 7 commits into
Conversation
Fixes #5793. Manually calculates size_cur from size_base and body modifiers to emulate native DF scaling logic, fulfilling the 3-year-old TODO.
chdoc
requested changes
Aug 9, 2026
chdoc
left a comment
chdoc
left a comment
Member
There was a problem hiding this comment.
This pull request makes a user-observable change (recalculating body sizes) and requires a changelog entry.
Comment on lines
+27
to
+39
| function Editor_Body_Modifier:recalculateBodySize() | ||
| -- Manually recalculate body size | ||
| local new_size = self.target_unit.body.size_info.size_base | ||
| local caste = df.creature_raw.find(self.target_unit.race).caste[self.target_unit.caste] | ||
| for idx, mod_entry in ipairs(caste.body_appearance_modifiers) do | ||
| local t = mod_entry.modifier.type | ||
| if t >= 0 and t <= 2 then -- 0=HEIGHT, 1=BROADNESS, 2=LENGTH | ||
| local mod_val = self.target_unit.appearance.body_modifiers[idx] | ||
| new_size = math.floor((new_size * mod_val) / 100) | ||
| end | ||
| end | ||
| self.target_unit.body.size_info.size_cur = new_size | ||
| end |
Member
There was a problem hiding this comment.
This was not present previously. Please explain where this comes from.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This PR is a cleanup and refactor of internal/gm-unit/editor_body.lua to remove duplicated code and follow standard DRY
Created unified setModifier and getModifier methods that intelligently handle both "part" and "body" modifications.
Deleted the nearly identical setPartModifier and setBodyModifier methods.
Stripped out the redundant if self.partChoice.type == "part" conditional checks that were scattered inside the selected(), random(), step(), and updateChoices() actions.