mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-18 22:20:53 +00:00
Code Issues Projects Releases Wiki Activity

Fixes bug #2031

Browse Source
This commit is contained in:
Internecine 2014-11-05 15:22:44 +13:00
parent 9c5f156793
commit 6741fbe7a9
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
apps/openmw/mwmechanics/spellcasting.cpp
View File

@ -434,7 +434,8 @@ namespace MWMechanics
float magnitude = effectIt->mMagnMin + (effectIt->mMagnMax - effectIt->mMagnMin) * random;
magnitude *= magnitudeMult;
bool hasDuration = !(magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration);
bool hasDuration = !(magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration) && effectIt->mDuration > 0;
std::cout << (hasDuration == true ? "true" : "false") << std::endl;
if (target.getClass().isActor() && hasDuration)
{
ActiveSpells::ActiveEffect effect;
@ -578,6 +579,33 @@ namespace MWMechanics
value.restore(magnitude);
target.getClass().getCreatureStats(target).setAttribute(attribute, value);
}
else if (effectId == ESM::MagicEffect::DamageHealth || effectId == ESM::MagicEffect::RestoreHealth)
{
MWMechanics::DynamicStat<float> health = target.getClass().getCreatureStats(target).getHealth();
if (effectId == ESM::MagicEffect::DamageHealth)
health.setCurrent(health.getCurrent() - magnitude);
else
health.setCurrent(health.getCurrent() + magnitude);
target.getClass().getCreatureStats(target).setHealth(health);
}
else if (effectId == ESM::MagicEffect::DamageFatigue || effectId == ESM::MagicEffect::RestoreFatigue)
{
MWMechanics::DynamicStat<float> fatigue = target.getClass().getCreatureStats(target).getFatigue();
if (effectId == ESM::MagicEffect::DamageFatigue)
fatigue.setCurrent(fatigue.getCurrent() - magnitude);
else
fatigue.setCurrent(fatigue.getCurrent() + magnitude);
target.getClass().getCreatureStats(target).setHealth(fatigue);
}
else if (effectId == ESM::MagicEffect::DamageMagicka || effectId == ESM::MagicEffect::RestoreMagicka)
{
MWMechanics::DynamicStat<float> magicka = target.getClass().getCreatureStats(target).getMagicka();
if (effectId == ESM::MagicEffect::DamageMagicka)
magicka.setCurrent(magicka.getCurrent() - magnitude);
else
magicka.setCurrent(magicka.getCurrent() + magnitude);
target.getClass().getCreatureStats(target).setHealth(magicka);
}
else if (effectId == ESM::MagicEffect::DamageSkill || effectId == ESM::MagicEffect::RestoreSkill)
{
if (target.getTypeName() != typeid(ESM::NPC).name())