Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgraded Asteroid Field SEXPs #6295

Merged
merged 5 commits into from
Aug 27, 2024

Conversation

MjnMixael
Copy link
Contributor

Follow-up to #6021 which enhanced asteroid/debris fields to allow more than three types to be active at once. This PR replaces the older set-asteroid-field and set-debris-field SEXPs with the newer config-asteroid-field and config-debris-field sexps that allow selecting more than three types to be active.

One core difference here is that the sexp for Active Asteroid Fields no longer sets the field targets within the same SEXP. A new config-field-targets SEXP has been added that allows adding/removing field targets arbitrarily which actually ends up being kind of a nice side-effect upgrade to the whole system.

The old SEXPs are deprecated and hidden, but still function as they used to according to my tests.

@wookieejedi wookieejedi added enhancement A new feature or upgrade of an existing feature to add additional functionality. sexps A feature or issue related to SEXPs labels Aug 13, 2024
@wookieejedi wookieejedi added this to the Release 24.2 milestone Aug 15, 2024
Copy link
Member

@BMagnu BMagnu left a comment

Choose a reason for hiding this comment

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

A few questions and possible tidyups

code/parse/sexp.cpp Show resolved Hide resolved
code/parse/sexp.cpp Show resolved Hide resolved
code/parse/sexp.cpp Show resolved Hide resolved
code/parse/sexp.cpp Show resolved Hide resolved
code/parse/sexp.cpp Show resolved Hide resolved
code/parse/sexp.cpp Show resolved Hide resolved
code/parse/sexp.cpp Show resolved Hide resolved
@BMagnu BMagnu merged commit d68b18d into scp-fs2open:master Aug 27, 2024
16 checks passed
@MjnMixael MjnMixael deleted the upgrade_asteroid_sexps branch August 27, 2024 18:39
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. sexps A feature or issue related to SEXPs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants