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

Update Earthquake spell animation and improve its logic to allow bridge and nearby towers demolition (Battlefield) #9011

Merged

Conversation

Districh-ru
Copy link
Collaborator

@Districh-ru Districh-ru commented Jul 28, 2024

Fix #7489, fix #7478

Changes in this PR:

  • update the logic of the earthquake animation for the Earthquake and Armageddon spells including stopping any IDLE animations and avoid shaking the Turn Order info if it is shown;
  • allow the demolition the Bridge by the Earthquake spell with an extra blast smoke;
  • allow the demolition of nearby bridge towers and other towers without turrets only by the Earthquake spell;
  • show blast smoke only for the objects damaged and destroyed by the Earthquake;
  • update the damaged/destroyed objects' sprites in the middle of the blast.
fheroes2.2024-07-28.19-11-46-793.mp4

@Districh-ru Districh-ru added bug Something doesn't work ui UI/GUI related stuff logic Things related to game logic labels Jul 28, 2024
@Districh-ru Districh-ru added this to the 1.1.2 milestone Jul 28, 2024
@Districh-ru Districh-ru self-assigned this Jul 28, 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_action.cpp Outdated Show resolved Hide resolved
src/fheroes2/battle/battle_action.cpp Outdated Show resolved Hide resolved
src/fheroes2/battle/battle_arena.cpp Outdated Show resolved Hide resolved
src/fheroes2/battle/battle_arena.cpp Outdated Show resolved Hide resolved
@Districh-ru Districh-ru marked this pull request as draft July 29, 2024 03:00
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_action.cpp Outdated Show resolved Hide resolved
@Districh-ru Districh-ru marked this pull request as ready for review July 29, 2024 14:29
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_arena.cpp Show resolved Hide resolved
@oleg-derevenetz
Copy link
Collaborator

Hi @Districh-ru I decided to make an effort to rewrite the logical part of the catapult and Earthquake spell operation to make it a little less confusing (I hope) and add a variety of assertions and checks. I will be checking the new implementation over the next couple of days. I hope that you will also take a look at it and express your comments, if any. As soon as I decide that the logic has been sufficiently tested, I will mark this PR as approved.

@oleg-derevenetz oleg-derevenetz self-requested a review July 30, 2024 07:34
@Districh-ru
Copy link
Collaborator Author

Hi @ihhub and @oleg-derevenetz , from tomorrow I'll be on leave and for the next two weeks (or possibly till september) I'll be far from home and internet and will not be able to maintain the project.
If you find issues in my PRs you are free to fix them when you have time. Thanks!

@oleg-derevenetz oleg-derevenetz merged commit 5a63b85 into ihhub:master Aug 4, 2024
20 checks passed
@oleg-derevenetz
Copy link
Collaborator

@Districh-ru Thank you very much!

@Districh-ru Districh-ru deleted the battlefield-earthquake-spell-fix branch October 2, 2024 16:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something doesn't work logic Things related to game logic ui UI/GUI related stuff
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Castle siege, Earthquake spell operation issues Castle siege, towers near the bridge are not destroyable
2 participants