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 SeriesArmor

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

1
CMakeLists.txt
View File

@ -85,6 +85,7 @@ add_executable(uking
src/KingSystem/Resource/GeneralParamList/resGParamListObjectPlayer.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectPlayer.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectSeriesArmor.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectShiekerStone.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectShiekerStone.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectShield.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectShield.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.h

2
data/uking_functions.csv
View File

@ -89174,7 +89174,7 @@
0x00000071011a7cd4,sub_71011A7CD4,12,_ZNK4ksys3res25GParamListObjectArmorHead7getNameEv 0x00000071011a7cd4,sub_71011A7CD4,12,_ZNK4ksys3res25GParamListObjectArmorHead7getNameEv
0x00000071011a7ce0,sub_71011A7CE0,12,_ZNK4ksys3res26GParamListObjectArmorUpper7getNameEv 0x00000071011a7ce0,sub_71011A7CE0,12,_ZNK4ksys3res26GParamListObjectArmorUpper7getNameEv
0x00000071011a7cec,sub_71011A7CEC,12,_ZNK4ksys3res28GParamListObjectShiekerStone7getNameEv 0x00000071011a7cec,sub_71011A7CEC,12,_ZNK4ksys3res28GParamListObjectShiekerStone7getNameEv
0x00000071011a7cf8,sub_71011A7CF8,12, 0x00000071011a7cf8,sub_71011A7CF8,12,_ZNK4ksys3res27GParamListObjectSeriesArmor7getNameEv
0x00000071011a7d04,sub_71011A7D04,12, 0x00000071011a7d04,sub_71011A7D04,12,
0x00000071011a7d10,sub_71011A7D10,12, 0x00000071011a7d10,sub_71011A7D10,12,
0x00000071011a7d1c,sub_71011A7D1C,12, 0x00000071011a7d1c,sub_71011A7D1C,12,

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

26
src/KingSystem/Resource/GeneralParamList/resGParamListObjectSeriesArmor.h Normal file
View File

@ -0,0 +1,26 @@
#pragma once
#include <agl/Utils/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"
namespace ksys::res {
class GParamListObjectSeriesArmor : public GParamListObject {
public:
GParamListObjectSeriesArmor();
const char* getName() const override { return "SeriesArmor"; }
agl::utl::Parameter<sead::SafeString> mSeriesType;
agl::utl::Parameter<bool> mEnableCompBonus;
};
KSYS_CHECK_SIZE_NX150(GParamListObjectSeriesArmor, 0x80);
inline GParamListObjectSeriesArmor::GParamListObjectSeriesArmor() {
auto* const obj = &mObj;
mSeriesType.init("", "SeriesType", "", obj);
mEnableCompBonus.init(false, "EnableCompBonus", "", obj);
}
} // namespace ksys::res

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

@ -24,6 +24,7 @@
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectPlayer.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectPlayer.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectSeriesArmor.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectShiekerStone.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectShiekerStone.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectShield.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectShield.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.h"
@ -97,6 +98,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) {
add<GParamListObjType::ArmorHead>(archive.getRootList(), "ArmorHead", heap, dummy_list); add<GParamListObjType::ArmorHead>(archive.getRootList(), "ArmorHead", heap, dummy_list);
add<GParamListObjType::ArmorUpper>(archive.getRootList(), "ArmorUpper", heap, dummy_list); add<GParamListObjType::ArmorUpper>(archive.getRootList(), "ArmorUpper", heap, dummy_list);
add<GParamListObjType::ShiekerStone>(archive.getRootList(), "ShiekerStone", heap, dummy_list); add<GParamListObjType::ShiekerStone>(archive.getRootList(), "ShiekerStone", heap, dummy_list);
add<GParamListObjType::SeriesArmor>(archive.getRootList(), "SeriesArmor", heap, dummy_list);
// TODO: the rest // TODO: the rest