From 5cc61e6db8caef6902aaf3ec48bf20c1412e0e00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 20 Sep 2020 00:26:06 +0200 Subject: [PATCH] ksys/res: Implement GParamList WeaponOption --- CMakeLists.txt | 1 + data/uking_functions.csv | 4 +-- .../resGParamListObjectWeaponOption.h | 34 +++++++++++++++++++ .../Resource/resResourceGParamList.cpp | 2 ++ 4 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponOption.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 97731e59..bb135193 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,6 +83,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.cpp src/KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponCommon.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponOption.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponThrow.h src/KingSystem/Resource/GeneralParamList/resGParamListTraits.h src/KingSystem/Resource/resCurrentResNameMgr.cpp diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 5a8b2bbf..b0a93c95 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89075,7 +89075,7 @@ 0x0000007101190500,BgparamlistObjectSpear::ctor,2080,_ZN4ksys3res21GParamListObjectSpearC2Ev 0x0000007101190d20,BgparamlistObjectShield::ctor,1484,_ZN4ksys3res22GParamListObjectShieldC2Ev 0x00000071011912ec,BgparamlistObjectBow::ctor,2724,_ZN4ksys3res19GParamListObjectBowC2Ev -0x0000007101191d90,BgparamlistObjectWeaponOption::ctor,596, +0x0000007101191d90,BgparamlistObjectWeaponOption::ctor,596,_ZN4ksys3res28GParamListObjectWeaponOptionC2Ev 0x0000007101191fe4,BgparamlistObjectMasterSword::ctor,772, 0x00000071011922e8,BgparamlistObjectGuardianMiniWeapon::ctor,608, 0x0000007101192548,BgparamlistObjectPlayer::ctor,11236, @@ -89163,7 +89163,7 @@ 0x00000071011a7c50,sub_71011A7C50,12,_ZNK4ksys3res21GParamListObjectSpear7getNameEv 0x00000071011a7c5c,sub_71011A7C5C,12,_ZNK4ksys3res22GParamListObjectShield7getNameEv 0x00000071011a7c68,sub_71011A7C68,12,_ZNK4ksys3res19GParamListObjectBow7getNameEv -0x00000071011a7c74,sub_71011A7C74,12, +0x00000071011a7c74,sub_71011A7C74,12,_ZNK4ksys3res28GParamListObjectWeaponOption7getNameEv 0x00000071011a7c80,sub_71011A7C80,12, 0x00000071011a7c8c,sub_71011A7C8C,12, 0x00000071011a7c98,sub_71011A7C98,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponOption.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponOption.h new file mode 100644 index 00000000..bed1a17b --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponOption.h @@ -0,0 +1,34 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectWeaponOption : public GParamListObject { +public: + GParamListObjectWeaponOption(); + const char* getName() const override { return "WeaponOption"; } + + agl::utl::Parameter mPlayerHoldTransOffset; + agl::utl::Parameter mPlayerHoldRotOffset; + agl::utl::Parameter mNPCHoldTransOffset; + agl::utl::Parameter mNPCHoldRotOffset; + agl::utl::Parameter mNPCEquipTransOffset; + agl::utl::Parameter mNPCEquipRotOffset; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectWeaponOption, 0x128); + +inline GParamListObjectWeaponOption::GParamListObjectWeaponOption() { + auto* const obj = &mObj; + + mPlayerHoldTransOffset.init({-0.02, -0.01, 0.12}, "PlayerHoldTransOffset", "", obj); + mPlayerHoldRotOffset.init({-8.0, -5.0, 75.0}, "PlayerHoldRotOffset", "", obj); + mNPCHoldTransOffset.init({0.0, 0.0, 0.0}, "NPCHoldTransOffset", "", obj); + mNPCHoldRotOffset.init({0.0, 0.0, 0.0}, "NPCHoldRotOffset", "", obj); + mNPCEquipTransOffset.init({0.0, 0.0, 0.0}, "NPCEquipTransOffset", "", obj); + mNPCEquipRotOffset.init({0.0, 0.0, 0.0}, "NPCEquipRotOffset", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index e0bfd342..997abe3e 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -20,6 +20,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObjectSpear.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectSystem.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponCommon.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponOption.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponThrow.h" #include "KingSystem/Resource/GeneralParamList/resGParamListTraits.h" @@ -74,6 +75,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "Spear", heap, dummy_list); add(archive.getRootList(), "Shield", heap, dummy_list); add(archive.getRootList(), "Bow", heap, dummy_list); + add(archive.getRootList(), "WeaponOption", heap, dummy_list); // TODO: the rest