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

Fix Weapons invoking skills when only 1 of weapon and it's equipped #1797

Merged
merged 3 commits into from Jun 7, 2019

Conversation

@fmatthew5876
Copy link
Contributor

commented Jun 6, 2019

Also includes a cleanup of item skill logic in scene_battle

Fix: #1722

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:skill_item branch 2 times, most recently from a77687c to 4bd63ae Jun 6, 2019

@fmatthew5876 fmatthew5876 referenced this pull request Jun 6, 2019

@fdelapena fdelapena added the Battle label Jun 6, 2019

src/scene_battle.cpp Outdated Show resolved Hide resolved

@Ghabry Ghabry added this to the 0.6.1 milestone Jun 6, 2019

fmatthew5876 added some commits Jun 6, 2019

Cleanup Scene_Battle item skill logic
Remove skill_item member and use the item/skill
windows directly.
Battle: SkillItem use - check inventory + equipped
If an actor uses an equipment which invokes a skill and the only
one we have is equipped to the actor, this check would fail and
cause the skill to do nothing.

Fix: #1722
Add Game_Actor::GetEquippedItemCount()
Split out behavior of GetItemCount() into 2 named functions

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:skill_item branch from 4bd63ae to 4ac5c90 Jun 6, 2019

@Ghabry

Ghabry approved these changes Jun 7, 2019

@Ghabry Ghabry merged commit c57aaac into EasyRPG:master Jun 7, 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.