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 MasterSword

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

1
CMakeLists.txt
View File

@ -74,6 +74,7 @@ add_executable(uking
src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyShown.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectLargeSword.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectShield.h

4
data/uking_functions.csv
View File

@ -89076,7 +89076,7 @@
0x0000007101190d20,BgparamlistObjectShield::ctor,1484,_ZN4ksys3res22GParamListObjectShieldC2Ev
0x00000071011912ec,BgparamlistObjectBow::ctor,2724,_ZN4ksys3res19GParamListObjectBowC2Ev
0x0000007101191d90,BgparamlistObjectWeaponOption::ctor,596,_ZN4ksys3res28GParamListObjectWeaponOptionC2Ev
0x0000007101191fe4,BgparamlistObjectMasterSword::ctor,772,
0x0000007101191fe4,BgparamlistObjectMasterSword::ctor,772,_ZN4ksys3res27GParamListObjectMasterSwordC2Ev
0x00000071011922e8,BgparamlistObjectGuardianMiniWeapon::ctor,608,
0x0000007101192548,BgparamlistObjectPlayer::ctor,11236,
0x000000710119512c,BgparamlistObjectCamera::ctor,884,
@ -89164,7 +89164,7 @@
0x00000071011a7c5c,sub_71011A7C5C,12,_ZNK4ksys3res22GParamListObjectShield7getNameEv
0x00000071011a7c68,sub_71011A7C68,12,_ZNK4ksys3res19GParamListObjectBow7getNameEv
0x00000071011a7c74,sub_71011A7C74,12,_ZNK4ksys3res28GParamListObjectWeaponOption7getNameEv
0x00000071011a7c80,sub_71011A7C80,12,
0x00000071011a7c80,sub_71011A7C80,12,_ZNK4ksys3res27GParamListObjectMasterSword7getNameEv
0x00000071011a7c8c,sub_71011A7C8C,12,
0x00000071011a7c98,sub_71011A7C98,12,
0x00000071011a7ca4,sub_71011A7CA4,12,

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

38
src/KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h Normal file
View File

@ -0,0 +1,38 @@
#pragma once
#include <agl/Utils/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"
namespace ksys::res {
class GParamListObjectMasterSword : public GParamListObject {
public:
GParamListObjectMasterSword();
const char* getName() const override { return "MasterSword"; }
agl::utl::Parameter<bool> mIsMasterSword;
agl::utl::Parameter<s32> mTrueFormAttackPower;
agl::utl::Parameter<s32> mTrueFormMagicPower;
agl::utl::Parameter<f32> mTrueFormBreakRatio;
agl::utl::Parameter<f32> mSearchEvilDist;
agl::utl::Parameter<s32> mRecoverTime;
agl::utl::Parameter<sead::SafeString> mSleepActorName;
agl::utl::Parameter<sead::SafeString> mTrueFormActorName;
};
KSYS_CHECK_SIZE_NX150(GParamListObjectMasterSword, 0x148);
inline GParamListObjectMasterSword::GParamListObjectMasterSword() {
auto* const obj = &mObj;
mIsMasterSword.init(false, "IsMasterSword", "", obj);
mTrueFormAttackPower.init(-1, "TrueFormAttackPower", "", obj);
mTrueFormMagicPower.init(-1, "TrueFormMagicPower", "", obj);
mTrueFormBreakRatio.init(0.5, "TrueFormBreakRatio", "", obj);
mSearchEvilDist.init(-1.0, "SearchEvilDist", "", obj);
mRecoverTime.init(30, "RecoverTime", "", obj);
mSleepActorName.init("", "SleepActorName", "", obj);
mTrueFormActorName.init("", "TrueFormActorName", "", obj);
}
} // namespace ksys::res

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

@ -13,6 +13,7 @@
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyShown.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectLargeSword.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectShield.h"
@ -76,6 +77,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) {
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);
add<GParamListObjType::MasterSword>(archive.getRootList(), "MasterSword", heap, dummy_list);
// TODO: the rest