mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-23 06:41:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'combat_aiming' into 'master'

Browse Source 
Finish turning before attacking

Closes #3488

See merge request OpenMW/openmw!1358
This commit is contained in:
Alexei Kotov 2021-11-07 11:25:05 +00:00
commit 0c11175da1
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -3,6 +3,7 @@
Bug #1751: Birthsign abilities increase modified attribute values instead of base ones Bug #1751: Birthsign abilities increase modified attribute values instead of base ones
Bug #3246: ESSImporter: Most NPCs are dead on save load Bug #3246: ESSImporter: Most NPCs are dead on save load
Bug #3488: AI combat aiming is too slow
Bug #3514: Editing a reference's position after loading an esp file makes the reference disappear Bug #3514: Editing a reference's position after loading an esp file makes the reference disappear
Bug #3737: Scripts from The Underground 2 .esp do not play (all patched versions) Bug #3737: Scripts from The Underground 2 .esp do not play (all patched versions)
Bug #3792: 1 frame late magicka recalc breaks early scripted magicka reactions to Intelligence change Bug #3792: 1 frame late magicka recalc breaks early scripted magicka reactions to Intelligence change

5
apps/openmw/mwmechanics/aicombat.cpp
View File

@ -137,7 +137,10 @@ namespace MWMechanics
} }
storage.updateCombatMove(duration); storage.updateCombatMove(duration);
storage.mRotateMove = false;
if (storage.mReadyToAttack) updateActorsMovement(actor, duration, storage); if (storage.mReadyToAttack) updateActorsMovement(actor, duration, storage);
if (storage.mRotateMove)
return false;
storage.updateAttack(characterController); storage.updateAttack(characterController);
} }
else else
@ -442,7 +445,7 @@ namespace MWMechanics
storage.mCurrentAction->getCombatRange(isRangedCombat); storage.mCurrentAction->getCombatRange(isRangedCombat);
float eps = isRangedCombat ? osg::DegreesToRadians(0.5) : osg::DegreesToRadians(3.f); float eps = isRangedCombat ? osg::DegreesToRadians(0.5) : osg::DegreesToRadians(3.f);
float targetAngleRadians = storage.mMovement.mRotation[axis]; float targetAngleRadians = storage.mMovement.mRotation[axis];
smoothTurn(actor, targetAngleRadians, axis, eps); storage.mRotateMove = !smoothTurn(actor, targetAngleRadians, axis, eps);
} }
MWWorld::Ptr AiCombat::getTarget() const MWWorld::Ptr AiCombat::getTarget() const

2
apps/openmw/mwmechanics/aicombat.hpp
View File

@ -33,6 +33,7 @@ namespace MWMechanics
bool mAttack; bool mAttack;
float mAttackRange; float mAttackRange;
bool mCombatMove; bool mCombatMove;
bool mRotateMove;
osg::Vec3f mLastTargetPos; osg::Vec3f mLastTargetPos;
const MWWorld::CellStore* mCell; const MWWorld::CellStore* mCell;
std::shared_ptr<Action> mCurrentAction; std::shared_ptr<Action> mCurrentAction;
@ -65,6 +66,7 @@ namespace MWMechanics
mAttack(false), mAttack(false),
mAttackRange(0.0f), mAttackRange(0.0f),
mCombatMove(false), mCombatMove(false),
mRotateMove(false),
mLastTargetPos(0,0,0), mLastTargetPos(0,0,0),
mCell(nullptr), mCell(nullptr),
mCurrentAction(), mCurrentAction(),