The Great Campaign Option Cull - Relationships #5861
Closed
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
Removed redundant manual options for marriage, divorce, and procreation from CampaignOptions and related classes. Adjusted logic to streamline features relying on only random methods while maintaining existing functionality. Cleaned up associated resources and XML serialization/deserialization.
Eliminated obsolete code related to marriage, divorce, and procreation options, such as mutual ancestor checks and specific toggles for random actions. These removals streamline the codebase and reduce maintenance of unused features, enhancing overall clarity and efficiency.
Removed redundant mock setups and unused assertions in several test files for divorce, procreation, and marriage handling. Streamlined `canProcreate` and `canMarry` test methods to clarify failure conditions and ensure concise execution paths.
IllianiCBT
added
For New Dev Cycle
Campaign Options
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #5861 +/- ##
============================================
- Coverage 10.28% 10.22% -0.06%
+ Complexity 6132 6063 -69
============================================
Files 1039 1039
Lines 139404 138945 -459
Branches 20650 20583 -67
============================================
- Hits 14341 14211 -130
+ Misses 123647 123324 -323
+ Partials 1416 1410 -6 ☔ View full report in Codecov by Sentry. |
rjhancock
approved these changes
Feb 1, 2025
| @@ -342,7 +327,7 @@ void testApplyBothSpaceYours() { | |||
|
|
|||
| @Test | |||
| void testApplyHyphenYours() { | |||
| when(mockCampaignOptions.isLogMarriageNameChanges()).thenReturn(false); | |||
|
|
|||
There was a problem hiding this comment.
Nit Pick: Don't need the extra white space.
There was a problem hiding this comment.
Same throughout the file....
Comment on lines
+122
to
124
|
|
||
| assertNull(mockProcreation.determineFather(mockCampaign, mother)); | ||
|
|
There was a problem hiding this comment.
Nitpick: Remove the extra blank lines.
# Conflicts: # MekHQ/src/mekhq/campaign/personnel/marriage/AbstractMarriage.java # MekHQ/src/mekhq/campaign/personnel/procreation/AbstractProcreation.java # MekHQ/unittests/mekhq/campaign/personnel/marriage/AbstractMarriageTest.java # MekHQ/unittests/mekhq/campaign/personnel/procreation/AbstractProcreationTest.java
Removed checks and test cases related to clan and prisoner-specific marriage and procreation rules. These changes simplify the handling of marriage and procreation, focusing on random cases and removing unused configuration options.
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.
This is the first phase of an attempt to reduce the sheer volume of campaign options. It is focused on trimming down some of the more niche options that have minimal impact. This is going to be an iterative process over the next few versions.
Removed (Marriage)
Removed (Divorce)
Removed (Procreation)