Fix some issues in Wolfenhain #1087

Merged
merged 3 commits into from Jan 21, 2017

Conversation

Projects
None yet
3 participants
@Ghabry
Member

Ghabry commented Jan 19, 2017

The test for Battle Commands was completely wrong (only worked for 1st actor)

The subskill fix is the same one used in other places: The check must be >=.
The diff is a mess because of the identation change, the only relevant change is from

case RPG::Skill::Type_normal:
case RPG::Skill::Type_subskill:

to

if (skill.type == RPG::Skill::Type_normal || skill.type >= RPG::Skill::Type_subskill) {

The item_usage change will cause minor issues when loading EasyRPG savegames: Items with more than one use will have an incorrect usage count until the usage limit is reached once.
Unlimited and Single use items are not affected. Unlimited doesn't care about uses at all and Single will wrap on first use (because 2 >= 1)

Ghabry added some commits Jan 19, 2017

Fix incorrect check for "BattleCommand used".
Fixes the skill "Eule" in Wolfenhain (Fix #1080)
Item usage was incorrectly handled compared to RPG_RT which resulted …
…in unlimited item usage after loading a RPG_RT savegame.

item_usage must be initialized to 0 and it increases until it reaches the uses.
@carstene1ns

This comment has been minimized.

Show comment
Hide comment
@carstene1ns

carstene1ns Jan 19, 2017

Member

You can use this GitHub secret to ignore whitespace changes: https://github.com/EasyRPG/Player/pull/1087/files?w=1 :octocat:

Member

carstene1ns commented Jan 19, 2017

You can use this GitHub secret to ignore whitespace changes: https://github.com/EasyRPG/Player/pull/1087/files?w=1 :octocat:

@carstene1ns carstene1ns merged commit e9526c5 into EasyRPG:master Jan 21, 2017

5 checks passed

Android (armeabi-v7a) Build finished.
Details
OSX Build finished.
Details
Windows (x64) Build finished.
Details
Windows (x86) Build finished.
Details
web Build finished.
Details

@Ghabry Ghabry added this to the 0.5.1 milestone Feb 22, 2017

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

Merge pull request #1087 from Ghabry/wolfenhein
Fix some issues in Wolfenhain
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment