From 2daaa04b7185224b8b63d4ce698aa7b2eea56b34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 20 Sep 2020 12:12:34 +0200 Subject: [PATCH] ksys/res: Implement GParamList Guardian --- CMakeLists.txt | 1 + data/uking_functions.csv | 4 +- .../resGParamListObjectGuardian.h | 40 +++++++++++++++++++ .../Resource/resResourceGParamList.cpp | 2 + 4 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardian.h diff --git a/CMakeLists.txt b/CMakeLists.txt index b2be9207..cf9a13c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,6 +91,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObjectGiantArmor.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectGiantArmorSlot.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectGrab.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardian.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMiniWeapon.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorse.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseCreator.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index f4e181d2..f7fd29a3 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89106,7 +89106,7 @@ 0x00000071011a0dd0,BgparamlistObjectHorseRider::ctor,1432,_ZN4ksys3res26GParamListObjectHorseRiderC2Ev 0x00000071011a1368,BgparamlistObjectHorseCreator::ctor,328,_ZN4ksys3res28GParamListObjectHorseCreatorC2Ev 0x00000071011a14b0,BgparamlistObjectGiantArmorSlot::ctor,1188,_ZN4ksys3res30GParamListObjectGiantArmorSlotC2Ev -0x00000071011a1954,BgparamlistObjectGuardian::ctor,812, +0x00000071011a1954,BgparamlistObjectGuardian::ctor,812,_ZN4ksys3res24GParamListObjectGuardianC2Ev 0x00000071011a1c80,BgparamlistObjectSwarm::ctor,388, 0x00000071011a1e04,BgparamlistObjectGelEnemy::ctor,1352, 0x00000071011a234c,BgparamlistObjectWizzrobe::ctor,832, @@ -89203,7 +89203,7 @@ 0x00000071011a7e30,sub_71011A7E30,12,_ZNK4ksys3res28GParamListObjectHorseCreator7getNameEv 0x00000071011a7e3c,sub_71011A7E3C,12,_ZNK4ksys3res30GParamListObjectGiantArmorSlot7getNameEv 0x00000071011a7e48,sub_71011A7E48,12,_ZNK4ksys3res26GParamListObjectGiantArmor7getNameEv -0x00000071011a7e54,sub_71011A7E54,12, +0x00000071011a7e54,sub_71011A7E54,12,_ZNK4ksys3res24GParamListObjectGuardian7getNameEv 0x00000071011a7e60,sub_71011A7E60,12, 0x00000071011a7e6c,sub_71011A7E6C,12, 0x00000071011a7e78,sub_71011A7E78,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardian.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardian.h new file mode 100644 index 00000000..b5ac3649 --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardian.h @@ -0,0 +1,40 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectGuardian : public GParamListObject { +public: + GParamListObjectGuardian(); + const char* getName() const override { return "Guardian"; } + + agl::utl::Parameter mGuardianModelType; + agl::utl::Parameter mGuardianControllerType; + agl::utl::Parameter mHeadLimitMax; + agl::utl::Parameter mHeadLimitMin; + agl::utl::Parameter mSightLimitMax; + agl::utl::Parameter mSightLimitMin; + agl::utl::Parameter mMaxSpeed; + agl::utl::Parameter mCannonBoneName; + agl::utl::Parameter mRapidFireDistance; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectGuardian, 0x160); + +inline GParamListObjectGuardian::GParamListObjectGuardian() { + auto* const obj = &mObj; + + mGuardianModelType.init(0, "GuardianModelType", "", obj); + mGuardianControllerType.init(0, "GuardianControllerType", "", obj); + mHeadLimitMax.init(90.0, "HeadLimitMax", "", obj); + mHeadLimitMin.init(-90.0, "HeadLimitMin", "", obj); + mSightLimitMax.init(90.0, "SightLimitMax", "", obj); + mSightLimitMin.init(-90.0, "SightLimitMin", "", obj); + mMaxSpeed.init(25.0, "MaxSpeed", "", obj); + mCannonBoneName.init("Eye", "CannonBoneName", "", obj); + mRapidFireDistance.init(10.0, "RapidFireDistance", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index 6ec5be63..af3c90d5 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -30,6 +30,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGiantArmor.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGiantArmorSlot.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGrab.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectGuardian.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMiniWeapon.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectHorse.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectHorseCreator.h" @@ -159,6 +160,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "GiantArmorSlot", heap, dummy_list); add(archive.getRootList(), "GiantArmor", heap, dummy_list); + add(archive.getRootList(), "Guardian", heap, dummy_list); // TODO: the rest