Skip to content

let a dinky shockwave use its own radius curve - #7831

Merged
Goober5000 merged 1 commit into
scp-fs2open:masterfrom
Goober5000:fix/dinky_curve
Nov 11, 2026
Merged

Goober5000 merged 1 commit into
scp-fs2open:masterfrom
Goober5000:fix/dinky_curve

Conversation

@Goober5000

Copy link
Copy Markdown
Contributor

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.

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>
@Goober5000
Goober5000 requested a review from Kestrellius October 6, 2026 06:06
@Goober5000 Goober5000 added the fix A fix for bugs, not-a-bugs, and/or regressions. label Oct 6, 2026

@dustinspace217 dustinspace217 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@Goober5000
Goober5000 merged commit 7a20f91 into scp-fs2open:master Nov 11, 2026
18 checks passed
@Goober5000
Goober5000 deleted the fix/dinky_curve branch November 11, 2026 01:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

fix A fix for bugs, not-a-bugs, and/or regressions.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants