-
Notifications
You must be signed in to change notification settings - Fork 177
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
Issue 5979: Force players to use commit when deploying forces #6003
Issue 5979: Force players to use commit when deploying forces #6003
Conversation
…n-deploying-forces
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #6003 +/- ##
============================================
+ Coverage 10.32% 10.35% +0.02%
- Complexity 6118 6141 +23
============================================
Files 1038 1038
Lines 139295 139326 +31
Branches 20662 20668 +6
============================================
+ Hits 14389 14428 +39
+ Misses 123466 123456 -10
- Partials 1440 1442 +2 ☔ View full report in Codecov by Sentry. |
scenarioWizard.setVisible(true); | ||
} | ||
if (selectedScenario != null && !isCommitForces()) { | ||
selectedScenario.resetScenario(campaign); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In particular @IllianiCBT I wanted your thoughts on this line:
I haven't seen any issues with this in my testing. This should only be reachable during the initial deployment. isCommitForces should only return true if the user hit "Commit" on the 2nd deployment popup. So, if the user doesn't hit "commit" we're back where we started - nothing's deployed. It gets... Complicated if we instead try to delay deploying the initial force until after the 2nd deployment popup - a lot of the 2nd popup relies on a force already being deployed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This all looks good to me. I'm going to approve and merge if but I'd like you to see if you can grab a volunteer or two to test it in tonight's nightly.
Fixes #5979
When deploying forces in Stratcon, the player should be required to hit "commit" on the 2nd deployment window before their primary forces are comitted. This ensures the objective is properly updated.
I also added another message to the 2nd deployment window to make it more clear, and a cancel button per Illiani's request:
![image](https://private-user-images.githubusercontent.com/189469115/411255033-7b588336-3742-4427-b055-97fb0d19379b.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk1MTI0NDYsIm5iZiI6MTczOTUxMjE0NiwicGF0aCI6Ii8xODk0NjkxMTUvNDExMjU1MDMzLTdiNTg4MzM2LTM3NDItNDQyNy1iMDU1LTk3ZmIwZDE5Mzc5Yi5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjUwMjE0JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI1MDIxNFQwNTQ5MDZaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT0xMzIwNGQxYzU5ODk0NDA1MDkxYjY4ZmI0ZDhlZDY4OThlOGZhYWE0ZWQ0NWFjNzU2NmZkZDM5ZTk3NDNkY2Q4JlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.yvurgTcqm8SDUqvdMqm36314WBs_Az0romSQS_NK-iE)
(displaying this even if there's no leadership units is intentional - it's a chance for the player to realize they don't get any free leadership units and opt to deploy a different force).