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

Bug squashing (#987, #1111, #1112, #1145, #1176, #1180, #1186, #1191) #1204

Merged
merged 18 commits into from Jun 23, 2017

Conversation

Projects
None yet
3 participants
@Ghabry
Member

Ghabry commented Jun 17, 2017

Additionally fixes some compiler warnings (ReplacePlaceholders had a bug)

And some ASAN error in battle of Wolfenhain.

Monster in 2k that can't act don't act anymore. ^^

Fixed a regression introduced in #1062

@Ghabry Ghabry added this to the 0.5.2 milestone Jun 17, 2017

@Ghabry Ghabry changed the title from Bug squashing (#987, #1111, #1112,, #1145, #1176, #1180, #1186, #1191) to Bug squashing (#987, #1111, #1112, #1145, #1176, #1180, #1186, #1191) Jun 17, 2017

Show outdated Hide outdated src/game_enemyparty.cpp Outdated
Show outdated Hide outdated src/utils.h Outdated

Ghabry added some commits May 28, 2017

Return correct terrain tag on looping maps.
Fixes the collision system in level 2 of "Schmetterlinkskuh-Flugsimulator-Simulation 2k".

Fix #1176
Remove pattern check in Event-Setup.
The purpose of this check is unknown and breaks a bird shooting minigame in Deep8.

Fix #1112
Only cancel the battle interpreter when a victory condition in RPG2k3…
… happens.

RPG2k and the RPG2k3 lose check (party defeated) can't interrupt the interpreter.

This fixes the battle against the nurse in 7th Jojo.

Fix #1180
Don't render the event at all (instead of tile 0) when no page fulfil…
…ls the start condition.

Fixes a regression introduced in #1179
@carstene1ns

Finally had time to test a few games, LGTM.

@carstene1ns carstene1ns merged commit f7749cc into EasyRPG:master Jun 23, 2017

6 checks passed

Android (armeabi-v7a) Build finished.
Details
GNU/Linux Build finished.
Details
OSX Build finished.
Details
Windows (x64) Build finished.
Details
Windows (x86) Build finished.
Details
web Build finished.
Details
Main_Data::game_enemyparty->GetBattlers(enemies);
for (Game_Battler* battler : enemies) {
if (!battler->CanAct()) {

This comment has been minimized.

@Ghabry

Ghabry Jun 26, 2017

Member

I forgot something here: When the enemy can't Act the action must be a "NoMove" because otherwise auto-healing of states doesn't work.

Correct code should be:

battler->SetBattleAlgorithm(std::make_shared<Game_BattleAlgorithm::NoMove>(battler));
ActionSelectedCallback(battler);
continue;

Maybe @carstene1ns can amend this to his "little cosmetics" PR because thats the only one still open :D

@Ghabry

Ghabry Jun 26, 2017

Member

I forgot something here: When the enemy can't Act the action must be a "NoMove" because otherwise auto-healing of states doesn't work.

Correct code should be:

battler->SetBattleAlgorithm(std::make_shared<Game_BattleAlgorithm::NoMove>(battler));
ActionSelectedCallback(battler);
continue;

Maybe @carstene1ns can amend this to his "little cosmetics" PR because thats the only one still open :D

SetX(battler->GetDisplayX());
SetY(battler->GetDisplayY());
SetZ(battler->GetBattleY());

This comment has been minimized.

@Ghabry

Ghabry Jun 26, 2017

Member

I think I found a use for these lines: The purpose was probably (y u no comment) to support RPG2k3 "Animation 2" stuff that contains e.g. "Move to enemy". But we don't implement this by now so no damage done.

@Ghabry

Ghabry Jun 26, 2017

Member

I think I found a use for these lines: The purpose was probably (y u no comment) to support RPG2k3 "Animation 2" stuff that contains e.g. "Move to enemy". But we don't implement this by now so no damage done.

This comment has been minimized.

@carstene1ns

carstene1ns Oct 10, 2017

Member

I am currently working on something in sprite_battler, history says these were added for screen shaking (891631f).

@carstene1ns

carstene1ns Oct 10, 2017

Member

I am currently working on something in sprite_battler, history says these were added for screen shaking (891631f).

This comment has been minimized.

@scurest

scurest Oct 10, 2017

Contributor

They've been there since the file was first added in c6f41c7. 891631f just changed GetBattleX to GetDisplayX to account for shaking.

@scurest

scurest Oct 10, 2017

Contributor

They've been there since the file was first added in c6f41c7. 891631f just changed GetBattleX to GetDisplayX to account for shaking.

This comment has been minimized.

@carstene1ns

carstene1ns Oct 10, 2017

Member

We were talking about the added ones in Update() ;-)
(61918b8 adds the needed line for shaking again).

@carstene1ns

carstene1ns Oct 10, 2017

Member

We were talking about the added ones in Update() ;-)
(61918b8 adds the needed line for shaking again).

Ghabry pushed a commit to libretro/easyrpg-libretro that referenced this pull request May 22, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment