Clear designations when mothballing/mass mothballing by theyoungster21 · Pull Request #9010 · MegaMek/mekhq

theyoungster21 · 2026-05-20T17:57:39Z

This PR addresses this RFE: #7833

It slightly changes how both individual mothballing and mass mothballing are handled.

For individual mothballing, it adds a second confirmation box that allows the user to choose whether to strip all designations and crew assignments from a unit as it is being mothballed. It does not fire if the unit has no crew assigned and is not assigned to any formations.

For mass mothballing it adds a checkbox that only appears while mass mothballing (not while mass activating) which, when checked, removes all formation and crew assignments.

The initial idea was to use a checkbox for both so as to keep consistency of implementation, but I struggled to figure out how to add it to the single mothballing dialog, as it appears to handle many different pop-ups and I didn't want to risk breaking things/expanding the scope too much.

…othballing and mass mothballing.

IllianiBird

A couple points of feedback, but at its core this looks good. Great work :)

IllianiBird · 2026-05-21T14:24:01Z

+                        int result = JOptionPane.showConfirmDialog(
+                              gui.getFrame(),
+                              "Also clear all assignments and designations?",
+                              "Mothball Unit",
+                              JOptionPane.YES_NO_OPTION


Let's use an ImmersiveDialog for this, rather than JOptionPane. Immersive dialog is a bit more steps to set up, but looks better and avoids some annoyances (like players being able to accidentally confirm/skip dialogs).

ImmersiveDialog also avoids a few annoying bugs that exist in JOptionPane.

IllianiBird · 2026-05-21T14:24:20Z

+                              "Also clear all assignments and designations?",
+                              "Mothball Unit",


All player-facing text must be in a resource bundle for i18n purposes.

IllianiBird · 2026-05-21T14:24:38Z

+            gbc.weighty = 0.1;
+            gbc.anchor = GridBagConstraints.CENTER;
+            clearDesignationsCheckbox = new JCheckBox();
+            clearDesignationsCheckbox.setText("Clear all assignments and designations?");


See earlier comment about player-facing text.

codecov · 2026-05-21T21:21:53Z

Codecov Report

❌ Patch coverage is 0% with 30 lines in your changes missing coverage. Please review.
✅ Project coverage is 15.22%. Comparing base (a361ba0) to head (b1f306f).
⚠️ Report is 33 commits behind head on main.

Files with missing lines	Patch %	Lines
...Q/src/mekhq/gui/adapter/UnitTableMouseAdapter.java	0.00%	16 Missing ⚠️
MekHQ/src/mekhq/gui/dialog/MassMothballDialog.java	0.00%	14 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               main    #9010      +/-   ##
============================================
- Coverage     15.23%   15.22%   -0.01%     
+ Complexity     9305     9301       -4     
============================================
  Files          1304     1304              
  Lines        172518   172545      +27     
  Branches      26063    26067       +4     
============================================
- Hits          26277    26267      -10     
- Misses       143198   143229      +31     
- Partials       3043     3049       +6

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

HammerGS · 2026-05-21T21:59:25Z

Converted to draft pending @theyoungster21 addressing the feedback.

…l replaced the JOption Pane for single mothballing with an ImmersiveDialog

theyoungster21 · 2026-05-22T17:34:48Z

Changes have been made, hopefully it's good!

IllianiBird

One comment regarding the ImmersiveDialog. What you've got is good, I think we can do a tiny bit more polish though

In future, if I forget to do a follow-up review feel free to @ me on Discord. We all know of my famous good memory by now ;)

IllianiBird · 2026-05-23T21:34:41Z

-                MekHQ.triggerEvent(new UnitChangedEvent(selectedUnit));
+                if (tech != null) {
+                    if ((!selectedUnit.getActiveCrew().isEmpty()) || (selectedUnit.getCampaign().getFormationFor(selectedUnit)) != null) {
+                        ImmersiveDialogCore clearAssignments = new ImmersiveDialogCore(selectedUnit.getCampaign(),


Take a look at, I think it's called ImersiveDialogSimple. That will fit your need better.

Also, let's add a speaker (as, the senior tech, or whoever was selected) and some IC text.

Generally the format for an ID is you want a speaker, a little bit of IC text and the OOC stuff at the bottom

Don't worry! I'm just new to actually using github to work so I wasn't sure if I needed to push a notification or something. I'll take a look at the simple version and write some simple IC text to make it all "in universe-y" tonight!

IllianiBird · 2026-05-23T22:36:09Z

Technically I get both an email from GitHub and we get the little notification on the Discord, so I don't have many excuses. :D

…ng a few more immersive features, i.e. IC dialogue and the portrait of the tech doing the work

…ignations

IllianiBird

Further polish, as discussed on Discord

IllianiBird · 2026-05-24T14:23:58Z

 tempCrew.fillWithTempCrew=Fill with temp crew
 tempCrew.removeTempCrew=Remove temp crew
+mothballUnit.clearDesignationsDialog.text=Also clear all assignments and designations?
+mothballUnit.clearDesignationsICMessage.text=Hey boss, did you want us to keep the personnel assigned to this unit on\


Replace the hardcoded 'boss' with {0}. This is a placeholder key, it's going to do something cool for us.

IllianiBird · 2026-05-24T14:25:12Z

+                                    getFormattedTextAt(RESOURCE_BUNDLE, "mothballUnit.clearDesignationsCancelButton.text"),
+                                    getFormattedTextAt(RESOURCE_BUNDLE, "mothballUnit.clearDesignationsConfirmButton.text")),
+                              getFormattedTextAt(RESOURCE_BUNDLE, "mothballUnit.clearDesignationsOOCMessage.text"),


We're not doing any formatting here, so we can actually do....

getTextAt(RESOURCE_BUNDLE, blah blah blah

However, (and this is true for all instances of the text getter you're using, you don't need to pass in a RESOURCE_BUNDLE at all.

If you use...

getText(blah blah blah) or getFormattedText(blah blah blah it actually defaults to GUI.properties

IllianiBird · 2026-05-24T14:27:05Z

+                        ImmersiveDialogSimple clearAssignments = new ImmersiveDialogSimple(selectedUnit.getCampaign(),
+                              tech,
+                              null,
+                              getFormattedTextAt(RESOURCE_BUNDLE, "mothballUnit.clearDesignationsICMessage.text"),


For this, we wanna add in the text that will replace the placeholder key we added earlier, change this line to...

getFormattedText(RESOURCE_BUNDLE, "mothballUnit.clearDesignationsICMessage.text", getCampaign().getCommanderAddress())

What that will do, is dynamically change the placeholder ({0}) with the return value of getCommanderAddress which changes based on commander gender and campaign type. For example, female pirate commanders get called "Bossma'am"

IllianiBird · 2026-05-24T14:27:41Z

+            gbc.weighty = 0.1;
+            gbc.anchor = GridBagConstraints.CENTER;
+            clearDesignationsCheckbox = new JCheckBox();
+            clearDesignationsCheckbox.setText(getFormattedTextAt(RESOURCE_BUNDLE,"mothballUnit.clearDesignationsDialog.text"));


So because we're not passing in any formatting, just use getTextAt, instead

…se campaign.getCommanderAddress() instead of hardcoding the dialogue. As well, some slightly changed formatting from getFormattedTextAt() to getText()

…ignations

IllianiBird · 2026-05-25T02:21:49Z

Good work, we'll get this merged once the tests have finished :)

Added option to clear designations of both formations and crew when m…

99b1d42

…othballing and mass mothballing.

theyoungster21 requested a review from a team as a code owner May 20, 2026 17:57

Merge branch 'main' into ClearDesignations

6c6878b

IllianiBird requested changes May 21, 2026

View reviewed changes

HammerGS marked this pull request as draft May 21, 2026 21:59

Addressed feedback by moving strings into the resource bundle, as wel…

29b7f07

…l replaced the JOption Pane for single mothballing with an ImmersiveDialog

Merge branch 'main' into ClearDesignations

bcf6f24

theyoungster21 marked this pull request as ready for review May 22, 2026 17:51

theyoungster21 requested a review from IllianiBird May 23, 2026 21:31

IllianiBird requested changes May 23, 2026

View reviewed changes

theyoungster21 marked this pull request as draft May 23, 2026 22:20

theyoungster21 added 2 commits May 23, 2026 19:26

Addressed feedback by swapping over to ImmersiveDialogSimple and addi…

1680044

…ng a few more immersive features, i.e. IC dialogue and the portrait of the tech doing the work

Merge remote-tracking branch 'origin/ClearDesignations' into ClearDes…

2b8bedd

…ignations

theyoungster21 marked this pull request as ready for review May 23, 2026 23:28

theyoungster21 requested a review from IllianiBird May 23, 2026 23:32

IllianiBird approved these changes May 23, 2026

View reviewed changes

Merge branch 'main' into ClearDesignations

fb4fc53

theyoungster21 marked this pull request as draft May 24, 2026 14:28

IllianiBird requested changes May 24, 2026

View reviewed changes

theyoungster21 added 2 commits May 24, 2026 22:18

Addressed more feedback regarding allowing ImmersiveDialogSimple to u…

235bc17

…se campaign.getCommanderAddress() instead of hardcoding the dialogue. As well, some slightly changed formatting from getFormattedTextAt() to getText()

Merge remote-tracking branch 'origin/ClearDesignations' into ClearDes…

932d9f2

…ignations

theyoungster21 requested a review from IllianiBird May 25, 2026 02:19

theyoungster21 marked this pull request as ready for review May 25, 2026 02:20

IllianiBird approved these changes May 25, 2026

View reviewed changes

Merge branch 'main' into ClearDesignations

b1f306f

IllianiBird merged commit 1878782 into MegaMek:main May 26, 2026
8 checks passed

theyoungster21 mentioned this pull request May 26, 2026

[RFE] Allow an option for a unit to "forget" it's assignments when mothballed #7833

Closed

3 tasks

		"Also clear all assignments and designations?",
		"Mothball Unit",

Conversation

theyoungster21 commented May 20, 2026

Uh oh!

IllianiBird left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

codecov Bot commented May 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

HammerGS commented May 21, 2026

Uh oh!

theyoungster21 commented May 22, 2026

Uh oh!

IllianiBird left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

IllianiBird commented May 23, 2026

Uh oh!

IllianiBird left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

IllianiBird commented May 25, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

codecov Bot commented May 21, 2026 •

edited

Loading