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

Make spell priority calculation close to vanilla (bug #3937).

Browse source
This commit is contained in:
Andrei Kortunov 2017-06-28 11:01:08 +04:00
parent 8d17565efd
commit 143fdae6fe
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/openmw/mwmechanics/aicombataction.cpp
View file

@ -558,8 +558,6 @@ namespace MWMechanics
return 0.f;
}
rating *= magicEffect->mData.mBaseCost;
if (magicEffect->mData.mFlags & ESM::MagicEffect::Harmful)
{
rating *= -1.f;
@ -594,13 +592,17 @@ namespace MWMechanics
return 0.f;
}
}
else
{
rating *= (effect.mMagnMin + effect.mMagnMax)/2.f;
}
if (!(magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration))
rating *= effect.mDuration;
rating *= ((effect.mMagnMin + effect.mMagnMax) * (effect.mDuration > 0 ? effect.mDuration : 1) + effect.mArea);
rating *= magicEffect->mData.mBaseCost;
if (effect.mRange == ESM::RT_Target)
rating *= 1.5f;
static const float fEffectCostMult = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(
"fEffectCostMult")->getFloat();
rating *= fEffectCostMult * 0.05;
// Currently treating all "on target" or "on touch" effects to target the enemy actor.
// Combat AI is egoistic, so doesn't consider applying positive effects to friendly actors.