diff --git a/CMakeLists.txt b/CMakeLists.txt index aec66806..04c475a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,6 +82,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyLevel.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyShown.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectExtendedEntity.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectGrab.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMiniWeapon.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index e3df275b..a73dfaeb 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89189,7 +89189,7 @@ 0x00000071011a7d88,sub_71011A7D88,12,_ZNK4ksys3res24GParamListObjectTraveler7getNameEv 0x00000071011a7d94,sub_71011A7D94,12,_ZNK4ksys3res20GParamListObjectPrey7getNameEv 0x00000071011a7da0,sub_71011A7DA0,12,_ZNK4ksys3res34GParamListObjectAnimalFollowOffset7getNameEv -0x00000071011a7dac,sub_71011A7DAC,12, +0x00000071011a7dac,sub_71011A7DAC,12,_ZNK4ksys3res30GParamListObjectExtendedEntity7getNameEv 0x00000071011a7db8,sub_71011A7DB8,12, 0x00000071011a7dc4,sub_71011A7DC4,12, 0x00000071011a7dd0,sub_71011A7DD0,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectExtendedEntity.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectExtendedEntity.h new file mode 100644 index 00000000..efa80023 --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectExtendedEntity.h @@ -0,0 +1,26 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectExtendedEntity : public GParamListObject { +public: + GParamListObjectExtendedEntity(); + const char* getName() const override { return "ExtendedEntity"; } + + agl::utl::Parameter mIsUsePivotAdjustRange; + agl::utl::Parameter mPivotAdjustRange; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectExtendedEntity, 0x78); + +inline GParamListObjectExtendedEntity::GParamListObjectExtendedEntity() { + auto* const obj = &mObj; + + mIsUsePivotAdjustRange.init(false, "IsUsePivotAdjustRange", "", obj); + mPivotAdjustRange.init(1.0, "PivotAdjustRange", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index 7b1c294e..d3d7ad4f 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -21,6 +21,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyLevel.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyShown.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectExtendedEntity.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGrab.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMiniWeapon.h" @@ -129,6 +130,8 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "Prey", heap, dummy_list); add(archive.getRootList(), "AnimalFollowOffset", heap, dummy_list); + add(archive.getRootList(), "ExtendedEntity", heap, + dummy_list); // TODO: the rest