diff --git a/CMakeLists.txt b/CMakeLists.txt index f42d92a8..cbd65a4a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,6 +75,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObjectBow.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectBullet.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectCamera.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectCookSpice.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectCureItem.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemy.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyLevel.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index dc0b9e67..476f168a 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89090,7 +89090,7 @@ 0x0000007101196a38,BgparamlistObjectItem::ctor,664,_ZN4ksys3res20GParamListObjectItemC2Ev 0x0000007101196cd0,BgparamlistObjectArrow::ctor,540,_ZN4ksys3res21GParamListObjectArrowC2Ev 0x0000007101196eec,BgparamlistObjectCureItem::ctor,456,_ZN4ksys3res24GParamListObjectCureItemC2Ev -0x00000071011970b4,BgparamlistObjectCookSpice::ctor,476, +0x00000071011970b4,BgparamlistObjectCookSpice::ctor,476,_ZN4ksys3res25GParamListObjectCookSpiceC2Ev 0x0000007101197290,BgparamlistObjectLumberjackTree::ctor,664, 0x0000007101197528,BgparamlistObjectNpc::ctor,1232, 0x00000071011979f8,BgparamlistObjectNpcEquipment::ctor,1960, @@ -89181,7 +89181,7 @@ 0x00000071011a7d28,sub_71011A7D28,12,_ZNK4ksys3res21GParamListObjectArrow7getNameEv 0x00000071011a7d34,sub_71011A7D34,12,_ZNK4ksys3res22GParamListObjectBullet7getNameEv 0x00000071011a7d40,sub_71011A7D40,12,_ZNK4ksys3res24GParamListObjectCureItem7getNameEv -0x00000071011a7d4c,sub_71011A7D4C,12, +0x00000071011a7d4c,sub_71011A7D4C,12,_ZNK4ksys3res25GParamListObjectCookSpice7getNameEv 0x00000071011a7d58,sub_71011A7D58,12, 0x00000071011a7d64,sub_71011A7D64,12, 0x00000071011a7d70,sub_71011A7D70,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectCookSpice.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectCookSpice.h new file mode 100644 index 00000000..01959bbc --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectCookSpice.h @@ -0,0 +1,32 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectCookSpice : public GParamListObject { +public: + GParamListObjectCookSpice(); + const char* getName() const override { return "CookSpice"; } + + agl::utl::Parameter mBoostHitPointRecover; + agl::utl::Parameter mBoostEffectiveTime; + agl::utl::Parameter mBoostSuccessRate; + agl::utl::Parameter mBoostMaxHeartLevel; + agl::utl::Parameter mBoostStaminaLevel; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectCookSpice, 0xd8); + +inline GParamListObjectCookSpice::GParamListObjectCookSpice() { + auto* const obj = &mObj; + + mBoostHitPointRecover.init(0, "BoostHitPointRecover", "", obj); + mBoostEffectiveTime.init(0, "BoostEffectiveTime", "", obj); + mBoostSuccessRate.init(0, "BoostSuccessRate", "", obj); + mBoostMaxHeartLevel.init(0, "BoostMaxHeartLevel", "", obj); + mBoostStaminaLevel.init(0, "BoostStaminaLevel", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index 657ca8b5..253c9d70 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -14,6 +14,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObjectBow.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectBullet.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectCamera.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectCookSpice.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectCureItem.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemy.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyLevel.h" @@ -111,6 +112,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "Arrow", heap, dummy_list); add(archive.getRootList(), "Bullet", heap, dummy_list); add(archive.getRootList(), "CureItem", heap, dummy_list); + add(archive.getRootList(), "CookSpice", heap, dummy_list); // TODO: the rest