summaryrefslogtreecommitdiff
path: root/src/KingSystem
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2021-06-15 17:47:03 +0200
committerLéo Lam <leo@leolam.fr>2021-06-15 18:04:39 +0200
commitdd0cc52ce99b9d78f1c7022c1bf13349149f263a (patch)
tree2eb5acd7d704d612181399bd8ab2be7b84fe450f /src/KingSystem
parent38e5e47b07696a0954145bf68148cb0301cf133c (diff)
ksys: Move ActorParam classes into separate folder to declutter Resource/
Diffstat (limited to 'src/KingSystem')
-rw-r--r--src/KingSystem/ActorSystem/LOD/actLodState.cpp2
-rw-r--r--src/KingSystem/ActorSystem/actActorCaptureMgr.h2
-rw-r--r--src/KingSystem/ActorSystem/actActorConstDataAccess.cpp2
-rw-r--r--src/KingSystem/ActorSystem/actActorParam.cpp10
-rw-r--r--src/KingSystem/ActorSystem/actActorParam.h2
-rw-r--r--src/KingSystem/ActorSystem/actActorParamMgr.cpp46
-rw-r--r--src/KingSystem/ActorSystem/actActorUtil.cpp4
-rw-r--r--src/KingSystem/ActorSystem/actAiAction.cpp2
-rw-r--r--src/KingSystem/ActorSystem/actAiActionBase.cpp2
-rw-r--r--src/KingSystem/ActorSystem/actAiAi.cpp2
-rw-r--r--src/KingSystem/ActorSystem/actAiBehavior.cpp2
-rw-r--r--src/KingSystem/ActorSystem/actAiQueries.cpp2
-rw-r--r--src/KingSystem/ActorSystem/actAiQuery.cpp2
-rw-r--r--src/KingSystem/ActorSystem/actGlobalParameter.cpp2
-rw-r--r--src/KingSystem/ActorSystem/actInfoData.cpp2
-rw-r--r--src/KingSystem/Mii/miiUMii.cpp2
-rw-r--r--src/KingSystem/Physics/Ragdoll/physRagdollConfig.cpp2
-rw-r--r--src/KingSystem/Physics/System/physParamSet.cpp2
-rw-r--r--src/KingSystem/Resource/Actor/resResourceAIProgram.cpp (renamed from src/KingSystem/Resource/resResourceAIProgram.cpp)2
-rw-r--r--src/KingSystem/Resource/Actor/resResourceAIProgram.h (renamed from src/KingSystem/Resource/resResourceAIProgram.h)0
-rw-r--r--src/KingSystem/Resource/Actor/resResourceAISchedule.cpp (renamed from src/KingSystem/Resource/resResourceAISchedule.cpp)2
-rw-r--r--src/KingSystem/Resource/Actor/resResourceAISchedule.h (renamed from src/KingSystem/Resource/resResourceAISchedule.h)0
-rw-r--r--src/KingSystem/Resource/Actor/resResourceAS.cpp (renamed from src/KingSystem/Resource/resResourceAS.cpp)4
-rw-r--r--src/KingSystem/Resource/Actor/resResourceAS.h (renamed from src/KingSystem/Resource/resResourceAS.h)0
-rw-r--r--src/KingSystem/Resource/Actor/resResourceASList.cpp (renamed from src/KingSystem/Resource/resResourceASList.cpp)4
-rw-r--r--src/KingSystem/Resource/Actor/resResourceASList.h (renamed from src/KingSystem/Resource/resResourceASList.h)0
-rw-r--r--src/KingSystem/Resource/Actor/resResourceASResource.cpp (renamed from src/KingSystem/Resource/resResourceASResource.cpp)4
-rw-r--r--src/KingSystem/Resource/Actor/resResourceASResource.h (renamed from src/KingSystem/Resource/resResourceASResource.h)2
-rw-r--r--src/KingSystem/Resource/Actor/resResourceASResourceExtension.cpp (renamed from src/KingSystem/Resource/resResourceASResourceExtension.cpp)2
-rw-r--r--src/KingSystem/Resource/Actor/resResourceASResourceExtension.h (renamed from src/KingSystem/Resource/resResourceASResourceExtension.h)0
-rw-r--r--src/KingSystem/Resource/Actor/resResourceActorCapture.cpp (renamed from src/KingSystem/Resource/resResourceActorCapture.cpp)2
-rw-r--r--src/KingSystem/Resource/Actor/resResourceActorCapture.h (renamed from src/KingSystem/Resource/resResourceActorCapture.h)0
-rw-r--r--src/KingSystem/Resource/Actor/resResourceActorLink.cpp (renamed from src/KingSystem/Resource/resResourceActorLink.cpp)2
-rw-r--r--src/KingSystem/Resource/Actor/resResourceActorLink.h (renamed from src/KingSystem/Resource/resResourceActorLink.h)0
-rw-r--r--src/KingSystem/Resource/Actor/resResourceAnimInfo.cpp (renamed from src/KingSystem/Resource/resResourceAnimInfo.cpp)2
-rw-r--r--src/KingSystem/Resource/Actor/resResourceAnimInfo.h (renamed from src/KingSystem/Resource/resResourceAnimInfo.h)0
-rw-r--r--src/KingSystem/Resource/Actor/resResourceAttCheck.cpp (renamed from src/KingSystem/Resource/resResourceAttCheck.cpp)2
-rw-r--r--src/KingSystem/Resource/Actor/resResourceAttCheck.h (renamed from src/KingSystem/Resource/resResourceAttCheck.h)4
-rw-r--r--src/KingSystem/Resource/Actor/resResourceAttClient.cpp (renamed from src/KingSystem/Resource/resResourceAttClient.cpp)4
-rw-r--r--src/KingSystem/Resource/Actor/resResourceAttClient.h (renamed from src/KingSystem/Resource/resResourceAttClient.h)2
-rw-r--r--src/KingSystem/Resource/Actor/resResourceAttPos.cpp (renamed from src/KingSystem/Resource/resResourceAttPos.cpp)2
-rw-r--r--src/KingSystem/Resource/Actor/resResourceAttPos.h (renamed from src/KingSystem/Resource/resResourceAttPos.h)0
-rw-r--r--src/KingSystem/Resource/Actor/resResourceAwareness.cpp (renamed from src/KingSystem/Resource/resResourceAwareness.cpp)2
-rw-r--r--src/KingSystem/Resource/Actor/resResourceAwareness.h (renamed from src/KingSystem/Resource/resResourceAwareness.h)0
-rw-r--r--src/KingSystem/Resource/Actor/resResourceBoneControl.cpp (renamed from src/KingSystem/Resource/resResourceBoneControl.cpp)2
-rw-r--r--src/KingSystem/Resource/Actor/resResourceBoneControl.h (renamed from src/KingSystem/Resource/resResourceBoneControl.h)0
-rw-r--r--src/KingSystem/Resource/Actor/resResourceChemical.cpp (renamed from src/KingSystem/Resource/resResourceChemical.cpp)2
-rw-r--r--src/KingSystem/Resource/Actor/resResourceChemical.h (renamed from src/KingSystem/Resource/resResourceChemical.h)0
-rw-r--r--src/KingSystem/Resource/Actor/resResourceDamageParam.cpp (renamed from src/KingSystem/Resource/resResourceDamageParam.cpp)2
-rw-r--r--src/KingSystem/Resource/Actor/resResourceDamageParam.h (renamed from src/KingSystem/Resource/resResourceDamageParam.h)0
-rw-r--r--src/KingSystem/Resource/Actor/resResourceDrop.cpp (renamed from src/KingSystem/Resource/resResourceDrop.cpp)2
-rw-r--r--src/KingSystem/Resource/Actor/resResourceDrop.h (renamed from src/KingSystem/Resource/resResourceDrop.h)0
-rw-r--r--src/KingSystem/Resource/Actor/resResourceGParamList.cpp (renamed from src/KingSystem/Resource/resResourceGParamList.cpp)2
-rw-r--r--src/KingSystem/Resource/Actor/resResourceGParamList.h (renamed from src/KingSystem/Resource/resResourceGParamList.h)0
-rw-r--r--src/KingSystem/Resource/Actor/resResourceLifeCondition.cpp (renamed from src/KingSystem/Resource/resResourceLifeCondition.cpp)2
-rw-r--r--src/KingSystem/Resource/Actor/resResourceLifeCondition.h (renamed from src/KingSystem/Resource/resResourceLifeCondition.h)0
-rw-r--r--src/KingSystem/Resource/Actor/resResourceLod.cpp (renamed from src/KingSystem/Resource/resResourceLod.cpp)2
-rw-r--r--src/KingSystem/Resource/Actor/resResourceLod.h (renamed from src/KingSystem/Resource/resResourceLod.h)0
-rw-r--r--src/KingSystem/Resource/Actor/resResourceModelList.cpp (renamed from src/KingSystem/Resource/resResourceModelList.cpp)2
-rw-r--r--src/KingSystem/Resource/Actor/resResourceModelList.h (renamed from src/KingSystem/Resource/resResourceModelList.h)0
-rw-r--r--src/KingSystem/Resource/Actor/resResourcePhysics.cpp (renamed from src/KingSystem/Resource/resResourcePhysics.cpp)2
-rw-r--r--src/KingSystem/Resource/Actor/resResourcePhysics.h (renamed from src/KingSystem/Resource/resResourcePhysics.h)0
-rw-r--r--src/KingSystem/Resource/Actor/resResourceRagdollBlendWeight.cpp (renamed from src/KingSystem/Resource/resResourceRagdollBlendWeight.cpp)2
-rw-r--r--src/KingSystem/Resource/Actor/resResourceRagdollBlendWeight.h (renamed from src/KingSystem/Resource/resResourceRagdollBlendWeight.h)0
-rw-r--r--src/KingSystem/Resource/Actor/resResourceRagdollConfig.cpp (renamed from src/KingSystem/Resource/resResourceRagdollConfig.cpp)2
-rw-r--r--src/KingSystem/Resource/Actor/resResourceRagdollConfig.h (renamed from src/KingSystem/Resource/resResourceRagdollConfig.h)0
-rw-r--r--src/KingSystem/Resource/Actor/resResourceRagdollConfigList.cpp (renamed from src/KingSystem/Resource/resResourceRagdollConfigList.cpp)4
-rw-r--r--src/KingSystem/Resource/Actor/resResourceRagdollConfigList.h (renamed from src/KingSystem/Resource/resResourceRagdollConfigList.h)0
-rw-r--r--src/KingSystem/Resource/Actor/resResourceRecipe.cpp (renamed from src/KingSystem/Resource/resResourceRecipe.cpp)2
-rw-r--r--src/KingSystem/Resource/Actor/resResourceRecipe.h (renamed from src/KingSystem/Resource/resResourceRecipe.h)0
-rw-r--r--src/KingSystem/Resource/Actor/resResourceShop.cpp (renamed from src/KingSystem/Resource/resResourceShop.cpp)2
-rw-r--r--src/KingSystem/Resource/Actor/resResourceShop.h (renamed from src/KingSystem/Resource/resResourceShop.h)0
-rw-r--r--src/KingSystem/Resource/Actor/resResourceUMii.cpp (renamed from src/KingSystem/Resource/resResourceUMii.cpp)2
-rw-r--r--src/KingSystem/Resource/Actor/resResourceUMii.h (renamed from src/KingSystem/Resource/resResourceUMii.h)0
-rw-r--r--src/KingSystem/Resource/CMakeLists.txt113
-rw-r--r--src/KingSystem/Resource/resResourceASSetting.h2
76 files changed, 140 insertions, 139 deletions
diff --git a/src/KingSystem/ActorSystem/LOD/actLodState.cpp b/src/KingSystem/ActorSystem/LOD/actLodState.cpp
index 0a53f016..99bdfbca 100644
--- a/src/KingSystem/ActorSystem/LOD/actLodState.cpp
+++ b/src/KingSystem/ActorSystem/LOD/actLodState.cpp
@@ -4,7 +4,7 @@
#include "KingSystem/ActorSystem/actActorUtil.h"
#include "KingSystem/Map/mapObject.h"
#include "KingSystem/Map/mapPlacementMgr.h"
-#include "KingSystem/Resource/resResourceLod.h"
+#include "KingSystem/Resource/Actor/resResourceLod.h"
#include "KingSystem/System/OcclusionQueryCylinder.h"
namespace ksys::act {
diff --git a/src/KingSystem/ActorSystem/actActorCaptureMgr.h b/src/KingSystem/ActorSystem/actActorCaptureMgr.h
index c66e8ad3..091fde8d 100644
--- a/src/KingSystem/ActorSystem/actActorCaptureMgr.h
+++ b/src/KingSystem/ActorSystem/actActorCaptureMgr.h
@@ -2,8 +2,8 @@
#include <basis/seadTypes.h>
#include <prim/seadSafeString.h>
+#include "KingSystem/Resource/Actor/resResourceActorCapture.h"
#include "KingSystem/Resource/resHandle.h"
-#include "KingSystem/Resource/resResourceActorCapture.h"
#include "KingSystem/System/Timer.h"
#include "KingSystem/Utils/Types.h"
diff --git a/src/KingSystem/ActorSystem/actActorConstDataAccess.cpp b/src/KingSystem/ActorSystem/actActorConstDataAccess.cpp
index 209961a4..c3061e90 100644
--- a/src/KingSystem/ActorSystem/actActorConstDataAccess.cpp
+++ b/src/KingSystem/ActorSystem/actActorConstDataAccess.cpp
@@ -5,12 +5,12 @@
#include "KingSystem/ActorSystem/actActorUtil.h"
#include "KingSystem/ActorSystem/actAiRoot.h"
#include "KingSystem/Map/mapObject.h"
+#include "KingSystem/Resource/Actor/resResourceGParamList.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectAttack.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemy.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectHorseTargetedInfo.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectLiftable.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectSystem.h"
-#include "KingSystem/Resource/resResourceGParamList.h"
namespace ksys::act {
diff --git a/src/KingSystem/ActorSystem/actActorParam.cpp b/src/KingSystem/ActorSystem/actActorParam.cpp
index 2c3ed848..863f631b 100644
--- a/src/KingSystem/ActorSystem/actActorParam.cpp
+++ b/src/KingSystem/ActorSystem/actActorParam.cpp
@@ -3,11 +3,11 @@
#include <prim/seadScopedLock.h>
#include "KingSystem/ActorSystem/actActorParamMgr.h"
#include "KingSystem/ActorSystem/actActorTemplate.h"
-#include "KingSystem/Resource/resResourceAS.h"
-#include "KingSystem/Resource/resResourceASList.h"
-#include "KingSystem/Resource/resResourceAttClient.h"
-#include "KingSystem/Resource/resResourceRagdollConfig.h"
-#include "KingSystem/Resource/resResourceRagdollConfigList.h"
+#include "KingSystem/Resource/Actor/resResourceAS.h"
+#include "KingSystem/Resource/Actor/resResourceASList.h"
+#include "KingSystem/Resource/Actor/resResourceAttClient.h"
+#include "KingSystem/Resource/Actor/resResourceRagdollConfig.h"
+#include "KingSystem/Resource/Actor/resResourceRagdollConfigList.h"
#include "KingSystem/Utils/Byaml/Byaml.h"
#include "KingSystem/Utils/ParamIO.h"
diff --git a/src/KingSystem/ActorSystem/actActorParam.h b/src/KingSystem/ActorSystem/actActorParam.h
index 2c6bf9c6..a1796eca 100644
--- a/src/KingSystem/ActorSystem/actActorParam.h
+++ b/src/KingSystem/ActorSystem/actActorParam.h
@@ -7,8 +7,8 @@
#include <prim/seadSafeString.h>
#include <thread/seadCriticalSection.h>
#include "KingSystem/ActorSystem/actBaseProcJob.h"
+#include "KingSystem/Resource/Actor/resResourceActorLink.h"
#include "KingSystem/Resource/resHandle.h"
-#include "KingSystem/Resource/resResourceActorLink.h"
#include "KingSystem/Utils/Thread/Event.h"
namespace ksys {
diff --git a/src/KingSystem/ActorSystem/actActorParamMgr.cpp b/src/KingSystem/ActorSystem/actActorParamMgr.cpp
index 55da4fcb..e2ace0d4 100644
--- a/src/KingSystem/ActorSystem/actActorParamMgr.cpp
+++ b/src/KingSystem/ActorSystem/actActorParamMgr.cpp
@@ -2,33 +2,33 @@
#include <prim/seadScopedLock.h>
#include "KingSystem/ActorSystem/actASSetting.h"
#include "KingSystem/ActorSystem/actActorParam.h"
+#include "KingSystem/Resource/Actor/resResourceAIProgram.h"
+#include "KingSystem/Resource/Actor/resResourceAISchedule.h"
+#include "KingSystem/Resource/Actor/resResourceAS.h"
+#include "KingSystem/Resource/Actor/resResourceASList.h"
+#include "KingSystem/Resource/Actor/resResourceActorLink.h"
+#include "KingSystem/Resource/Actor/resResourceAnimInfo.h"
+#include "KingSystem/Resource/Actor/resResourceAttClient.h"
+#include "KingSystem/Resource/Actor/resResourceAwareness.h"
+#include "KingSystem/Resource/Actor/resResourceBoneControl.h"
+#include "KingSystem/Resource/Actor/resResourceChemical.h"
+#include "KingSystem/Resource/Actor/resResourceDamageParam.h"
+#include "KingSystem/Resource/Actor/resResourceDrop.h"
+#include "KingSystem/Resource/Actor/resResourceGParamList.h"
+#include "KingSystem/Resource/Actor/resResourceLifeCondition.h"
+#include "KingSystem/Resource/Actor/resResourceLod.h"
+#include "KingSystem/Resource/Actor/resResourceModelList.h"
+#include "KingSystem/Resource/Actor/resResourcePhysics.h"
+#include "KingSystem/Resource/Actor/resResourceRagdollBlendWeight.h"
+#include "KingSystem/Resource/Actor/resResourceRagdollConfig.h"
+#include "KingSystem/Resource/Actor/resResourceRagdollConfigList.h"
+#include "KingSystem/Resource/Actor/resResourceRecipe.h"
+#include "KingSystem/Resource/Actor/resResourceShop.h"
+#include "KingSystem/Resource/Actor/resResourceUMii.h"
#include "KingSystem/Resource/resEntryFactory.h"
#include "KingSystem/Resource/resLoadRequest.h"
-#include "KingSystem/Resource/resResourceAIProgram.h"
-#include "KingSystem/Resource/resResourceAISchedule.h"
-#include "KingSystem/Resource/resResourceAS.h"
-#include "KingSystem/Resource/resResourceASList.h"
-#include "KingSystem/Resource/resResourceActorLink.h"
-#include "KingSystem/Resource/resResourceAnimInfo.h"
#include "KingSystem/Resource/resResourceArchive.h"
-#include "KingSystem/Resource/resResourceAttClient.h"
-#include "KingSystem/Resource/resResourceAwareness.h"
-#include "KingSystem/Resource/resResourceBoneControl.h"
-#include "KingSystem/Resource/resResourceChemical.h"
-#include "KingSystem/Resource/resResourceDamageParam.h"
-#include "KingSystem/Resource/resResourceDrop.h"
-#include "KingSystem/Resource/resResourceGParamList.h"
-#include "KingSystem/Resource/resResourceLifeCondition.h"
-#include "KingSystem/Resource/resResourceLod.h"
#include "KingSystem/Resource/resResourceMgrTask.h"
-#include "KingSystem/Resource/resResourceModelList.h"
-#include "KingSystem/Resource/resResourcePhysics.h"
-#include "KingSystem/Resource/resResourceRagdollBlendWeight.h"
-#include "KingSystem/Resource/resResourceRagdollConfig.h"
-#include "KingSystem/Resource/resResourceRagdollConfigList.h"
-#include "KingSystem/Resource/resResourceRecipe.h"
-#include "KingSystem/Resource/resResourceShop.h"
-#include "KingSystem/Resource/resResourceUMii.h"
#include "KingSystem/Resource/resSystem.h"
#include "KingSystem/Resource/resTempResourceLoader.h"
#include "KingSystem/Utils/Debug.h"
diff --git a/src/KingSystem/ActorSystem/actActorUtil.cpp b/src/KingSystem/ActorSystem/actActorUtil.cpp
index 8f24330e..24fb1011 100644
--- a/src/KingSystem/ActorSystem/actActorUtil.cpp
+++ b/src/KingSystem/ActorSystem/actActorUtil.cpp
@@ -11,9 +11,9 @@
#include "KingSystem/GameData/gdtManager.h"
#include "KingSystem/Map/mapObject.h"
#include "KingSystem/Map/mapPlacementMgr.h"
+#include "KingSystem/Resource/Actor/resResourceActorLink.h"
+#include "KingSystem/Resource/Actor/resResourceGParamList.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectNpc.h"
-#include "KingSystem/Resource/resResourceActorLink.h"
-#include "KingSystem/Resource/resResourceGParamList.h"
#include "KingSystem/Utils/Byaml/Byaml.h"
#include "KingSystem/World/worldManager.h"
diff --git a/src/KingSystem/ActorSystem/actAiAction.cpp b/src/KingSystem/ActorSystem/actAiAction.cpp
index 78632dfc..4c57a5e6 100644
--- a/src/KingSystem/ActorSystem/actAiAction.cpp
+++ b/src/KingSystem/ActorSystem/actAiAction.cpp
@@ -4,7 +4,7 @@
#include "KingSystem/ActorSystem/actActorParam.h"
#include "KingSystem/ActorSystem/actAiRoot.h"
#include "KingSystem/ActorSystem/actionDummyAction.h"
-#include "KingSystem/Resource/resResourceAIProgram.h"
+#include "KingSystem/Resource/Actor/resResourceAIProgram.h"
namespace ksys::act::ai {
diff --git a/src/KingSystem/ActorSystem/actAiActionBase.cpp b/src/KingSystem/ActorSystem/actAiActionBase.cpp
index 8f62ecd9..458fabfc 100644
--- a/src/KingSystem/ActorSystem/actAiActionBase.cpp
+++ b/src/KingSystem/ActorSystem/actAiActionBase.cpp
@@ -4,7 +4,7 @@
#include "KingSystem/ActorSystem/actAiAction.h"
#include "KingSystem/ActorSystem/actAiInlineParam.h"
#include "KingSystem/ActorSystem/actAiRoot.h"
-#include "KingSystem/Resource/resResourceAIProgram.h"
+#include "KingSystem/Resource/Actor/resResourceAIProgram.h"
#include "KingSystem/Utils/InitTimeInfo.h"
#include "KingSystem/Utils/Thread/MessageTransceiverId.h"
diff --git a/src/KingSystem/ActorSystem/actAiAi.cpp b/src/KingSystem/ActorSystem/actAiAi.cpp
index 5495aa83..c96bea6e 100644
--- a/src/KingSystem/ActorSystem/actAiAi.cpp
+++ b/src/KingSystem/ActorSystem/actAiAi.cpp
@@ -7,7 +7,7 @@
#include "KingSystem/ActorSystem/actAiInlineParam.h"
#include "KingSystem/ActorSystem/actAiRoot.h"
#include "KingSystem/ActorSystem/aiDummyAi.h"
-#include "KingSystem/Resource/resResourceAIProgram.h"
+#include "KingSystem/Resource/Actor/resResourceAIProgram.h"
namespace ksys::act::ai {
diff --git a/src/KingSystem/ActorSystem/actAiBehavior.cpp b/src/KingSystem/ActorSystem/actAiBehavior.cpp
index 28781e3c..2f868984 100644
--- a/src/KingSystem/ActorSystem/actAiBehavior.cpp
+++ b/src/KingSystem/ActorSystem/actAiBehavior.cpp
@@ -3,7 +3,7 @@
#include "KingSystem/ActorSystem/actActorParam.h"
#include "KingSystem/ActorSystem/actAiRoot.h"
#include "KingSystem/ActorSystem/behaviorDummyBehavior.h"
-#include "KingSystem/Resource/resResourceAIProgram.h"
+#include "KingSystem/Resource/Actor/resResourceAIProgram.h"
namespace ksys::act::ai {
diff --git a/src/KingSystem/ActorSystem/actAiQueries.cpp b/src/KingSystem/ActorSystem/actAiQueries.cpp
index ac5e03a6..5e3b9404 100644
--- a/src/KingSystem/ActorSystem/actAiQueries.cpp
+++ b/src/KingSystem/ActorSystem/actAiQueries.cpp
@@ -4,7 +4,7 @@
#include "KingSystem/ActorSystem/actActorParam.h"
#include "KingSystem/ActorSystem/actAiQuery.h"
#include "KingSystem/ActorSystem/queryDummyQuery.h"
-#include "KingSystem/Resource/resResourceAIProgram.h"
+#include "KingSystem/Resource/Actor/resResourceAIProgram.h"
namespace ksys::act::ai {
diff --git a/src/KingSystem/ActorSystem/actAiQuery.cpp b/src/KingSystem/ActorSystem/actAiQuery.cpp
index 5a1a0ccc..b5467bb2 100644
--- a/src/KingSystem/ActorSystem/actAiQuery.cpp
+++ b/src/KingSystem/ActorSystem/actAiQuery.cpp
@@ -3,7 +3,7 @@
#include "KingSystem/ActorSystem/actActorParam.h"
#include "KingSystem/ActorSystem/actAiClassDef.h"
#include "KingSystem/ActorSystem/actAiRoot.h"
-#include "KingSystem/Resource/resResourceAIProgram.h"
+#include "KingSystem/Resource/Actor/resResourceAIProgram.h"
namespace ksys::act::ai {
diff --git a/src/KingSystem/ActorSystem/actGlobalParameter.cpp b/src/KingSystem/ActorSystem/actGlobalParameter.cpp
index 3e560b9d..050141ba 100644
--- a/src/KingSystem/ActorSystem/actGlobalParameter.cpp
+++ b/src/KingSystem/ActorSystem/actGlobalParameter.cpp
@@ -1,8 +1,8 @@
#include "KingSystem/ActorSystem/actGlobalParameter.h"
#include "KingSystem/ActorSystem/actActorParam.h"
#include "KingSystem/ActorSystem/actActorParamMgr.h"
+#include "KingSystem/Resource/Actor/resResourceGParamList.h"
#include "KingSystem/Resource/resResourceArchive.h"
-#include "KingSystem/Resource/resResourceGParamList.h"
namespace ksys::act {
diff --git a/src/KingSystem/ActorSystem/actInfoData.cpp b/src/KingSystem/ActorSystem/actInfoData.cpp
index a36aeb30..5c7ef40c 100644
--- a/src/KingSystem/ActorSystem/actInfoData.cpp
+++ b/src/KingSystem/ActorSystem/actInfoData.cpp
@@ -6,7 +6,7 @@
#include "KingSystem/ActorSystem/actDebug.h"
#include "KingSystem/Event/evtEvent.h"
#include "KingSystem/Event/evtManager.h"
-#include "KingSystem/Resource/resResourceModelList.h"
+#include "KingSystem/Resource/Actor/resResourceModelList.h"
#include "KingSystem/Utils/Byaml/Byaml.h"
#include "KingSystem/Utils/Byaml/ByamlArrayIter.h"
#include "KingSystem/Utils/Byaml/ByamlData.h"
diff --git a/src/KingSystem/Mii/miiUMii.cpp b/src/KingSystem/Mii/miiUMii.cpp
index 7c282e90..82dced5b 100644
--- a/src/KingSystem/Mii/miiUMii.cpp
+++ b/src/KingSystem/Mii/miiUMii.cpp
@@ -3,7 +3,7 @@
#include <random/seadGlobalRandom.h>
#include "KingSystem/ActorSystem/actActorParamMgr.h"
#include "KingSystem/Mii/miiModelCreator.h"
-#include "KingSystem/Resource/resResourceUMii.h"
+#include "KingSystem/Resource/Actor/resResourceUMii.h"
#include "KingSystem/Utils/InitTimeInfo.h"
namespace ksys::mii {
diff --git a/src/KingSystem/Physics/Ragdoll/physRagdollConfig.cpp b/src/KingSystem/Physics/Ragdoll/physRagdollConfig.cpp
index 87d50703..a8085e76 100644
--- a/src/KingSystem/Physics/Ragdoll/physRagdollConfig.cpp
+++ b/src/KingSystem/Physics/Ragdoll/physRagdollConfig.cpp
@@ -1,5 +1,5 @@
#include "KingSystem/Physics/Ragdoll/physRagdollConfig.h"
-#include "KingSystem/Resource/resResourceRagdollConfig.h"
+#include "KingSystem/Resource/Actor/resResourceRagdollConfig.h"
namespace ksys::phys {
diff --git a/src/KingSystem/Physics/System/physParamSet.cpp b/src/KingSystem/Physics/System/physParamSet.cpp
index 3af09949..19d64c52 100644
--- a/src/KingSystem/Physics/System/physParamSet.cpp
+++ b/src/KingSystem/Physics/System/physParamSet.cpp
@@ -7,7 +7,7 @@
#include "KingSystem/Physics/SupportBone/physSupportBoneParam.h"
#include "KingSystem/Physics/System/physCharacterControllerParam.h"
#include "KingSystem/Physics/System/physContactInfoParam.h"
-#include "KingSystem/Resource/resResourcePhysics.h"
+#include "KingSystem/Resource/Actor/resResourcePhysics.h"
namespace ksys::phys {
diff --git a/src/KingSystem/Resource/resResourceAIProgram.cpp b/src/KingSystem/Resource/Actor/resResourceAIProgram.cpp
index bce91bf7..4900aa20 100644
--- a/src/KingSystem/Resource/resResourceAIProgram.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceAIProgram.cpp
@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceAIProgram.h"
+#include "KingSystem/Resource/Actor/resResourceAIProgram.h"
#include <agl/Utils/aglParameter.h>
#include <heap/seadHeapMgr.h>
#include "KingSystem/ActorSystem/actAiActionBase.h"
diff --git a/src/KingSystem/Resource/resResourceAIProgram.h b/src/KingSystem/Resource/Actor/resResourceAIProgram.h
index c7a646bf..c7a646bf 100644
--- a/src/KingSystem/Resource/resResourceAIProgram.h
+++ b/src/KingSystem/Resource/Actor/resResourceAIProgram.h
diff --git a/src/KingSystem/Resource/resResourceAISchedule.cpp b/src/KingSystem/Resource/Actor/resResourceAISchedule.cpp
index af2c0ca5..6f812de1 100644
--- a/src/KingSystem/Resource/resResourceAISchedule.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceAISchedule.cpp
@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceAISchedule.h"
+#include "KingSystem/Resource/Actor/resResourceAISchedule.h"
namespace ksys::res {
diff --git a/src/KingSystem/Resource/resResourceAISchedule.h b/src/KingSystem/Resource/Actor/resResourceAISchedule.h
index d7de2803..d7de2803 100644
--- a/src/KingSystem/Resource/resResourceAISchedule.h
+++ b/src/KingSystem/Resource/Actor/resResourceAISchedule.h
diff --git a/src/KingSystem/Resource/resResourceAS.cpp b/src/KingSystem/Resource/Actor/resResourceAS.cpp
index 53aaf594..2453d491 100644
--- a/src/KingSystem/Resource/resResourceAS.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceAS.cpp
@@ -1,9 +1,9 @@
-#include "KingSystem/Resource/resResourceAS.h"
+#include "KingSystem/Resource/Actor/resResourceAS.h"
#include <memory>
#include <random/seadGlobalRandom.h>
-#include "KingSystem/Resource/resResourceASResource.h"
#include "KingSystem/Utils/HeapUtil.h"
#include "KingSystem/Utils/SafeDelete.h"
+#include "resResourceASResource.h"
namespace ksys::res {
diff --git a/src/KingSystem/Resource/resResourceAS.h b/src/KingSystem/Resource/Actor/resResourceAS.h
index 14a6b1e4..14a6b1e4 100644
--- a/src/KingSystem/Resource/resResourceAS.h
+++ b/src/KingSystem/Resource/Actor/resResourceAS.h
diff --git a/src/KingSystem/Resource/resResourceASList.cpp b/src/KingSystem/Resource/Actor/resResourceASList.cpp
index 2552898f..2a5a1f4c 100644
--- a/src/KingSystem/Resource/resResourceASList.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceASList.cpp
@@ -1,5 +1,5 @@
-#include "KingSystem/Resource/resResourceASList.h"
-#include "KingSystem/Resource/resResourceAS.h"
+#include "KingSystem/Resource/Actor/resResourceASList.h"
+#include "KingSystem/Resource/Actor/resResourceAS.h"
namespace ksys::res {
diff --git a/src/KingSystem/Resource/resResourceASList.h b/src/KingSystem/Resource/Actor/resResourceASList.h
index d8836523..d8836523 100644
--- a/src/KingSystem/Resource/resResourceASList.h
+++ b/src/KingSystem/Resource/Actor/resResourceASList.h
diff --git a/src/KingSystem/Resource/resResourceASResource.cpp b/src/KingSystem/Resource/Actor/resResourceASResource.cpp
index e7b348db..e6b2be31 100644
--- a/src/KingSystem/Resource/resResourceASResource.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceASResource.cpp
@@ -1,7 +1,7 @@
-#include "KingSystem/Resource/resResourceASResource.h"
+#include "KingSystem/Resource/Actor/resResourceASResource.h"
#include <limits>
#include <prim/seadSafeString.h>
-#include "KingSystem/Resource/resResourceAS.h"
+#include "KingSystem/Resource/Actor/resResourceAS.h"
namespace ksys::as {
class Element;
diff --git a/src/KingSystem/Resource/resResourceASResource.h b/src/KingSystem/Resource/Actor/resResourceASResource.h
index 167fbe01..4160a2bf 100644
--- a/src/KingSystem/Resource/resResourceASResource.h
+++ b/src/KingSystem/Resource/Actor/resResourceASResource.h
@@ -4,7 +4,7 @@
#include <agl/Utils/aglResParameter.h>
#include <container/seadBuffer.h>
#include <prim/seadRuntimeTypeInfo.h>
-#include "KingSystem/Resource/resResourceASResourceExtension.h"
+#include "KingSystem/Resource/Actor/resResourceASResourceExtension.h"
namespace ksys::res {
diff --git a/src/KingSystem/Resource/resResourceASResourceExtension.cpp b/src/KingSystem/Resource/Actor/resResourceASResourceExtension.cpp
index baad9497..9a400cd1 100644
--- a/src/KingSystem/Resource/resResourceASResourceExtension.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceASResourceExtension.cpp
@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceASResourceExtension.h"
+#include "KingSystem/Resource/Actor/resResourceASResourceExtension.h"
#include <container/seadSafeArray.h>
#include <optional>
#include <prim/seadSafeString.h>
diff --git a/src/KingSystem/Resource/resResourceASResourceExtension.h b/src/KingSystem/Resource/Actor/resResourceASResourceExtension.h
index fd244cc6..fd244cc6 100644
--- a/src/KingSystem/Resource/resResourceASResourceExtension.h
+++ b/src/KingSystem/Resource/Actor/resResourceASResourceExtension.h
diff --git a/src/KingSystem/Resource/resResourceActorCapture.cpp b/src/KingSystem/Resource/Actor/resResourceActorCapture.cpp
index f74f5c0e..a2d0b3f4 100644
--- a/src/KingSystem/Resource/resResourceActorCapture.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceActorCapture.cpp
@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceActorCapture.h"
+#include "KingSystem/Resource/Actor/resResourceActorCapture.h"
namespace ksys::res {
diff --git a/src/KingSystem/Resource/resResourceActorCapture.h b/src/KingSystem/Resource/Actor/resResourceActorCapture.h
index 51145a68..51145a68 100644
--- a/src/KingSystem/Resource/resResourceActorCapture.h
+++ b/src/KingSystem/Resource/Actor/resResourceActorCapture.h
diff --git a/src/KingSystem/Resource/resResourceActorLink.cpp b/src/KingSystem/Resource/Actor/resResourceActorLink.cpp
index a4cd1709..d941d417 100644
--- a/src/KingSystem/Resource/resResourceActorLink.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceActorLink.cpp
@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceActorLink.h"
+#include "KingSystem/Resource/Actor/resResourceActorLink.h"
#include <codec/seadHashCRC32.h>
#include <heap/seadHeapMgr.h>
diff --git a/src/KingSystem/Resource/resResourceActorLink.h b/src/KingSystem/Resource/Actor/resResourceActorLink.h
index 0b2f017e..0b2f017e 100644
--- a/src/KingSystem/Resource/resResourceActorLink.h
+++ b/src/KingSystem/Resource/Actor/resResourceActorLink.h
diff --git a/src/KingSystem/Resource/resResourceAnimInfo.cpp b/src/KingSystem/Resource/Actor/resResourceAnimInfo.cpp
index 6e0672d8..7c6da1b0 100644
--- a/src/KingSystem/Resource/resResourceAnimInfo.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceAnimInfo.cpp
@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceAnimInfo.h"
+#include "KingSystem/Resource/Actor/resResourceAnimInfo.h"
#include "KingSystem/Utils/Byaml/Byaml.h"
#include "KingSystem/Utils/SafeDelete.h"
diff --git a/src/KingSystem/Resource/resResourceAnimInfo.h b/src/KingSystem/Resource/Actor/resResourceAnimInfo.h
index b27e28a7..b27e28a7 100644
--- a/src/KingSystem/Resource/resResourceAnimInfo.h
+++ b/src/KingSystem/Resource/Actor/resResourceAnimInfo.h
diff --git a/src/KingSystem/Resource/resResourceAttCheck.cpp b/src/KingSystem/Resource/Actor/resResourceAttCheck.cpp
index 676d19ed..e75d35d1 100644
--- a/src/KingSystem/Resource/resResourceAttCheck.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceAttCheck.cpp
@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceAttCheck.h"
+#include "KingSystem/Resource/Actor/resResourceAttCheck.h"
namespace ksys::res {
diff --git a/src/KingSystem/Resource/resResourceAttCheck.h b/src/KingSystem/Resource/Actor/resResourceAttCheck.h
index 5ff8ee65..5b788b33 100644
--- a/src/KingSystem/Resource/resResourceAttCheck.h
+++ b/src/KingSystem/Resource/Actor/resResourceAttCheck.h
@@ -4,8 +4,8 @@
#include <agl/Utils/aglParameterList.h>
#include <agl/Utils/aglParameterObj.h>
#include <prim/seadRuntimeTypeInfo.h>
-#include "KingSystem/Resource/resResourceAttClient.h"
-#include "KingSystem/Resource/resResourceAttPos.h"
+#include "resResourceAttClient.h"
+#include "resResourceAttPos.h"
namespace ksys::res {
diff --git a/src/KingSystem/Resource/resResourceAttClient.cpp b/src/KingSystem/Resource/Actor/resResourceAttClient.cpp
index dc00b1a7..070c5561 100644
--- a/src/KingSystem/Resource/resResourceAttClient.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceAttClient.cpp
@@ -1,6 +1,6 @@
-#include "KingSystem/Resource/resResourceAttClient.h"
+#include "resResourceAttClient.h"
#include <container/seadSafeArray.h>
-#include "KingSystem/Resource/resResourceAttCheck.h"
+#include "resResourceAttCheck.h"
namespace ksys::res {
diff --git a/src/KingSystem/Resource/resResourceAttClient.h b/src/KingSystem/Resource/Actor/resResourceAttClient.h
index dd0977fa..96df34d3 100644
--- a/src/KingSystem/Resource/resResourceAttClient.h
+++ b/src/KingSystem/Resource/Actor/resResourceAttClient.h
@@ -6,8 +6,8 @@
#include <container/seadBuffer.h>
#include <prim/seadSafeString.h>
#include "KingSystem/ActorSystem/Attention/actAttention.h"
+#include "KingSystem/Resource/Actor/resResourceAttPos.h"
#include "KingSystem/Resource/resResource.h"
-#include "KingSystem/Resource/resResourceAttPos.h"
#include "KingSystem/Utils/ParamIO.h"
#include "KingSystem/Utils/Types.h"
diff --git a/src/KingSystem/Resource/resResourceAttPos.cpp b/src/KingSystem/Resource/Actor/resResourceAttPos.cpp
index 46c4f010..1eb43c83 100644
--- a/src/KingSystem/Resource/resResourceAttPos.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceAttPos.cpp
@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceAttPos.h"
+#include "KingSystem/Resource/Actor/resResourceAttPos.h"
namespace ksys::res {
diff --git a/src/KingSystem/Resource/resResourceAttPos.h b/src/KingSystem/Resource/Actor/resResourceAttPos.h
index 0251b02c..0251b02c 100644
--- a/src/KingSystem/Resource/resResourceAttPos.h
+++ b/src/KingSystem/Resource/Actor/resResourceAttPos.h
diff --git a/src/KingSystem/Resource/resResourceAwareness.cpp b/src/KingSystem/Resource/Actor/resResourceAwareness.cpp
index 9c66ded8..9011ac29 100644
--- a/src/KingSystem/Resource/resResourceAwareness.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceAwareness.cpp
@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceAwareness.h"
+#include "KingSystem/Resource/Actor/resResourceAwareness.h"
namespace ksys::res {
diff --git a/src/KingSystem/Resource/resResourceAwareness.h b/src/KingSystem/Resource/Actor/resResourceAwareness.h
index 2e6888ef..2e6888ef 100644
--- a/src/KingSystem/Resource/resResourceAwareness.h
+++ b/src/KingSystem/Resource/Actor/resResourceAwareness.h
diff --git a/src/KingSystem/Resource/resResourceBoneControl.cpp b/src/KingSystem/Resource/Actor/resResourceBoneControl.cpp
index 06859559..1c4fe869 100644
--- a/src/KingSystem/Resource/resResourceBoneControl.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceBoneControl.cpp
@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceBoneControl.h"
+#include "KingSystem/Resource/Actor/resResourceBoneControl.h"
namespace ksys::res {
diff --git a/src/KingSystem/Resource/resResourceBoneControl.h b/src/KingSystem/Resource/Actor/resResourceBoneControl.h
index 4cb74ea5..4cb74ea5 100644
--- a/src/KingSystem/Resource/resResourceBoneControl.h
+++ b/src/KingSystem/Resource/Actor/resResourceBoneControl.h
diff --git a/src/KingSystem/Resource/resResourceChemical.cpp b/src/KingSystem/Resource/Actor/resResourceChemical.cpp
index b404656f..45346d1f 100644
--- a/src/KingSystem/Resource/resResourceChemical.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceChemical.cpp
@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceChemical.h"
+#include "KingSystem/Resource/Actor/resResourceChemical.h"
namespace ksys::res {
diff --git a/src/KingSystem/Resource/resResourceChemical.h b/src/KingSystem/Resource/Actor/resResourceChemical.h
index 4b27461c..4b27461c 100644
--- a/src/KingSystem/Resource/resResourceChemical.h
+++ b/src/KingSystem/Resource/Actor/resResourceChemical.h
diff --git a/src/KingSystem/Resource/resResourceDamageParam.cpp b/src/KingSystem/Resource/Actor/resResourceDamageParam.cpp
index bf051e0f..432f2fdc 100644
--- a/src/KingSystem/Resource/resResourceDamageParam.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceDamageParam.cpp
@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceDamageParam.h"
+#include "KingSystem/Resource/Actor/resResourceDamageParam.h"
namespace ksys::res {
diff --git a/src/KingSystem/Resource/resResourceDamageParam.h b/src/KingSystem/Resource/Actor/resResourceDamageParam.h
index 30d75c44..30d75c44 100644
--- a/src/KingSystem/Resource/resResourceDamageParam.h
+++ b/src/KingSystem/Resource/Actor/resResourceDamageParam.h
diff --git a/src/KingSystem/Resource/resResourceDrop.cpp b/src/KingSystem/Resource/Actor/resResourceDrop.cpp
index cf115b32..d3696ba3 100644
--- a/src/KingSystem/Resource/resResourceDrop.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceDrop.cpp
@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceDrop.h"
+#include "KingSystem/Resource/Actor/resResourceDrop.h"
#include <random/seadGlobalRandom.h>
namespace ksys::res {
diff --git a/src/KingSystem/Resource/resResourceDrop.h b/src/KingSystem/Resource/Actor/resResourceDrop.h
index 198f26e5..198f26e5 100644
--- a/src/KingSystem/Resource/resResourceDrop.h
+++ b/src/KingSystem/Resource/Actor/resResourceDrop.h
diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/Actor/resResourceGParamList.cpp
index adab0db8..22512e64 100644
--- a/src/KingSystem/Resource/resResourceGParamList.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceGParamList.cpp
@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceGParamList.h"
+#include "KingSystem/Resource/Actor/resResourceGParamList.h"
#include <agl/Utils/aglParameter.h>
#include <prim/seadRuntimeTypeInfo.h>
#include "KingSystem/ActorSystem/actActorParamMgr.h"
diff --git a/src/KingSystem/Resource/resResourceGParamList.h b/src/KingSystem/Resource/Actor/resResourceGParamList.h
index 98ac36f0..98ac36f0 100644
--- a/src/KingSystem/Resource/resResourceGParamList.h
+++ b/src/KingSystem/Resource/Actor/resResourceGParamList.h
diff --git a/src/KingSystem/Resource/resResourceLifeCondition.cpp b/src/KingSystem/Resource/Actor/resResourceLifeCondition.cpp
index 7cdd45a0..84edd261 100644
--- a/src/KingSystem/Resource/resResourceLifeCondition.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceLifeCondition.cpp
@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceLifeCondition.h"
+#include "KingSystem/Resource/Actor/resResourceLifeCondition.h"
namespace ksys::res {
diff --git a/src/KingSystem/Resource/resResourceLifeCondition.h b/src/KingSystem/Resource/Actor/resResourceLifeCondition.h
index 8f6d6d9d..8f6d6d9d 100644
--- a/src/KingSystem/Resource/resResourceLifeCondition.h
+++ b/src/KingSystem/Resource/Actor/resResourceLifeCondition.h
diff --git a/src/KingSystem/Resource/resResourceLod.cpp b/src/KingSystem/Resource/Actor/resResourceLod.cpp
index baa7545f..04c02b3e 100644
--- a/src/KingSystem/Resource/resResourceLod.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceLod.cpp
@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceLod.h"
+#include "KingSystem/Resource/Actor/resResourceLod.h"
namespace ksys::res {
diff --git a/src/KingSystem/Resource/resResourceLod.h b/src/KingSystem/Resource/Actor/resResourceLod.h
index 098faee2..098faee2 100644
--- a/src/KingSystem/Resource/resResourceLod.h
+++ b/src/KingSystem/Resource/Actor/resResourceLod.h
diff --git a/src/KingSystem/Resource/resResourceModelList.cpp b/src/KingSystem/Resource/Actor/resResourceModelList.cpp
index feee9a38..18b9c0e8 100644
--- a/src/KingSystem/Resource/resResourceModelList.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceModelList.cpp
@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceModelList.h"
+#include "KingSystem/Resource/Actor/resResourceModelList.h"
#include <container/seadSafeArray.h>
#include "KingSystem/Resource/resModelResourceDivide.h"
diff --git a/src/KingSystem/Resource/resResourceModelList.h b/src/KingSystem/Resource/Actor/resResourceModelList.h
index 1d399f46..1d399f46 100644
--- a/src/KingSystem/Resource/resResourceModelList.h
+++ b/src/KingSystem/Resource/Actor/resResourceModelList.h
diff --git a/src/KingSystem/Resource/resResourcePhysics.cpp b/src/KingSystem/Resource/Actor/resResourcePhysics.cpp
index 88591fb9..f9a90eda 100644
--- a/src/KingSystem/Resource/resResourcePhysics.cpp
+++ b/src/KingSystem/Resource/Actor/resResourcePhysics.cpp
@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourcePhysics.h"
+#include "KingSystem/Resource/Actor/resResourcePhysics.h"
namespace ksys::res {
diff --git a/src/KingSystem/Resource/resResourcePhysics.h b/src/KingSystem/Resource/Actor/resResourcePhysics.h
index 5eef2cfd..5eef2cfd 100644
--- a/src/KingSystem/Resource/resResourcePhysics.h
+++ b/src/KingSystem/Resource/Actor/resResourcePhysics.h
diff --git a/src/KingSystem/Resource/resResourceRagdollBlendWeight.cpp b/src/KingSystem/Resource/Actor/resResourceRagdollBlendWeight.cpp
index a5689bba..07aec2d7 100644
--- a/src/KingSystem/Resource/resResourceRagdollBlendWeight.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceRagdollBlendWeight.cpp
@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceRagdollBlendWeight.h"
+#include "KingSystem/Resource/Actor/resResourceRagdollBlendWeight.h"
namespace ksys::res {
diff --git a/src/KingSystem/Resource/resResourceRagdollBlendWeight.h b/src/KingSystem/Resource/Actor/resResourceRagdollBlendWeight.h
index 257c3184..257c3184 100644
--- a/src/KingSystem/Resource/resResourceRagdollBlendWeight.h
+++ b/src/KingSystem/Resource/Actor/resResourceRagdollBlendWeight.h
diff --git a/src/KingSystem/Resource/resResourceRagdollConfig.cpp b/src/KingSystem/Resource/Actor/resResourceRagdollConfig.cpp
index 3c61dcd9..dfadf9fd 100644
--- a/src/KingSystem/Resource/resResourceRagdollConfig.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceRagdollConfig.cpp
@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceRagdollConfig.h"
+#include "KingSystem/Resource/Actor/resResourceRagdollConfig.h"
namespace ksys::res {
diff --git a/src/KingSystem/Resource/resResourceRagdollConfig.h b/src/KingSystem/Resource/Actor/resResourceRagdollConfig.h
index 46e71cf4..46e71cf4 100644
--- a/src/KingSystem/Resource/resResourceRagdollConfig.h
+++ b/src/KingSystem/Resource/Actor/resResourceRagdollConfig.h
diff --git a/src/KingSystem/Resource/resResourceRagdollConfigList.cpp b/src/KingSystem/Resource/Actor/resResourceRagdollConfigList.cpp
index c9b8b77a..cf230021 100644
--- a/src/KingSystem/Resource/resResourceRagdollConfigList.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceRagdollConfigList.cpp
@@ -1,5 +1,5 @@
-#include "KingSystem/Resource/resResourceRagdollConfigList.h"
-#include "KingSystem/Resource/resResourceRagdollConfig.h"
+#include "KingSystem/Resource/Actor/resResourceRagdollConfigList.h"
+#include "KingSystem/Resource/Actor/resResourceRagdollConfig.h"
namespace ksys::res {
diff --git a/src/KingSystem/Resource/resResourceRagdollConfigList.h b/src/KingSystem/Resource/Actor/resResourceRagdollConfigList.h
index 9b207189..9b207189 100644
--- a/src/KingSystem/Resource/resResourceRagdollConfigList.h
+++ b/src/KingSystem/Resource/Actor/resResourceRagdollConfigList.h
diff --git a/src/KingSystem/Resource/resResourceRecipe.cpp b/src/KingSystem/Resource/Actor/resResourceRecipe.cpp
index 9beeb1dc..c2921e62 100644
--- a/src/KingSystem/Resource/resResourceRecipe.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceRecipe.cpp
@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceRecipe.h"
+#include "KingSystem/Resource/Actor/resResourceRecipe.h"
namespace ksys::res {
diff --git a/src/KingSystem/Resource/resResourceRecipe.h b/src/KingSystem/Resource/Actor/resResourceRecipe.h
index 0429451b..0429451b 100644
--- a/src/KingSystem/Resource/resResourceRecipe.h
+++ b/src/KingSystem/Resource/Actor/resResourceRecipe.h
diff --git a/src/KingSystem/Resource/resResourceShop.cpp b/src/KingSystem/Resource/Actor/resResourceShop.cpp
index 8a407062..1d6e9974 100644
--- a/src/KingSystem/Resource/resResourceShop.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceShop.cpp
@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceShop.h"
+#include "KingSystem/Resource/Actor/resResourceShop.h"
namespace ksys::res {
diff --git a/src/KingSystem/Resource/resResourceShop.h b/src/KingSystem/Resource/Actor/resResourceShop.h
index 14c383e1..14c383e1 100644
--- a/src/KingSystem/Resource/resResourceShop.h
+++ b/src/KingSystem/Resource/Actor/resResourceShop.h
diff --git a/src/KingSystem/Resource/resResourceUMii.cpp b/src/KingSystem/Resource/Actor/resResourceUMii.cpp
index 677f8f58..2f432137 100644
--- a/src/KingSystem/Resource/resResourceUMii.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceUMii.cpp
@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceUMii.h"
+#include "KingSystem/Resource/Actor/resResourceUMii.h"
namespace ksys::res {
diff --git a/src/KingSystem/Resource/resResourceUMii.h b/src/KingSystem/Resource/Actor/resResourceUMii.h
index ed4f8d0d..ed4f8d0d 100644
--- a/src/KingSystem/Resource/resResourceUMii.h
+++ b/src/KingSystem/Resource/Actor/resResourceUMii.h
diff --git a/src/KingSystem/Resource/CMakeLists.txt b/src/KingSystem/Resource/CMakeLists.txt
index b4f3d690..d24f5fa9 100644
--- a/src/KingSystem/Resource/CMakeLists.txt
+++ b/src/KingSystem/Resource/CMakeLists.txt
@@ -128,70 +128,71 @@ target_sources(uking PRIVATE
resResource.cpp
resResource.h
- resResourceActorCapture.cpp
- resResourceActorCapture.h
- resResourceActorLink.cpp
- resResourceActorLink.h
- resResourceAIProgram.cpp
- resResourceAIProgram.h
- resResourceAISchedule.cpp
- resResourceAISchedule.h
- resResourceAnimInfo.cpp
- resResourceAnimInfo.h
- resResourceAS.cpp
- resResourceAS.h
- resResourceASList.cpp
- resResourceASList.h
- resResourceASResource.cpp
- resResourceASResource.h
- resResourceASResourceExtension.cpp
- resResourceASResourceExtension.h
resResourceASSetting.cpp
resResourceASSetting.h
- resResourceAttCheck.cpp
- resResourceAttCheck.h
- resResourceAttClient.cpp
- resResourceAttClient.h
- resResourceAttPos.cpp
- resResourceAttPos.h
resResourceArchive.cpp
resResourceArchive.h
- resResourceAwareness.cpp
- resResourceAwareness.h
- resResourceBoneControl.cpp
- resResourceBoneControl.h
- resResourceChemical.cpp
- resResourceChemical.h
- resResourceDamageParam.cpp
- resResourceDamageParam.h
resResourceDemo.cpp
resResourceDemo.h
- resResourceDrop.cpp
- resResourceDrop.h
resResourceGameData.cpp
resResourceGameData.h
resResourceGameSaveData.cpp
resResourceGameSaveData.h
- resResourceGParamList.cpp
- resResourceGParamList.h
- resResourceLifeCondition.cpp
- resResourceLifeCondition.h
- resResourceLod.cpp
- resResourceLod.h
- resResourceModelList.cpp
- resResourceModelList.h
- resResourcePhysics.cpp
- resResourcePhysics.h
- resResourceRagdollBlendWeight.cpp
- resResourceRagdollBlendWeight.h
- resResourceRagdollConfig.cpp
- resResourceRagdollConfig.h
- resResourceRagdollConfigList.cpp
- resResourceRagdollConfigList.h
- resResourceRecipe.cpp
- resResourceRecipe.h
- resResourceShop.cpp
- resResourceShop.h
- resResourceUMii.cpp
- resResourceUMii.h
+
+ Actor/resResourceActorCapture.cpp
+ Actor/resResourceActorCapture.h
+ Actor/resResourceActorLink.cpp
+ Actor/resResourceActorLink.h
+ Actor/resResourceAIProgram.cpp
+ Actor/resResourceAIProgram.h
+ Actor/resResourceAISchedule.cpp
+ Actor/resResourceAISchedule.h
+ Actor/resResourceAnimInfo.cpp
+ Actor/resResourceAnimInfo.h
+ Actor/resResourceAS.cpp
+ Actor/resResourceAS.h
+ Actor/resResourceASList.cpp
+ Actor/resResourceASList.h
+ Actor/resResourceASResource.cpp
+ Actor/resResourceASResource.h
+ Actor/resResourceASResourceExtension.cpp
+ Actor/resResourceASResourceExtension.h
+ Actor/resResourceAttCheck.cpp
+ Actor/resResourceAttCheck.h
+ Actor/resResourceAttClient.cpp
+ Actor/resResourceAttClient.h
+ Actor/resResourceAttPos.cpp
+ Actor/resResourceAttPos.h
+ Actor/resResourceAwareness.cpp
+ Actor/resResourceAwareness.h
+ Actor/resResourceBoneControl.cpp
+ Actor/resResourceBoneControl.h
+ Actor/resResourceChemical.cpp
+ Actor/resResourceChemical.h
+ Actor/resResourceDamageParam.cpp
+ Actor/resResourceDamageParam.h
+ Actor/resResourceDrop.cpp
+ Actor/resResourceDrop.h
+ Actor/resResourceGParamList.cpp
+ Actor/resResourceGParamList.h
+ Actor/resResourceLifeCondition.cpp
+ Actor/resResourceLifeCondition.h
+ Actor/resResourceLod.cpp
+ Actor/resResourceLod.h
+ Actor/resResourceModelList.cpp
+ Actor/resResourceModelList.h
+ Actor/resResourcePhysics.cpp
+ Actor/resResourcePhysics.h
+ Actor/resResourceRagdollBlendWeight.cpp
+ Actor/resResourceRagdollBlendWeight.h
+ Actor/resResourceRagdollConfig.cpp
+ Actor/resResourceRagdollConfig.h
+ Actor/resResourceRagdollConfigList.cpp
+ Actor/resResourceRagdollConfigList.h
+ Actor/resResourceRecipe.cpp
+ Actor/resResourceRecipe.h
+ Actor/resResourceShop.cpp
+ Actor/resResourceShop.h
+ Actor/resResourceUMii.cpp
+ Actor/resResourceUMii.h
)
diff --git a/src/KingSystem/Resource/resResourceASSetting.h b/src/KingSystem/Resource/resResourceASSetting.h
index 61f5b658..8f098245 100644
--- a/src/KingSystem/Resource/resResourceASSetting.h
+++ b/src/KingSystem/Resource/resResourceASSetting.h
@@ -9,8 +9,8 @@
#include <container/seadBuffer.h>
#include <prim/seadRuntimeTypeInfo.h>
#include <prim/seadSafeString.h>
+#include "KingSystem/Resource/Actor/resResourceASResourceExtension.h"
#include "KingSystem/Resource/resResource.h"
-#include "KingSystem/Resource/resResourceASResourceExtension.h"
namespace ksys::res {