-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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
Add small Skip/Cycle Button #12845
Add small Skip/Cycle Button #12845
Conversation
# Conflicts: # android/Images.ConstructionIcons/UnitActionIcons/Wait.png # android/Images.Icons/OtherIcons/Wait.png # android/assets/jsons/translations/template.properties # core/src/com/unciv/ui/components/input/KeyboardBinding.kt # core/src/com/unciv/ui/screens/worldscreen/status/NextTurnAction.kt # core/src/com/unciv/ui/screens/worldscreen/status/NextTurnButton.kt
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
# Conflicts: # android/assets/jsons/translations/template.properties
Conflicts have been resolved. |
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.
Great work on making StatusButtons extend Table! 👍
The only real issue is that one instance of "waiting" need to be renamed to "skipping".
core/src/com/unciv/ui/screens/worldscreen/status/StatusButtons.kt
Outdated
Show resolved
Hide resolved
core/src/com/unciv/ui/screens/worldscreen/status/StatusButtons.kt
Outdated
Show resolved
Hide resolved
Any changes still wanted? |
Good work. Having the two "select unit" behaviours (skip or cycle) available in the UI at the same time is very convenient. However, the Idle Units civilopedia article is quite incomplete now, as some additional "select unit" options could be explained here. These lines (in bold below) could be added (unless you think it clutters the article):
Clicking 'Next unit' jumps to the next idle unit in the queue (as listed in Overview -> Units). After issuing an order to an unit, it is also possible to jump automatically to the next unit by enabling 'Auto Unit Cycle' in Options -> Gameplay. (Note: maybe 'Auto Unit Cycle" option could be renamed 'Jump automatically to next unit' to prevent confusion with the new "Cycle" button) If you don't want to move a unit this turn, you can skip it by clicking 'Next unit' again, or command the unit to 'Skip turn'. You can also cycle through the idle units using the left and right triangles on the Unit Table in the lower left of the screen, or by enabling the Skip/Cycle button in Options > Gameplay. I already added these two sentences in the french translation, as I think it makes things clearer regarding the four "select unit" options available in Options > Gameplay: |
Co-authored with @sulai. Continuation from #12799
Adds small button next to Big Button that lets you Skip or Cycle through the current due unit list.
It also renames Wait command to Skip to be more consistent.
If you change the Next Unit button to instead mark the unit as Done (
due=true
), then a different Cycle button will appear.Working vertical orientation too
![image](https://private-user-images.githubusercontent.com/44038014/408202249-0bf7397f-207c-4fa9-8298-adcfed7fb04b.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkwNjIyMDEsIm5iZiI6MTczOTA2MTkwMSwicGF0aCI6Ii80NDAzODAxNC80MDgyMDIyNDktMGJmNzM5N2YtMjA3Yy00ZmE5LTgyOTgtYWRjZmVkN2ZiMDRiLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMDklMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjA5VDAwNDUwMVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPThiN2ZiNjNjZWUzOGFkODkyNTA2ZDZiZjgyZjZhOGMyNDJkMTg1MTU2NmI0MzBiZmNiNDkwYTgzMThjOThmOWImWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.GnNPAxTDrKSIqEvYRAKYnKHOOdqvjEKxc3Q2Fwjq67g)
![image](https://private-user-images.githubusercontent.com/44038014/408202306-bbed4f47-a498-45d3-8f25-5e442f2e34d7.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkwNjIyMDEsIm5iZiI6MTczOTA2MTkwMSwicGF0aCI6Ii80NDAzODAxNC80MDgyMDIzMDYtYmJlZDRmNDctYTQ5OC00NWQzLThmMjUtNWU0NDJmMmUzNGQ3LnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMDklMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjA5VDAwNDUwMVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTE4YzY0YjlmZWVmOTc5NmY2YTM5ZDA0NDFhZjY1NzBlZDhiNmNhMTk4ZjZiNjM4ZTlhNjM0YjRkZDQ0ZGVkOGQmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.AJha-vdw6_0e4Mz5oiPBScPyPUlwdFkhs9IqnzHpK94)
Update in SummaryPresenter to match verb
![image](https://private-user-images.githubusercontent.com/44038014/408202555-ad072f90-30ad-4927-b20c-2ec755a6ed1e.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkwNjIyMDEsIm5iZiI6MTczOTA2MTkwMSwicGF0aCI6Ii80NDAzODAxNC80MDgyMDI1NTUtYWQwNzJmOTAtMzBhZC00OTI3LWIyMGMtMmVjNzU1YTZlZDFlLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMDklMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjA5VDAwNDUwMVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTIxODUyNmVkNGZmMGE1Y2QxY2FjOTliMWNkMzdkYTVhYzk3N2ExODE1MzMwN2Q2YmE0Nzg3NjNmNWQ4OWZhMmQmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.7PKyhLJDzlMRij1m79-gIvzEAhThOBUrDv5rIw5zcQc)
#12785