Skip to content

Support Rearm Pool, Limits, and Other Features#7249

Open
MjnMixael wants to merge 14 commits into
scp-fs2open:masterfrom
MjnMixael:support_rearm_upgrades
Open

Support Rearm Pool, Limits, and Other Features#7249
MjnMixael wants to merge 14 commits into
scp-fs2open:masterfrom
MjnMixael:support_rearm_upgrades

Conversation

@MjnMixael
Copy link
Copy Markdown
Contributor

@MjnMixael MjnMixael commented Feb 26, 2026 •
edited
Loading

Fulfills several feature requests and fixes #7248 .

  • The new weapon.tbl entry $Disallow Support Rearm: can prevent a weapon from ever being rearmed.
  • Support ships can be prevented from ever rearming, making them purely a repair ship.
  • Support ships can draw from a "Rearm Pool" for rearms and when the rearm pool runs out of a weapon, that weapon can no longer be rearmed. Additionally the "Rearm Pool" can be automatically filled based on the Team Loadout Pool.
  • If using the Rearm Pool, the mission designer can optionally allow the support ship to reload a different weapon if the Rearm Pool is out of the current weapon. The weapon selected to swap to is based on the weapon hierarchy in weapons.tbl.
  • Full FRED and QtFRED support for this feature included moving all support ship options to a Mission Specs sub dialog.
  • Added Lua access to the Rearm Pool as well as two new hooks, On Support Rearm Started and On Support Rearm Finished. Both hooks provide the support ship and the ship to rearm as hook variables.
image

Below are the retail-compatible missions (and a table file) I used to test the features including testing standard support ship behavior.
RearmUpgradeTestFiles.zip

@MoerasGrizzly
Copy link
Copy Markdown

MoerasGrizzly commented Feb 26, 2026

This is so bleeping cool

@MjnMixael MjnMixael force-pushed the support_rearm_upgrades branch from 6d7dadf to 77c5964 Compare February 28, 2026 22:37
@MjnMixael
Copy link
Copy Markdown
Contributor Author

MjnMixael commented Mar 1, 2026

Latest commit adds support for multiple teams.

@MoerasGrizzly
Copy link
Copy Markdown

MoerasGrizzly commented Mar 1, 2026

I have been testing this and thus far, everything seems good.

@MoerasGrizzly
Copy link
Copy Markdown

MoerasGrizzly commented Mar 1, 2026

I've tested this and so far, it all seems to work fine.

@wookieejedi wookieejedi added enhancement A new feature or upgrade of an existing feature to add additional functionality. ai A feature or issue related to the AI algorithms labels Mar 2, 2026
@MjnMixael MjnMixael force-pushed the support_rearm_upgrades branch 3 times, most recently from 3187de2 to f84a697 Compare March 3, 2026 12:52
@wookieejedi wookieejedi added this to the Release 26.0 milestone Mar 12, 2026
@MjnMixael MjnMixael mentioned this pull request Mar 12, 2026
Open
@MjnMixael MjnMixael force-pushed the support_rearm_upgrades branch from f84a697 to 8fed549 Compare March 16, 2026 03:33
@MjnMixael MjnMixael force-pushed the support_rearm_upgrades branch from 8fed549 to 48de347 Compare March 24, 2026 05:33
@MjnMixael MjnMixael added qtfred A feature or issue related to qtFred. fred A feature or issue related to the FReespace EDitor (FRED) labels Mar 31, 2026
@github-project-automation github-project-automation Bot moved this to Work In Progress (PRs) in qtFRED2 Mar 31, 2026
@JohnAFernandez
Copy link
Copy Markdown
Contributor

JohnAFernandez commented Apr 2, 2026 •
edited
Loading

looks at description

Sees feature list

Sees FRED and qtFRED support

"This must be bonkers big"

Sees 1700 lines added

Yup....

@MjnMixael MjnMixael force-pushed the support_rearm_upgrades branch 2 times, most recently from e7f1881 to b3fbb2e Compare April 10, 2026 16:34
@MjnMixael MjnMixael force-pushed the support_rearm_upgrades branch 2 times, most recently from 0ded503 to e74d9ba Compare April 16, 2026 03:11
@MjnMixael MjnMixael force-pushed the support_rearm_upgrades branch from e74d9ba to ce52928 Compare April 20, 2026 13:09
@MjnMixael MjnMixael mentioned this pull request Apr 21, 2026
Open
@MjnMixael
Copy link
Copy Markdown
Contributor Author

MjnMixael commented May 3, 2026 •
edited
Loading

This will need help dialog updates for QtFRED

Done

@MjnMixael MjnMixael force-pushed the support_rearm_upgrades branch from ce52928 to c808e64 Compare May 4, 2026 14:04
@MjnMixael MjnMixael force-pushed the support_rearm_upgrades branch 2 times, most recently from a399231 to f247a60 Compare May 14, 2026 20:30
@MjnMixael MjnMixael force-pushed the support_rearm_upgrades branch from 6634024 to 6285abb Compare May 26, 2026 13:40
BMagnu
BMagnu requested changes Jun 1, 2026
View reviewed changes
Copy link
Copy Markdown
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.

Some minor issues, mostly centered around my issues with get_support_rearm_pool_tvt_team_index

Comment thread code/scripting/global_hooks.cpp
Comment thread code/mission/missionparse.cpp Outdated
Comment thread code/ship/ship.cpp Outdated
Comment thread code/ship/ship.cpp Outdated
Comment thread code/ship/ship.cpp Outdated
Comment thread code/ship/ship.cpp Outdated
Comment thread code/ship/ship.cpp Outdated
@github-project-automation github-project-automation Bot moved this from Work In Progress (PRs) to In Review (PRs) in qtFRED2 Jun 1, 2026
@MjnMixael MjnMixael force-pushed the support_rearm_upgrades branch from 6285abb to 250042e Compare June 4, 2026 13:24
BMagnu
BMagnu requested changes Jun 4, 2026
View reviewed changes
Copy link
Copy Markdown
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.

Found two more things, but it's mostly good now

Comment thread code/mission/missionparse.cpp Outdated
stuff_loadout_list(support_rearm_list, ParseLookupType::MISSION_LOADOUT_WEAPON_LIST);

if (pm->support_ships.rearm_pool_from_loadout) {
WarningEx(LOCATION, "+Support Rearm Pool is set but +Support Rearm Pool From Loadout is also enabled! The explicit pool will be ignored.\n");
Copy link
Copy Markdown
Member

@BMagnu BMagnu Jun 4, 2026

Choose a reason for hiding this comment

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

Should have caught this the first time round, but these WarningEx's should really be error_display(0, ...) as well.
Especially using an Ex Warning seems overblown here.

Copy link
Copy Markdown
Contributor Author

@MjnMixael MjnMixael Jun 4, 2026

Choose a reason for hiding this comment

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

I disagree. This warning is recoverable and not important. I'll change it because I'm really trying to just get this in for Grizzly.

Copy link
Copy Markdown
Member

@BMagnu BMagnu Jun 4, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

Then at least change it to Warning
(Since Ex is the stronger one that will pop in release builds)

Copy link
Copy Markdown
Member

@BMagnu BMagnu Jun 4, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

(also, error_display(0, ...) is recoverable, it's like Warning but for parsing. error_display(1, ...) is a hard error)

Copy link
Copy Markdown
Contributor Author

@MjnMixael MjnMixael Jun 4, 2026

Choose a reason for hiding this comment

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

Uh.. what? WarningEx is behind an #ifndef NDEBUG and a commandline for extra warnings. Unless there's some overload I'm not aware of, WarningEx will not pop in release builds or in most debug runs.

Comment thread code/mission/missionparse.cpp Outdated
Comment thread code/ship/ship.cpp Outdated
Comment thread code/ship/ship.cpp Outdated
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@BMagnu BMagnu BMagnu approved these changes

Assignees

No one assigned

Labels

ai A feature or issue related to the AI algorithms enhancement A new feature or upgrade of an existing feature to add additional functionality. fred A feature or issue related to the FReespace EDitor (FRED) qtfred A feature or issue related to qtFred.

Projects

qtFRED2
Status: In Review (PRs)

Milestone

Release 26.0

Development

Successfully merging this pull request may close these issues.

FR: ways to limit support ships rearm capabilities.

5 participants

@MjnMixael @MoerasGrizzly @JohnAFernandez @BMagnu @wookieejedi