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 Liftable

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

1
CMakeLists.txt
View File

@ -81,6 +81,7 @@ add_executable(uking
src/KingSystem/Resource/GeneralParamList/resGParamListObjectGrab.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMiniWeapon.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectLargeSword.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectLiftable.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectPlayer.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h

4
data/uking_functions.csv
View File

@ -89086,7 +89086,7 @@
0x0000007101195e1c,BgparamlistObjectArmorHead::ctor,400,_ZN4ksys3res25GParamListObjectArmorHeadC2Ev
0x0000007101195fac,BgparamlistObjectArmorUpper::ctor,508,_ZN4ksys3res26GParamListObjectArmorUpperC2Ev
0x00000071011961a8,BgparamlistObjectShiekerStone::ctor,672,_ZN4ksys3res28GParamListObjectShiekerStoneC2Ev
0x0000007101196448,BgparamlistObjectLiftable::ctor,1520,
0x0000007101196448,BgparamlistObjectLiftable::ctor,1520,_ZN4ksys3res24GParamListObjectLiftableC2Ev
0x0000007101196a38,BgparamlistObjectItem::ctor,664,
0x0000007101196cd0,BgparamlistObjectArrow::ctor,540,
0x0000007101196eec,BgparamlistObjectCureItem::ctor,456,
@ -89175,7 +89175,7 @@
0x00000071011a7ce0,sub_71011A7CE0,12,_ZNK4ksys3res26GParamListObjectArmorUpper7getNameEv
0x00000071011a7cec,sub_71011A7CEC,12,_ZNK4ksys3res28GParamListObjectShiekerStone7getNameEv
0x00000071011a7cf8,sub_71011A7CF8,12,_ZNK4ksys3res27GParamListObjectSeriesArmor7getNameEv
0x00000071011a7d04,sub_71011A7D04,12,
0x00000071011a7d04,sub_71011A7D04,12,_ZNK4ksys3res24GParamListObjectLiftable7getNameEv
0x00000071011a7d10,sub_71011A7D10,12,
0x00000071011a7d1c,sub_71011A7D1C,12,
0x00000071011a7d28,sub_71011A7D28,12,

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

60
src/KingSystem/Resource/GeneralParamList/resGParamListObjectLiftable.h Normal file
View File

@ -0,0 +1,60 @@
#pragma once
#include <agl/Utils/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"
namespace ksys::res {
class GParamListObjectLiftable : public GParamListObject {
public:
GParamListObjectLiftable();
const char* getName() const override { return "Liftable"; }
agl::utl::Parameter<sead::SafeString> mLiftType;
agl::utl::Parameter<s32> mThrownMass;
agl::utl::Parameter<sead::Vector3f> mThrownRotSpd;
agl::utl::Parameter<sead::Vector3f> mLiftPosOffset;
agl::utl::Parameter<sead::Vector3f> mLiftRotOffset;
agl::utl::Parameter<s32> mLiftRotFrame;
agl::utl::Parameter<sead::SafeString> mAddLiftRotOffsetList;
agl::utl::Parameter<bool> mChaseLiftRotOffset;
agl::utl::Parameter<sead::Vector3f> mLiftCenterOffset;
agl::utl::Parameter<sead::Vector3f> mPutPosOffset;
agl::utl::Parameter<sead::Vector3f> mPutRotOffset;
agl::utl::Parameter<s32> mPutRotFrame;
agl::utl::Parameter<sead::SafeString> mAddPutRotOffsetList;
agl::utl::Parameter<bool> mIsUpdateOffsetEachFrame;
agl::utl::Parameter<bool> mIsUse2MassConstraintMode;
agl::utl::Parameter<bool> mIsSetChemicalParent;
agl::utl::Parameter<bool> mDisableFreezeLift;
agl::utl::Parameter<bool> mDisableBurnLift;
agl::utl::Parameter<s32> mThrowReactionLevel;
};
KSYS_CHECK_SIZE_NX150(GParamListObjectLiftable, 0x2e0);
inline GParamListObjectLiftable::GParamListObjectLiftable() {
auto* const obj = &mObj;
mLiftType.init("", "LiftType", "", obj);
mThrownMass.init(10, "ThrownMass", "", obj);
mThrownRotSpd.init({0.0, 0.0, 0.0}, "ThrownRotSpd", "", obj);
mLiftPosOffset.init({0.0, 0.0, 0.0}, "LiftPosOffset", "", obj);
mLiftRotOffset.init({0.0, 0.0, 0.0}, "LiftRotOffset", "", obj);
mLiftRotFrame.init(10, "LiftRotFrame", "", obj);
mAddLiftRotOffsetList.init("", "AddLiftRotOffsetList", "", obj);
mChaseLiftRotOffset.init(false, "ChaseLiftRotOffset", "", obj);
mLiftCenterOffset.init({0.0, 0.0, 0.0}, "LiftCenterOffset", "", obj);
mPutPosOffset.init({0.0, 0.0, 0.5}, "PutPosOffset", "", obj);
mPutRotOffset.init({0.0, 0.0, 0.0}, "PutRotOffset", "", obj);
mPutRotFrame.init(10, "PutRotFrame", "", obj);
mAddPutRotOffsetList.init("", "AddPutRotOffsetList", "", obj);
mIsUpdateOffsetEachFrame.init(false, "IsUpdateOffsetEachFrame", "", obj);
mIsUse2MassConstraintMode.init(true, "IsUse2MassConstraintMode", "", obj);
mIsSetChemicalParent.init(true, "IsSetChemicalParent", "", obj);
mDisableFreezeLift.init(false, "DisableFreezeLift", "", obj);
mDisableBurnLift.init(false, "DisableBurnLift", "", obj);
mThrowReactionLevel.init(-1, "ThrowReactionLevel", "", obj);
}
} // namespace ksys::res

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

@ -20,6 +20,7 @@
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectGrab.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMiniWeapon.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectLargeSword.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectLiftable.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectPlayer.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h"
@ -99,6 +100,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) {
add<GParamListObjType::ArmorUpper>(archive.getRootList(), "ArmorUpper", heap, dummy_list);
add<GParamListObjType::ShiekerStone>(archive.getRootList(), "ShiekerStone", heap, dummy_list);
add<GParamListObjType::SeriesArmor>(archive.getRootList(), "SeriesArmor", heap, dummy_list);
add<GParamListObjType::Liftable>(archive.getRootList(), "Liftable", heap, dummy_list);
// TODO: the rest