From fcdb52e723a3154aa391cf3ca18fb47a8ebde28b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 20 Sep 2020 01:18:31 +0200 Subject: [PATCH] ksys/res: Implement GParamList SeriesArmor --- CMakeLists.txt | 1 + data/uking_functions.csv | 2 +- .../resGParamListObjectSeriesArmor.h | 26 +++++++++++++++++++ .../Resource/resResourceGParamList.cpp | 2 ++ 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 src/KingSystem/Resource/GeneralParamList/resGParamListObjectSeriesArmor.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e27f419..9e6ab36c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,6 +85,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObjectPlayer.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectSeriesArmor.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectShiekerStone.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectShield.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index e7ffee17..ab3f03c0 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89174,7 +89174,7 @@ 0x00000071011a7cd4,sub_71011A7CD4,12,_ZNK4ksys3res25GParamListObjectArmorHead7getNameEv 0x00000071011a7ce0,sub_71011A7CE0,12,_ZNK4ksys3res26GParamListObjectArmorUpper7getNameEv 0x00000071011a7cec,sub_71011A7CEC,12,_ZNK4ksys3res28GParamListObjectShiekerStone7getNameEv -0x00000071011a7cf8,sub_71011A7CF8,12, +0x00000071011a7cf8,sub_71011A7CF8,12,_ZNK4ksys3res27GParamListObjectSeriesArmor7getNameEv 0x00000071011a7d04,sub_71011A7D04,12, 0x00000071011a7d10,sub_71011A7D10,12, 0x00000071011a7d1c,sub_71011A7D1C,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSeriesArmor.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSeriesArmor.h new file mode 100644 index 00000000..034d140b --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSeriesArmor.h @@ -0,0 +1,26 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectSeriesArmor : public GParamListObject { +public: + GParamListObjectSeriesArmor(); + const char* getName() const override { return "SeriesArmor"; } + + agl::utl::Parameter mSeriesType; + agl::utl::Parameter mEnableCompBonus; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectSeriesArmor, 0x80); + +inline GParamListObjectSeriesArmor::GParamListObjectSeriesArmor() { + auto* const obj = &mObj; + + mSeriesType.init("", "SeriesType", "", obj); + mEnableCompBonus.init(false, "EnableCompBonus", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index 4223d2e6..b87f829f 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -24,6 +24,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObjectPlayer.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectSeriesArmor.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectShiekerStone.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectShield.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.h" @@ -97,6 +98,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "ArmorHead", heap, dummy_list); add(archive.getRootList(), "ArmorUpper", heap, dummy_list); add(archive.getRootList(), "ShiekerStone", heap, dummy_list); + add(archive.getRootList(), "SeriesArmor", heap, dummy_list); // TODO: the rest