From 2d566fbbd9a37049ea96b29572eacf69c78ff380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 20 Sep 2020 01:16:34 +0200 Subject: [PATCH] ksys/res: Implement GParamList ShiekerStone --- CMakeLists.txt | 1 + data/uking_functions.csv | 4 +-- .../resGParamListObjectShiekerStone.h | 34 +++++++++++++++++++ .../Resource/resResourceGParamList.cpp | 2 ++ 4 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 src/KingSystem/Resource/GeneralParamList/resGParamListObjectShiekerStone.h diff --git a/CMakeLists.txt b/CMakeLists.txt index f8483fe3..5e27f419 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/resGParamListObjectShiekerStone.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectShield.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectSpear.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index e32c03cb..e7ffee17 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89085,7 +89085,7 @@ 0x0000007101195c00,BgparamlistObjectArmorEffect::ctor,540,_ZN4ksys3res27GParamListObjectArmorEffectC2Ev 0x0000007101195e1c,BgparamlistObjectArmorHead::ctor,400,_ZN4ksys3res25GParamListObjectArmorHeadC2Ev 0x0000007101195fac,BgparamlistObjectArmorUpper::ctor,508,_ZN4ksys3res26GParamListObjectArmorUpperC2Ev -0x00000071011961a8,BgparamlistObjectShiekerStone::ctor,672, +0x00000071011961a8,BgparamlistObjectShiekerStone::ctor,672,_ZN4ksys3res28GParamListObjectShiekerStoneC2Ev 0x0000007101196448,BgparamlistObjectLiftable::ctor,1520, 0x0000007101196a38,BgparamlistObjectItem::ctor,664, 0x0000007101196cd0,BgparamlistObjectArrow::ctor,540, @@ -89173,7 +89173,7 @@ 0x00000071011a7cc8,sub_71011A7CC8,12,_ZNK4ksys3res27GParamListObjectArmorEffect7getNameEv 0x00000071011a7cd4,sub_71011A7CD4,12,_ZNK4ksys3res25GParamListObjectArmorHead7getNameEv 0x00000071011a7ce0,sub_71011A7CE0,12,_ZNK4ksys3res26GParamListObjectArmorUpper7getNameEv -0x00000071011a7cec,sub_71011A7CEC,12, +0x00000071011a7cec,sub_71011A7CEC,12,_ZNK4ksys3res28GParamListObjectShiekerStone7getNameEv 0x00000071011a7cf8,sub_71011A7CF8,12, 0x00000071011a7d04,sub_71011A7D04,12, 0x00000071011a7d10,sub_71011A7D10,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectShiekerStone.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectShiekerStone.h new file mode 100644 index 00000000..61cbcfbd --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectShiekerStone.h @@ -0,0 +1,34 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectShiekerStone : public GParamListObject { +public: + GParamListObjectShiekerStone(); + const char* getName() const override { return "ShiekerStone"; } + + agl::utl::Parameter mNodeNameWithWaist; + agl::utl::Parameter mTransOffsetWithWaist; + agl::utl::Parameter mRotOffsetWithWaist; + agl::utl::Parameter mNodeNameWithHand; + agl::utl::Parameter mTransOffsetWithHand; + agl::utl::Parameter mRotOffsetWithHand; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectShiekerStone, 0x128); + +inline GParamListObjectShiekerStone::GParamListObjectShiekerStone() { + auto* const obj = &mObj; + + mNodeNameWithWaist.init("Pod_C", "NodeNameWithWaist", "", obj); + mTransOffsetWithWaist.init({0.125, 0.0, -0.017}, "TransOffsetWithWaist", "", obj); + mRotOffsetWithWaist.init({2.0, 184.0, -3.0}, "RotOffsetWithWaist", "", obj); + mNodeNameWithHand.init("Weapon_L", "NodeNameWithHand", "", obj); + mTransOffsetWithHand.init({0.0, 0.0, 0.0}, "TransOffsetWithHand", "", obj); + mRotOffsetWithHand.init({180.0, 180.0, 0.0}, "RotOffsetWithHand", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index 8b113737..4223d2e6 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/resGParamListObjectShiekerStone.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectShield.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectSpear.h" @@ -95,6 +96,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "ArmorEffect", heap, dummy_list); add(archive.getRootList(), "ArmorHead", heap, dummy_list); add(archive.getRootList(), "ArmorUpper", heap, dummy_list); + add(archive.getRootList(), "ShiekerStone", heap, dummy_list); // TODO: the rest