Repository navigation
let a dinky shockwave use its own radius curve - #7831
Merged
Merged
Conversation
The radius curve was always read from the weapon's regular shockwave, so a curve specified under $Dinky shockwave: had no effect. Store the curve on the shockwave itself. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
dustinspace217
approved these changes
Nov 3, 2026
dustinspace217
left a comment
Contributor
There was a problem hiding this comment.
Looks good. Every shockwave_create path sets the new field (ship-death and sexp shockwaves stay at -1), and a dinky with no curve of its own still gets the regular one through the first-parse copy.
One merge-order note: since that copy only happens on the first parse, a .tbm that later adds or changes just the regular curve no longer reaches the dinky, where before it did by accident. #7833's post-parse inheritance covers it, so this is fine as long as #7833 follows. Small heads-up for #7833: WeaponsParseTest.dinky_inheritance doesn't check radius_curve_idx; an inline curve in the +nocreate block plus one assert would cover it.
Kestrellius
approved these changes
Nov 11, 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.
The radius curve was always read from the weapon's regular shockwave, so a curve specified under $Dinky shockwave: had no effect. Store the curve on the shockwave itself.