[TF2] Prevent resistance buffs from stopping Half-Zatoichi duel instant kill#1881
Open
FlaminSarge wants to merge 3 commits intoValveSoftware:masterfrom
Open
[TF2] Prevent resistance buffs from stopping Half-Zatoichi duel instant kill#1881FlaminSarge wants to merge 3 commits intoValveSoftware:masterfrom
FlaminSarge wants to merge 3 commits intoValveSoftware:masterfrom
Conversation
Co-authored-by: FlaminSarge <flaminsarge@gmail.com>
Reuses DMG_PHYSGUN
Contributor
Author
|
@JoriKos Your implementation with the new DamageCustom value was pretty close, tbh. Adding a damage type flag was way cleaner than doing the Honorbound victim+attacker checks everywhere. |
Contributor
|
Yeah this makes more sense, though it is not something I would've probably figured out on my own due to a lack of experience. |
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.
Description
Rework of #1691
This adds checks to prevent damage reduction (from Buff Banner or Powerups) from preventing the Honorbound duel insta-kill.
It does this by creating a new damage type flag
DMG_IGNORE_RESIST_BUFFS(=DMG_PHYSGUN), setting it when the Katana instant kill is handled and reading it where conditions apply their damage resistances.I used
DMG_PHYSGUNbecause it was the least likely to cause side effects (melee damage sets its damage forces on CTakeDamageInfo manually, so Damage_NoPhysicsForce won't take effect even if DMG_PHYSGUN is present in the damage info).I avoided
DMG_DIRECTbecause it is also used by EntityFlame, so using that would cause map-created legacy fire damage (torches on Egypt, as an example) to no longer be affected by resistances, which is technically a regression. I'll leave it to Valve to determine of DMG_DIRECT is a better representation/usage here and if that regression is acceptable, though.I avoided reusing
DMG_DONT_COUNT_DAMAGE_TOWARDS_CRIT_RATEas I expected mods to make use of that damage type much more often than other types.Tested against the case where the victim had Resist powerup + Battalion's Backup buff.
Originally based off changes by @JoriKos
Note that the change in tf_shareddefs is due to Sourcetree very much disliking the special characters in that comment and refusing to commit until they were removed, for some reason.