Skip to content

Enhanced functionality for conditional impacts#6785

Merged
BMagnu merged 14 commits into
scp-fs2open:masterfrom
Kestrellius:extra-conditions
Jul 12, 2025
Merged

Enhanced functionality for conditional impacts#6785
BMagnu merged 14 commits into
scp-fs2open:masterfrom
Kestrellius:extra-conditions

Conversation

@Kestrellius

Copy link
Copy Markdown
Contributor

This PR adds a suite of new options to the conditional impacts system, including:

  • support for subsystem armor as a condition
  • special cases for asteroids, debris, and empty space
  • a system to detect cases where a long laser is overpenetrating its impact point, and spawn an additional effect at the laser's head to help conceal the overpenetration
  • options for conditioning an effect on the ratio between damage dealt and hitpoints left
  • a few other boolean options for controlling when effects can or can't play

This required a certain amount of moving things around, but I'm pretty sure I got all the code paths and behavior will not be changed given the same tables.

@wookieejedi wookieejedi added the enhancement A new feature or upgrade of an existing feature to add additional functionality. label Jun 20, 2025
Comment thread code/ship/shiphit.cpp
Comment thread code/ship/shiphit.cpp Outdated
Comment thread code/ship/shiphit.cpp Outdated
Comment thread code/ship/shiphit.cpp Outdated
Comment thread code/ship/shiphit.cpp
Comment thread code/ship/shiphit.cpp Outdated
Comment thread code/ship/shiphit.cpp Outdated
Comment thread code/weapon/weapons.cpp Outdated
@wookieejedi

Copy link
Copy Markdown
Member

Will plan to merge this in a day or so.

@BMagnu BMagnu merged commit 6921f55 into scp-fs2open:master Jul 12, 2025
20 checks passed
@Kestrellius Kestrellius deleted the extra-conditions branch July 16, 2025 04:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement A new feature or upgrade of an existing feature to add additional functionality.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants