Refactor Battle2k message timings + state fixes 1 / 2 #1726

fmatthew5876 · 2019-03-24T18:29:03Z

This is yet another 2k battle system refactor.

In order to emulate all of the waits RPG_RT does in #1677 I've had to add more states and substates.

I've also taken this opportunity to do some cleanup. In particular I've removed GetResultMessages() from Game_BattleAlgorithm and nearly all of the 2k message processing logic into SceneBattleRpg2k.

I also fixed a self-destruct bug and #1725 using a hack that hopefully can be dismantled later.

Related: #1725
Related: #1677
Related: #1748
Related: #1770
Related: #821
Related: #1490
(they are all closed with #1785)

Tested:

Test all message timing cases in Fix Battle Console timings in 2k battles #1677
Test all weapon state cases in Fix Battle Console timings in 2k battles #1677
Test all skill state cases in Fix Battle Console timings in 2k battles #1677
Test all item state cases in Fix Battle Console timings in 2k battles #1677
Test all self-destruct state cases in Fix Battle Console timings in 2k battles #1677
Test the last state for off by 1 errors.

fmatthew5876 · 2019-03-26T04:58:44Z

This is ready now, I've run through all the test cases and they all pass.

There is a bug where enemies with no actions will not print messages for their states. I believe they won't heal states either. If this takes a while to merge I might fix it here, or punt it until a later PR.

Ghabry · 2019-03-26T14:14:03Z

Can you explain why GetResultMessages and GetResultSe were removed and GetFailureMessage and GetFailureSe were added.

How is success handled now?

fmatthew5876 · 2019-03-26T14:22:57Z

The GetResult methods had too much 2k specific logic in them so I moved them out.

GetResultSE no longer makes sense as failure and damage sounds happen in different places.

In the damage and death commits I already had to start ripping stuff out of GetResultMessages(). So it already became partially implemented.

Success is computed in Execute(), so it shouldn't change.

Essentially, GetFailureMessage() is like getting a property of the action. Whereas GetResultMessages() is like, "do a bunch of 2k battle system message logic on this action and return it"

We could move out all the message logic from battle algorithm, but there are many others outside of failure and I haven't done that. I'm not sure we need to, as long as they stay like properties and not battle system logic.

Ghabry · 2019-05-20T23:17:29Z

Fix broken states healed by SelfDestruct logic

What was broken there?

I don't really understand the cloning.
After Cloning the Actor it will still modify the same liblcf data as the original actor.

fmatthew5876 · 2019-05-21T01:26:05Z

Fix broken states healed by SelfDestruct logic

What was broken there?

Self Destruct is supposed to heal states like confuse, just like a normal attack.

I don't really understand the cloning.
After Cloning the Actor it will still modify the same liblcf data as the original actor.

Ouch, that's a pretty bad oversight on my part. I will need to re-evaluate this one.

It's supposed to make a copy of everything, so that we just use AddState() to answer of the question of whether we can add the state or not.

The reason for this is that the logic involved is very complicated, mostly because of the whole thing about states being cancelled by priorities. The idea was to isolate it in one place.

fmatthew5876 · 2019-05-25T21:59:41Z

This now passes all test cases of #1770

Ghabry · 2019-05-29T11:09:05Z

src/scene_equip.cpp

+		def = Utils::Clamp(def, 1, 999);
+		spi = Utils::Clamp(spi, 1, 999);
+		agi = Utils::Clamp(agi, 1, 999);
+


Refactor scene_equip

But this change doesn't handle the case where a state is inflicted which halfes the SP, or does it?

Half SP?

If you mean the half SP cost flag on equipment, that doesn't change the equip numbers.

If you mean half / double stats from states, this is RPG_RT compatible. The equip window doesn't show the effect of those states in the arrows, they only appear after you change equipment.

Yes I mean the half/double skill stuff.
The problem is that this is a RPG2k3 feature, so my educated guess is: They forgot to update the scene code. ^^'

I could see a use for this. Imagine a cursed equipment with apparently good stats which ends up halving all your stats after you equip it and can't remove it!

Ghabry · 2019-05-29T11:15:15Z

I ask for a split after "Fixes for physically healed conditions" because the state code exploded into 20 new commits.

Use it for battle 2k escape logic

* Add Begin state to flash and wait 4 * Rename ConditionsHeal -> Conditions * Remove IsFirstAttack() check, as the state machine never returns to Begin anyway

* Add wait 4 in execute * Adds Critical state

Hacky, but we need it for proper message timing in 2k battles

* No target? : Apply->Finished * Add a new failure state: Apply->Failure->Finished * Handle failure SFX and message separately

Also clean up Finished state

* Wait 4 before each action * Fix timing for actions

Fix EasyRPG#1725

* Remove Game_BattleAlgorithm::GetResultsMessages() * Put all the logic into ProcessActionResults * Fix RPG_RT wait bug with death state handling

Conditions healed by attacks can be re-infliced again by the same weapon. Change the logic to allow this to happen and rename `healed_conditions` to `phys_healed_conditions` to make it more obvious what its for.

Ghabry · 2019-05-29T12:07:34Z

thx!

fmatthew5876 · 2019-05-29T12:36:55Z

FYI I haven't really tested this split here. Not sure if there would be regressions while we're in between this and #1785

Ghabry

Everything seems to work, couldn't find any regressions (also tested a bit in 2k3)

fmatthew5876 force-pushed the battle_time branch from bd5aa3d to a70d306 Compare March 24, 2019 18:29

fdelapena added Battle Refactor labels Mar 24, 2019

fdelapena added this to the 0.6.1 milestone Mar 24, 2019

fmatthew5876 force-pushed the battle_time branch 5 times, most recently from 6ee60c4 to 352ed88 Compare March 25, 2019 23:09

fmatthew5876 changed the title ~~Refactor Battle2k message timings~~ Refactor Battle2k message timings + state fixes Mar 26, 2019

fmatthew5876 force-pushed the battle_time branch 5 times, most recently from e66ba7c to 47bdd2a Compare March 26, 2019 04:42

fmatthew5876 marked this pull request as ready for review March 26, 2019 04:49

fmatthew5876 mentioned this pull request Mar 26, 2019

Battle 2k3: Skills + Equip State infliction #1655

Closed

fmatthew5876 force-pushed the battle_time branch from 47bdd2a to 4c8c552 Compare March 31, 2019 00:20

fmatthew5876 mentioned this pull request Mar 31, 2019

Battle 2k - Shake screen is off by 1 frame for monsters #1735

Closed

fmatthew5876 mentioned this pull request Apr 18, 2019

fixes #1748. Reviving items does not revive. #1749

Closed

Tondorian mentioned this pull request Apr 18, 2019

VD2 reviving items in battle does not work #1748

Closed

This was referenced Apr 18, 2019

Battle 2k - Handle enemies with no actions #1750

Closed

Abnormal state #1490

Closed

fdelapena approved these changes Apr 19, 2019

View reviewed changes

fmatthew5876 force-pushed the battle_time branch from 2c5013f to f9960f0 Compare May 1, 2019 04:00

This was referenced May 25, 2019

Battle System: Remaining, not implemented stuff #821

Closed

Item use is abnormal #1495

Closed

Ghabry reviewed May 29, 2019

View reviewed changes

fmatthew5876 added 17 commits May 29, 2019 08:03

Fix 2k battle console waiting for monster display

76f8b4b

Fix states physical healed logic in SelfDestruct

f1c8e0b

Battle2k: Use new SetWait() / CheckWait() everywhere

de32d20

Battle2k: Fix Escape message timing

c878e72

Introduce BattleActionSubState concept

1610fb6

Use it for battle 2k escape logic

Refactor BattleActionState_ConditionsHeal

fc8b583

* Add Begin state to flash and wait 4 * Rename ConditionsHeal -> Conditions * Remove IsFirstAttack() check, as the state machine never returns to Begin anyway

Batttle2k: Refactor timings for Usage/Animation

8f697f7

Fix Wait timings for Execute state

b4c7ab7

* Add wait 4 in execute * Adds Critical state

Add Game_BattleAlgorithm::IsKilledByDamage()

d44b1d1

Hacky, but we need it for proper message timing in 2k battles

Battle2k: Refactor Failure handling

72d99b2

* No target? : Apply->Finished * Add a new failure state: Apply->Failure->Finished * Handle failure SFX and message separately

Battle2k: Refactor Damage message timing

68e3115

Battle2k: Fix Death message timing

1e22c6a

Also clean up Finished state

Battle2k: Refactor battle action results stage

f5708cd

* Wait 4 before each action * Fix timing for actions

Add FIXME comment in 2k3 battles to remove GetResultSe

7b20b9e

Battle2k: Don't animate death until we display the message

cd2f26c

Fix EasyRPG#1725

Battle2k: Refactor results messages processing

28c1f5a

* Remove Game_BattleAlgorithm::GetResultsMessages() * Put all the logic into ProcessActionResults * Fix RPG_RT wait bug with death state handling

Fixes for physically healed conditions

9c43376

Conditions healed by attacks can be re-infliced again by the same weapon. Change the logic to allow this to happen and rename `healed_conditions` to `phys_healed_conditions` to make it more obvious what its for.

fmatthew5876 mentioned this pull request May 29, 2019

Refactor Battle2k message timings + state fixes 2 / 2 #1785

Merged

fmatthew5876 force-pushed the battle_time branch from 94fdec5 to 9c43376 Compare May 29, 2019 12:05

fmatthew5876 changed the title ~~Refactor Battle2k message timings + state fixes~~ Refactor Battle2k message timings + state fixes 1 / 2 May 29, 2019

Ghabry approved these changes Jun 2, 2019

View reviewed changes

carstene1ns merged commit 7735033 into EasyRPG:master Jun 5, 2019

fmatthew5876 deleted the battle_time branch January 16, 2020 03:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor Battle2k message timings + state fixes 1 / 2 #1726

Refactor Battle2k message timings + state fixes 1 / 2 #1726

fmatthew5876 commented Mar 24, 2019 •

edited by Ghabry

Loading

fmatthew5876 commented Mar 26, 2019

Ghabry commented Mar 26, 2019

fmatthew5876 commented Mar 26, 2019 •

edited

Loading

Ghabry commented May 20, 2019 •

edited

Loading

fmatthew5876 commented May 21, 2019 •

edited

Loading

fmatthew5876 commented May 25, 2019

Ghabry May 29, 2019

fmatthew5876 May 29, 2019

Ghabry May 29, 2019

fmatthew5876 May 29, 2019

Ghabry commented May 29, 2019 •

edited

Loading

Ghabry commented May 29, 2019

fmatthew5876 commented May 29, 2019

Ghabry left a comment

Refactor Battle2k message timings + state fixes 1 / 2 #1726

Refactor Battle2k message timings + state fixes 1 / 2 #1726

Conversation

fmatthew5876 commented Mar 24, 2019 • edited by Ghabry Loading

fmatthew5876 commented Mar 26, 2019

Ghabry commented Mar 26, 2019

fmatthew5876 commented Mar 26, 2019 • edited Loading

Ghabry commented May 20, 2019 • edited Loading

fmatthew5876 commented May 21, 2019 • edited Loading

fmatthew5876 commented May 25, 2019

Ghabry May 29, 2019

Choose a reason for hiding this comment

fmatthew5876 May 29, 2019

Choose a reason for hiding this comment

Ghabry May 29, 2019

Choose a reason for hiding this comment

fmatthew5876 May 29, 2019

Choose a reason for hiding this comment

Ghabry commented May 29, 2019 • edited Loading

Ghabry commented May 29, 2019

fmatthew5876 commented May 29, 2019

Ghabry left a comment

Choose a reason for hiding this comment

fmatthew5876 commented Mar 24, 2019 •

edited by Ghabry

Loading

fmatthew5876 commented Mar 26, 2019 •

edited

Loading

Ghabry commented May 20, 2019 •

edited

Loading

fmatthew5876 commented May 21, 2019 •

edited

Loading

Ghabry commented May 29, 2019 •

edited

Loading