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 ability to set spells in Shrine in the Editor #9347

Merged
merged 12 commits into from
Dec 18, 2024
Merged

Conversation

ihhub
Copy link
Owner

@ihhub ihhub commented Dec 16, 2024

image

image

this pull request should be merged after #9335

@ihhub ihhub added improvement New feature, request or improvement ui UI/GUI related stuff logic Things related to game logic editor Map editor related stuff labels Dec 16, 2024
@ihhub ihhub added this to the 1.1.5 milestone Dec 16, 2024
@ihhub ihhub self-assigned this Dec 16, 2024
@ihhub ihhub marked this pull request as draft December 16, 2024 10:23
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)

@ihhub ihhub marked this pull request as ready for review December 16, 2024 12:22
Copy link
Collaborator

@Districh-ru Districh-ru left a comment

Choose a reason for hiding this comment

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

Hi, @ihhub, well done! 👍
I left one optional suggestion, could you please take a look in you spare time?
Also later (in a new PR) we can optimize spells rendering not to fully redraw all spells and scrolls on the single spell change. :)

src/fheroes2/world/world_loadmap.cpp Show resolved Hide resolved
@ihhub ihhub requested a review from Districh-ru December 18, 2024 07:09
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/world/world_loadmap.cpp Outdated Show resolved Hide resolved
src/fheroes2/world/world_loadmap.cpp Outdated Show resolved Hide resolved
@ihhub ihhub merged commit d9569c8 into master Dec 18, 2024
21 checks passed
@ihhub
Copy link
Owner Author

ihhub commented Dec 18, 2024

Hi @Districh-ru , I merged this pull request as I would like to add functionality for Pyramid before the release. Please let me know if you have any further comments so I could address them in the new pull request.

@ihhub ihhub deleted the shrine_spell_setup branch December 18, 2024 13:46
@Districh-ru
Copy link
Collaborator

Hi, @ihhub, I've checked the updated code and all is OK. I like that now it correlates with the editor's code so it'll be easier to maintain the same looking logic. :)

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

Successfully merging this pull request may close these issues.

4 participants