Skip to content

Lab dock tester#6715

Merged
wookieejedi merged 2 commits into
scp-fs2open:masterfrom
MjnMixael:lab_dock_tester
Jun 12, 2025
Merged

Lab dock tester#6715
wookieejedi merged 2 commits into
scp-fs2open:masterfrom
MjnMixael:lab_dock_tester

Conversation

@MjnMixael

Copy link
Copy Markdown
Contributor

My final (for now) Lab PR. This adds the ability to test ship docking and undocking.

Basically there were two base requirements to get this functioning in the lab. Working AI and a valid Player_ship pointer. Toggling AI on is pretty easy so this toggles it on only when we're viewing a ship. I tested that this does not interfere with the turret firing test option. The AI code expects a valid Player_ship all over the place so in lieu of adding a ton extra checks for a valid pointer it seemed easy enough to simply set the current lab ship as the Player_ship. Kinda hacky but it does work. A play-dead order is required also but works.

From there it spawns a docking ship and issues the dock order. The existing AI code does the rest.

Note that collisions are intentionally turned off because this is meant to test dock animations and dock locations. Turning collisions and physics on in the lab requires a whole other set of things to be initialized and we just don't need to do that here.

Relies on #6710 just because I wrote these in order on top of each other to avoid conflicts.

@MjnMixael MjnMixael added enhancement A new feature or upgrade of an existing feature to add additional functionality. Lab A feature or bug related to the F3 lab labels May 9, 2025
@MjnMixael MjnMixael added this to the Release 25.0 milestone May 9, 2025

@JohnAFernandez JohnAFernandez 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.

Nothing major

Comment thread code/ai/aicode.cpp Outdated
Comment thread code/ai/aigoals.h Outdated
Comment thread code/lab/dialogs/lab_ui.cpp
Comment thread code/lab/dialogs/lab_ui.cpp
Comment thread code/lab/dialogs/lab_ui_helpers.cpp Outdated
Comment thread code/lab/manager/lab_manager.cpp Outdated
Comment thread code/lab/manager/lab_manager.cpp
Comment thread code/lab/manager/lab_manager.cpp Outdated
Comment thread code/lab/manager/lab_manager.cpp
@wookieejedi

Copy link
Copy Markdown
Member

Awesome! Will plan to merge tomorrow pending any other requests.

@wookieejedi wookieejedi merged commit 4ad0158 into scp-fs2open:master Jun 12, 2025
20 checks passed
@MjnMixael MjnMixael deleted the lab_dock_tester branch June 12, 2025 18:47
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. Lab A feature or bug related to the F3 lab

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants