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

Enchanting code cleanup

Browse source
This commit is contained in:
scrawl 2015-01-12 23:28:52 +01:00
parent bb718f216d
commit 4ed3e7bbb7
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/openmw/mwmechanics/enchanting.cpp
View file

@ -171,7 +171,6 @@ namespace MWMechanics
for (std::vector<ESM::ENAMstruct>::const_iterator it = mEffects.begin(); it != mEffects.end(); ++it) for (std::vector<ESM::ENAMstruct>::const_iterator it = mEffects.begin(); it != mEffects.end(); ++it)
{ {
float baseCost = (store.get<ESM::MagicEffect>().find(it->mEffectID))->mData.mBaseCost; float baseCost = (store.get<ESM::MagicEffect>().find(it->mEffectID))->mData.mBaseCost;
// To reflect vanilla behavior
int magMin = (it->mMagnMin == 0) ? 1 : it->mMagnMin; int magMin = (it->mMagnMin == 0) ? 1 : it->mMagnMin;
int magMax = (it->mMagnMax == 0) ? 1 : it->mMagnMax; int magMax = (it->mMagnMax == 0) ? 1 : it->mMagnMax;
int area = (it->mArea == 0) ? 1 : it->mArea; int area = (it->mArea == 0) ? 1 : it->mArea;
@ -184,17 +183,18 @@ namespace MWMechanics
else else
{ {
magnitudeCost *= it->mDuration; magnitudeCost *= it->mDuration;
if(it->mRange == ESM::RT_Target)
magnitudeCost *= 1.5;
} }
float areaCost = area * 0.05 * baseCost; float areaCost = area * 0.05 * baseCost;
if (it->mRange == ESM::RT_Target)
areaCost *= 1.5;
const float fEffectCostMult = store.get<ESM::GameSetting>().find("fEffectCostMult")->getFloat(); const float fEffectCostMult = store.get<ESM::GameSetting>().find("fEffectCostMult")->getFloat();
enchantmentCost += (magnitudeCost + areaCost) * fEffectCostMult * effectsLeftCnt; float cost = (magnitudeCost + areaCost) * fEffectCostMult;
if (it->mRange == ESM::RT_Target)
cost *= 1.5;
enchantmentCost += cost * effectsLeftCnt;
enchantmentCost = std::max(1.f, enchantmentCost);
--effectsLeftCnt; --effectsLeftCnt;
} }