diff --git a/CMakeLists.txt b/CMakeLists.txt index d0337fc0..5db045ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,6 +65,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObject.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmor.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorEffect.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectAttack.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectAttackInterval.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindBone.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 0530676c..60ba5b1a 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89082,7 +89082,7 @@ 0x000000710119512c,BgparamlistObjectCamera::ctor,884,_ZN4ksys3res22GParamListObjectCameraC2Ev 0x00000071011954a0,BgparamlistObjectGrab::ctor,1188,_ZN4ksys3res20GParamListObjectGrabC2Ev 0x0000007101195944,BgparamlistObjectArmor::ctor,700,_ZN4ksys3res21GParamListObjectArmorC2Ev -0x0000007101195c00,BgparamlistObjectArmorEffect::ctor,540, +0x0000007101195c00,BgparamlistObjectArmorEffect::ctor,540,_ZN4ksys3res27GParamListObjectArmorEffectC2Ev 0x0000007101195e1c,BgparamlistObjectArmorHead::ctor,400, 0x0000007101195fac,BgparamlistObjectArmorUpper::ctor,508, 0x00000071011961a8,BgparamlistObjectShiekerStone::ctor,672, @@ -89170,7 +89170,7 @@ 0x00000071011a7ca4,sub_71011A7CA4,12,_ZNK4ksys3res22GParamListObjectCamera7getNameEv 0x00000071011a7cb0,sub_71011A7CB0,12,_ZNK4ksys3res20GParamListObjectGrab7getNameEv 0x00000071011a7cbc,sub_71011A7CBC,12,_ZNK4ksys3res21GParamListObjectArmor7getNameEv -0x00000071011a7cc8,sub_71011A7CC8,12, +0x00000071011a7cc8,sub_71011A7CC8,12,_ZNK4ksys3res27GParamListObjectArmorEffect7getNameEv 0x00000071011a7cd4,sub_71011A7CD4,12, 0x00000071011a7ce0,sub_71011A7CE0,12, 0x00000071011a7cec,sub_71011A7CEC,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorEffect.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorEffect.h new file mode 100644 index 00000000..eea7f784 --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorEffect.h @@ -0,0 +1,32 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectArmorEffect : public GParamListObject { +public: + GParamListObjectArmorEffect(); + const char* getName() const override { return "ArmorEffect"; } + + agl::utl::Parameter mEffectType; + agl::utl::Parameter mEffectLevel; + agl::utl::Parameter mAncientPowUp; + agl::utl::Parameter mEnableClimbWaterfall; + agl::utl::Parameter mEnableSpinAttack; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectArmorEffect, 0xe0); + +inline GParamListObjectArmorEffect::GParamListObjectArmorEffect() { + auto* const obj = &mObj; + + mEffectType.init("None", "EffectType", "", obj); + mEffectLevel.init(0, "EffectLevel", "", obj); + mAncientPowUp.init(false, "AncientPowUp", "", obj); + mEnableClimbWaterfall.init(false, "EnableClimbWaterfall", "", obj); + mEnableSpinAttack.init(false, "EnableSpinAttack", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index ed323288..a4db757f 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -4,6 +4,7 @@ #include "KingSystem/ActorSystem/actActorParamMgr.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectArmor.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectArmorEffect.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectAttack.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectAttackInterval.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectBindBone.h" @@ -89,6 +90,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "Camera", heap, dummy_list); add(archive.getRootList(), "Grab", heap, dummy_list); add(archive.getRootList(), "Armor", heap, dummy_list); + add(archive.getRootList(), "ArmorEffect", heap, dummy_list); // TODO: the rest