mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-19 16:21:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'essskills' into 'master'

Browse Source 
essimporter: fix doubled stats

See merge request OpenMW/openmw!2211
This commit is contained in:
psi29a 2022-07-31 08:11:58 +00:00
commit 015a5c6b93
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/essimporter/convertacdt.cpp
View File

@ -24,14 +24,14 @@ namespace ESSImport
{ {
int writeIndex = translateDynamicIndex(i); int writeIndex = translateDynamicIndex(i);
cStats.mDynamic[writeIndex].mBase = acdt.mDynamic[i][1]; cStats.mDynamic[writeIndex].mBase = acdt.mDynamic[i][1];
cStats.mDynamic[writeIndex].mMod = acdt.mDynamic[i][1]; cStats.mDynamic[writeIndex].mMod = 0.f;
cStats.mDynamic[writeIndex].mCurrent = acdt.mDynamic[i][0]; cStats.mDynamic[writeIndex].mCurrent = acdt.mDynamic[i][0];
} }
for (int i=0; i<8; ++i) for (int i=0; i<8; ++i)
{ {
cStats.mAttributes[i].mBase = static_cast<int>(acdt.mAttributes[i][1]); cStats.mAttributes[i].mBase = acdt.mAttributes[i][1];
cStats.mAttributes[i].mMod = static_cast<int>(acdt.mAttributes[i][0]); cStats.mAttributes[i].mMod = 0.f;
cStats.mAttributes[i].mCurrent = static_cast<int>(acdt.mAttributes[i][0]); cStats.mAttributes[i].mCurrent = acdt.mAttributes[i][0];
} }
cStats.mGoldPool = acdt.mGoldPool; cStats.mGoldPool = acdt.mGoldPool;
cStats.mTalkedTo = (acdt.mFlags & TalkedToPlayer) != 0; cStats.mTalkedTo = (acdt.mFlags & TalkedToPlayer) != 0;
@ -47,7 +47,7 @@ namespace ESSImport
{ {
for (int i=0; i<ESM::Skill::Length; ++i) for (int i=0; i<ESM::Skill::Length; ++i)
{ {
npcStats.mSkills[i].mMod = actorData.mSkills[i][1]; npcStats.mSkills[i].mMod = 0.f;
npcStats.mSkills[i].mCurrent = actorData.mSkills[i][1]; npcStats.mSkills[i].mCurrent = actorData.mSkills[i][1];
npcStats.mSkills[i].mBase = actorData.mSkills[i][0]; npcStats.mSkills[i].mBase = actorData.mSkills[i][0];
} }