From c0d7b624ae24bb33f6faed872f39871bd0c6ea1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 20 Sep 2020 01:35:06 +0200 Subject: [PATCH] ksys/res: Implement GParamList CureItem --- CMakeLists.txt | 1 + data/uking_functions.csv | 4 +-- .../resGParamListObjectCureItem.h | 30 +++++++++++++++++++ .../Resource/resResourceGParamList.cpp | 2 ++ 4 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 src/KingSystem/Resource/GeneralParamList/resGParamListObjectCureItem.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b61afe7..f42d92a8 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/resGParamListObjectCureItem.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemy.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyLevel.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 9b6f4b6c..dc0b9e67 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89089,7 +89089,7 @@ 0x0000007101196448,BgparamlistObjectLiftable::ctor,1520,_ZN4ksys3res24GParamListObjectLiftableC2Ev 0x0000007101196a38,BgparamlistObjectItem::ctor,664,_ZN4ksys3res20GParamListObjectItemC2Ev 0x0000007101196cd0,BgparamlistObjectArrow::ctor,540,_ZN4ksys3res21GParamListObjectArrowC2Ev -0x0000007101196eec,BgparamlistObjectCureItem::ctor,456, +0x0000007101196eec,BgparamlistObjectCureItem::ctor,456,_ZN4ksys3res24GParamListObjectCureItemC2Ev 0x00000071011970b4,BgparamlistObjectCookSpice::ctor,476, 0x0000007101197290,BgparamlistObjectLumberjackTree::ctor,664, 0x0000007101197528,BgparamlistObjectNpc::ctor,1232, @@ -89180,7 +89180,7 @@ 0x00000071011a7d1c,sub_71011A7D1C,12,_ZNK4ksys3res21GParamListObjectRupee7getNameEv 0x00000071011a7d28,sub_71011A7D28,12,_ZNK4ksys3res21GParamListObjectArrow7getNameEv 0x00000071011a7d34,sub_71011A7D34,12,_ZNK4ksys3res22GParamListObjectBullet7getNameEv -0x00000071011a7d40,sub_71011A7D40,12, +0x00000071011a7d40,sub_71011A7D40,12,_ZNK4ksys3res24GParamListObjectCureItem7getNameEv 0x00000071011a7d4c,sub_71011A7D4C,12, 0x00000071011a7d58,sub_71011A7D58,12, 0x00000071011a7d64,sub_71011A7D64,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectCureItem.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectCureItem.h new file mode 100644 index 00000000..4196d435 --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectCureItem.h @@ -0,0 +1,30 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectCureItem : public GParamListObject { +public: + GParamListObjectCureItem(); + const char* getName() const override { return "CureItem"; } + + agl::utl::Parameter mHitPointRecover; + agl::utl::Parameter mEffectType; + agl::utl::Parameter mEffectLevel; + agl::utl::Parameter mEffectiveTime; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectCureItem, 0xc0); + +inline GParamListObjectCureItem::GParamListObjectCureItem() { + auto* const obj = &mObj; + + mHitPointRecover.init(0, "HitPointRecover", "", obj); + mEffectType.init("None", "EffectType", "", obj); + mEffectLevel.init(0, "EffectLevel", "", obj); + mEffectiveTime.init(0, "EffectiveTime", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index 5f5c18b0..657ca8b5 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/resGParamListObjectCureItem.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemy.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyLevel.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h" @@ -109,6 +110,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "Rupee", heap, dummy_list); add(archive.getRootList(), "Arrow", heap, dummy_list); add(archive.getRootList(), "Bullet", heap, dummy_list); + add(archive.getRootList(), "CureItem", heap, dummy_list); // TODO: the rest