various StratCon fixes #2651
Merged
various StratCon fixes #2651
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
Member
NickAragua
commented
May 29, 2021
•
NickAragua
commented
- Updated arrival altitude for aerospace fighter reinforcement modifiers (they were showing up on the ground)
- Standardized "recon" type scenarios to have the same criteria as Tukayyid scenarios
- Various briefing text clarifications
- Store artillery offboard status between campaign saves
- On Integrated command, don't immediately and incorrectly undeploy lances after generating scenarios
- Adjusted manual force deployment rules (unlimited stacking on allied facilities, one per hex otherwise, no manual deployment under integrated command)
- Tighten up reinforcement restrictions (can't deploy units that can't actually deploy; can't double deploy units; can now only deploy fight lances or have to use a support point/VP)
- VTOLs no longer start on the ground
… deployment; relax deployment rules
…kAragua/MekHQ into small_unit_contract_init_fix
|
This pull request fixes 1 alert when merging d5144e3 into 4c2b9e7 - view on LGTM.com fixed alerts:
|
Windchild292
approved these changes
May 30, 2021
| @@ -32,14 +32,15 @@ | |||
| <additionalDetails> | |||
| <additionalDetail>Extraction can be carried out by a unit with at least one free hand actuator, infantry or battle armor.</additionalDetail> | |||
| <additionalDetail>Extraction cannot be performed from destroyed buildings.</additionalDetail> | |||
| <additionalDetail>The extracting units may flee the battlefield, or the objective is automatically complete if routing the oppossing force.</additionalDetail> | |||
There was a problem hiding this comment.
Suggested change
| <additionalDetail>The extracting units may flee the battlefield, or the objective is automatically complete if routing the oppossing force.</additionalDetail> | |
| <additionalDetail>The extracting units may flee the battlefield, or the objective is automatically complete if routing the opposing force.</additionalDetail> |
There was a problem hiding this comment.
automatically completed upon routing?
Comment on lines
+172
to
+174
| <additionalDetails> | ||
| <additionalDetail></additionalDetail> | ||
| </additionalDetails> |
There was a problem hiding this comment.
Why the addition of this?
There was a problem hiding this comment.
I think it's a function of how the code is saved, there's probably a "don't serialize empty lists" flag somewhere.
| /** | ||
| * Can the given force be manually deployed to the given coordinates on the given track | ||
| */ | ||
| public static boolean canManuallyDeployForce(StratconCoords coords, |
There was a problem hiding this comment.
Leaving it in, but unused, for now?
| @@ -418,7 +417,7 @@ private String buildForceCost(int forceID) { | |||
| StringBuilder costBuilder = new StringBuilder(); | |||
| costBuilder.append("("); | |||
|
|
|||
| switch(StratconRulesManager.getReinforcementType(forceID, currentTrackState, campaign)) { | |||
| switch(StratconRulesManager.getReinforcementType(forceID, currentTrackState, campaign, currentCampaignState)) { | |||
There was a problem hiding this comment.
Suggested change
| switch(StratconRulesManager.getReinforcementType(forceID, currentTrackState, campaign, currentCampaignState)) { | |
| switch (StratconRulesManager.getReinforcementType(forceID, currentTrackState, campaign, currentCampaignState)) { |
Codecov Report
@@ Coverage Diff @@
## master #2651 +/- ##
=========================================
Coverage 10.76% 10.76%
- Complexity 3807 3809 +2
=========================================
Files 703 703
Lines 97876 97897 +21
Branches 16269 16277 +8
=========================================
+ Hits 10534 10538 +4
- Misses 85965 85982 +17
Partials 1377 1377
Continue to review full report at Codecov.
|
|
This pull request fixes 1 alert when merging 666e99e into 2fa74ec - view on LGTM.com fixed alerts:
|
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.