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

Apply a comment that got lost in the endless depths of my git stash

Browse source
This commit is contained in:
scrawl 2015-06-02 17:13:30 +02:00
parent 8c50f8ed26
commit 58ebf57154
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -239,7 +239,6 @@ namespace MWMechanics
if(smoothTurn(actor, Ogre::Degree(movement.mRotation[0]), 0)) movement.mRotation[0] = 0; if(smoothTurn(actor, Ogre::Degree(movement.mRotation[0]), 0)) movement.mRotation[0] = 0;
} }
//TODO: Some skills affect period of strikes.For berserk-like style period ~ 0.25f
float attacksPeriod = 1.0f; float attacksPeriod = 1.0f;
ESM::Weapon::AttackType attackType; ESM::Weapon::AttackType attackType;
@ -260,7 +259,7 @@ namespace MWMechanics
if (!minMaxAttackDurationInitialised) if (!minMaxAttackDurationInitialised)
{ {
// TODO: this must be updated when a different weapon is equipped // TODO: this must be updated when a different weapon is equipped
// FIXME: attack durations would be easier to control if we interact more closely with the CharacterController // TODO: it would be much easier to ask the CharacterController about the current % completion of the weapon wind-up animation
getMinMaxAttackDuration(actor, minMaxAttackDuration); getMinMaxAttackDuration(actor, minMaxAttackDuration);
minMaxAttackDurationInitialised = true; minMaxAttackDurationInitialised = true;
} }
@ -319,6 +318,10 @@ namespace MWMechanics
float rangeAttack = 0; float rangeAttack = 0;
float rangeFollow = 0; float rangeFollow = 0;
boost::shared_ptr<Action>& currentAction = storage.mCurrentAction; boost::shared_ptr<Action>& currentAction = storage.mCurrentAction;
// TODO: upperBodyReady() works fine for checking if we can start an attack,
// but doesn't work properly for checking if the attack is finished (as things like hit recovery or knockdown also play on the upper body)
// Only a minor problem, but can mess with the actionCooldown timer.
// To fix this the AI needs to be brought closer to the CharacterController, so we can simply check if a weapon animation is playing.
if (anim->upperBodyReady()) if (anim->upperBodyReady())
{ {
currentAction = prepareNextAction(actor, target); currentAction = prepareNextAction(actor, target);
@ -654,9 +657,6 @@ namespace MWMechanics
} }
} }
// NOTE: This section gets updated every tReaction, which is currently hard
// coded at 250ms or 1/4 second
//
// TODO: Add a parameter to vary DURATION_SAME_SPOT? // TODO: Add a parameter to vary DURATION_SAME_SPOT?
if((distToTarget > rangeAttack || followTarget) && if((distToTarget > rangeAttack || followTarget) &&
mObstacleCheck.check(actor, tReaction)) // check if evasive action needed mObstacleCheck.check(actor, tReaction)) // check if evasive action needed