Feature: Added 7 New Unofficial SPAs for Admin Characters #6783
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
…` to `defaultspa.xml`. - Allows characters to make one additional procurement attempt per day. - Costs 200 XP with a weight of 1.
…ration by 1 for Admin Capacity calculations.
…y 1 when this character is the senior Admin/Command. - **Logistician (Unofficial):** Reduces delivery time of parts procured by this character by 10%.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #6783 +/- ##
=========================================
Coverage 12.03% 12.03%
Complexity 6889 6889
=========================================
Files 1103 1103
Lines 142284 142332 +48
Branches 21991 22004 +13
=========================================
+ Hits 17121 17133 +12
- Misses 123328 123364 +36
Partials 1835 1835 ☔ 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 fixes multiple issues and adds 7 new unofficial SPAs for Admin Characters by introducing new PersonnelOptions and integrating their effects into various campaign and market systems. Key changes include:
- Adding new admin options (Scrounge, Mediator, Logistician, Coordinator, Tetris Master, Networker, and Interstellar Negotiator) to PersonnelOptions.
- Adjusting calculations in reinforcement targeting, acquisition limits, cargo capacity, transit time, and negotiation modifiers to account for the new SPAs.
- Updating contract market and campaign cost calculations to integrate SPA logic for improved operational dynamics.
Reviewed Changes
Copilot reviewed 7 out of 8 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| MekHQ/src/mekhq/campaign/stratcon/StratconRulesManager.java | Added Coordinator SPA logic for liaison command rights. |
| MekHQ/src/mekhq/campaign/personnel/turnoverAndRetention/RetirementDefectionTracker.java | Incorporated Mediator SPA bonus into combined skill calculations. |
| MekHQ/src/mekhq/campaign/personnel/PersonnelOptions.java | Introduced new admin SPA constants and options. |
| MekHQ/src/mekhq/campaign/market/contractMarket/CamOpsContractMarket.java | Applied Networker SPA modifier for contract offer generation. |
| MekHQ/src/mekhq/campaign/market/contractMarket/AtbMonthlyContractMarket.java | Integrated Networker SPA modifier into contract generation. |
| MekHQ/src/mekhq/campaign/CampaignSummary.java | Adjusted cargo capacity using Tetris Master SPA multiplier. |
| MekHQ/src/mekhq/campaign/Campaign.java | Updated acquisition limits with Scrounge SPA, transit time with Logistician SPA, and travel cost reduction with Interstellar Negotiator SPA. |
Files not reviewed (1)
- MekHQ/data/universe/defaultspa.xml: Language not supported
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
|
@IllianiBird Co-pilot |
# Conflicts: # MekHQ/src/mekhq/campaign/market/contractMarket/AtbMonthlyContractMarket.java
# Conflicts: # MekHQ/src/mekhq/campaign/market/contractMarket/AtbMonthlyContractMarket.java
| continue; | ||
| } | ||
|
|
||
| combinedSkillValues += skill.getTotalSkillLevel() + mediatorModifier; |
Check notice
Code scanning / CodeQL
Deprecated method or constructor invocation Note
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.
Fix #6678
Fix #6679
Fix #6681
Fix #6686
Interstellar Negotiator
Cost: 100 xp
Requirements: Veteran Administration
No matter who's in charge, this character always has a way of bringing down the price.
If this character is the senior-most Admin/Transport character, the cost of interstellar travel is reduced by 15%.
Networker
Cost: 400 xp
Requirements: Elite Administration
This character knows people in high places.
If this character is the senior-most Admin/Command character, the number of contracts offered each month is increased by 1 (may still be 0).
Tetris Master
Cost: 100 xp
Requirements: Regular Administration
This character has mastered the subtle art of stacking boxes.
The campaign's cargo capacity is increased by 5% per character with this SPA.
Coordinator
Cost: 100 xp
Requirements: Veteran Administration
This character is exceptionally skilled at liaising with allied forces, ensuring reinforcements arrive where they're needed.
If this character is the senior Admin/Command character, the reinforcement target number is reduced by 1.
Logistician
Cost: 50 xp
Requirements: Veteran Administration
This character is an expert at managing interstellar supply lines.
Parts procured by this character have their delivery time reduced by 10%.
Mediator
Cost: 50 xp
Requirements: Regular Administration
Whether with a smoothing word or a calming presence, this character knows how to solve disputes.
This character's Administration skill is increased by 1 when calculating the campaign's Admin Capacity.
Scrounge
Cost: 200 xp
Requirements: Elite Administration
The character is adept at finding resources in places nobody else would think to look.
They can make one additional procurement attempt per day.