Skip to content
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

Merged
merged 22 commits into from
Feb 6, 2025
Merged

Conversation

itanasi
Copy link
Contributor

@itanasi itanasi commented Jan 22, 2025

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.

image
If you change the Next Unit button to instead mark the unit as Done (due=true), then a different Cycle button will appear.
image

Working vertical orientation too
image
image

Update in SummaryPresenter to match verb
image

#12785

@itanasi itanasi closed this Jan 22, 2025
# 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
@itanasi itanasi reopened this Jan 22, 2025
@itanasi itanasi marked this pull request as draft January 22, 2025 06:08
@itanasi itanasi marked this pull request as ready for review January 24, 2025 06:29
@itanasi itanasi marked this pull request as draft January 24, 2025 15:09
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Copy link

Conflicts have been resolved.

@itanasi itanasi marked this pull request as ready for review January 30, 2025 05:19
Copy link
Contributor

@sulai sulai left a 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".

@itanasi
Copy link
Contributor Author

itanasi commented Feb 4, 2025

Any changes still wanted?

@yairm210 yairm210 merged commit 26c2a8c into yairm210:master Feb 6, 2025
4 checks passed
@Ouaz
Copy link
Contributor

Ouaz commented Feb 6, 2025

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):


  • Idle Units

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'.
If you want to disable the 'Next unit' feature entirely, you can toggle it in Menu -> Check for idle units.
If you'd rather 'Next unit' cycle the units and not mark them as Done, you can change it in the Options -> Gameplay menu.

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:

image

yairm210 added a commit that referenced this pull request Feb 7, 2025
yairm210 added a commit that referenced this pull request Feb 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants