From 4657060d2caef27f3a7d67fb8995c969dc8a7440 Mon Sep 17 00:00:00 2001 From: Evil Eye Date: Sun, 6 Feb 2022 11:08:47 +0100 Subject: [PATCH] Extend swish and strength changes to all random attacks --- apps/openmw/mwmechanics/character.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp index 3ea09569ba..90a175af51 100644 --- a/apps/openmw/mwmechanics/character.cpp +++ b/apps/openmw/mwmechanics/character.cpp @@ -1377,8 +1377,6 @@ bool CharacterController::updateState(CharacterState& idle) (!mAnimation->hasAnimation(mCurrentWeapon) || isRandomAttackAnimation(mCurrentWeapon))) { mCurrentWeapon = chooseRandomAttackAnimation(); - if (!mPtr.getClass().hasInventoryStore(mPtr)) - mAttackStrength = std::min(1.f, 0.1f + Misc::Rng::rollClosedProbability()); } if(mWeaponType == ESM::Weapon::Spell) @@ -1561,8 +1559,11 @@ bool CharacterController::updateState(CharacterState& idle) if(mAnimation->getCurrentTime(mCurrentWeapon) != -1.f) { 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); + } } } }