Fix self hit damage conversion #7351
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
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.
Fixes #7190 and issue created by normalisation, and taken as not applying to non-phys self hits
Fixes taken as being only from phys to something else (present from creation), not any ele to other, as well as normalisation being applied to the taken as (fixed for calc defence in #6844 but not this), and it only including generic and not hit specific taken as (introduced issue in #6803)
This also moves the function to calc defence and cleans it up a little
I would like to properly dedupe it with other calc defence stuff (eg
takenHitFromDamage) as it likely has other issues with being out of date, but it is too much work for how much time I have for it at the moment and this is still an improvement.