Separate out non retreatable units in the casualty selector #8947
Conversation
|
The UnitChooser is the code that builds the UI. It is used in several places, not just the casualty selection. It already handles separating out units by their dependents (such as transports), by their transport cost, and by their left over movement. I added a new case to handle the non-retreat state but it shows the image. |
trevan
force-pushed
the
separate-non-retreatable-units-in-casualty-selector
branch
from
7dd4b26
to
b06885f
Compare
Codecov Report
@@ Coverage Diff @@
## master #8947 +/- ##
============================================
- Coverage 28.38% 28.13% -0.25%
- Complexity 8370 9454 +1084
============================================
Files 1300 1442 +142
Lines 80931 91966 +11035
Branches 11053 13826 +2773
============================================
+ Hits 22975 25879 +2904
- Misses 55781 63770 +7989
- Partials 2175 2317 +142
Continue to review full report at Codecov.
|
…eatable-units-in-casualty-selector
|
Is this more likely to be a long term project or more likely to be featured in TripleA 2.6 (asking because it is relevant to a map of mine which I'm going to update soon)? |
|
This pull request has been automatically marked as stale because it has not had recent activity. We are eager to see this work completed, please update and re-open as soon as possible. |
|
So, is it safe to say that TripleA 2.6 will not allow picking between retreatable and non? EDIT: Nevermind: I just noticed the recent assignation, which I guess means the intention to get this in the first 2.6 release. |
|
This pull request has been automatically marked as stale because it has not had recent activity. We are eager to see this work completed, please update and re-open as soon as possible. |
|
This pull request has been automatically marked as stale because it has not had recent activity. We are eager to see this work completed, please update and re-open as soon as possible. |
|
@RaiNova , this was a draft PR because there was still discussion about the UI and I don't have much Java UI experience. So I committed the logic part and then expected someone else to try and work on the UI. You can see the discussion in the forum at https://forums.triplea-game.org/topic/2677/allow-user-to-specifically-choose-amphibious-offloaded-units-in-battle-chooser/29?_=1631472565173&lang=en-US. |
@trevan As you mentioned in the forum, I should now build on your pull request. What is the easiest way? Lacking much experience with github, it looks to me the easiest way would be you finalize your pull request, I reveive it by an update of the head and the integrate the UI. The code I am working on includes my pull reuqest #9509. I‘d like to keep me work consolidate in that pull request. Would that work? |
|
@RaiNova , I don't think we want to merge this until the UI is done because this will change the behavior of the game. I'd recommend you cherry-pick the commit into your branch and then we close this PR. |
|
@RaiNova this was waiting for me to finish the UI components. I haven't been able to manage the time/effort despite my better wishes. If you're willing to, would you want to finish this PR? Judging by the screenshots in the forums, it looks like you are far along the way. Cherry-picking commits into a new branch could be a good way to go. @trevan , which changes to behavior are you referring to (more specifically)? Is that referring to how the non-retreat units will be split out in UI, or are there further changes you were thinking of? |
|
@DanVanAtta , the changes I'm referring to is how the non-retreat units will be split out in the UI. But there won't be any indication on why they are split. So users wouldn't be able to know which of the rows is the non-retreat units and which are the retreat units. Nor would they be able to tell why there are two rows of the same unit. |
|
@RaiNova could you confirm if you are taking over this effort / PR? If so, do you have a plan or expectation for which changes would land when? |
Confirmed. I'll try to complete this by the end of November. It's functionally complete already, but I need to do more testing |
PR triplea-game#8947 can be closed. Automated UI testing is not included, because I wrote it in Kotlin and don't want to put too much into this PR.
|
This PR is now included in #9509 and can be closed. But I can't close it - the close button doesn't show left to the comment button. |
|
Closing in favor #9509 |
PR triplea-game#8947 can be closed. Automated UI testing is not included, because I wrote it in Kotlin and don't want to put too much into this PR.
The UI needs to be worked on but this will separate out units that can retreat from units that can't retreat.
Testing
Screens Shots
Additional Notes to Reviewer
Release Note