mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-27 03:35:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1990 from Capostrophic/absorption

Browse Source 
Avoid making expensive visitEffectSources calls if no spell absorption effect is active
This commit is contained in:
Bret Curtis 2018-10-27 17:45:48 +02:00 committed by GitHub
commit 9f4892ce92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -472,28 +472,31 @@ namespace MWMechanics
MWBase::Environment::get().getWindowManager()->setEnemy(target); MWBase::Environment::get().getWindowManager()->setEnemy(target);
// Try absorbing if it's a spell // Try absorbing if it's a spell
// NOTE: Vanilla does this once per spell absorption effect source instead of adding the % from all sources together, so use the same approach here // Unlike Reflect, this is done once per spell absorption effect source
bool absorbed = false; bool absorbed = false;
if (spell && caster != target && target.getClass().isActor()) if (spell && caster != target && target.getClass().isActor())
{ {
GetAbsorptionProbability check(target); CreatureStats& stats = target.getClass().getCreatureStats(target);
MWMechanics::CreatureStats& stats = target.getClass().getCreatureStats(target); if (stats.getMagicEffects().get(ESM::MagicEffect::SpellAbsorption).getMagnitude() > 0.f)
stats.getActiveSpells().visitEffectSources(check);
stats.getSpells().visitEffectSources(check);
if (target.getClass().hasInventoryStore(target))
target.getClass().getInventoryStore(target).visitEffectSources(check);
int absorb = check.mProbability * 100;
absorbed = (Misc::Rng::roll0to99() < absorb);
if (absorbed)
{ {
const ESM::Static* absorbStatic = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().find ("VFX_Absorb"); GetAbsorptionProbability check(target);
MWBase::Environment::get().getWorld()->getAnimation(target)->addEffect( stats.getActiveSpells().visitEffectSources(check);
"meshes\\" + absorbStatic->mModel, ESM::MagicEffect::SpellAbsorption, false, ""); stats.getSpells().visitEffectSources(check);
// Magicka is increased by cost of spell if (target.getClass().hasInventoryStore(target))
DynamicStat<float> magicka = target.getClass().getCreatureStats(target).getMagicka(); target.getClass().getInventoryStore(target).visitEffectSources(check);
magicka.setCurrent(magicka.getCurrent() + spell->mData.mCost);
target.getClass().getCreatureStats(target).setMagicka(magicka); int absorb = check.mProbability * 100;
absorbed = (Misc::Rng::roll0to99() < absorb);
if (absorbed)
{
const ESM::Static* absorbStatic = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().find ("VFX_Absorb");
MWBase::Environment::get().getWorld()->getAnimation(target)->addEffect(
"meshes\\" + absorbStatic->mModel, ESM::MagicEffect::SpellAbsorption, false, "");
// Magicka is increased by cost of spell
DynamicStat<float> magicka = stats.getMagicka();
magicka.setCurrent(magicka.getCurrent() + spell->mData.mCost);
stats.setMagicka(magicka);
}
} }
} }