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

Merge branch 'gmst_typo' into 'master'

Browse source 
Gmst typo in MWMechanics::NpcStats::increaseSkill

See merge request OpenMW/openmw!59
This commit is contained in:
Bret Curtis 2019-01-24 13:33:18 +00:00
commit c5176321ee
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
apps/openmw/mwmechanics/npcstats.cpp
View file

@ -152,20 +152,18 @@ float MWMechanics::NpcStats::getSkillProgressRequirement (int skillIndex, const
float typeFactor = gmst.find ("fMiscSkillBonus")->mValue.getFloat(); float typeFactor = gmst.find ("fMiscSkillBonus")->mValue.getFloat();
for (int i=0; i<5; ++i) for (int i=0; i<5; ++i)
{
if (class_.mData.mSkills[i][0]==skillIndex) if (class_.mData.mSkills[i][0]==skillIndex)
{ {
typeFactor = gmst.find ("fMinorSkillBonus")->mValue.getFloat(); typeFactor = gmst.find ("fMinorSkillBonus")->mValue.getFloat();
break; break;
} }
else if (class_.mData.mSkills[i][1]==skillIndex)
for (int i=0; i<5; ++i)
if (class_.mData.mSkills[i][1]==skillIndex)
{ {
typeFactor = gmst.find ("fMajorSkillBonus")->mValue.getFloat(); typeFactor = gmst.find ("fMajorSkillBonus")->mValue.getFloat();
break; break;
} }
}
progressRequirement *= typeFactor; progressRequirement *= typeFactor;
@ -233,15 +231,14 @@ void MWMechanics::NpcStats::increaseSkill(int skillIndex, const ESM::Class &clas
if (class_.mData.mSkills[k][0] == skillIndex) if (class_.mData.mSkills[k][0] == skillIndex)
{ {
mLevelProgress += gmst.find("iLevelUpMinorMult")->mValue.getInteger(); mLevelProgress += gmst.find("iLevelUpMinorMult")->mValue.getInteger();
increase = gmst.find("iLevelUpMajorMultAttribute")->mValue.getInteger(); increase = gmst.find("iLevelUpMinorMultAttribute")->mValue.getInteger();
break;
} }
} else if (class_.mData.mSkills[k][1] == skillIndex)
for (int k=0; k<5; ++k)
{
if (class_.mData.mSkills[k][1] == skillIndex)
{ {
mLevelProgress += gmst.find("iLevelUpMajorMult")->mValue.getInteger(); mLevelProgress += gmst.find("iLevelUpMajorMult")->mValue.getInteger();
increase = gmst.find("iLevelUpMinorMultAttribute")->mValue.getInteger(); increase = gmst.find("iLevelUpMajorMultAttribute")->mValue.getInteger();
break;
} }
} }