Fix odd-looking hull impacts spawning when the shield is hit#6855
Merged
wookieejedi merged 1 commit intoJul 23, 2025
Conversation
BMagnu
approved these changes
Jul 22, 2025
Kestrellius
added a commit
to Kestrellius/fs2open.github.com
that referenced
this pull request
Jul 26, 2025
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.
If a ship's shield is hit with more than enough damage to deplete it completely, the remaining damage will be sent to the hull. This triggers hull conditional impacts, which then proceed to spawn at the location of the shield impact and potentially look very strange, if they were designed specifically for hull impacts. Previously, this would have been very rare, because the 10% shield skip percentage meant that a shot hitting the shield and doing overkill damage would have been difficult. However, setting the skip percentage to 0 via #6847, as FotG has recently done, reveals the issue dramatically, as shields on certain ships begin regenerating immediately after depletion and therefore most hits are against shields with very little health.
To fix this, we simply make sure not to pass in conditional impact data for hull or subsystems if we know the hit is a shield hit.