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 dialog to choose between Auto Combat and Quick Combat #9180

Merged
merged 61 commits into from
Jan 18, 2025

Conversation

zenseii
Copy link
Collaborator

@zenseii zenseii commented Oct 10, 2024

This will let more users notice the Quick Combat feature and it will give touch devices access to Quick Combat.

This PR also adds basic shine effect to the generated buttons' edges.

image

Related to #9095 and #9100

Fix #9094

@zenseii zenseii added improvement New feature, request or improvement ui UI/GUI related stuff labels Oct 10, 2024
@zenseii zenseii added this to the 1.1.4 milestone Oct 10, 2024
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Clang-Tidy found issue(s) with the introduced code (1/1)

src/fheroes2/battle/battle_interface.cpp Outdated Show resolved Hide resolved
src/fheroes2/battle/battle_interface.cpp Outdated Show resolved Hide resolved
@ihhub ihhub modified the milestones: 1.1.4, 1.1.5 Nov 27, 2024
@ihhub ihhub modified the milestones: 1.1.5, 1.1.6 Dec 30, 2024
@zenseii
Copy link
Collaborator Author

zenseii commented Jan 16, 2025

@oleg-derevenetz, I'm done pushing changes to this branch now. If you have the chance to look over the changes from resolve/instant to quick then that would be greatly appreciated.

@oleg-derevenetz
Copy link
Collaborator

I'm done pushing changes to this branch now. If you have the chance to look over the changes from resolve/instant to quick then that would be greatly appreciated.

Thank you! I'll make an effort to take a look during tomorrow.

@zenseii zenseii requested a review from ihhub January 16, 2025 19:08
@zenseii
Copy link
Collaborator Author

zenseii commented Jan 16, 2025

@LeHerosInconnu, I've addressed your text suggestions. I shortened this text because action was redundant in this context and undone already implies that something has been done, and the word validate doesn't work in this context.
image

As for this description I changed the part about while you observe because it sounds like the game is forcing you to sit down and watch. activating was changed with performing since that is the correct expression, alternatively we could just say right or left clicking.

image

@LeHerosInconnu
Copy link

Hello @zenseii,

@LeHerosInconnu, I've addressed your text suggestions. I shortened this text because action was redundant in this context and undone already implies that something has been done, and the word validate doesn't work in this context. image

The words "resolved" and "ended" mean the same thing, and the "and ended" part makes the sentence a bit cumbersome.

What about:
"The combat is resolved from the current state to the end."

As for this description I changed the part about while you observe because it sounds like the game is forcing you to sit down and watch. activating was changed with performing since that is the correct expression, alternatively we could just say right or left clicking.

image

The "at the currently set combat speed" part of the sentence will raise a question in the user's mind: "What does that mean?"; whereas the text should be descriptive and clear.

As for this description I changed the part about while you observe because it sounds like the game is forcing you to sit down and watch.

This indicates that the user will be watching the combat (it's simply a description of what happens in this mode), and that he will be able to observe the AI's actions, which may be beneficial to his understanding of how the AI works.

alternatively we could just say right or left clicking.

Since "by pressing" is used for keys and is not really suitable for clicks (mouse or other, we press a button not a click), there is need to use a more appropriate term for clicks and in the same style as "by pressing", "by performing" is fine.

Why replace the word "time" with "moment"?

What about:
"The computer continues the combat for you, while you watch the progression of the combat.

This can be interrupted at any time by pressing the Auto Combat hotkey or the default Cancel key, or by performing a left or right click anywhere on the game screen."

@Branikolog
Copy link
Collaborator

"The combat is resolved from the current state to the end."

Looks nice.
However "The combat ends instantly from the current state." looked good for me too.

The "at the currently set combat speed" part of the sentence will raise a question in the user's mind: "What does that mean?"; whereas the text should be descriptive and clear.

I agreed. Mentioning speed is useless in the description.
Mentioning "the progression of the combat" also feels redundant, since we're mentioning in the following description, that the battle could be interrupted at any moment...

What about more short and simple? "The computer continues the combat for you in auto mode/automatically"?
I'm even OK with "The computer continues the combat for you."

@zenseii
Copy link
Collaborator Author

zenseii commented Jan 17, 2025

@LeHerosInconnu and @Branikolog.

Let's make it simple and just say "The combat is resolved from the current state." The simpler we can make it, the better.

I also agree with "The computer continues the combat for you." Continue does imply some similarity to how you were doing the battle up to that point and therefore implies that you can observe it, if you wish. Or you can go and make a sandwich in the meantime. The "while you watch" part sounds like the game is telling you that you have to watch. As @Branikolog points out, it's implied that you can watch it.

As for changing time with moment, this isn't only just a matter of taste. Generally words from Latin/French, like moment, are considered more formal than their more casual Germanic counterparts, like time. Another example is the difference between "in a fight" and "in combat" which technically mean the same, but fight being the Germanic word means it is more casual.

Therefore, considering the language used in the game in general, like in the videos and the dialogs, moment fits better than time in my opinion.

@LeHerosInconnu
Copy link

@Branikolog and @zenseii,

So, I am fine to go with:

"The combat is resolved from the current state.

This cannot be undone."

and:

"The computer continues the combat for you.

This can be interrupted at any moment by pressing the Auto Combat hotkey or the default Cancel key, or by performing a left or right click anywhere on the game screen."

@zenseii zenseii requested a review from ihhub January 17, 2025 12:09
@ihhub ihhub merged commit 2d4b7df into ihhub:master Jan 18, 2025
21 checks passed
@ihhub
Copy link
Owner

ihhub commented Jan 18, 2025

@zenseii , many thanks for this useful feature!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
improvement New feature, request or improvement ui UI/GUI related stuff
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Combat screen, Auto combat and Instant Combat windows, change the text for better understanding
6 participants