diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c1fed41..ab7a81f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,6 +92,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObjectNpc.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectNpcEquipment.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectPlayer.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectPrey.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectRupee.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index ffcd498b..f4ab019d 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89096,7 +89096,7 @@ 0x00000071011979f8,BgparamlistObjectNpcEquipment::ctor,1960,_ZN4ksys3res28GParamListObjectNpcEquipmentC2Ev 0x00000071011981a0,BgparamlistObjectZora::ctor,508,_ZN4ksys3res20GParamListObjectZoraC2Ev 0x000000710119839c,BgparamlistObjectTraveler::ctor,29996,_ZN4ksys3res24GParamListObjectTravelerC1Ev -0x000000710119f8c8,BgparamlistObjectPrey::ctor,508, +0x000000710119f8c8,BgparamlistObjectPrey::ctor,508,_ZN4ksys3res20GParamListObjectPreyC2Ev 0x000000710119fac4,BgparamlistObjectEatTarget::ctor,684, 0x000000710119fd70,BgparamlistObjectAnimalUnit::ctor,1380, 0x00000071011a02d4,BgparamlistObjectFish::ctor,500, @@ -89187,7 +89187,7 @@ 0x00000071011a7d70,sub_71011A7D70,12,_ZNK4ksys3res28GParamListObjectNpcEquipment7getNameEv 0x00000071011a7d7c,sub_71011A7D7C,12,_ZNK4ksys3res20GParamListObjectZora7getNameEv 0x00000071011a7d88,sub_71011A7D88,12,_ZNK4ksys3res24GParamListObjectTraveler7getNameEv -0x00000071011a7d94,sub_71011A7D94,12, +0x00000071011a7d94,sub_71011A7D94,12,_ZNK4ksys3res20GParamListObjectPrey7getNameEv 0x00000071011a7da0,sub_71011A7DA0,12, 0x00000071011a7dac,sub_71011A7DAC,12, 0x00000071011a7db8,sub_71011A7DB8,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectPrey.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectPrey.h new file mode 100644 index 00000000..8121f75d --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectPrey.h @@ -0,0 +1,32 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectPrey : public GParamListObject { +public: + GParamListObjectPrey(); + const char* getName() const override { return "Prey"; } + + agl::utl::Parameter mEatActorFindRadius; + agl::utl::Parameter mEatActorFindRotDegree; + agl::utl::Parameter mWaitTimeForStartEat; + agl::utl::Parameter mIsEnableGroupEscape; + agl::utl::Parameter mAimEscapeOffsetRate; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectPrey, 0xd8); + +inline GParamListObjectPrey::GParamListObjectPrey() { + auto* const obj = &mObj; + + mEatActorFindRadius.init(-1.0, "EatActorFindRadius", "", obj); + mEatActorFindRotDegree.init(135.0, "EatActorFindRotDegree", "", obj); + mWaitTimeForStartEat.init(150.0, "WaitTimeForStartEat", "", obj); + mIsEnableGroupEscape.init(true, "IsEnableGroupEscape", "", obj); + mAimEscapeOffsetRate.init(1.0, "AimEscapeOffsetRate", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index 38981845..85cd446c 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -31,6 +31,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObjectNpc.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectNpcEquipment.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectPlayer.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectPrey.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectRupee.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h" @@ -124,6 +125,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "NpcEquipment", heap, dummy_list); add(archive.getRootList(), "Zora", heap, dummy_list); add(archive.getRootList(), "Traveler", heap, dummy_list); + add(archive.getRootList(), "Prey", heap, dummy_list); // TODO: the rest