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

Battle2k: Always allow escape when first strike + unusable skills fix #1830

Merged
merged 3 commits into from Jul 15, 2019

Conversation

@fmatthew5876
Copy link
Contributor

commented Jul 7, 2019

A few more battle 2k fixes.

FIXME comments left for relevant 2k3 pieces..

Battle2k: Always allow escape when first strike
* Removed unused local variable
* Cleans up some use of game_temp vars

@fmatthew5876 fmatthew5876 changed the title Battle2k: Always allow escape when first strike Battle2k: Always allow escape when first strike + Teleport / Escape skill fix Jul 7, 2019

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:battle_escape branch 3 times, most recently from b43361a to 9762e20 Jul 7, 2019

@fmatthew5876 fmatthew5876 changed the title Battle2k: Always allow escape when first strike + Teleport / Escape skill fix Battle2k: Always allow escape when first strike + unusable skills fix Jul 7, 2019

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:battle_escape branch 2 times, most recently from 3d941c3 to d473365 Jul 7, 2019

Battle2k / 2k3: Enemy action skill fixes
Augment Game_Battler::IsSkillUsable() to support switch, teleport,
and escape skills.

This is called by Game_Enemy::IsValidAction() and fixes the following
issues:

* Teleport / Escape are never valid enemy actions
* Switch skills not usable in battle are never valid enemy actions

This commit makes sure enemies with these actions never actually
select them and process their states correctly in 2k battles.

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:battle_escape branch from d473365 to 705a754 Jul 7, 2019

Battle: Redraw status window after exiting debug scene
This fixes a bug where FullHeal used from debug scene
wasn't immediately reflected in the status window.

@Ghabry Ghabry added this to the 0.6.1 milestone Jul 8, 2019

@Ghabry Ghabry added the Battle label Jul 8, 2019

@Ghabry

Ghabry approved these changes Jul 15, 2019

Copy link
Member

left a comment

Want to do some testing but code LGTM 👍

@Ghabry Ghabry requested a review from fdelapena Jul 15, 2019

@Ghabry Ghabry merged commit d3594f6 into EasyRPG:master Jul 15, 2019

7 checks passed

Android (armeabi-v7a) Build finished.
Details
GNU/Linux Build finished.
Details
OSX Build finished.
Details
Wii (SDL1) Build finished.
Details
Windows (x64) Build finished.
Details
Windows (x86) Build finished.
Details
web Build finished.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.