Added Administrative Skill Integration for Techs #6438
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
- Introduced a new campaign option "Techs Use Administration" to adjust daily available tech time based on the Administration skill level. - Updated UI components (e.g., RepairAndMaintenanceTab) to include the new setting. - Enhanced underlying logic to account for administration multipliers in technician time calculations. - Modified relevant components like CampaignOptions, tech-related views, and personnel generators to incorporate this feature. - Adjusted sorting logic for technicians to reflect the updated calculations. - Added corresponding tooltips and text to inform users about the new functionality in the GUI.
This was referenced Mar 26, 2025
Merged
…tration" to include a star emoji (🌟) for better visual emphasis.
# Conflicts: # MekHQ/resources/mekhq/resources/CampaignOptionsDialog.properties # MekHQ/src/mekhq/campaign/Campaign.java # MekHQ/src/mekhq/campaign/CampaignOptions.java # MekHQ/src/mekhq/campaign/personnel/Person.java # MekHQ/src/mekhq/campaign/personnel/PersonUtility.java # MekHQ/src/mekhq/campaign/personnel/generator/DefaultSkillGenerator.java # MekHQ/src/mekhq/campaign/randomEvents/RoninOffer.java # MekHQ/src/mekhq/gui/CampaignGUI.java # MekHQ/src/mekhq/gui/adapter/UnitTableMouseAdapter.java # MekHQ/src/mekhq/gui/dialog/HireBulkPersonnelDialog.java
…avoid code duplication.
…ions` is not initialized, improving testability with real `Person` objects.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #6438 +/- ##
============================================
- Coverage 11.29% 11.28% -0.01%
Complexity 6289 6289
============================================
Files 1073 1073
Lines 136694 136745 +51
Branches 21137 21151 +14
============================================
- Hits 15435 15430 -5
- Misses 119713 119766 +53
- Partials 1546 1549 +3 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
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.
CampaignOptions, tech-related views, and personnel generators to incorporate this feature.Order of Merging
Must be merged AFTER #6436
Dev Notes
As mentioned in #6436, I'm wanting to move players away from mono-skilled professions. Specifically Doctors and Techs, as this increases the amount of xp required to progress the character.
In this PR we (optionally) hook available daily work time to the tech's Administration skill, similar to how number of beds is now (optionally) linked to a doctor's Administration skill. I've included a table below showing the estimated values.
Note that default work time is 480 minutes for a primary role, 240 for a secondary role. Those values are unchanged if this option is disabled.