Improvement: Converted Most Convoy Dialogs into Immersive Dialogs #6855
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #6855 +/- ##
=========================================
Coverage 12.03% 12.03%
Complexity 6889 6889
=========================================
Files 1103 1103
Lines 142284 142248 -36
Branches 21991 21994 +3
=========================================
- Hits 17121 17119 -2
+ Misses 123328 123296 -32
+ Partials 1835 1833 -2 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
There was a problem hiding this comment.
Pull Request Overview
This PR transitions most convoy and resupply dialogs to the new Immersive Dialog format and deprecates the old dialog implementations. Key changes include:
- Replacing legacy dialogs (DialogRoleplayEvent, DialogInterception, etc.) with ImmersiveDialogSimple.
- Updating resource key references from legacy keys (e.g. documentation.prompt) to outOfCharacter.* keys.
- Removing unused UI components and refactoring dialog construction in several files.
Reviewed Changes
Copilot reviewed 10 out of 10 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| DialogRoleplayEvent.java | Deprecated the old dialog and added the @deprecated annotation. |
| DialogResupplyFocus.java | Updated resource key for focus description to the new immersive dialog style. |
| DialogPlayerConvoyOption.java | Updated resource key for the dialog text to the new format. |
| DialogItinerary.java | Changed resource key from documentation.prompt to outOfCharacter.itinerary. |
| DialogInterception.java | Deprecated the dialog with a corresponding @deprecated annotation. |
| DialogContractStart.java | Replaced custom panel layout with ImmersiveDialogSimple for contract start dialogs. |
| DialogAbandonedConvoy.java | Marked as deprecated and noted as unused. |
| ResupplyUtilities.java | Replaced dialog invocations with ImmersiveDialogSimple and refactored resource string calls. |
| PerformResupply.java | Replaced Compute.randomInt with randomInt and updated dialog calls to use ImmersiveDialogSimple. |
| Resupply.properties | Added new outOfCharacter resource keys and updated existing keys accordingly. |
Comments suppressed due to low confidence (3)
MekHQ/src/mekhq/campaign/mission/resupplyAndCaches/PerformResupply.java:645
- [nitpick] The use of 'GROUND_VEHICLE_DRIVER' may be ambiguous; consider clarifying its role or using a more descriptive constant to better convey its purpose.
speaker = campaign.newPerson(GROUND_VEHICLE_DRIVER, contract.getEmployerCode(), Gender.RANDOMIZE);
MekHQ/resources/mekhq/resources/Resupply.properties:17
- Ensure that the newly added 'outOfCharacter.*' resource keys consistently replace all legacy keys across the dialogs and that their formatting meets the intended user display requirements.
outOfCharacter.abandoned=All units and personnel have been killed or captured...
MekHQ/src/mekhq/gui/dialog/resupplyAndCaches/DialogContractStart.java:81
- The new usage of ImmersiveDialogSimple replaces a custom dialog layout, which changes modal behavior and disposal management; confirm that these dialog lifecycle aspects are handled appropriately.
new ImmersiveDialogSimple(campaign,
# Conflicts: # MekHQ/src/mekhq/campaign/mission/resupplyAndCaches/PerformResupply.java
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The Resupply module was the birthplace of what became the Immersive Dialog format, but never itself used Immersive Dialogs. While there are still a couple of convoy dialogs using the old style, most have now been moved over.