ksys: Move ActorParam classes into separate folder to declutter Resource/

15 files changed, 42 insertions, 42 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"