diff --git a/CMakeLists.txt b/CMakeLists.txt index 906a67e5..e934c8c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,6 +73,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObjectArrow.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectAttack.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectAttackInterval.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectAutoGen.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectBeam.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindActor.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindBone.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index cd1d80dd..0a1abbed 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89114,7 +89114,7 @@ 0x00000071011a27d4,BgparamlistObjectGuardianMini::ctor,672,_ZN4ksys3res28GParamListObjectGuardianMiniC2Ev 0x00000071011a2a74,BgparamlistObjectClothReaction::ctor,1460,_ZN4ksys3res29GParamListObjectClothReactionC2Ev 0x00000071011a3028,BgparamlistObjectGlobal::ctor,6116,_ZN4ksys3res22GParamListObjectGlobalC2Ev -0x00000071011a480c,BgparamlistObjectAutoGen::ctor,404, +0x00000071011a480c,BgparamlistObjectAutoGen::ctor,404,_ZN4ksys3res23GParamListObjectAutoGenC2Ev 0x00000071011a49a0,BgparamlistObjectChemicalType::ctor,336, 0x00000071011a4af0,BgparamlistObjectGolem::ctor,676, 0x00000071011a4d94,BgparamlistObjectHorseTargetedInfo::ctor,356, @@ -89214,7 +89214,7 @@ 0x00000071011a7eb4,sub_71011A7EB4,12,_ZNK4ksys3res29GParamListObjectClothReaction7getNameEv 0x00000071011a7ec0,sub_71011A7EC0,12,_ZNK4ksys3res22GParamListObjectGlobal7getNameEv 0x00000071011a7ecc,sub_71011A7ECC,12,_ZNK4ksys3res20GParamListObjectBeam7getNameEv -0x00000071011a7ed8,sub_71011A7ED8,12, +0x00000071011a7ed8,sub_71011A7ED8,12,_ZNK4ksys3res23GParamListObjectAutoGen7getNameEv 0x00000071011a7ee4,sub_71011A7EE4,12, 0x00000071011a7ef0,sub_71011A7EF0,12, 0x00000071011a7efc,sub_71011A7EFC,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAutoGen.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAutoGen.h new file mode 100644 index 00000000..5c33c059 --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAutoGen.h @@ -0,0 +1,28 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectAutoGen : public GParamListObject { +public: + GParamListObjectAutoGen(); + const char* getName() const override { return "AutoGen"; } + + agl::utl::Parameter mSetName; + agl::utl::Parameter mKeyActorName; + agl::utl::Parameter mSetRadius; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectAutoGen, 0xa8); + +inline GParamListObjectAutoGen::GParamListObjectAutoGen() { + auto* const obj = &mObj; + + mSetName.init("", "SetName", "", obj); + mKeyActorName.init("", "KeyActorName", "", obj); + mSetRadius.init(0.0, "SetRadius", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index 4424d96f..d2c163d5 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -12,6 +12,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObjectArrow.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectAttack.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectAttackInterval.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectAutoGen.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectBeam.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectBindActor.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectBindBone.h" @@ -181,6 +182,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "ClothReaction", heap, dummy_list); add(archive.getRootList(), "Global", heap, dummy_list); add(archive.getRootList(), "Beam", heap, dummy_list); + add(archive.getRootList(), "AutoGen", heap, dummy_list); // TODO: the rest