diff --git a/CMakeLists.txt b/CMakeLists.txt index cbd65a4a..3bcb68a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,6 +87,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObjectItem.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectLargeSword.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectLiftable.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectLumberjackTree.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectPlayer.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 476f168a..a0f24131 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89091,7 +89091,7 @@ 0x0000007101196cd0,BgparamlistObjectArrow::ctor,540,_ZN4ksys3res21GParamListObjectArrowC2Ev 0x0000007101196eec,BgparamlistObjectCureItem::ctor,456,_ZN4ksys3res24GParamListObjectCureItemC2Ev 0x00000071011970b4,BgparamlistObjectCookSpice::ctor,476,_ZN4ksys3res25GParamListObjectCookSpiceC2Ev -0x0000007101197290,BgparamlistObjectLumberjackTree::ctor,664, +0x0000007101197290,BgparamlistObjectLumberjackTree::ctor,664,_ZN4ksys3res30GParamListObjectLumberjackTreeC2Ev 0x0000007101197528,BgparamlistObjectNpc::ctor,1232, 0x00000071011979f8,BgparamlistObjectNpcEquipment::ctor,1960, 0x00000071011981a0,BgparamlistObjectZora::ctor,508, @@ -89182,7 +89182,7 @@ 0x00000071011a7d34,sub_71011A7D34,12,_ZNK4ksys3res22GParamListObjectBullet7getNameEv 0x00000071011a7d40,sub_71011A7D40,12,_ZNK4ksys3res24GParamListObjectCureItem7getNameEv 0x00000071011a7d4c,sub_71011A7D4C,12,_ZNK4ksys3res25GParamListObjectCookSpice7getNameEv -0x00000071011a7d58,sub_71011A7D58,12, +0x00000071011a7d58,sub_71011A7D58,12,_ZNK4ksys3res30GParamListObjectLumberjackTree7getNameEv 0x00000071011a7d64,sub_71011A7D64,12, 0x00000071011a7d70,sub_71011A7D70,12, 0x00000071011a7d7c,sub_71011A7D7C,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectLumberjackTree.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectLumberjackTree.h new file mode 100644 index 00000000..86ee9c35 --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectLumberjackTree.h @@ -0,0 +1,34 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectLumberjackTree : public GParamListObject { +public: + GParamListObjectLumberjackTree(); + const char* getName() const override { return "LumberjackTree"; } + + agl::utl::Parameter mImpulseThreshold; + agl::utl::Parameter mIsValid; + agl::utl::Parameter mStumpName; + agl::utl::Parameter mTrunkName; + agl::utl::Parameter mWeaponWoodName; + agl::utl::Parameter mBranchName; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectLumberjackTree, 0x118); + +inline GParamListObjectLumberjackTree::GParamListObjectLumberjackTree() { + auto* const obj = &mObj; + + mImpulseThreshold.init(100.0, "ImpulseThreshold", "", obj); + mIsValid.init(false, "IsValid", "", obj); + mStumpName.init("", "StumpName", "", obj); + mTrunkName.init("", "TrunkName", "", obj); + mWeaponWoodName.init("", "WeaponWoodName", "", obj); + mBranchName.init("", "BranchName", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index 253c9d70..90e607f0 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -26,6 +26,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObjectItem.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectLargeSword.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectLiftable.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectLumberjackTree.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectPlayer.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h" @@ -113,6 +114,8 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "Bullet", heap, dummy_list); add(archive.getRootList(), "CureItem", heap, dummy_list); add(archive.getRootList(), "CookSpice", heap, dummy_list); + add(archive.getRootList(), "LumberjackTree", heap, + dummy_list); // TODO: the rest