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

Improved morale ui when all troops are undead #9398

Merged
merged 5 commits into from
Jan 9, 2025

Conversation

felix642
Copy link
Contributor

@felix642 felix642 commented Dec 31, 2024

The morale modifier is now calculated when using an undead army. The previous behaviour was inconsistent depending on where the modifier was coming from (artifact vs hero).

Grayed out the morale icon if the hero is using an undead army.

image

fixes #2419

When the player has an undead army, the moral does not apply. The issue is that the info is still (partially calculated)
and displayed. The artifacts are taken into consideration but not the skills / tavern.
With this commit the morale is always calculated & displayed in the hero menu.
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/heroes/heroes_indicator.cpp Outdated Show resolved Hide resolved
src/fheroes2/dialog/dialog_quickinfo.cpp Outdated Show resolved Hide resolved
@oleg-derevenetz oleg-derevenetz added improvement New feature, request or improvement ui UI/GUI related stuff labels Dec 31, 2024
@oleg-derevenetz oleg-derevenetz added this to the 1.1.6 milestone Dec 31, 2024
@ihhub ihhub requested a review from Branikolog January 1, 2025 06:19
Copy link
Collaborator

@Branikolog Branikolog left a comment

Choose a reason for hiding this comment

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

Works nice!

@ihhub ihhub merged commit 92395ac into ihhub:master Jan 9, 2025
20 checks passed
@ihhub
Copy link
Owner

ihhub commented Jan 9, 2025

@felix642 , many thanks for the fix!

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.

Hero morale indicator with undead army
4 participants