Fix: Fixed Placement of GM Prisoner Ransom Option #6869
Merged
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 #6869 +/- ##
=========================================
Coverage 11.52% 11.52%
+ Complexity 6567 6566 -1
=========================================
Files 1100 1100
Lines 140971 140971
Branches 21845 21845
=========================================
+ Hits 16243 16244 +1
+ Misses 123030 123025 -5
- Partials 1698 1702 +4 ☔ 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 moves the GM prisoner ransom options out of the m AF6F ain personnel right‐click menu into the designated GM section.
- Removes the ransom menu items from general personnel context
- Adds GM-specific ransom options in a separate menu block
- Eliminates inline GM user checks in the earlier context
Files not reviewed (1)
- MekHQ/resources/mekhq/resources/GUI.properties: Language not supported
Comments suppressed due to low confidence (2)
MekHQ/src/mekhq/gui/adapter/PersonnelTableMouseAdapter.java:3897
- [nitpick] Both ransom options use the same resource key "ransom.text". If these options are meant to be clearly distinguishable (for example, standard versus friendly ransom), consider using a distinct resource key for the friendly ransom option.
menu.add(newMenuItem(resources.getString("ransom.text"), CMD_RANSOM_FRIENDLY));
MekHQ/src/mekhq/gui/adapter/PersonnelTableMouseAdapter.java:3892
- It is unclear if the new GM menu block should enforce a GM user check. Consider adding an explicit check (or a comment clarifying that this code path is only reachable by GM users) to ensure that non-GM users do not see these sensitive options.
if (StaticChecks.areAllPrisoners(selected)) {
Scoppio
approved these changes
May 6, 2025
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.
I spotted during a recent user stream that the ransom options had accidentally been left in the main personnel right-click menu instead of the GM section. This PR just moves them.