Improvement: Reworked Integrated Command Rights to No Longer AutoAssign Forces and to Allow Interactions with StratCon #6813
Conversation
… to Allow Interactions with StratCon ### Dev Notes Integrated command rights have long been a pain point for players and generally considered a 'newbie trap'. Under integrated command rights the player does not deploy forces, instead MekHQ will pick a force at random and deploy that for them. This means StratCon players under integrated command rights _do not play StratCon_ they play _advance day until something interesting happens and hope MekHQ doesn't deploy an infantry company against an assault lance for the 4th time this contract_. This PR changes Integrated command rights so that they work like House with some minor differences. Every scenario is still considered a Turning Point, under integrated, but unlike House command rights you will be supported by allied forces in every scenario. This makes integrated rights a good choice for starting campaigns - the time in which players are most likely to be posted to integrated contracts.
|
I have tested this change both in a standard contract (non-integrated) and in an integrated contract and I've not noticed any issues. The bulk of this PR consist of removing special handlers for Integrated command rights, rather than adding new content. While I recognize the reduced scope of 50.06 I think the inclusion of this PR will be a net positive. During a recent user stream I spotted the user encounter a terrible play experience where they accidentally selected an integrated contract. They only discovered this after traveling for close to a year (to reach the contract site). This meant their autosave had overwritten their pre-contract save. They were left with the choice of canning the contract and hopefully finding another one close enough. Or playing through the contract and hoping for the best. Landmines - problems users only know not to step on if they already know not to step on them - are poor design, especially if there is nothing the user can do to fix the issue. |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #6813 +/- ##
=========================================
Coverage 12.03% 12.04%
- Complexity 6852 6854 +2
=========================================
Files 1101 1101
Lines 141438 141379 -59
Branches 21917 21902 -15
=========================================
+ Hits 17026 17032 +6
+ Misses 122597 122523 -74
- Partials 1815 1824 +9 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
I'm second-guessing myself and moving this to 50.07 |
There was a problem hiding this comment.
Pull Request Overview
This PR updates the integrated command rights behavior in StratCon by removing automatic force assignment and aligning interactions with manual deployment similar to House command rights.
- UI adjustments in StratconPanel to reflect the new integrated command behavior
- Removal of auto-assign logic in StratconRulesManager and corresponding changes to scenario finalization
- Adjustments in campaign initialization and prisoner event handling to remove legacy integrated command objectives and auto-assignment logic
Reviewed Changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| MekHQ/src/mekhq/gui/StratconPanel.java | Removed the disabled “Integrated Command” menu item to allow manual interaction |
| MekHQ/src/mekhq/campaign/stratcon/StratconRulesManager.java | Eliminated auto-assign logic and updated scenario finalization calls to use manual assignment |
| MekHQ/src/mekhq/campaign/stratcon/StratconContractInitializer.java | Removed integrated command objectives cleanup to retain strategic objectives |
| MekHQ/src/mekhq/campaign/randomEvents/prisoners/PrisonEscapeScenario.java | Removed auto-assignment related force selection handling consistent with other changes |
Comments suppressed due to low confidence (6)
MekHQ/src/mekhq/gui/StratconPanel.java:198
- The removal of the integrated command check changes UI behavior; ensure that the panel now supports manual force deployment for integrated commands consistently.
if (campaignState.getContract().getCommandRights().isIntegrated()) {
MekHQ/src/mekhq/campaign/stratcon/StratconRulesManager.java:208
- Removal of the auto-assignment checks may lead to scenarios where availableForceIDs is empty; verify that downstream logic safely handles an empty force list.
for (int scenarioIndex = 0; scenarioIndex < scenarioRolls; scenarioIndex++) {
MekHQ/src/mekhq/campaign/stratcon/StratconRulesManager.java:2751
- The integrated command check removal in canManuallyDeployAnyForce alters deployment rules; confirm that manual deployment is now allowed for integrated contracts as intended.
if (contract.getCommandRights().isIntegrated()) { return false; }
MekHQ/src/mekhq/campaign/stratcon/StratconContractInitializer.java:239
- Removal of the strategic objectives cleanup for integrated commands means objectives are retained; ensure that this aligns with the new design and does not interfere with campaign progression.
if (contract.getCommandRights() == ContractCommandRights.INTEGRATED) { ... }
MekHQ/src/mekhq/campaign/randomEvents/prisoners/PrisonEscapeScenario.java:265
- The removal of auto-assignment logic in this scenario is consistent with the overall changes; verify that any manual force selection here works as expected.
List<Integer> availableForceIDs = getAvailableForceIDs(campaign, contract, false);
MekHQ/src/mekhq/campaign/stratcon/StratconRulesManager.java:306
- Passing 'false' in the call to finalizeBackingScenario replaces the previous auto-assign behavior; ensure that finalizeBackingScenario correctly processes manual assignment scenarios.
finalizeBackingScenario(campaign, contract, track, false, scenario);
|
I'm second guessing my second guessing. I think this should be ok for 50.06. @HammerGS what are your thoughts? |
|
Flipping this to live |
|
This accidentally still had the new dev cycle tag. It has since been removed. |
Dev Notes
Integrated command rights have long been a pain point for players and generally considered a 'newbie trap'. Under integrated command rights the player does not deploy forces, instead MekHQ will pick a force at random and deploy that for them.
This means StratCon players under integrated command rights do not play StratCon they play "advance day until something interesting happens and hope MekHQ doesn't deploy an infantry company against an assault lance for the 4th time this contract."
This PR changes Integrated command rights so that they work like House with some minor differences. Every scenario is still considered a Turning Point, under integrated, but unlike House command rights you will be supported by allied forces in every scenario.
This makes integrated rights a good choice for starting campaigns - the time in which players are most likely to be posted to integrated contracts.