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

Fixes for NovemberJoy's remaining battle issues #2481

Merged
merged 2 commits into from Mar 25, 2021
Merged

Fixes for NovemberJoy's remaining battle issues #2481

merged 2 commits into from Mar 25, 2021

Conversation

ghost
Copy link

@ghost ghost commented Mar 15, 2021

This PR fixes the death animation loop by playing death animations only once (RPG_RT does this as well) and normal enemy attacks do not longer wait for the battle animation (you will see the animation and the damage number at the same time like in RPG_RT). This affects RPG Maker 2003 battles.

Fixes: #1681
Fixes: #2335

@Ghabry Ghabry added Battle Has PR Dependencies This PR depends on another PR labels Mar 15, 2021
@Ghabry Ghabry added this to the 0.6.3 milestone Mar 15, 2021
@ghost ghost mentioned this pull request Mar 15, 2021
91 tasks
@Ghabry Ghabry added Awaiting Rebase Pull requests with conflicting files due to former merge and removed Has PR Dependencies This PR depends on another PR labels Mar 21, 2021
@ghost ghost marked this pull request as ready for review March 22, 2021 04:55
@fdelapena fdelapena removed the Awaiting Rebase Pull requests with conflicting files due to former merge label Mar 22, 2021
}
}

if (action->IsSuccess() && target->GetType() == Game_Battler::Type_Ally && target->IsDead()) {
Copy link
Contributor

Choose a reason for hiding this comment

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

A better condition is !was_dead && target->GetType() == Game_Battler::Type_Ally && target->IsDead(). Then you're guaranteed to change the state only when the actor is killed by the action but not when they happen to already be dead and some battle action was successful.

Copy link
Author

Choose a reason for hiding this comment

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

Fixed.

Copy link
Member

@Ghabry Ghabry left a comment

Choose a reason for hiding this comment

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

The code looks fine and I trust rueter that they did lots of testing to ensure this works as expected.

I'm far less knowledgeable in how the battle system should behave.

So when fmatthews concern is addressed can be merged.

rueter37 added 2 commits March 25, 2021 17:31
Dead characters play the death animation only once now.
If an enemy starts a normal attack, do not wait for the battle
animation.
@fmatthew5876 fmatthew5876 merged commit 276fc87 into EasyRPG:master Mar 25, 2021
@ghost ghost deleted the issues-1681-2335 branch March 25, 2021 17:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

2k3 Battle: Player waits for animations, RPG_RT doesn't 2k3 Death animations loop in EasyRPG
3 participants