diff --git a/CMakeLists.txt b/CMakeLists.txt index afac6796..b2be9207 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,6 +88,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObjectExtendedEntity.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectFish.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectGiantArmor.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectGiantArmorSlot.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 db41fdd0..f4e181d2 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89202,7 +89202,7 @@ 0x00000071011a7e24,sub_71011A7E24,12,_ZNK4ksys3res26GParamListObjectHorseRider7getNameEv 0x00000071011a7e30,sub_71011A7E30,12,_ZNK4ksys3res28GParamListObjectHorseCreator7getNameEv 0x00000071011a7e3c,sub_71011A7E3C,12,_ZNK4ksys3res30GParamListObjectGiantArmorSlot7getNameEv -0x00000071011a7e48,sub_71011A7E48,12, +0x00000071011a7e48,sub_71011A7E48,12,_ZNK4ksys3res26GParamListObjectGiantArmor7getNameEv 0x00000071011a7e54,sub_71011A7E54,12, 0x00000071011a7e60,sub_71011A7E60,12, 0x00000071011a7e6c,sub_71011A7E6C,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGiantArmor.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGiantArmor.h new file mode 100644 index 00000000..98a3a2eb --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGiantArmor.h @@ -0,0 +1,26 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectGiantArmor : public GParamListObject { +public: + GParamListObjectGiantArmor(); + const char* getName() const override { return "GiantArmor"; } + + agl::utl::Parameter mDamageScale; + agl::utl::Parameter mRotOffset; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectGiantArmor, 0x80); + +inline GParamListObjectGiantArmor::GParamListObjectGiantArmor() { + auto* const obj = &mObj; + + mDamageScale.init(0.0, "DamageScale", "", obj); + mRotOffset.init({0.0, 0.0, 0.0}, "RotOffset", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index c33f9cf9..6ec5be63 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -27,6 +27,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObjectExtendedEntity.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectFish.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectGiantArmor.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGiantArmorSlot.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGrab.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMiniWeapon.h" @@ -157,6 +158,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "HorseCreator", heap, dummy_list); add(archive.getRootList(), "GiantArmorSlot", heap, dummy_list); + add(archive.getRootList(), "GiantArmor", heap, dummy_list); // TODO: the rest