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

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"

src/KingSystem/Resource/Actor/resResourceAISchedule.cpp

@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceAISchedule.h"
+#include "KingSystem/Resource/Actor/resResourceAISchedule.h"
 
 namespace ksys::res {
 

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 {
 

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 {
 

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;

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 {
 

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>

src/KingSystem/Resource/Actor/resResourceActorCapture.cpp

@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceActorCapture.h"
+#include "KingSystem/Resource/Actor/resResourceActorCapture.h"
 
 namespace ksys::res {
 

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>
 

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"
 

src/KingSystem/Resource/Actor/resResourceAttCheck.cpp

@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceAttCheck.h"
+#include "KingSystem/Resource/Actor/resResourceAttCheck.h"
 
 namespace ksys::res {
 

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 {
 

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 {
 

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"
 

src/KingSystem/Resource/Actor/resResourceAttPos.cpp

@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceAttPos.h"
+#include "KingSystem/Resource/Actor/resResourceAttPos.h"
 
 namespace ksys::res {
 

src/KingSystem/Resource/Actor/resResourceAwareness.cpp

@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceAwareness.h"
+#include "KingSystem/Resource/Actor/resResourceAwareness.h"
 
 namespace ksys::res {
 

src/KingSystem/Resource/Actor/resResourceBoneControl.cpp

@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceBoneControl.h"
+#include "KingSystem/Resource/Actor/resResourceBoneControl.h"
 
 namespace ksys::res {
 

src/KingSystem/Resource/Actor/resResourceChemical.cpp

@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceChemical.h"
+#include "KingSystem/Resource/Actor/resResourceChemical.h"
 
 namespace ksys::res {
 

src/KingSystem/Resource/Actor/resResourceDamageParam.cpp

@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceDamageParam.h"
+#include "KingSystem/Resource/Actor/resResourceDamageParam.h"
 
 namespace ksys::res {
 

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 {

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"

src/KingSystem/Resource/Actor/resResourceLifeCondition.cpp

@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceLifeCondition.h"
+#include "KingSystem/Resource/Actor/resResourceLifeCondition.h"
 
 namespace ksys::res {
 

src/KingSystem/Resource/Actor/resResourceLod.cpp

@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceLod.h"
+#include "KingSystem/Resource/Actor/resResourceLod.h"
 
 namespace ksys::res {
 

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"
 

src/KingSystem/Resource/Actor/resResourcePhysics.cpp

@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourcePhysics.h"
+#include "KingSystem/Resource/Actor/resResourcePhysics.h"
 
 namespace ksys::res {
 

src/KingSystem/Resource/Actor/resResourceRagdollBlendWeight.cpp

@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceRagdollBlendWeight.h"
+#include "KingSystem/Resource/Actor/resResourceRagdollBlendWeight.h"
 
 namespace ksys::res {
 

src/KingSystem/Resource/Actor/resResourceRagdollConfig.cpp

@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceRagdollConfig.h"
+#include "KingSystem/Resource/Actor/resResourceRagdollConfig.h"
 
 namespace ksys::res {
 

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 {
 

src/KingSystem/Resource/Actor/resResourceRecipe.cpp

@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceRecipe.h"
+#include "KingSystem/Resource/Actor/resResourceRecipe.h"
 
 namespace ksys::res {
 

src/KingSystem/Resource/Actor/resResourceShop.cpp

@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceShop.h"
+#include "KingSystem/Resource/Actor/resResourceShop.h"
 
 namespace ksys::res {
 

src/KingSystem/Resource/Actor/resResourceUMii.cpp

@@ -1,4 +1,4 @@
-#include "KingSystem/Resource/resResourceUMii.h"
+#include "KingSystem/Resource/Actor/resResourceUMii.h"
 
 namespace ksys::res {
 

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
 )

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 {