teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Merge pull request #1189 from Allofich/attack

Browse source 
Match best attack selection to vanilla behavior
This commit is contained in:
scrawl 2017-01-11 18:36:10 +01:00 committed by GitHub
commit 73aa07b81b
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/openmw/mwmechanics/character.cpp
View file

@ -70,12 +70,14 @@ std::string getBestAttack (const ESM::Weapon* weapon)
int slash = (weapon->mData.mSlash[0] + weapon->mData.mSlash[1])/2;
int chop = (weapon->mData.mChop[0] + weapon->mData.mChop[1])/2;
int thrust = (weapon->mData.mThrust[0] + weapon->mData.mThrust[1])/2;
if (slash >= chop && slash >= thrust)
if (slash == chop && slash == thrust)
return "slash";
else if (chop >= slash && chop >= thrust)
return "chop";
else
else if (thrust >= chop && thrust >= slash)
return "thrust";
else if (slash >= chop && slash >= thrust)
return "slash";
else
return "chop";
}
// Converts a movement Run state to its equivalent Walk state.