From 782cdf941505604b5cf40fd821b7b838b27241e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 20 Sep 2020 11:57:37 +0200 Subject: [PATCH] ksys/res: Implement GParamList Horse --- CMakeLists.txt | 1 + data/uking_functions.csv | 4 +- .../resGParamListObjectHorse.h | 46 +++++++++++++++++++ .../Resource/resResourceGParamList.cpp | 2 + 4 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorse.h diff --git a/CMakeLists.txt b/CMakeLists.txt index f0fa1d4c..0d3de822 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,6 +90,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectGrab.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMiniWeapon.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorse.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectInsect.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectItem.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectLargeSword.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 955b23a0..cb425b54 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89101,7 +89101,7 @@ 0x000000710119fd70,BgparamlistObjectAnimalUnit::ctor,1380,_ZN4ksys3res26GParamListObjectAnimalUnitC2Ev 0x00000071011a02d4,BgparamlistObjectFish::ctor,500,_ZN4ksys3res20GParamListObjectFishC2Ev 0x00000071011a04c8,BgparamlistObjectRope::ctor,820,_ZN4ksys3res20GParamListObjectRopeC2Ev -0x00000071011a07fc,BgparamlistObjectHorse::ctor,1068, +0x00000071011a07fc,BgparamlistObjectHorse::ctor,1068,_ZN4ksys3res21GParamListObjectHorseC2Ev 0x00000071011a0c28,BgparamlistObjectHorseUnit::ctor,424, 0x00000071011a0dd0,BgparamlistObjectHorseRider::ctor,1432, 0x00000071011a1368,BgparamlistObjectHorseCreator::ctor,328, @@ -89196,7 +89196,7 @@ 0x00000071011a7ddc,sub_71011A7DDC,12,_ZNK4ksys3res22GParamListObjectInsect7getNameEv 0x00000071011a7de8,sub_71011A7DE8,12,_ZNK4ksys3res20GParamListObjectFish7getNameEv 0x00000071011a7df4,sub_71011A7DF4,12,_ZNK4ksys3res20GParamListObjectRope7getNameEv -0x00000071011a7e00,sub_71011A7E00,12, +0x00000071011a7e00,sub_71011A7E00,12,_ZNK4ksys3res21GParamListObjectHorse7getNameEv 0x00000071011a7e0c,sub_71011A7E0C,12, 0x00000071011a7e18,sub_71011A7E18,12, 0x00000071011a7e24,sub_71011A7E24,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorse.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorse.h new file mode 100644 index 00000000..2a1fdb88 --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorse.h @@ -0,0 +1,46 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectHorse : public GParamListObject { +public: + GParamListObjectHorse(); + const char* getName() const override { return "Horse"; } + + agl::utl::Parameter mIsDecoy; + agl::utl::Parameter mHasMane; + agl::utl::Parameter mASVariation; + agl::utl::Parameter mNature; + agl::utl::Parameter mAttackPowerMultiplierGear2; + agl::utl::Parameter mAttackPowerMultiplierGear3; + agl::utl::Parameter mAttackPowerMultiplierGearTop; + agl::utl::Parameter mRunnableFramesAtGearTop; + agl::utl::Parameter mGearTopInterval; + agl::utl::Parameter mGearTopChargeNum; + agl::utl::Parameter mEatActorNames; + agl::utl::Parameter mEatActorNamesForExtraCharge; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectHorse, 0x1d0); + +inline GParamListObjectHorse::GParamListObjectHorse() { + auto* const obj = &mObj; + + mIsDecoy.init(false, "IsDecoy", "", obj); + mHasMane.init(true, "HasMane", "", obj); + mASVariation.init("Normal", "ASVariation", "", obj); + mNature.init(0, "Nature", "", obj); + mAttackPowerMultiplierGear2.init(0.0, "AttackPowerMultiplierGear2", "", obj); + mAttackPowerMultiplierGear3.init(0.0, "AttackPowerMultiplierGear3", "", obj); + mAttackPowerMultiplierGearTop.init(6.0, "AttackPowerMultiplierGearTop", "", obj); + mRunnableFramesAtGearTop.init(180.0, "RunnableFramesAtGearTop", "", obj); + mGearTopInterval.init(240.0, "GearTopInterval", "", obj); + mGearTopChargeNum.init(3, "GearTopChargeNum", "", obj); + mEatActorNames.init("", "EatActorNames", "", obj); + mEatActorNamesForExtraCharge.init("", "EatActorNamesForExtraCharge", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index bfad76b4..a7f7e2f8 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -29,6 +29,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGrab.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMiniWeapon.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectHorse.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectInsect.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectItem.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectLargeSword.h" @@ -144,6 +145,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "Insect", heap, dummy_list); add(archive.getRootList(), "Fish", heap, dummy_list); add(archive.getRootList(), "Rope", heap, dummy_list); + add(archive.getRootList(), "Horse", heap, dummy_list); // TODO: the rest