falso
/
botw
mirror of https://github.com/zeldaret/botw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ksys/res: Implement GParamList Spear

This commit is contained in:
Léo Lam 2020-09-19 23:53:27 +02:00
parent 6979611c63
commit 9c32a09afb
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
4 changed files with 80 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -76,6 +76,7 @@ add_executable(uking
src/KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectSpear.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectSystem.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.cpp
src/KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.h

4
data/uking_functions.csv
View File

@ -89072,7 +89072,7 @@
0x000000710118f29c,BgparamlistObjectSmallSword::ctor,1756,_ZN4ksys3res26GParamListObjectSmallSwordC2Ev
0x000000710118f978,BgparamlistObjectRod::ctor,1192,_ZN4ksys3res19GParamListObjectRodC2Ev
0x000000710118fe20,BgparamlistObjectLargeSword::ctor,1760,_ZN4ksys3res26GParamListObjectLargeSwordC2Ev
0x0000007101190500,BgparamlistObjectSpear::ctor,2080,
0x0000007101190500,BgparamlistObjectSpear::ctor,2080,_ZN4ksys3res21GParamListObjectSpearC2Ev
0x0000007101190d20,BgparamlistObjectShield::ctor,1484,
0x00000071011912ec,BgparamlistObjectBow::ctor,2724,
0x0000007101191d90,BgparamlistObjectWeaponOption::ctor,596,
@ -89160,7 +89160,7 @@
0x00000071011a7c2c,sub_71011A7C2C,12,_ZNK4ksys3res26GParamListObjectSmallSword7getNameEv
0x00000071011a7c38,sub_71011A7C38,12,_ZNK4ksys3res19GParamListObjectRod7getNameEv
0x00000071011a7c44,sub_71011A7C44,12,_ZNK4ksys3res26GParamListObjectLargeSword7getNameEv
0x00000071011a7c50,sub_71011A7C50,12,
0x00000071011a7c50,sub_71011A7C50,12,_ZNK4ksys3res21GParamListObjectSpear7getNameEv
0x00000071011a7c5c,sub_71011A7C5C,12,
0x00000071011a7c68,sub_71011A7C68,12,
0x00000071011a7c74,sub_71011A7C74,12,

Can't render this file because it is too large.

75
src/KingSystem/Resource/GeneralParamList/resGParamListObjectSpear.h Normal file
View File

@ -0,0 +1,75 @@
#pragma once
#include <agl/Utils/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"
namespace ksys::res {
class GParamListObjectSpear : public GParamListObject {
public:
GParamListObjectSpear();
const char* getName() const override { return "Spear"; }
agl::utl::Parameter<sead::SafeString> mPodName;
agl::utl::Parameter<sead::Vector3f> mPlayerHoldTransOffset;
agl::utl::Parameter<sead::Vector3f> mPlayerHoldRotOffset;
agl::utl::Parameter<sead::Vector3f> mPlayerEquipTransOffset;
agl::utl::Parameter<sead::Vector3f> mPlayerEquipRotOffset;
agl::utl::Parameter<sead::Vector3f> mRideHorsePlayerHoldTransOffset;
agl::utl::Parameter<sead::Vector3f> mRideHorsePlayerHoldRotOffset;
agl::utl::Parameter<sead::Vector3f> mAffectTransOffsetShield;
agl::utl::Parameter<sead::Vector3f> mAffectRotOffsetShield;
agl::utl::Parameter<sead::Vector3f> mAffectTransOffsetBow;
agl::utl::Parameter<sead::Vector3f> mAffectRotOffsetBow;
agl::utl::Parameter<sead::Vector3f> mGrabPlayerHoldTransOffset;
agl::utl::Parameter<sead::Vector3f> mGrabPlayerHoldRotOffset;
agl::utl::Parameter<sead::Vector3f> mGrabAffectTransOffsetShield;
agl::utl::Parameter<sead::Vector3f> mGrabAffectRotOffsetShield;
agl::utl::Parameter<sead::Vector3f> mSquatPlayerHoldTransAddOffset;
agl::utl::Parameter<sead::Vector3f> mSquatPlayerHoldRotAddOffset;
agl::utl::Parameter<sead::Vector3f> mNPCHoldTransOffset;
agl::utl::Parameter<sead::Vector3f> mNPCHoldRotOffset;
agl::utl::Parameter<sead::Vector3f> mNPCEquipTransOffset;
agl::utl::Parameter<sead::Vector3f> mNPCEquipRotOffset;
agl::utl::Parameter<sead::Vector3f> mEnemyEquipTransOffset;
agl::utl::Parameter<sead::Vector3f> mEnemyEquipRotOffset;
agl::utl::Parameter<sead::Vector3f> mStandEquipTransOffset;
agl::utl::Parameter<sead::Vector3f> mStandEquipRotOffset;
agl::utl::Parameter<sead::SafeString> mWeaponSubType;
};
KSYS_CHECK_SIZE_NX150(GParamListObjectSpear, 0x448);
inline GParamListObjectSpear::GParamListObjectSpear() {
auto* const obj = &mObj;
mPodName.init("", "PodName", "", obj);
mPlayerHoldTransOffset.init({-0.9, -0.02, 0.52}, "PlayerHoldTransOffset", "", obj);
mPlayerHoldRotOffset.init({0.0, -120.0, -180.0}, "PlayerHoldRotOffset", "", obj);
mPlayerEquipTransOffset.init({0.0, 0.0, 0.0}, "PlayerEquipTransOffset", "", obj);
mPlayerEquipRotOffset.init({0.0, 0.0, 0.0}, "PlayerEquipRotOffset", "", obj);
mRideHorsePlayerHoldTransOffset.init({0.0, 0.0, 0.0}, "RideHorsePlayerHoldTransOffset", "",
obj);
mRideHorsePlayerHoldRotOffset.init({0.0, 0.0, 0.0}, "RideHorsePlayerHoldRotOffset", "", obj);
mAffectTransOffsetShield.init({0.0, 0.0, 0.0}, "AffectTransOffsetShield", "", obj);
mAffectRotOffsetShield.init({0.0, 0.0, 0.0}, "AffectRotOffsetShield", "", obj);
mAffectTransOffsetBow.init({0.0, 0.0, 0.0}, "AffectTransOffsetBow", "", obj);
mAffectRotOffsetBow.init({0.0, 0.0, 0.0}, "AffectRotOffsetBow", "", obj);
mGrabPlayerHoldTransOffset.init({-0.87, -0.17, -0.34}, "GrabPlayerHoldTransOffset", "", obj);
mGrabPlayerHoldRotOffset.init({-60.0, -20.0, -90.0}, "GrabPlayerHoldRotOffset", "", obj);
mGrabAffectTransOffsetShield.init({0.0, -0.03, 0.0}, "GrabAffectTransOffsetShield", "", obj);
mGrabAffectRotOffsetShield.init({-5.0, 0.0, 0.0}, "GrabAffectRotOffsetShield", "", 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);
mWeaponSubType.init("", "WeaponSubType", "", obj);
}
} // namespace ksys::res

2
src/KingSystem/Resource/resResourceGParamList.cpp
View File

@ -15,6 +15,7 @@
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectSpear.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectSystem.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponCommon.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponThrow.h"
@ -68,6 +69,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) {
add<GParamListObjType::SmallSword>(archive.getRootList(), "SmallSword", heap, dummy_list);
add<GParamListObjType::Rod>(archive.getRootList(), "Rod", heap, dummy_list);
add<GParamListObjType::LargeSword>(archive.getRootList(), "LargeSword", heap, dummy_list);
add<GParamListObjType::Spear>(archive.getRootList(), "Spear", heap, dummy_list);
// TODO: the rest