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 WeaponOption

This commit is contained in:
Léo Lam 2020-09-20 00:26:06 +02:00
parent 5a2ff7cedf
commit 5cc61e6db8
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
4 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -83,6 +83,7 @@ add_executable(uking
src/KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.cpp
src/KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponCommon.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponOption.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponThrow.h
src/KingSystem/Resource/GeneralParamList/resGParamListTraits.h
src/KingSystem/Resource/resCurrentResNameMgr.cpp

4
data/uking_functions.csv
View File

@ -89075,7 +89075,7 @@
0x0000007101190500,BgparamlistObjectSpear::ctor,2080,_ZN4ksys3res21GParamListObjectSpearC2Ev
0x0000007101190d20,BgparamlistObjectShield::ctor,1484,_ZN4ksys3res22GParamListObjectShieldC2Ev
0x00000071011912ec,BgparamlistObjectBow::ctor,2724,_ZN4ksys3res19GParamListObjectBowC2Ev
0x0000007101191d90,BgparamlistObjectWeaponOption::ctor,596,
0x0000007101191d90,BgparamlistObjectWeaponOption::ctor,596,_ZN4ksys3res28GParamListObjectWeaponOptionC2Ev
0x0000007101191fe4,BgparamlistObjectMasterSword::ctor,772,
0x00000071011922e8,BgparamlistObjectGuardianMiniWeapon::ctor,608,
0x0000007101192548,BgparamlistObjectPlayer::ctor,11236,
@ -89163,7 +89163,7 @@
0x00000071011a7c50,sub_71011A7C50,12,_ZNK4ksys3res21GParamListObjectSpear7getNameEv
0x00000071011a7c5c,sub_71011A7C5C,12,_ZNK4ksys3res22GParamListObjectShield7getNameEv
0x00000071011a7c68,sub_71011A7C68,12,_ZNK4ksys3res19GParamListObjectBow7getNameEv
0x00000071011a7c74,sub_71011A7C74,12,
0x00000071011a7c74,sub_71011A7C74,12,_ZNK4ksys3res28GParamListObjectWeaponOption7getNameEv
0x00000071011a7c80,sub_71011A7C80,12,
0x00000071011a7c8c,sub_71011A7C8C,12,
0x00000071011a7c98,sub_71011A7C98,12,

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

34
src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponOption.h Normal file
View File

@ -0,0 +1,34 @@
#pragma once
#include <agl/Utils/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"
namespace ksys::res {
class GParamListObjectWeaponOption : public GParamListObject {
public:
GParamListObjectWeaponOption();
const char* getName() const override { return "WeaponOption"; }
agl::utl::Parameter<sead::Vector3f> mPlayerHoldTransOffset;
agl::utl::Parameter<sead::Vector3f> mPlayerHoldRotOffset;
agl::utl::Parameter<sead::Vector3f> mNPCHoldTransOffset;
agl::utl::Parameter<sead::Vector3f> mNPCHoldRotOffset;
agl::utl::Parameter<sead::Vector3f> mNPCEquipTransOffset;
agl::utl::Parameter<sead::Vector3f> mNPCEquipRotOffset;
};
KSYS_CHECK_SIZE_NX150(GParamListObjectWeaponOption, 0x128);
inline GParamListObjectWeaponOption::GParamListObjectWeaponOption() {
auto* const obj = &mObj;
mPlayerHoldTransOffset.init({-0.02, -0.01, 0.12}, "PlayerHoldTransOffset", "", obj);
mPlayerHoldRotOffset.init({-8.0, -5.0, 75.0}, "PlayerHoldRotOffset", "", 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);
}
} // namespace ksys::res

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

@ -20,6 +20,7 @@
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectSpear.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectSystem.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponCommon.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponOption.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponThrow.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListTraits.h"
@ -74,6 +75,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) {
add<GParamListObjType::Spear>(archive.getRootList(), "Spear", heap, dummy_list);
add<GParamListObjType::Shield>(archive.getRootList(), "Shield", heap, dummy_list);
add<GParamListObjType::Bow>(archive.getRootList(), "Bow", heap, dummy_list);
add<GParamListObjType::WeaponOption>(archive.getRootList(), "WeaponOption", heap, dummy_list);
// TODO: the rest