[cpp, combat] Fix Ranged Weapon Rank Calculations#9678
Merged
Xaver-DaRed merged 1 commit intoMar 30, 2026
Conversation
9001-Sols
commented
Mar 27, 2026
| } | ||
|
|
||
| wDamage += weapon->getModifier(Mod::RANGED_DMG_RANK); | ||
| wDamage -= weapon->getModifier(Mod::DMG_RATING); // Company sword, Maneater, etc don't boost weapon rank |
Contributor
Author
There was a problem hiding this comment.
Now that we just read the weapon damage directly for calculations, we don't need to subtract out the mod
WinterSolstice8
approved these changes
Mar 28, 2026
Xaver-DaRed
approved these changes
Mar 30, 2026
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
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.
I affirm:
What does this pull request do?
Fixes the Weapon Rank calculation for Ranged weapons to use only the Ranged Weapon, instead of Ranged Weapon + Ammo
Steps to test these changes
floor(RANGE_WEAPON_DMG / 9)and doesn't include ammo (unless the throwable is an ammo, in which case it uses the throwable damage)