Conditions in Battles #815

Tondorian · 2016-03-12T01:13:05Z

Conditions are applied to battle_actors now.
GainMoneyMessage only shown if money >0

I only tested it with rpg Maker 2k but should work on 2k3...

GainMoneyMessage only shown if money >0

carstene1ns · 2016-03-12T07:26:51Z

src/game_battlealgorithm.cpp

+			int hp = state.hp_change_val;
+			int sp = state.sp_change_val;
+			int source_hp = source->GetHp();
+		    int source_sp = source->GetSp();


Stray spaces detected.

Should be fixed

Ghabry · 2016-03-12T12:48:00Z

Jenkins: Test this please

Ghabry · 2016-03-12T13:38:51Z

One reason speaking against ::Apply is that under RPG2k3 all actors get damage at the begin of a battle action (doesn't matter if ally or enemy). With Apply only the current one doing the action gets damage.

I suggest moving this to a function in Game_Battler and when invoking that function it directly alters SP and MP of that Battler.

For RPG2k you can place the call in ... maybe BattleActionState_ConditionHeal (for the FirstAttack case)

So for RPG2k3 I suggest placing the call to this function (and displaying the damage number (for HP only!) as a floating number) in the BattleActionState_Start for the "IsFirstAttack" case.

The RPG2k3 battle system also shows that damaging due to states happens before the action is executed.

Tondorian · 2016-03-12T16:16:58Z

git commit --amend failed again 👎

Ghabry · 2016-03-12T16:18:22Z

git reset HEAD~1 :D should work

Because you use Windows you should consider tortoise git

RPG_RT2k3 should show damage numbers now

Ghabry · 2016-03-12T19:52:40Z

Jenkins: Test this please

Ghabry · 2016-03-12T21:14:39Z

src/scene_battle_rpg2k3.cpp

@@ -532,6 +532,15 @@ bool Scene_Battle_Rpg2k3::ProcessBattleAction(Game_BattleAlgorithm::AlgorithmBas

 		if (action->IsFirstAttack() && action->GetStartSe()) {
 			Game_System::SePlay(*action->GetStartSe());


The damageTaken codepath depends on action->GetStartSe()

Ghabry · 2016-03-12T21:32:14Z

Test case for RPG Maker 2003 (add a RPG_RT.exe):
BattleTest with Monster Party 2.

rpg2k3 testcase.zip

Command Line for Player: "BattleTest 2"

Ghabry · 2016-03-12T21:34:51Z

Test case for RPG Maker 2000
BattleTest with Monster Party 1.

rpg2k battletest.zip

Ghabry · 2016-03-12T21:51:22Z

src/scene_battle_rpg2k.cpp

 				return false;
 			}

 			// Reset variables
-			battle_action_state = BattleActionState_Start;
+			battle_action_state = BattleActionState_ConditionHeal;


You changed all the battle_action_state transitions. This is super super risky, pls don't do this unless you are 100% certain this is required. Because this must be tested with every available battle action available (Normal, different items, different skills, defend) to proof that it doesn't break anything or added a subtil bug.

One problem I already noticed is, that you introduced some delay before everybodys turn.

Yeah i needed to change them to get poisen effect working before the battlers attack.
think need to double check, if waiting is needed

I reverted all the state changes and I only took your code from line 370 to 388 and it still works fine for me.

so it shows conditioneffct, Clean enemyAttacks, Damage clean to you?
Takes me 2h yesterday to get it shown correct

In my tests your state changes broke the message box. At the beginning it shows an empty message box with a delay and between battle actions, too.

And after an enemy finished his battle animation the delay got removed.

RPG2k Message Delay fixed Cleanup ConditionApply() and fixed damage calculation

Ghabry · 2016-03-13T12:09:16Z

The delay is still wrong here.

Normal attacks without any states have a 30 frame delay before anything happens -> Must be 0.

And after battle animations the feedback is now instant instead of a delay. (After showing the attack animation, e.g. the sword slash, the old version had a 30 frame delay).

And sometimes enemy attacks give me now a negative amount and heal me :O

…more

Tondorian · 2016-03-13T14:49:36Z

I think it should work as expected now
if you can confirm, i'll clean up my branch

Ghabry · 2016-03-13T17:40:15Z

I will prepare an emscripten test case for both battle systems this evening.
Then it's easier to verify this (also for future pull requests).

But I think you are getting closer now :D

Ghabry · 2016-03-13T20:04:13Z

Jenkins: Test this please

Test cases:

https://easyrpg.org/play/pr815/?game=battle_test&battle-test=1&engine=rpg2k

https://easyrpg.org/play/pr815/?game=battle_test&battle-test=1&engine=rpg2k3

VS. Master:

Test cases:

https://easyrpg.org/play/master/?game=battle_test&battle-test=1&engine=rpg2k

https://easyrpg.org/play/master/?game=battle_test&battle-test=1&engine=rpg2k3

carstene1ns · 2016-03-13T20:10:40Z

Needs #include <cmath>, http://www.cplusplus.com/reference/cmath/ceil/

fix another timing error

Ghabry · 2016-03-14T11:10:55Z

Jenkins: Test this please

@fdelapena Maybe we should whitelist him ;)

Tondorian · 2016-03-14T15:54:49Z

And sometimes enemy attacks give me now a negative amount and heal me :O

See this on your Emscripten Testcase first time
I think i did not change anything on this part game_battlealgoithm.cpp

fdelapena · 2016-03-14T16:08:38Z

@fdelapena Maybe we should whitelist him ;)

Done!

I think i did not change anything on this part game_battlealgoithm.cpp

Yeah, Ghabry commented on IRC this also happens with the current upstream master version.

Tondorian · 2016-03-14T16:10:00Z

but i messed up dead enemys in rpg2k3 :D if they are dead they get 1hp ^^
will fix this part now

Ghabry · 2016-03-14T19:46:46Z

Okay, looks fine now. The negative HP after attacks and poison are strange but this already happens in Master... :(.
@Tondorian Is the PR ready?

Ghabry · 2016-03-14T22:28:12Z

The problem for that "-5" is the skill damage code in Game_BattleAlgorithm::Skill::Execute()

We need a "effect < 0 -> = 0" check before the line with rand().

Conditions in Battles

Conditions are applied to battle_actors now.

eaab481

GainMoneyMessage only shown if money >0

carstene1ns reviewed Mar 12, 2016
View reviewed changes

Condition Messages are only shown if there is a message

f75f9b4

Move ContitionAplliying into Game_Battler.cpp

97ee082

RPG_RT2k3 should show damage numbers now

Tondorian force-pushed the mergeRequest branch from a5da41d to 97ee082 Compare March 12, 2016 16:24

Ghabry reviewed Mar 12, 2016
View reviewed changes

RPG2k3 everybody get damages if anyone does his turn

4e501f6

RPG2k Message Delay fixed Cleanup ConditionApply() and fixed damage calculation

Tondorian added 2 commits March 13, 2016 15:24

[rpg20k3] damage applying does not depend on action->GetStartSe() any…

2e30257

…more

[rpg2k] fixed delaying issue

78ca22a

Ghabry added this to the 0.4.1 milestone Mar 13, 2016

added missing include

1933224

fix another timing error

Dead Battlers stay Dead now

970810d

should fix negativ Damage on attack and condition appyement

a9fdd28

Fixed more damage <0 bugs

95e8532

Tondorian force-pushed the mergeRequest branch from 6cc070f to 95e8532 Compare March 14, 2016 22:51

Ghabry added a commit that referenced this pull request Mar 14, 2016

Merge pull request #815 from Tondorian/mergeRequest

118e900

Conditions in Battles

Ghabry merged commit 118e900 into EasyRPG:master Mar 14, 2016

Tondorian deleted the mergeRequest branch March 14, 2016 23:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Conditions in Battles #815

Conditions in Battles #815

Tondorian commented Mar 12, 2016

carstene1ns Mar 12, 2016

Tondorian Mar 12, 2016

Ghabry commented Mar 12, 2016

Ghabry commented Mar 12, 2016

Tondorian commented Mar 12, 2016

Ghabry commented Mar 12, 2016

Ghabry commented Mar 12, 2016

Ghabry Mar 12, 2016

Ghabry commented Mar 12, 2016

Ghabry commented Mar 12, 2016

Ghabry Mar 12, 2016

Tondorian Mar 12, 2016

Ghabry Mar 12, 2016

Tondorian Mar 12, 2016

Ghabry Mar 12, 2016

Ghabry commented Mar 13, 2016

Tondorian commented Mar 13, 2016

Ghabry commented Mar 13, 2016

Ghabry commented Mar 13, 2016 •

edited by fdelapena

carstene1ns commented Mar 13, 2016

Ghabry commented Mar 14, 2016

Tondorian commented Mar 14, 2016

fdelapena commented Mar 14, 2016

Tondorian commented Mar 14, 2016

Ghabry commented Mar 14, 2016

Ghabry commented Mar 14, 2016

		@@ -532,6 +532,15 @@ bool Scene_Battle_Rpg2k3::ProcessBattleAction(Game_BattleAlgorithm::AlgorithmBas

		if (action->IsFirstAttack() && action->GetStartSe()) {
		Game_System::SePlay(*action->GetStartSe());

Conditions in Battles #815

Conditions in Battles #815

Conversation

Tondorian commented Mar 12, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Ghabry commented Mar 12, 2016

Ghabry commented Mar 12, 2016

Tondorian commented Mar 12, 2016

Ghabry commented Mar 12, 2016

Ghabry commented Mar 12, 2016

Choose a reason for hiding this comment

Ghabry commented Mar 12, 2016

Ghabry commented Mar 12, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Ghabry commented Mar 13, 2016

Tondorian commented Mar 13, 2016

Ghabry commented Mar 13, 2016

Ghabry commented Mar 13, 2016 • edited by fdelapena

carstene1ns commented Mar 13, 2016

Ghabry commented Mar 14, 2016

Tondorian commented Mar 14, 2016

fdelapena commented Mar 14, 2016

Tondorian commented Mar 14, 2016

Ghabry commented Mar 14, 2016

Ghabry commented Mar 14, 2016

Ghabry commented Mar 13, 2016 •

edited by fdelapena