Bush damage fix #2191
Closed
Bush damage fix #2191
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
![ellipsis-dev[bot]](https://avatars.githubusercontent.com/in/64358?s=60&v=4){kind=small}
There was a problem hiding this comment.
❌ Changes requested. Reviewed everything up to 37bb1bc in 40 seconds
More details
- Looked at
68lines of code in2files - Skipped
0files when reviewing. - Skipped posting
1drafted comments based on config settings.
1. skymp5-server/cpp/server_guest_lib/formulas/TES5DamageFormula.cpp:213
- Draft comment:
The function IsUnarmedAttack is defined twice, once in the global namespace and once within the internal namespace. Consider removing the redundant definition. - Reason this comment was not posted:
Decided after close inspection that this draft comment was likely wrong and/or not actionable:
The comment is incorrect because the function was not defined twice in the current state of the file. The diff shows that the function was moved from the internal namespace to the global namespace with a modification. The comment does not reflect the current state of the code after the changes.
I might be missing the fact that the comment could be referring to a different part of the code not visible in the diff, but based on the provided context, it seems unlikely.
The context provided includes the entire file, so it's reasonable to conclude that the comment is outdated or incorrect based on the current state of the file.
The comment is incorrect because the function 'IsUnarmedAttack' is not defined twice in the current state of the file. The comment should be deleted.
Workflow ID: wflow_UwiewKsOrdY2KBGS
Want Ellipsis to fix these issues? Tag @ellipsis-dev in a comment. You can customize Ellipsis with 👍 / 👎 feedback, review rules, user-specific overrides, quiet mode, and more.
|
|
||
| bool IsUnarmedAttack(const uint32_t sourceFormId, bool isBashAttack) | ||
| { | ||
| return isBashAttack ? false : sourceFormId == 0x1f4 |
There was a problem hiding this comment.
Missing semicolon at the end of the return statement.
Suggested change
| return isBashAttack ? false : sourceFormId == 0x1f4 | |
| return isBashAttack ? false : sourceFormId == 0x1f4; |
| @@ -118,9 +112,9 @@ | |||
| return espm::GetData<espm::RACE>(raceId, espmProvider).unarmedDamage; | |||
There was a problem hiding this comment.
Update the function declaration to match the definition by adding the bool isBashAttack parameter.
|
@BartPortugalec Could you please revert |
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.
closes #1813
Important
Adjusts damage calculation in
TES5DamageFormulaImplto account for bash attacks and updates submodule invcpkg.DetermineDamageFromSourceinTES5DamageFormulaImplto acceptisBashAttackparameter.CalculateDamageto apply a 0.3x multiplier for bash attacks.IsUnarmedAttackto return false for bash attacks.vcpkg.This description was created by
for 37bb1bc. It will automatically update as commits are pushed.