diff --git a/CMakeLists.txt b/CMakeLists.txt index 5db045ae..08933d2f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,6 +66,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObject.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmor.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorEffect.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorHead.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectAttack.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectAttackInterval.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindBone.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 60ba5b1a..ef0d9f2b 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89083,7 +89083,7 @@ 0x00000071011954a0,BgparamlistObjectGrab::ctor,1188,_ZN4ksys3res20GParamListObjectGrabC2Ev 0x0000007101195944,BgparamlistObjectArmor::ctor,700,_ZN4ksys3res21GParamListObjectArmorC2Ev 0x0000007101195c00,BgparamlistObjectArmorEffect::ctor,540,_ZN4ksys3res27GParamListObjectArmorEffectC2Ev -0x0000007101195e1c,BgparamlistObjectArmorHead::ctor,400, +0x0000007101195e1c,BgparamlistObjectArmorHead::ctor,400,_ZN4ksys3res25GParamListObjectArmorHeadC2Ev 0x0000007101195fac,BgparamlistObjectArmorUpper::ctor,508, 0x00000071011961a8,BgparamlistObjectShiekerStone::ctor,672, 0x0000007101196448,BgparamlistObjectLiftable::ctor,1520, @@ -89171,7 +89171,7 @@ 0x00000071011a7cb0,sub_71011A7CB0,12,_ZNK4ksys3res20GParamListObjectGrab7getNameEv 0x00000071011a7cbc,sub_71011A7CBC,12,_ZNK4ksys3res21GParamListObjectArmor7getNameEv 0x00000071011a7cc8,sub_71011A7CC8,12,_ZNK4ksys3res27GParamListObjectArmorEffect7getNameEv -0x00000071011a7cd4,sub_71011A7CD4,12, +0x00000071011a7cd4,sub_71011A7CD4,12,_ZNK4ksys3res25GParamListObjectArmorHead7getNameEv 0x00000071011a7ce0,sub_71011A7CE0,12, 0x00000071011a7cec,sub_71011A7CEC,12, 0x00000071011a7cf8,sub_71011A7CF8,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorHead.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorHead.h new file mode 100644 index 00000000..93273f66 --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorHead.h @@ -0,0 +1,28 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectArmorHead : public GParamListObject { +public: + GParamListObjectArmorHead(); + const char* getName() const override { return "ArmorHead"; } + + agl::utl::Parameter mEarRotate; + agl::utl::Parameter mMantleType; + agl::utl::Parameter mMaskType; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectArmorHead, 0xa8); + +inline GParamListObjectArmorHead::GParamListObjectArmorHead() { + auto* const obj = &mObj; + + mEarRotate.init({0.0, 0.0, 0.0}, "EarRotate", "", obj); + mMantleType.init(0, "MantleType", "", obj); + mMaskType.init("", "MaskType", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index a4db757f..a1558e66 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -5,6 +5,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectArmor.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectArmorEffect.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectArmorHead.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectAttack.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectAttackInterval.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectBindBone.h" @@ -91,6 +92,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "Grab", heap, dummy_list); add(archive.getRootList(), "Armor", heap, dummy_list); add(archive.getRootList(), "ArmorEffect", heap, dummy_list); + add(archive.getRootList(), "ArmorHead", heap, dummy_list); // TODO: the rest