diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e6ab36c..5db61fd7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,6 +81,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObjectGrab.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMiniWeapon.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectLargeSword.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectLiftable.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectPlayer.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index ab3f03c0..52d9bef8 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89086,7 +89086,7 @@ 0x0000007101195e1c,BgparamlistObjectArmorHead::ctor,400,_ZN4ksys3res25GParamListObjectArmorHeadC2Ev 0x0000007101195fac,BgparamlistObjectArmorUpper::ctor,508,_ZN4ksys3res26GParamListObjectArmorUpperC2Ev 0x00000071011961a8,BgparamlistObjectShiekerStone::ctor,672,_ZN4ksys3res28GParamListObjectShiekerStoneC2Ev -0x0000007101196448,BgparamlistObjectLiftable::ctor,1520, +0x0000007101196448,BgparamlistObjectLiftable::ctor,1520,_ZN4ksys3res24GParamListObjectLiftableC2Ev 0x0000007101196a38,BgparamlistObjectItem::ctor,664, 0x0000007101196cd0,BgparamlistObjectArrow::ctor,540, 0x0000007101196eec,BgparamlistObjectCureItem::ctor,456, @@ -89175,7 +89175,7 @@ 0x00000071011a7ce0,sub_71011A7CE0,12,_ZNK4ksys3res26GParamListObjectArmorUpper7getNameEv 0x00000071011a7cec,sub_71011A7CEC,12,_ZNK4ksys3res28GParamListObjectShiekerStone7getNameEv 0x00000071011a7cf8,sub_71011A7CF8,12,_ZNK4ksys3res27GParamListObjectSeriesArmor7getNameEv -0x00000071011a7d04,sub_71011A7D04,12, +0x00000071011a7d04,sub_71011A7D04,12,_ZNK4ksys3res24GParamListObjectLiftable7getNameEv 0x00000071011a7d10,sub_71011A7D10,12, 0x00000071011a7d1c,sub_71011A7D1C,12, 0x00000071011a7d28,sub_71011A7D28,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectLiftable.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectLiftable.h new file mode 100644 index 00000000..a8b7d458 --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectLiftable.h @@ -0,0 +1,60 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectLiftable : public GParamListObject { +public: + GParamListObjectLiftable(); + const char* getName() const override { return "Liftable"; } + + agl::utl::Parameter mLiftType; + agl::utl::Parameter mThrownMass; + agl::utl::Parameter mThrownRotSpd; + agl::utl::Parameter mLiftPosOffset; + agl::utl::Parameter mLiftRotOffset; + agl::utl::Parameter mLiftRotFrame; + agl::utl::Parameter mAddLiftRotOffsetList; + agl::utl::Parameter mChaseLiftRotOffset; + agl::utl::Parameter mLiftCenterOffset; + agl::utl::Parameter mPutPosOffset; + agl::utl::Parameter mPutRotOffset; + agl::utl::Parameter mPutRotFrame; + agl::utl::Parameter mAddPutRotOffsetList; + agl::utl::Parameter mIsUpdateOffsetEachFrame; + agl::utl::Parameter mIsUse2MassConstraintMode; + agl::utl::Parameter mIsSetChemicalParent; + agl::utl::Parameter mDisableFreezeLift; + agl::utl::Parameter mDisableBurnLift; + agl::utl::Parameter mThrowReactionLevel; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectLiftable, 0x2e0); + +inline GParamListObjectLiftable::GParamListObjectLiftable() { + auto* const obj = &mObj; + + mLiftType.init("", "LiftType", "", obj); + mThrownMass.init(10, "ThrownMass", "", obj); + mThrownRotSpd.init({0.0, 0.0, 0.0}, "ThrownRotSpd", "", obj); + mLiftPosOffset.init({0.0, 0.0, 0.0}, "LiftPosOffset", "", obj); + mLiftRotOffset.init({0.0, 0.0, 0.0}, "LiftRotOffset", "", obj); + mLiftRotFrame.init(10, "LiftRotFrame", "", obj); + mAddLiftRotOffsetList.init("", "AddLiftRotOffsetList", "", obj); + mChaseLiftRotOffset.init(false, "ChaseLiftRotOffset", "", obj); + mLiftCenterOffset.init({0.0, 0.0, 0.0}, "LiftCenterOffset", "", obj); + mPutPosOffset.init({0.0, 0.0, 0.5}, "PutPosOffset", "", obj); + mPutRotOffset.init({0.0, 0.0, 0.0}, "PutRotOffset", "", obj); + mPutRotFrame.init(10, "PutRotFrame", "", obj); + mAddPutRotOffsetList.init("", "AddPutRotOffsetList", "", obj); + mIsUpdateOffsetEachFrame.init(false, "IsUpdateOffsetEachFrame", "", obj); + mIsUse2MassConstraintMode.init(true, "IsUse2MassConstraintMode", "", obj); + mIsSetChemicalParent.init(true, "IsSetChemicalParent", "", obj); + mDisableFreezeLift.init(false, "DisableFreezeLift", "", obj); + mDisableBurnLift.init(false, "DisableBurnLift", "", obj); + mThrowReactionLevel.init(-1, "ThrowReactionLevel", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index b87f829f..f449c29a 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -20,6 +20,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGrab.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMiniWeapon.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectLargeSword.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectLiftable.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectPlayer.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h" @@ -99,6 +100,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "ArmorUpper", heap, dummy_list); add(archive.getRootList(), "ShiekerStone", heap, dummy_list); add(archive.getRootList(), "SeriesArmor", heap, dummy_list); + add(archive.getRootList(), "Liftable", heap, dummy_list); // TODO: the rest