mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-28 13:09:42 +00:00
Code Issues Releases Wiki Activity

Maybe load FO4 NPC records

Browse source
This commit is contained in:
Alexei Kotov 2023-08-16 11:34:29 +03:00
parent e9f9da98cf
commit 4dc4add62d
3 changed files with 72 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
components/esm4/actor.hpp
View file

@ -100,11 +100,26 @@ namespace ESM4
std::uint16_t bleedoutOverride;
};
struct ACBS_FO4
{
std::uint32_t flags;
std::int16_t xpOffset;
std::int16_t levelOrMult;
std::uint16_t calcMinlevel;
std::uint16_t calcMaxlevel;
std::int16_t dispositionBase;
std::uint16_t templateFlags;
std::uint16_t bleedoutOverride;
std::uint16_t padding;
};
union ActorBaseConfig
{
ACBS_TES4 tes4;
ACBS_FO3 fo3;
ACBS_TES5 tes5;
ACBS_FO4 fo4;
};
struct ActorFaction

70
components/esm4/loadnpc.cpp
View file

@ -73,7 +73,11 @@ void ESM4::Npc::load(ESM4::Reader& reader)
break;
case ESM4::SUB_SNAM:
{
reader.get(mFaction);
// FO4, FO76
if (subHdr.dataSize == 5)
reader.get(&mFaction, 5);
else
reader.get(mFaction);
reader.adjustFormId(mFaction.faction);
break;
}
@ -99,7 +103,7 @@ void ESM4::Npc::load(ESM4::Reader& reader)
//
case ESM4::SUB_AIDT:
{
if (esmVer == ESM::VER_094 || esmVer == ESM::VER_170 || mIsFONV)
if (subHdr.dataSize != 12)
{
reader.skipSubRecordData(); // FIXME: process the subrecord rather than skip
break;
@ -110,24 +114,26 @@ void ESM4::Npc::load(ESM4::Reader& reader)
}
case ESM4::SUB_ACBS:
{
// if (esmVer == ESM::VER_094 || esmVer == ESM::VER_170 || mIsFONV)
if (subHdr.dataSize == 24)
reader.get(mBaseConfig);
else
reader.get(&mBaseConfig, 16); // TES4
// TES4
else if (subHdr.dataSize == 16)
reader.get(&mBaseConfig, 16);
// FO4
else if (subHdr.dataSize == 20)
reader.get(&mBaseConfig, 20);
break;
}
case ESM4::SUB_DATA:
{
if (esmVer == ESM::VER_094 || esmVer == ESM::VER_170 || mIsFONV)
{
if (subHdr.dataSize != 0) // FIXME FO3
reader.skipSubRecordData();
break; // zero length
}
if (subHdr.dataSize == 0)
break;
reader.get(&mData, 33); // FIXME: check packing
if (subHdr.dataSize == 33)
reader.get(&mData, 33); // FIXME: check packing
else // FIXME FO3
reader.skipSubRecordData();
break;
}
case ESM4::SUB_ZNAM:
@ -144,6 +150,7 @@ void ESM4::Npc::load(ESM4::Reader& reader)
break;
case ESM4::SUB_WNAM:
{
// FIXME: should be read into mWornArmor for FO4
if (reader.esmVersion() == ESM::VER_094 || reader.esmVersion() == ESM::VER_170)
reader.getFormId(mWornArmor);
else
@ -218,6 +225,11 @@ void ESM4::Npc::load(ESM4::Reader& reader)
break;
}
case ESM4::SUB_BCLF:
{
reader.getFormId(mBeardColourId);
break;
}
case ESM4::SUB_COCT: // TES5
{
std::uint32_t count;
@ -277,12 +289,42 @@ void ESM4::Npc::load(ESM4::Reader& reader)
case ESM4::SUB_EAMT: // FO3
case ESM4::SUB_NAM4: // FO3
case ESM4::SUB_COED: // FO3
case ESM4::SUB_APPR: // FO4
case ESM4::SUB_ATKS: // FO4
case ESM4::SUB_ATKT: // FO4
case ESM4::SUB_ATKW: // FO4
case ESM4::SUB_ATTX: // FO4
case ESM4::SUB_FTYP: // FO4
case ESM4::SUB_LTPT: // FO4
case ESM4::SUB_LTPC: // FO4
case ESM4::SUB_MWGT: // FO4
case ESM4::SUB_NTRM: // FO4
case ESM4::SUB_PFRN: // FO4
case ESM4::SUB_PRPS: // FO4
case ESM4::SUB_PTRN: // FO4
case ESM4::SUB_STCP: // FO4
case ESM4::SUB_TETI: // FO4
case ESM4::SUB_TEND: // FO4
case ESM4::SUB_TPTA: // FO4
case ESM4::SUB_OBTE: // FO4 object template start
case ESM4::SUB_OBTF:
case ESM4::SUB_OBTS:
case ESM4::SUB_OBTF: //
case ESM4::SUB_OBTS: //
case ESM4::SUB_STOP: // FO4 object template end
case ESM4::SUB_OCOR: // FO4 new package lists start
case ESM4::SUB_GWOR: //
case ESM4::SUB_FCPL: //
case ESM4::SUB_RCLR: // FO4 new package lists end
case ESM4::SUB_CS2D: // FO4 actor sound subrecords
case ESM4::SUB_CS2E: //
case ESM4::SUB_CS2F: //
case ESM4::SUB_CS2H: //
case ESM4::SUB_CS2K: // FO4 actor sound subrecords end
case ESM4::SUB_MSDK: // FO4 morph subrecords start
case ESM4::SUB_MSDV: //
case ESM4::SUB_MRSV: //
case ESM4::SUB_FMRI: //
case ESM4::SUB_FMRS: //
case ESM4::SUB_FMIN: // FO4 morph subrecords end
reader.skipSubRecordData();
break;
default:

1
components/esm4/loadnpc.hpp
View file

@ -187,6 +187,7 @@ namespace ESM4
float mHairLength;
HairColour mHairColour; // TES4/FO3/FONV
ESM::FormId mHairColourId; // TES5
ESM::FormId mBeardColourId; // FO4
ESM::FormId mDeathItem;
std::vector<ESM::FormId> mSpell;