diff --git a/CMakeLists.txt b/CMakeLists.txt index c2ea4d1a..3ac12a2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,6 +66,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObject.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemy.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyLevel.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectSystem.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.cpp diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 6070ba86..072dd00b 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89061,7 +89061,7 @@ 0x000000710118bc58,BgparamlistObjectGeneral::ctor,764,_ZN4ksys3res23GParamListObjectGeneralC2Ev 0x000000710118bf54,BgparamlistObjectEnemy::ctor,1440,_ZN4ksys3res21GParamListObjectEnemyC2Ev 0x000000710118c4f4,BgparamlistObjectEnemyLevel::ctor,936,_ZN4ksys3res26GParamListObjectEnemyLevelC2Ev -0x000000710118c89c,BgparamlistObjectEnemyRace::ctor,2780, +0x000000710118c89c,BgparamlistObjectEnemyRace::ctor,2780,_ZN4ksys3res25GParamListObjectEnemyRaceC2Ev 0x000000710118d378,BgparamlistObjectAttackInterval::ctor,564, 0x000000710118d5ac,BgparamlistObjectEnemyShown::ctor,404, 0x000000710118d740,BgparamlistObjectBindBone::ctor,392, @@ -89149,7 +89149,7 @@ 0x00000071011a7ba8,sub_71011A7BA8,12,_ZNK4ksys3res23GParamListObjectGeneral7getNameEv 0x00000071011a7bb4,sub_71011A7BB4,12,_ZNK4ksys3res21GParamListObjectEnemy7getNameEv 0x00000071011a7bc0,sub_71011A7BC0,12,_ZNK4ksys3res26GParamListObjectEnemyLevel7getNameEv -0x00000071011a7bcc,sub_71011A7BCC,12, +0x00000071011a7bcc,sub_71011A7BCC,12,_ZNK4ksys3res25GParamListObjectEnemyRace7getNameEv 0x00000071011a7bd8,sub_71011A7BD8,12, 0x00000071011a7be4,sub_71011A7BE4,12, 0x00000071011a7bf0,sub_71011A7BF0,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h new file mode 100644 index 00000000..19fca76d --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h @@ -0,0 +1,98 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectEnemyRace : public GParamListObject { +public: + GParamListObjectEnemyRace(); + const char* getName() const override { return "EnemyRace"; } + + agl::utl::Parameter mEquipableWeapon; + agl::utl::Parameter mIsFitGroundByAnimalUnit; + agl::utl::Parameter mIsUpdateSupportNormalInAir; + agl::utl::Parameter mBowAttackRangeRatio; + agl::utl::Parameter mWeaponScaleSmallSword; + agl::utl::Parameter mWeaponTransOffsetSmallSword; + agl::utl::Parameter mWeaponRotOffsetSmallSword; + agl::utl::Parameter mWeaponHoldTransOffsetSmallSword; + agl::utl::Parameter mWeaponHoldRotOffsetSmallSword; + agl::utl::Parameter mWeaponScaleLargeSword; + agl::utl::Parameter mWeaponTransOffsetLargeSword; + agl::utl::Parameter mWeaponRotOffsetLargeSword; + agl::utl::Parameter mWeaponHoldTransOffsetLargeSword; + agl::utl::Parameter mWeaponHoldRotOffsetLargeSword; + agl::utl::Parameter mWeaponScaleSpear; + agl::utl::Parameter mWeaponTransOffsetSpear; + agl::utl::Parameter mWeaponRotOffsetSpear; + agl::utl::Parameter mWeaponHoldTransOffsetSpear; + agl::utl::Parameter mWeaponHoldRotOffsetSpear; + agl::utl::Parameter mWeaponScaleBow; + agl::utl::Parameter mWeaponTransOffsetBow; + agl::utl::Parameter mWeaponRotOffsetBow; + agl::utl::Parameter mWeaponHoldTransOffsetBow; + agl::utl::Parameter mWeaponHoldRotOffsetBow; + agl::utl::Parameter mWeaponScaleShield; + agl::utl::Parameter mWeaponTransOffsetShield; + agl::utl::Parameter mWeaponRotOffsetShield; + agl::utl::Parameter mWeaponHoldTransOffsetShield; + agl::utl::Parameter mWeaponHoldRotOffsetShield; + agl::utl::Parameter mIsUseTargetTag; + agl::utl::Parameter mTargetActorType; + agl::utl::Parameter mEscapeAttackedActorType; + agl::utl::Parameter mReactionBalloon; + agl::utl::Parameter mSmallRagdollTime; + agl::utl::Parameter mSmallRagdollRecoverTime; + agl::utl::Parameter mSmallLargeRagdollTime; + agl::utl::Parameter mSmallLargeRagdollRecoverTime; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectEnemyRace, 0x590); + +inline GParamListObjectEnemyRace::GParamListObjectEnemyRace() { + auto* const obj = &mObj; + + mEquipableWeapon.init("", "EquipableWeapon", "", obj); + mIsFitGroundByAnimalUnit.init(true, "IsFitGroundByAnimalUnit", "", obj); + mIsUpdateSupportNormalInAir.init(false, "IsUpdateSupportNormalInAir", "", obj); + mBowAttackRangeRatio.init(1.0, "BowAttackRangeRatio", "", obj); + mWeaponScaleSmallSword.init(1.0, "WeaponScaleSmallSword", "", obj); + mWeaponTransOffsetSmallSword.init({0.0, 0.0, 0.0}, "WeaponTransOffsetSmallSword", "", obj); + mWeaponRotOffsetSmallSword.init({0.0, 0.0, 0.0}, "WeaponRotOffsetSmallSword", "", obj); + mWeaponHoldTransOffsetSmallSword.init({0.0, 0.0, 0.0}, "WeaponHoldTransOffsetSmallSword", "", + obj); + mWeaponHoldRotOffsetSmallSword.init({0.0, 0.0, 0.0}, "WeaponHoldRotOffsetSmallSword", "", obj); + mWeaponScaleLargeSword.init(1.0, "WeaponScaleLargeSword", "", obj); + mWeaponTransOffsetLargeSword.init({0.0, 0.0, 0.0}, "WeaponTransOffsetLargeSword", "", obj); + mWeaponRotOffsetLargeSword.init({0.0, 0.0, 0.0}, "WeaponRotOffsetLargeSword", "", obj); + mWeaponHoldTransOffsetLargeSword.init({0.0, 0.0, 0.0}, "WeaponHoldTransOffsetLargeSword", "", + obj); + mWeaponHoldRotOffsetLargeSword.init({0.0, 0.0, 0.0}, "WeaponHoldRotOffsetLargeSword", "", obj); + mWeaponScaleSpear.init(1.0, "WeaponScaleSpear", "", obj); + mWeaponTransOffsetSpear.init({0.0, 0.0, 0.0}, "WeaponTransOffsetSpear", "", obj); + mWeaponRotOffsetSpear.init({0.0, 0.0, 0.0}, "WeaponRotOffsetSpear", "", obj); + mWeaponHoldTransOffsetSpear.init({0.0, 0.0, 0.0}, "WeaponHoldTransOffsetSpear", "", obj); + mWeaponHoldRotOffsetSpear.init({0.0, 0.0, 0.0}, "WeaponHoldRotOffsetSpear", "", obj); + mWeaponScaleBow.init(1.0, "WeaponScaleBow", "", obj); + mWeaponTransOffsetBow.init({0.0, 0.0, 0.0}, "WeaponTransOffsetBow", "", obj); + mWeaponRotOffsetBow.init({0.0, 0.0, 0.0}, "WeaponRotOffsetBow", "", obj); + mWeaponHoldTransOffsetBow.init({0.0, 0.0, 0.0}, "WeaponHoldTransOffsetBow", "", obj); + mWeaponHoldRotOffsetBow.init({0.0, 0.0, 0.0}, "WeaponHoldRotOffsetBow", "", obj); + mWeaponScaleShield.init(1.0, "WeaponScaleShield", "", obj); + mWeaponTransOffsetShield.init({0.0, 0.0, 0.0}, "WeaponTransOffsetShield", "", obj); + mWeaponRotOffsetShield.init({0.0, 0.0, 0.0}, "WeaponRotOffsetShield", "", obj); + mWeaponHoldTransOffsetShield.init({0.0, 0.0, 0.0}, "WeaponHoldTransOffsetShield", "", obj); + mWeaponHoldRotOffsetShield.init({0.0, 0.0, 0.0}, "WeaponHoldRotOffsetShield", "", obj); + mIsUseTargetTag.init(false, "IsUseTargetTag", "", obj); + mTargetActorType.init("Player", "TargetActorType", "", obj); + mEscapeAttackedActorType.init("", "EscapeAttackedActorType", "", obj); + mReactionBalloon.init(false, "ReactionBalloon", "", obj); + mSmallRagdollTime.init(8, "SmallRagdollTime", "", obj); + mSmallRagdollRecoverTime.init(15, "SmallRagdollRecoverTime", "", obj); + mSmallLargeRagdollTime.init(60, "SmallLargeRagdollTime", "", obj); + mSmallLargeRagdollRecoverTime.init(20, "SmallLargeRagdollRecoverTime", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index 96c3eab9..1c57644b 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -5,6 +5,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemy.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyLevel.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectSystem.h" #include "KingSystem/Resource/GeneralParamList/resGParamListTraits.h" @@ -45,6 +46,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "General", heap, dummy_list); add(archive.getRootList(), "Enemy", heap, dummy_list); add(archive.getRootList(), "EnemyLevel", heap, dummy_list); + add(archive.getRootList(), "EnemyRace", heap, dummy_list); // TODO: the rest