diff --git a/CMakeLists.txt b/CMakeLists.txt index 46c6a681..0d8de802 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,6 +76,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectSpear.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectSystem.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.cpp src/KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 452ba28a..b8174267 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89072,7 +89072,7 @@ 0x000000710118f29c,BgparamlistObjectSmallSword::ctor,1756,_ZN4ksys3res26GParamListObjectSmallSwordC2Ev 0x000000710118f978,BgparamlistObjectRod::ctor,1192,_ZN4ksys3res19GParamListObjectRodC2Ev 0x000000710118fe20,BgparamlistObjectLargeSword::ctor,1760,_ZN4ksys3res26GParamListObjectLargeSwordC2Ev -0x0000007101190500,BgparamlistObjectSpear::ctor,2080, +0x0000007101190500,BgparamlistObjectSpear::ctor,2080,_ZN4ksys3res21GParamListObjectSpearC2Ev 0x0000007101190d20,BgparamlistObjectShield::ctor,1484, 0x00000071011912ec,BgparamlistObjectBow::ctor,2724, 0x0000007101191d90,BgparamlistObjectWeaponOption::ctor,596, @@ -89160,7 +89160,7 @@ 0x00000071011a7c2c,sub_71011A7C2C,12,_ZNK4ksys3res26GParamListObjectSmallSword7getNameEv 0x00000071011a7c38,sub_71011A7C38,12,_ZNK4ksys3res19GParamListObjectRod7getNameEv 0x00000071011a7c44,sub_71011A7C44,12,_ZNK4ksys3res26GParamListObjectLargeSword7getNameEv -0x00000071011a7c50,sub_71011A7C50,12, +0x00000071011a7c50,sub_71011A7C50,12,_ZNK4ksys3res21GParamListObjectSpear7getNameEv 0x00000071011a7c5c,sub_71011A7C5C,12, 0x00000071011a7c68,sub_71011A7C68,12, 0x00000071011a7c74,sub_71011A7C74,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSpear.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSpear.h new file mode 100644 index 00000000..c5fb00fb --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSpear.h @@ -0,0 +1,75 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectSpear : public GParamListObject { +public: + GParamListObjectSpear(); + const char* getName() const override { return "Spear"; } + + agl::utl::Parameter mPodName; + agl::utl::Parameter mPlayerHoldTransOffset; + agl::utl::Parameter mPlayerHoldRotOffset; + agl::utl::Parameter mPlayerEquipTransOffset; + agl::utl::Parameter mPlayerEquipRotOffset; + agl::utl::Parameter mRideHorsePlayerHoldTransOffset; + agl::utl::Parameter mRideHorsePlayerHoldRotOffset; + agl::utl::Parameter mAffectTransOffsetShield; + agl::utl::Parameter mAffectRotOffsetShield; + agl::utl::Parameter mAffectTransOffsetBow; + agl::utl::Parameter mAffectRotOffsetBow; + agl::utl::Parameter mGrabPlayerHoldTransOffset; + agl::utl::Parameter mGrabPlayerHoldRotOffset; + agl::utl::Parameter mGrabAffectTransOffsetShield; + agl::utl::Parameter mGrabAffectRotOffsetShield; + agl::utl::Parameter mSquatPlayerHoldTransAddOffset; + agl::utl::Parameter mSquatPlayerHoldRotAddOffset; + agl::utl::Parameter mNPCHoldTransOffset; + agl::utl::Parameter mNPCHoldRotOffset; + agl::utl::Parameter mNPCEquipTransOffset; + agl::utl::Parameter mNPCEquipRotOffset; + agl::utl::Parameter mEnemyEquipTransOffset; + agl::utl::Parameter mEnemyEquipRotOffset; + agl::utl::Parameter mStandEquipTransOffset; + agl::utl::Parameter mStandEquipRotOffset; + agl::utl::Parameter mWeaponSubType; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectSpear, 0x448); + +inline GParamListObjectSpear::GParamListObjectSpear() { + auto* const obj = &mObj; + + mPodName.init("", "PodName", "", obj); + mPlayerHoldTransOffset.init({-0.9, -0.02, 0.52}, "PlayerHoldTransOffset", "", obj); + mPlayerHoldRotOffset.init({0.0, -120.0, -180.0}, "PlayerHoldRotOffset", "", obj); + mPlayerEquipTransOffset.init({0.0, 0.0, 0.0}, "PlayerEquipTransOffset", "", obj); + mPlayerEquipRotOffset.init({0.0, 0.0, 0.0}, "PlayerEquipRotOffset", "", obj); + mRideHorsePlayerHoldTransOffset.init({0.0, 0.0, 0.0}, "RideHorsePlayerHoldTransOffset", "", + obj); + mRideHorsePlayerHoldRotOffset.init({0.0, 0.0, 0.0}, "RideHorsePlayerHoldRotOffset", "", obj); + mAffectTransOffsetShield.init({0.0, 0.0, 0.0}, "AffectTransOffsetShield", "", obj); + mAffectRotOffsetShield.init({0.0, 0.0, 0.0}, "AffectRotOffsetShield", "", obj); + mAffectTransOffsetBow.init({0.0, 0.0, 0.0}, "AffectTransOffsetBow", "", obj); + mAffectRotOffsetBow.init({0.0, 0.0, 0.0}, "AffectRotOffsetBow", "", obj); + mGrabPlayerHoldTransOffset.init({-0.87, -0.17, -0.34}, "GrabPlayerHoldTransOffset", "", obj); + mGrabPlayerHoldRotOffset.init({-60.0, -20.0, -90.0}, "GrabPlayerHoldRotOffset", "", obj); + mGrabAffectTransOffsetShield.init({0.0, -0.03, 0.0}, "GrabAffectTransOffsetShield", "", obj); + mGrabAffectRotOffsetShield.init({-5.0, 0.0, 0.0}, "GrabAffectRotOffsetShield", "", obj); + mSquatPlayerHoldTransAddOffset.init({0.0, 0.0, 0.0}, "SquatPlayerHoldTransAddOffset", "", obj); + mSquatPlayerHoldRotAddOffset.init({0.0, 0.0, 0.0}, "SquatPlayerHoldRotAddOffset", "", 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); + mEnemyEquipTransOffset.init({0.0, 0.0, 0.0}, "EnemyEquipTransOffset", "", obj); + mEnemyEquipRotOffset.init({0.0, 0.0, 0.0}, "EnemyEquipRotOffset", "", obj); + mStandEquipTransOffset.init({0.0, 0.0, 0.0}, "StandEquipTransOffset", "", obj); + mStandEquipRotOffset.init({0.0, 0.0, 0.0}, "StandEquipRotOffset", "", obj); + mWeaponSubType.init("", "WeaponSubType", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index e5536f3a..416fe699 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -15,6 +15,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectSpear.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectSystem.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponCommon.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponThrow.h" @@ -68,6 +69,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "SmallSword", heap, dummy_list); add(archive.getRootList(), "Rod", heap, dummy_list); add(archive.getRootList(), "LargeSword", heap, dummy_list); + add(archive.getRootList(), "Spear", heap, dummy_list); // TODO: the rest