mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-25 06:56:38 +00:00
Code Issues Releases Wiki Activity

Extend swish and strength changes to all random attacks

Browse source
This commit is contained in:
Evil Eye 2022-02-06 11:08:47 +01:00
parent 020e0b2ea5
commit 4657060d2c
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1377,8 +1377,6 @@ bool CharacterController::updateState(CharacterState& idle)
(!mAnimation->hasAnimation(mCurrentWeapon) || isRandomAttackAnimation(mCurrentWeapon))) (!mAnimation->hasAnimation(mCurrentWeapon) || isRandomAttackAnimation(mCurrentWeapon)))
{ {
mCurrentWeapon = chooseRandomAttackAnimation(); mCurrentWeapon = chooseRandomAttackAnimation();
if (!mPtr.getClass().hasInventoryStore(mPtr))
mAttackStrength = std::min(1.f, 0.1f + Misc::Rng::rollClosedProbability());
} }
if(mWeaponType == ESM::Weapon::Spell) if(mWeaponType == ESM::Weapon::Spell)
@ -1561,8 +1559,11 @@ bool CharacterController::updateState(CharacterState& idle)
if(mAnimation->getCurrentTime(mCurrentWeapon) != -1.f) if(mAnimation->getCurrentTime(mCurrentWeapon) != -1.f)
{ {
mUpperBodyState = UpperCharState_StartToMinAttack; mUpperBodyState = UpperCharState_StartToMinAttack;
if (mWeaponType == ESM::Weapon::HandToHand && !mPtr.getClass().isBipedal(mPtr)) if (isRandomAttackAnimation(mCurrentWeapon))
{
mAttackStrength = std::min(1.f, 0.1f + Misc::Rng::rollClosedProbability());
playSwishSound(0.0f); playSwishSound(0.0f);
}
} }
} }
} }