diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f606146..13064c2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,6 +72,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyShown.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectSystem.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.cpp src/KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 847cc560..0a756a74 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89068,7 +89068,7 @@ 0x000000710118d8c8,BgparamlistObjectAttack::ctor,900,_ZN4ksys3res22GParamListObjectAttackC2Ev 0x000000710118dc4c,BgparamlistObjectWeaponCommon::ctor,3288,_ZN4ksys3res28GParamListObjectWeaponCommonC2Ev 0x000000710118e924,BgparamlistObjectWeaponThrow::ctor,432,_ZN4ksys3res27GParamListObjectWeaponThrowC2Ev -0x000000710118ead4,BgparamlistObjectSandworm::ctor,1992, +0x000000710118ead4,BgparamlistObjectSandworm::ctor,1992,_ZN4ksys3res24GParamListObjectSandwormC2Ev 0x000000710118f29c,BgparamlistObjectSmallSword::ctor,1756, 0x000000710118f978,BgparamlistObjectRod::ctor,1192, 0x000000710118fe20,BgparamlistObjectLargeSword::ctor,1760, @@ -89156,7 +89156,7 @@ 0x00000071011a7bfc,sub_71011A7BFC,12,_ZNK4ksys3res22GParamListObjectAttack7getNameEv 0x00000071011a7c08,sub_71011A7C08,12,_ZNK4ksys3res28GParamListObjectWeaponCommon7getNameEv 0x00000071011a7c14,sub_71011A7C14,12,_ZNK4ksys3res27GParamListObjectWeaponThrow7getNameEv -0x00000071011a7c20,sub_71011A7C20,12, +0x00000071011a7c20,sub_71011A7C20,12,_ZNK4ksys3res24GParamListObjectSandworm7getNameEv 0x00000071011a7c2c,sub_71011A7C2C,12, 0x00000071011a7c38,sub_71011A7C38,12, 0x00000071011a7c44,sub_71011A7C44,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h new file mode 100644 index 00000000..23dc4c1f --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h @@ -0,0 +1,68 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectSandworm : public GParamListObject { +public: + GParamListObjectSandworm(); + const char* getName() const override { return "Sandworm"; } + + agl::utl::Parameter mSandWidth; + agl::utl::Parameter mSandLength; + agl::utl::Parameter mSandHeight; + agl::utl::Parameter mSandCombSpan; + agl::utl::Parameter mSandCombHeight; + agl::utl::Parameter mSnakeModelOffsetZ; + agl::utl::Parameter mSnakeBaseNode; + agl::utl::Parameter mSnakeNode1; + agl::utl::Parameter mSnakeNode2; + agl::utl::Parameter mSnakeNode3; + agl::utl::Parameter mSnakeNode4; + agl::utl::Parameter mSnakeNode5; + agl::utl::Parameter mSnakeNode6; + agl::utl::Parameter mSnakeNode7; + agl::utl::Parameter mSnakeNode8; + agl::utl::Parameter mSnakeNode9; + agl::utl::Parameter mSnakeNode10; + agl::utl::Parameter mSnakeNode11; + agl::utl::Parameter mSnakeNode12; + agl::utl::Parameter mSnakeNodeRotOffset; + agl::utl::Parameter mSnakeNodeChaseInterval; + agl::utl::Parameter mShowLifeGageDist; + agl::utl::Parameter mShowLifeGageOffset; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectSandworm, 0x388); + +inline GParamListObjectSandworm::GParamListObjectSandworm() { + auto* const obj = &mObj; + + mSandWidth.init(0.0, "SandWidth", "", obj); + mSandLength.init(0.0, "SandLength", "", obj); + mSandHeight.init(0.0, "SandHeight", "", obj); + mSandCombSpan.init(0.0, "SandCombSpan", "", obj); + mSandCombHeight.init(0.0, "SandCombHeight", "", obj); + mSnakeModelOffsetZ.init(0.0, "SnakeModelOffsetZ", "", obj); + mSnakeBaseNode.init("", "SnakeBaseNode", "", obj); + mSnakeNode1.init("", "SnakeNode1", "", obj); + mSnakeNode2.init("", "SnakeNode2", "", obj); + mSnakeNode3.init("", "SnakeNode3", "", obj); + mSnakeNode4.init("", "SnakeNode4", "", obj); + mSnakeNode5.init("", "SnakeNode5", "", obj); + mSnakeNode6.init("", "SnakeNode6", "", obj); + mSnakeNode7.init("", "SnakeNode7", "", obj); + mSnakeNode8.init("", "SnakeNode8", "", obj); + mSnakeNode9.init("", "SnakeNode9", "", obj); + mSnakeNode10.init("", "SnakeNode10", "", obj); + mSnakeNode11.init("", "SnakeNode11", "", obj); + mSnakeNode12.init("", "SnakeNode12", "", obj); + mSnakeNodeRotOffset.init({0.0, 0.0, 0.0}, "SnakeNodeRotOffset", "", obj); + mSnakeNodeChaseInterval.init(0.0, "SnakeNodeChaseInterval", "", obj); + mShowLifeGageDist.init(150.0, "ShowLifeGageDist", "", obj); + mShowLifeGageOffset.init(10.0, "ShowLifeGageOffset", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index 056ed2e9..ce2305da 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -11,6 +11,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyShown.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectSystem.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponCommon.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponThrow.h" @@ -60,6 +61,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "Attack", heap, dummy_list); add(archive.getRootList(), "WeaponCommon", heap, dummy_list); add(archive.getRootList(), "WeaponThrow", heap, dummy_list); + add(archive.getRootList(), "Sandworm", heap, dummy_list); // TODO: the rest