mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-20 12:11:32 +00:00
Code Issues Releases Wiki Activity

Play pick/probe animation in attack start animation logic

Browse source
This commit is contained in:
Alexei Kotov 2022-08-08 20:41:25 +03:00
parent a4b5bfc051
commit 8f280c521c
1 changed files with 30 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1501,49 +1501,40 @@ bool CharacterController::updateWeaponState()
resetIdle = false; resetIdle = false;
} }
} }
else if(mWeaponType == ESM::Weapon::PickProbe)
{
world->breakInvisibility(mPtr);
// TODO: this will only work for the player, and needs to be fixed if NPCs should ever use lockpicks/probes.
MWWorld::Ptr target = world->getFacedObject();
std::string resultMessage, resultSound;
if(!target.isEmpty())
{
if (mWeapon.getType() == ESM::Lockpick::sRecordId)
Security(mPtr).pickLock(target, mWeapon, resultMessage, resultSound);
else if (mWeapon.getType() == ESM::Probe::sRecordId)
Security(mPtr).probeTrap(target, mWeapon, resultMessage, resultSound);
}
mAnimation->play(mCurrentWeapon, priorityWeapon,
MWRender::Animation::BlendMask_All, true,
1.0f, "start", "stop", 0.0, 0);
mUpperBodyState = UpperBodyState::AttackEnd;
if(!resultMessage.empty())
MWBase::Environment::get().getWindowManager()->messageBox(resultMessage);
if(!resultSound.empty())
sndMgr->playSound3D(target, resultSound, 1.0f, 1.0f);
}
else else
{ {
std::string startKey; std::string startKey = "start";
std::string stopKey; std::string stopKey = "stop";
bool autodisable = false;
if(weapclass == ESM::WeaponType::Ranged || weapclass == ESM::WeaponType::Thrown) if (mWeaponType == ESM::Weapon::PickProbe)
{ {
mAttackType = "shoot"; autodisable = true;
startKey = mAttackType+" start"; mUpperBodyState = UpperBodyState::AttackEnd;
stopKey = mAttackType+" min attack";
world->breakInvisibility(mPtr);
// TODO: this will only work for the player, and needs to be fixed if NPCs should ever use lockpicks/probes.
MWWorld::Ptr target = world->getFacedObject();
std::string resultMessage, resultSound;
if(!target.isEmpty())
{
if (mWeapon.getType() == ESM::Lockpick::sRecordId)
Security(mPtr).pickLock(target, mWeapon, resultMessage, resultSound);
else if (mWeapon.getType() == ESM::Probe::sRecordId)
Security(mPtr).probeTrap(target, mWeapon, resultMessage, resultSound);
}
if (!resultMessage.empty())
MWBase::Environment::get().getWindowManager()->messageBox(resultMessage);
if (!resultSound.empty())
sndMgr->playSound3D(target, resultSound, 1.0f, 1.0f);
} }
else if (isRandomAttackAnimation(mCurrentWeapon)) else if (!isRandomAttackAnimation(mCurrentWeapon))
{ {
startKey = "start"; if (weapclass == ESM::WeaponType::Ranged || weapclass == ESM::WeaponType::Thrown)
stopKey = "stop"; mAttackType = "shoot";
} else if (mPtr == getPlayer())
else
{
if(mPtr == getPlayer())
{ {
if (Settings::Manager::getBool("best attack", "Game")) if (Settings::Manager::getBool("best attack", "Game"))
{ {
@ -1568,10 +1559,10 @@ bool CharacterController::updateWeaponState()
} }
mAnimation->play(mCurrentWeapon, priorityWeapon, mAnimation->play(mCurrentWeapon, priorityWeapon,
MWRender::Animation::BlendMask_All, false, MWRender::Animation::BlendMask_All, autodisable,
weapSpeed, startKey, stopKey, weapSpeed, startKey, stopKey,
0.0f, 0); 0.0f, 0);
if(mAnimation->getCurrentTime(mCurrentWeapon) != -1.f) if (mWeaponType != ESM::Weapon::PickProbe && mAnimation->getCurrentTime(mCurrentWeapon) != -1.f)
{ {
mUpperBodyState = UpperBodyState::AttackPreWindUp; mUpperBodyState = UpperBodyState::AttackPreWindUp;
if (isRandomAttackAnimation(mCurrentWeapon)) if (isRandomAttackAnimation(mCurrentWeapon))