diff --git a/CMakeLists.txt b/CMakeLists.txt index 13064c2b..e4d37ffd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,6 +73,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyShown.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.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 0a756a74..01e8d9c6 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89069,7 +89069,7 @@ 0x000000710118dc4c,BgparamlistObjectWeaponCommon::ctor,3288,_ZN4ksys3res28GParamListObjectWeaponCommonC2Ev 0x000000710118e924,BgparamlistObjectWeaponThrow::ctor,432,_ZN4ksys3res27GParamListObjectWeaponThrowC2Ev 0x000000710118ead4,BgparamlistObjectSandworm::ctor,1992,_ZN4ksys3res24GParamListObjectSandwormC2Ev -0x000000710118f29c,BgparamlistObjectSmallSword::ctor,1756, +0x000000710118f29c,BgparamlistObjectSmallSword::ctor,1756,_ZN4ksys3res26GParamListObjectSmallSwordC2Ev 0x000000710118f978,BgparamlistObjectRod::ctor,1192, 0x000000710118fe20,BgparamlistObjectLargeSword::ctor,1760, 0x0000007101190500,BgparamlistObjectSpear::ctor,2080, @@ -89157,7 +89157,7 @@ 0x00000071011a7c08,sub_71011A7C08,12,_ZNK4ksys3res28GParamListObjectWeaponCommon7getNameEv 0x00000071011a7c14,sub_71011A7C14,12,_ZNK4ksys3res27GParamListObjectWeaponThrow7getNameEv 0x00000071011a7c20,sub_71011A7C20,12,_ZNK4ksys3res24GParamListObjectSandworm7getNameEv -0x00000071011a7c2c,sub_71011A7C2C,12, +0x00000071011a7c2c,sub_71011A7C2C,12,_ZNK4ksys3res26GParamListObjectSmallSword7getNameEv 0x00000071011a7c38,sub_71011A7C38,12, 0x00000071011a7c44,sub_71011A7C44,12, 0x00000071011a7c50,sub_71011A7C50,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.h new file mode 100644 index 00000000..f53bd247 --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.h @@ -0,0 +1,67 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectSmallSword : public GParamListObject { +public: + GParamListObjectSmallSword(); + const char* getName() const override { return "SmallSword"; } + + 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 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(GParamListObjectSmallSword, 0x3a8); + +inline GParamListObjectSmallSword::GParamListObjectSmallSword() { + auto* const obj = &mObj; + + mPodName.init("", "PodName", "", obj); + mPlayerHoldTransOffset.init({0.125, -0.025, -0.075}, "PlayerHoldTransOffset", "", obj); + mPlayerHoldRotOffset.init({16.0, -60.0, -18.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); + 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 ce2305da..b6d6c195 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -12,6 +12,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyShown.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectSystem.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponCommon.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponThrow.h" @@ -62,6 +63,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "WeaponCommon", heap, dummy_list); add(archive.getRootList(), "WeaponThrow", heap, dummy_list); add(archive.getRootList(), "Sandworm", heap, dummy_list); + add(archive.getRootList(), "SmallSword", heap, dummy_list); // TODO: the rest