diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b6b78c8..97731e59 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,6 +67,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObjectAttack.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectAttackInterval.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindBone.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectBow.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemy.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyLevel.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 0c285dd9..5a8b2bbf 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89074,7 +89074,7 @@ 0x000000710118fe20,BgparamlistObjectLargeSword::ctor,1760,_ZN4ksys3res26GParamListObjectLargeSwordC2Ev 0x0000007101190500,BgparamlistObjectSpear::ctor,2080,_ZN4ksys3res21GParamListObjectSpearC2Ev 0x0000007101190d20,BgparamlistObjectShield::ctor,1484,_ZN4ksys3res22GParamListObjectShieldC2Ev -0x00000071011912ec,BgparamlistObjectBow::ctor,2724, +0x00000071011912ec,BgparamlistObjectBow::ctor,2724,_ZN4ksys3res19GParamListObjectBowC2Ev 0x0000007101191d90,BgparamlistObjectWeaponOption::ctor,596, 0x0000007101191fe4,BgparamlistObjectMasterSword::ctor,772, 0x00000071011922e8,BgparamlistObjectGuardianMiniWeapon::ctor,608, @@ -89162,7 +89162,7 @@ 0x00000071011a7c44,sub_71011A7C44,12,_ZNK4ksys3res26GParamListObjectLargeSword7getNameEv 0x00000071011a7c50,sub_71011A7C50,12,_ZNK4ksys3res21GParamListObjectSpear7getNameEv 0x00000071011a7c5c,sub_71011A7C5C,12,_ZNK4ksys3res22GParamListObjectShield7getNameEv -0x00000071011a7c68,sub_71011A7C68,12, +0x00000071011a7c68,sub_71011A7C68,12,_ZNK4ksys3res19GParamListObjectBow7getNameEv 0x00000071011a7c74,sub_71011A7C74,12, 0x00000071011a7c80,sub_71011A7C80,12, 0x00000071011a7c8c,sub_71011A7C8C,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBow.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBow.h new file mode 100644 index 00000000..e1001c32 --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBow.h @@ -0,0 +1,94 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectBow : public GParamListObject { +public: + GParamListObjectBow(); + const char* getName() const override { return "Bow"; } + + agl::utl::Parameter mQuiverName; + agl::utl::Parameter mArrowName; + agl::utl::Parameter mIsGuardPierce; + agl::utl::Parameter mExtraDamageRatio; + agl::utl::Parameter mBaseAttackPowerRatio; + agl::utl::Parameter mIsLeadShot; + agl::utl::Parameter mLeadShotNum; + agl::utl::Parameter mLeadShotAng; + agl::utl::Parameter mLeadShotInterval; + agl::utl::Parameter mIsRapidFire; + agl::utl::Parameter mRapidFireNum; + agl::utl::Parameter mRapidFireInterval; + agl::utl::Parameter mIsLongRange; + agl::utl::Parameter mArrowFirstSpeed; + agl::utl::Parameter mArrowAcceleration; + agl::utl::Parameter mArrowStabilitySpeed; + agl::utl::Parameter mArrowFallAcceleration; + agl::utl::Parameter mArrowFallStabilitySpeed; + agl::utl::Parameter mArrowGravity; + agl::utl::Parameter mPlayerHoldTransOffset; + agl::utl::Parameter mPlayerHoldRotOffset; + agl::utl::Parameter mPlayerEquipTransOffset; + agl::utl::Parameter mPlayerEquipRotOffset; + agl::utl::Parameter mSquatPlayerHoldTransAddOffset; + agl::utl::Parameter mSquatPlayerHoldRotAddOffset; + agl::utl::Parameter mNPCHoldTransOffset; + agl::utl::Parameter mNPCHoldRotOffset; + agl::utl::Parameter mNPCEquipTransOffset; + agl::utl::Parameter mNPCEquipRotOffset; + agl::utl::Parameter mEnemyEquipTransOffset; + agl::utl::Parameter mEnemyEquipRotOffset; + agl::utl::Parameter mStandEquipTransOffset; + agl::utl::Parameter mStandEquipRotOffset; + agl::utl::Parameter mArrowChargeRate; + agl::utl::Parameter mArrowReloadRate; + agl::utl::Parameter mWeaponSubType; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectBow, 0x540); + +inline GParamListObjectBow::GParamListObjectBow() { + auto* const obj = &mObj; + + mQuiverName.init("", "QuiverName", "", obj); + mArrowName.init("", "ArrowName", "", obj); + mIsGuardPierce.init(false, "IsGuardPierce", "", obj); + mExtraDamageRatio.init(1.0, "ExtraDamageRatio", "", obj); + mBaseAttackPowerRatio.init(1.0, "BaseAttackPowerRatio", "", obj); + mIsLeadShot.init(false, "IsLeadShot", "", obj); + mLeadShotNum.init(0, "LeadShotNum", "", obj); + mLeadShotAng.init(45.0, "LeadShotAng", "", obj); + mLeadShotInterval.init(0, "LeadShotInterval", "", obj); + mIsRapidFire.init(false, "IsRapidFire", "", obj); + mRapidFireNum.init(0, "RapidFireNum", "", obj); + mRapidFireInterval.init(0, "RapidFireInterval", "", obj); + mIsLongRange.init(false, "IsLongRange", "", obj); + mArrowFirstSpeed.init(4.5, "ArrowFirstSpeed", "", obj); + mArrowAcceleration.init(-0.1, "ArrowAcceleration", "", obj); + mArrowStabilitySpeed.init(3.0, "ArrowStabilitySpeed", "", obj); + mArrowFallAcceleration.init(-0.2, "ArrowFallAcceleration", "", obj); + mArrowFallStabilitySpeed.init(1.0, "ArrowFallStabilitySpeed", "", obj); + mArrowGravity.init(-9.8, "ArrowGravity", "", obj); + mPlayerHoldTransOffset.init({-0.2, -0.01, 0.0}, "PlayerHoldTransOffset", "", obj); + mPlayerHoldRotOffset.init({12.0, -60.0, -22.0}, "PlayerHoldRotOffset", "", obj); + mPlayerEquipTransOffset.init({0.0, 0.0, 0.0}, "PlayerEquipTransOffset", "", obj); + mPlayerEquipRotOffset.init({0.0, 0.0, 0.0}, "PlayerEquipRotOffset", "", obj); + mSquatPlayerHoldTransAddOffset.init({0.0, 0.0, 0.0}, "SquatPlayerHoldTransAddOffset", "", obj); + mSquatPlayerHoldRotAddOffset.init({0.0, 0.0, 0.0}, "SquatPlayerHoldRotAddOffset", "", obj); + mNPCHoldTransOffset.init({0.0, 0.0, 0.0}, "NPCHoldTransOffset", "", obj); + mNPCHoldRotOffset.init({0.0, 0.0, 0.0}, "NPCHoldRotOffset", "", obj); + mNPCEquipTransOffset.init({0.0, 0.0, 0.0}, "NPCEquipTransOffset", "", obj); + mNPCEquipRotOffset.init({0.0, 0.0, 0.0}, "NPCEquipRotOffset", "", obj); + mEnemyEquipTransOffset.init({0.0, 0.0, 0.0}, "EnemyEquipTransOffset", "", obj); + mEnemyEquipRotOffset.init({0.0, 0.0, 0.0}, "EnemyEquipRotOffset", "", obj); + mStandEquipTransOffset.init({0.0, 0.0, 0.0}, "StandEquipTransOffset", "", obj); + mStandEquipRotOffset.init({0.0, 0.0, 0.0}, "StandEquipRotOffset", "", obj); + mArrowChargeRate.init(1.0, "ArrowChargeRate", "", obj); + mArrowReloadRate.init(1.0, "ArrowReloadRate", "", obj); + mWeaponSubType.init("", "WeaponSubType", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index a978ec25..e0bfd342 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -6,6 +6,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObjectAttack.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectAttackInterval.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectBindBone.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectBow.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemy.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyLevel.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h" @@ -72,6 +73,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "LargeSword", heap, dummy_list); add(archive.getRootList(), "Spear", heap, dummy_list); add(archive.getRootList(), "Shield", heap, dummy_list); + add(archive.getRootList(), "Bow", heap, dummy_list); // TODO: the rest