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 Swarm

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

1
CMakeLists.txt
View File

@ -118,6 +118,7 @@ add_executable(uking
src/KingSystem/Resource/GeneralParamList/resGParamListObjectShield.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectShield.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectSpear.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectSpear.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectSwarm.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectSystem.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectSystem.h
src/KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.cpp src/KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.cpp
src/KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.h

4
data/uking_functions.csv
View File

@ -89107,7 +89107,7 @@
0x00000071011a1368,BgparamlistObjectHorseCreator::ctor,328,_ZN4ksys3res28GParamListObjectHorseCreatorC2Ev 0x00000071011a1368,BgparamlistObjectHorseCreator::ctor,328,_ZN4ksys3res28GParamListObjectHorseCreatorC2Ev
0x00000071011a14b0,BgparamlistObjectGiantArmorSlot::ctor,1188,_ZN4ksys3res30GParamListObjectGiantArmorSlotC2Ev 0x00000071011a14b0,BgparamlistObjectGiantArmorSlot::ctor,1188,_ZN4ksys3res30GParamListObjectGiantArmorSlotC2Ev
0x00000071011a1954,BgparamlistObjectGuardian::ctor,812,_ZN4ksys3res24GParamListObjectGuardianC2Ev 0x00000071011a1954,BgparamlistObjectGuardian::ctor,812,_ZN4ksys3res24GParamListObjectGuardianC2Ev
0x00000071011a1c80,BgparamlistObjectSwarm::ctor,388, 0x00000071011a1c80,BgparamlistObjectSwarm::ctor,388,_ZN4ksys3res21GParamListObjectSwarmC2Ev
0x00000071011a1e04,BgparamlistObjectGelEnemy::ctor,1352, 0x00000071011a1e04,BgparamlistObjectGelEnemy::ctor,1352,
0x00000071011a234c,BgparamlistObjectWizzrobe::ctor,832, 0x00000071011a234c,BgparamlistObjectWizzrobe::ctor,832,
0x00000071011a268c,BgparamlistObjectStalEnemy::ctor,328, 0x00000071011a268c,BgparamlistObjectStalEnemy::ctor,328,
@ -89205,7 +89205,7 @@
0x00000071011a7e48,sub_71011A7E48,12,_ZNK4ksys3res26GParamListObjectGiantArmor7getNameEv 0x00000071011a7e48,sub_71011A7E48,12,_ZNK4ksys3res26GParamListObjectGiantArmor7getNameEv
0x00000071011a7e54,sub_71011A7E54,12,_ZNK4ksys3res24GParamListObjectGuardian7getNameEv 0x00000071011a7e54,sub_71011A7E54,12,_ZNK4ksys3res24GParamListObjectGuardian7getNameEv
0x00000071011a7e60,sub_71011A7E60,12,_ZNK4ksys3res27GParamListObjectMonsterShop7getNameEv 0x00000071011a7e60,sub_71011A7E60,12,_ZNK4ksys3res27GParamListObjectMonsterShop7getNameEv
0x00000071011a7e6c,sub_71011A7E6C,12, 0x00000071011a7e6c,sub_71011A7E6C,12,_ZNK4ksys3res21GParamListObjectSwarm7getNameEv
0x00000071011a7e78,sub_71011A7E78,12, 0x00000071011a7e78,sub_71011A7E78,12,
0x00000071011a7e84,sub_71011A7E84,12, 0x00000071011a7e84,sub_71011A7E84,12,
0x00000071011a7e90,sub_71011A7E90,12, 0x00000071011a7e90,sub_71011A7E90,12,

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

28
src/KingSystem/Resource/GeneralParamList/resGParamListObjectSwarm.h Normal file
View File

@ -0,0 +1,28 @@
#pragma once
#include <agl/Utils/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"
namespace ksys::res {
class GParamListObjectSwarm : public GParamListObject {
public:
GParamListObjectSwarm();
const char* getName() const override { return "Swarm"; }
agl::utl::Parameter<s32> mSwarmSubActorNum;
agl::utl::Parameter<s32> mSwarmPattern;
agl::utl::Parameter<sead::SafeString> mDeadActorName;
};
KSYS_CHECK_SIZE_NX150(GParamListObjectSwarm, 0xa0);
inline GParamListObjectSwarm::GParamListObjectSwarm() {
auto* const obj = &mObj;
mSwarmSubActorNum.init(50, "SwarmSubActorNum", "", obj);
mSwarmPattern.init(0, "SwarmPattern", "", obj);
mDeadActorName.init("", "DeadActorName", "", obj);
}
} // namespace ksys::res

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

@ -57,6 +57,7 @@
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectShield.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectShield.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectSpear.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectSpear.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectSwarm.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectSystem.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectSystem.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponCommon.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponCommon.h"
@ -163,6 +164,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) {
add<GParamListObjType::GiantArmor>(archive.getRootList(), "GiantArmor", heap, dummy_list); add<GParamListObjType::GiantArmor>(archive.getRootList(), "GiantArmor", heap, dummy_list);
add<GParamListObjType::Guardian>(archive.getRootList(), "Guardian", heap, dummy_list); add<GParamListObjType::Guardian>(archive.getRootList(), "Guardian", heap, dummy_list);
add<GParamListObjType::MonsterShop>(archive.getRootList(), "MonsterShop", heap, dummy_list); add<GParamListObjType::MonsterShop>(archive.getRootList(), "MonsterShop", heap, dummy_list);
add<GParamListObjType::Swarm>(archive.getRootList(), "Swarm", heap, dummy_list);
// TODO: the rest // TODO: the rest