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

Revert condition changes

Browse Source
This commit is contained in:
Grigorii Latyshev 2017-11-28 17:04:37 +01:00
parent dab72b45db
commit 9fe5a4d236
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,10 +126,7 @@ namespace MWMechanics
float castChance = calcSpellBaseSuccessChance(spell, actor, effectiveSchool) + castBonus;
castChance *= stats.getFatigueTerm();
if (godmode)
return 100;
if (stats.getMagicEffects().get(ESM::MagicEffect::Silence).getMagnitude())
if (stats.getMagicEffects().get(ESM::MagicEffect::Silence).getMagnitude()&& !godmode)
return 0;
if (spell->mData.mType == ESM::Spell::ST_Power)
@ -138,12 +135,17 @@ namespace MWMechanics
if (spell->mData.mType != ESM::Spell::ST_Spell)
return 100;
if (stats.getMagicka().getCurrent() < spell->mData.mCost)
if (stats.getMagicka().getCurrent() < spell->mData.mCost && !godmode)
return 0;
if (spell->mData.mFlags & ESM::Spell::F_Always)
return 100;
if (godmode)
{
return 100;
}
if (!cap)
return std::max(0.f, castChance);
else