diff --git a/CMakeLists.txt b/CMakeLists.txt index c2ea6c30..3930f1c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,6 +64,7 @@ add_executable(uking src/KingSystem/MessageSystem/mesTransceiver.h src/KingSystem/Resource/GeneralParamList/resGParamListObject.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemy.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectSystem.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.cpp diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 5fb32daa..eac393f0 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89059,7 +89059,7 @@ 0x000000710118bc24,sub_710118BC24,24,_ZN4ksys3res15DummyGParamList6parse_EPhmPN4sead4HeapE 0x000000710118bc3c,sub_710118BC3C,28,_ZThn632_N4ksys3res15DummyGParamList6parse_EPhmPN4sead4HeapE 0x000000710118bc58,BgparamlistObjectGeneral::ctor,764,_ZN4ksys3res23GParamListObjectGeneralC2Ev -0x000000710118bf54,BgparamlistObjectEnemy::ctor,1440, +0x000000710118bf54,BgparamlistObjectEnemy::ctor,1440,_ZN4ksys3res21GParamListObjectEnemyC2Ev 0x000000710118c4f4,BgparamlistObjectEnemyLevel::ctor,936, 0x000000710118c89c,BgparamlistObjectEnemyRace::ctor,2780, 0x000000710118d378,BgparamlistObjectAttackInterval::ctor,564, @@ -89147,7 +89147,7 @@ 0x00000071011a7b74,sub_71011A7B74,40,_ZThn664_N4ksys3res15DummyGParamListD0Ev 0x00000071011a7b9c,sub_71011A7B9C,12,_ZNK4ksys3res22GParamListObjectSystem7getNameEv 0x00000071011a7ba8,sub_71011A7BA8,12,_ZNK4ksys3res23GParamListObjectGeneral7getNameEv -0x00000071011a7bb4,sub_71011A7BB4,12, +0x00000071011a7bb4,sub_71011A7BB4,12,_ZNK4ksys3res21GParamListObjectEnemy7getNameEv 0x00000071011a7bc0,sub_71011A7BC0,12, 0x00000071011a7bcc,sub_71011A7BCC,12, 0x00000071011a7bd8,sub_71011A7BD8,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemy.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemy.h new file mode 100644 index 00000000..ed6e575a --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemy.h @@ -0,0 +1,58 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectEnemy : public GParamListObject { +public: + GParamListObjectEnemy(); + const char* getName() const override { return "Enemy"; } + + agl::utl::Parameter mRank; + agl::utl::Parameter mPower; + agl::utl::Parameter mDropLife; + agl::utl::Parameter mDyingLife; + agl::utl::Parameter mLostDist; + agl::utl::Parameter mLostHeightMax; + agl::utl::Parameter mLostHeightMin; + agl::utl::Parameter mLostRayLength; + agl::utl::Parameter mLODLostDist; + agl::utl::Parameter mLODLostHeightMax; + agl::utl::Parameter mLODLostHeightMin; + agl::utl::Parameter mIntelligenceLevel; + agl::utl::Parameter mEmotionalLevel; + agl::utl::Parameter mHeroismLevel; + agl::utl::Parameter mPartActorName; + agl::utl::Parameter mIsMindFriend; + agl::utl::Parameter mStatusChangeFlag; + agl::utl::Parameter mChangeLife; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectEnemy, 0x288); + +inline GParamListObjectEnemy::GParamListObjectEnemy() { + auto* const obj = &mObj; + + mRank.init(0, "Rank", "", obj); + mPower.init(0, "Power", "", obj); + mDropLife.init(100, "DropLife", "", obj); + mDyingLife.init(20, "DyingLife", "", obj); + mLostDist.init(100.0, "LostDist", "", obj); + mLostHeightMax.init(30.0, "LostHeightMax", "", obj); + mLostHeightMin.init(-30.0, "LostHeightMin", "", obj); + mLostRayLength.init(-1.0, "LostRayLength", "", obj); + mLODLostDist.init(40.0, "LODLostDist", "", obj); + mLODLostHeightMax.init(30.0, "LODLostHeightMax", "", obj); + mLODLostHeightMin.init(-30.0, "LODLostHeightMin", "", obj); + mIntelligenceLevel.init(0.0, "IntelligenceLevel", "", obj); + mEmotionalLevel.init(0.0, "EmotionalLevel", "", obj); + mHeroismLevel.init(0.0, "HeroismLevel", "", obj); + mPartActorName.init("", "PartActorName", "", obj); + mIsMindFriend.init(true, "IsMindFriend", "", obj); + mStatusChangeFlag.init("", "StatusChangeFlag", "", obj); + mChangeLife.init(-1.0, "ChangeLife", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index 4955d91f..743bd6fe 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -3,6 +3,7 @@ #include #include "KingSystem/ActorSystem/actActorParamMgr.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemy.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectSystem.h" #include "KingSystem/Resource/GeneralParamList/resGParamListTraits.h" @@ -41,6 +42,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "System", heap, dummy_list); add(archive.getRootList(), "General", heap, dummy_list); + add(archive.getRootList(), "Enemy", heap, dummy_list); // TODO: the rest