-
Notifications
You must be signed in to change notification settings - Fork 176
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Added Automatic Bonus Parts Exchange at Contract End, Added Bonus Parts Display to Mission Stats Panel #4149
Merged
SJuliez
merged 6 commits into
MegaMek:master
from
IllianiCBT:stratCon_BonusPartConversion
Jun 8, 2024
Merged
Added Automatic Bonus Parts Exchange at Contract End, Added Bonus Parts Display to Mission Stats Panel #4149
SJuliez
merged 6 commits into
MegaMek:master
from
IllianiCBT:stratCon_BonusPartConversion
Jun 8, 2024
Conversation
This file contains 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
- Added new feature to convert bonus parts into c-bills at the end of AtB contracts - Implemented configuration options for bonus part value and maximum exchange count - Added Bonus Part Exchange TransactionType
… parsing in TransactionTypeTest
# Conflicts: # MekHQ/data/scenariomodifiers/OverwhelmingEnemyAirReinforcements.xml # MekHQ/data/scenariomodifiers/OverwhelmingEnemyGroundReinforcements.xml # MekHQ/data/scenariomodifiers/PiratesIncomingAir.xml # MekHQ/data/scenariomodifiers/PiratesIncomingGround.xml # MekHQ/data/scenariomodifiers/PiratesPresentAir.xml # MekHQ/data/scenariomodifiers/PiratesPresentGround.xml # MekHQ/data/scenariomodifiers/PrimaryAlliesAir.xml # MekHQ/data/scenariomodifiers/PrimaryAlliesGround.xml # MekHQ/src/mekhq/campaign/Campaign.java # MekHQ/src/mekhq/campaign/finances/enums/TransactionType.java # MekHQ/src/mekhq/campaign/mission/AtBDynamicScenarioFactory.java # MekHQ/unittests/mekhq/campaign/finances/enums/TransactionTypeTest.java
Resolved the surprisingly numerous conflicts |
# Conflicts: # MekHQ/src/mekhq/campaign/finances/enums/TransactionType.java # MekHQ/unittests/mekhq/campaign/finances/enums/TransactionTypeTest.java
Resolved conflicts |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #4149 +/- ##
============================================
- Coverage 10.28% 10.27% -0.01%
- Complexity 5793 5810 +17
============================================
Files 919 920 +1
Lines 125219 125730 +511
Branches 18550 18590 +40
============================================
+ Hits 12883 12925 +42
- Misses 111068 111535 +467
- Partials 1268 1270 +2 ☔ View full report in Codecov by Sentry. |
SJuliez
approved these changes
Jun 8, 2024
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.
Requires: #4138
At the end of an AtBContract any remaining Bonus Parts (that would otherwise be lost) are automatically exchanged for c-bills at a rate defined by the user (default: 500,000 c-bills). An optional cap on the number of parts exchanged can also be defined by the user (default: 10).
This does not otherwise affect Bonus Parts usage. So parts can be gained and used in the same way they always have. This PR just adds a small bonus in the event the user forgets to use their Bonus Parts.
I also added a Bonus Part count to the Mission Stats panel, so users don't need to go hunting to determine how many Bonus Parts they have available. This count is refreshed on new day
Closes
Closes #3390