From a5ea3328f43cad979ea7a534bce12ea69f399f33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 20 Sep 2020 00:28:20 +0200 Subject: [PATCH] ksys/res: Implement GParamList MasterSword --- CMakeLists.txt | 1 + data/uking_functions.csv | 4 +- .../resGParamListObjectMasterSword.h | 38 +++++++++++++++++++ .../Resource/resResourceGParamList.cpp | 2 + 4 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 src/KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h diff --git a/CMakeLists.txt b/CMakeLists.txt index bb135193..5d64fc28 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,6 +74,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyShown.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectLargeSword.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectShield.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index b0a93c95..72b6e7b6 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89076,7 +89076,7 @@ 0x0000007101190d20,BgparamlistObjectShield::ctor,1484,_ZN4ksys3res22GParamListObjectShieldC2Ev 0x00000071011912ec,BgparamlistObjectBow::ctor,2724,_ZN4ksys3res19GParamListObjectBowC2Ev 0x0000007101191d90,BgparamlistObjectWeaponOption::ctor,596,_ZN4ksys3res28GParamListObjectWeaponOptionC2Ev -0x0000007101191fe4,BgparamlistObjectMasterSword::ctor,772, +0x0000007101191fe4,BgparamlistObjectMasterSword::ctor,772,_ZN4ksys3res27GParamListObjectMasterSwordC2Ev 0x00000071011922e8,BgparamlistObjectGuardianMiniWeapon::ctor,608, 0x0000007101192548,BgparamlistObjectPlayer::ctor,11236, 0x000000710119512c,BgparamlistObjectCamera::ctor,884, @@ -89164,7 +89164,7 @@ 0x00000071011a7c5c,sub_71011A7C5C,12,_ZNK4ksys3res22GParamListObjectShield7getNameEv 0x00000071011a7c68,sub_71011A7C68,12,_ZNK4ksys3res19GParamListObjectBow7getNameEv 0x00000071011a7c74,sub_71011A7C74,12,_ZNK4ksys3res28GParamListObjectWeaponOption7getNameEv -0x00000071011a7c80,sub_71011A7C80,12, +0x00000071011a7c80,sub_71011A7C80,12,_ZNK4ksys3res27GParamListObjectMasterSword7getNameEv 0x00000071011a7c8c,sub_71011A7C8C,12, 0x00000071011a7c98,sub_71011A7C98,12, 0x00000071011a7ca4,sub_71011A7CA4,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h new file mode 100644 index 00000000..86cef94d --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h @@ -0,0 +1,38 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectMasterSword : public GParamListObject { +public: + GParamListObjectMasterSword(); + const char* getName() const override { return "MasterSword"; } + + agl::utl::Parameter mIsMasterSword; + agl::utl::Parameter mTrueFormAttackPower; + agl::utl::Parameter mTrueFormMagicPower; + agl::utl::Parameter mTrueFormBreakRatio; + agl::utl::Parameter mSearchEvilDist; + agl::utl::Parameter mRecoverTime; + agl::utl::Parameter mSleepActorName; + agl::utl::Parameter mTrueFormActorName; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectMasterSword, 0x148); + +inline GParamListObjectMasterSword::GParamListObjectMasterSword() { + auto* const obj = &mObj; + + mIsMasterSword.init(false, "IsMasterSword", "", obj); + mTrueFormAttackPower.init(-1, "TrueFormAttackPower", "", obj); + mTrueFormMagicPower.init(-1, "TrueFormMagicPower", "", obj); + mTrueFormBreakRatio.init(0.5, "TrueFormBreakRatio", "", obj); + mSearchEvilDist.init(-1.0, "SearchEvilDist", "", obj); + mRecoverTime.init(30, "RecoverTime", "", obj); + mSleepActorName.init("", "SleepActorName", "", obj); + mTrueFormActorName.init("", "TrueFormActorName", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index 997abe3e..4fe17721 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -13,6 +13,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyShown.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectLargeSword.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectShield.h" @@ -76,6 +77,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "Shield", heap, dummy_list); add(archive.getRootList(), "Bow", heap, dummy_list); add(archive.getRootList(), "WeaponOption", heap, dummy_list); + add(archive.getRootList(), "MasterSword", heap, dummy_list); // TODO: the rest