mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 22:23:51 +00:00
Code Issues Releases Wiki Activity

Enable casting of NoMagnitude effects in AI (e.g. summoned creatures)

Browse source
This commit is contained in:
scrawl 2014-08-28 21:37:18 +02:00
parent feeb740497
commit 0be1ac1343
1 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -178,7 +178,7 @@ namespace MWMechanics
{ {
// NOTE: target may be empty // NOTE: target may be empty
float baseRating = 1; float rating = 1;
switch (effect.mEffectID) switch (effect.mEffectID)
{ {
case ESM::MagicEffect::Soultrap: case ESM::MagicEffect::Soultrap:
@ -231,24 +231,11 @@ namespace MWMechanics
} }
break; break;
// Give a small boost to all direct damage effects. This is combat, after all!
case ESM::MagicEffect::FireDamage:
case ESM::MagicEffect::ShockDamage:
case ESM::MagicEffect::FrostDamage:
case ESM::MagicEffect::Poison:
case ESM::MagicEffect::AbsorbHealth:
case ESM::MagicEffect::DamageHealth:
baseRating *= 4;
break;
case ESM::MagicEffect::Paralyze: // *Evil laughter*
baseRating *= 5;
break;
// TODO: rate these effects very high if we are currently suffering from negative effects that could be cured // TODO: rate these effects very high if we are currently suffering from negative effects that could be cured
case ESM::MagicEffect::Dispel: case ESM::MagicEffect::Dispel:
case ESM::MagicEffect::CureParalyzation: case ESM::MagicEffect::CureParalyzation:
case ESM::MagicEffect::CurePoison: case ESM::MagicEffect::CurePoison:
return 0.f;
break; break;
default: default:
@ -261,12 +248,10 @@ namespace MWMechanics
const ESM::MagicEffect* magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effect.mEffectID); const ESM::MagicEffect* magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effect.mEffectID);
baseRating *= magicEffect->mData.mBaseCost; rating *= magicEffect->mData.mBaseCost;
if (magicEffect->mData.mFlags & ESM::MagicEffect::NoMagnitude) if (!(magicEffect->mData.mFlags & ESM::MagicEffect::NoMagnitude))
return 0.f; // No clue how useful this would be; will need special cases for each effect rating *= (effect.mMagnMin + effect.mMagnMax)/2.f;
float rating = baseRating * (effect.mMagnMin + effect.mMagnMax)/2.f;
if (!(magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration)) if (!(magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration))
rating *= effect.mDuration; rating *= effect.mDuration;