Merge pull request #211 from leoetlino/stack/01-moves

Move source files around to better match link order

src/Game/AI/CMakeLists.txt

@@ -1,12 +0,0 @@
-add_subdirectory(Action)
-add_subdirectory(AI)
-add_subdirectory(Query)
-
-target_sources(uking PRIVATE
-  aiActionFactories.cpp
-  aiActionFactories.h
-  aiAiFactories.cpp
-  aiAiFactories.h
-  aiQueryFactories.cpp
-  aiQueryFactories.h
-)

src/Game/Actor/AI/CMakeLists.txt

@@ -25,6 +25,8 @@ target_sources(uking PRIVATE
   aiAirOctaBoardBurn.h
   aiAirOctaBurnReaction.cpp
   aiAirOctaBurnReaction.h
+  aiAirOctaDataMgr.cpp
+  aiAirOctaDataMgr.h
   aiAirOctaFlyUp.cpp
   aiAirOctaFlyUp.h
   aiAirOctaReaction.cpp
@@ -229,28 +231,6 @@ target_sources(uking PRIVATE
   aiBreathEnemyRangeKeepMove.h
   aiCalledEnemyMove.cpp
   aiCalledEnemyMove.h
-  aiCameraAI.cpp
-  aiCameraAI.h
-  aiCameraBow.cpp
-  aiCameraBow.h
-  aiCameraEditRoot.cpp
-  aiCameraEditRoot.h
-  aiCameraEvent.cpp
-  aiCameraEvent.h
-  aiCameraEventReturnSavePoint.cpp
-  aiCameraEventReturnSavePoint.h
-  aiCameraEventTalkAI.cpp
-  aiCameraEventTalkAI.h
-  aiCameraEventTalkAIRet.cpp
-  aiCameraEventTalkAIRet.h
-  aiCameraEventTalk.cpp
-  aiCameraEventTalk.h
-  aiCameraGameRoot.cpp
-  aiCameraGameRoot.h
-  aiCameraRoot.cpp
-  aiCameraRoot.h
-  aiCameraTool.cpp
-  aiCameraTool.h
   aiCannonBallRoot.cpp
   aiCannonBallRoot.h
   aiCapturedActDeadSelector.cpp
@@ -365,8 +345,6 @@ target_sources(uking PRIVATE
   aiDeadlyBlowWeaponRoot.h
   aiDeadOrOtherState.cpp
   aiDeadOrOtherState.h
-  aiDefWanderAI.cpp
-  aiDefWanderAI.h
   aiDemoRailMoveRemains.cpp
   aiDemoRailMoveRemains.h
   aiDemoRootAI.cpp
@@ -1018,33 +996,19 @@ target_sources(uking PRIVATE
   aiHorse.cpp
   aiHorseDamageTypeSelect.cpp
   aiHorseDamageTypeSelect.h
-  aiHorseEscapeRouteRailAI.cpp
-  aiHorseEscapeRouteRailAI.h
   aiHorseFollow.cpp
   aiHorseFollow.h
-  aiHorseGoToEatAI.cpp
-  aiHorseGoToEatAI.h
   aiHorse.h
-  aiHorseLoopTargetAndWaitAI.cpp
-  aiHorseLoopTargetAndWaitAI.h
   aiHorseLoopTarget.cpp
   aiHorseLoopTarget.h
   aiHorseMoveToPlayer.cpp
   aiHorseMoveToPlayer.h
-  aiHorseNatureSelectAI.cpp
-  aiHorseNatureSelectAI.h
   aiHorseNotRidden.cpp
   aiHorseNotRidden.h
   aiHorsePrevRiddenStatusSelector.cpp
   aiHorsePrevRiddenStatusSelector.h
   aiHorseReins.cpp
   aiHorseReins.h
-  aiHorseRiddenAI.cpp
-  aiHorseRiddenAI.h
-  aiHorseRiddenByEnemyAI.cpp
-  aiHorseRiddenByEnemyAI.h
-  aiHorseRiddenByNPCBase.cpp
-  aiHorseRiddenByNPCBase.h
   aiHorseRiddenByNPC.cpp
   aiHorseRiddenByNPC.h
   aiHorseRideChargeAttack.cpp
@@ -1073,8 +1037,6 @@ target_sources(uking PRIVATE
   aiHorseRideShootingEnemyBattle.h
   aiHorseRideTurn.cpp
   aiHorseRideTurn.h
-  aiHorseWanderAI.cpp
-  aiHorseWanderAI.h
   aiIAIAttack.cpp
   aiIAIAttack.h
   aiIbutsuWaterFallRoot.cpp
@@ -1401,8 +1363,6 @@ target_sources(uking PRIVATE
   aiNearCreateSelect.h
   aiNewMannequinRoot.cpp
   aiNewMannequinRoot.h
-  aiNonPlayerHorseRide.cpp
-  aiNonPlayerHorseRide.h
   aiNormalHumanEquipableShield.cpp
   aiNormalHumanEquipableShield.h
   aiNoticePartsRangeSelector.cpp
@@ -1467,8 +1427,6 @@ target_sources(uking PRIVATE
   aiNpcTebaRoot.h
   aiNpcTebaTrainingRoot.cpp
   aiNpcTebaTrainingRoot.h
-  aiNPCTerrorAI.cpp
-  aiNPCTerrorAI.h
   aiNPCTimeline.cpp
   aiNPCTimeline.h
   aiNPCTravelBase.cpp
@@ -1535,48 +1493,8 @@ target_sources(uking PRIVATE
   aiPillarCrack.h
   aiPipeDrawing.cpp
   aiPipeDrawing.h
-  aiPlayerAttack.cpp
-  aiPlayerAttack.h
-  aiPlayerBarrierBlow.cpp
-  aiPlayerBarrierBlow.h
-  aiPlayerBeetle.cpp
-  aiPlayerBeetle.h
-  aiPlayerCamera.cpp
-  aiPlayerCamera.h
-  aiPlayerCaught.cpp
-  aiPlayerCaught.h
-  aiPlayerClimb.cpp
-  aiPlayerClimb.h
-  aiPlayerCutJump.cpp
-  aiPlayerCutJump.h
-  aiPlayerDead.cpp
-  aiPlayerDead.h
-  aiPlayerDemoRoot.cpp
-  aiPlayerDemoRoot.h
-  aiPlayerGrab.cpp
-  aiPlayerGrab.h
-  aiPlayerItem.cpp
-  aiPlayerItem.h
-  aiPlayerLadder.cpp
-  aiPlayerLadder.h
-  aiPlayerNavDestinationMove.cpp
-  aiPlayerNavDestinationMove.h
-  aiPlayerNormal.cpp
-  aiPlayerNormal.h
-  aiPlayerRideHorse.cpp
-  aiPlayerRideHorse.h
-  aiPlayerRoot.cpp
-  aiPlayerRoot.h
   aiPlayerSetTarget.cpp
   aiPlayerSetTarget.h
-  aiPlayerSit.cpp
-  aiPlayerSit.h
-  aiPlayerSwim.cpp
-  aiPlayerSwim.h
-  aiPlayerWaterFall.cpp
-  aiPlayerWaterFall.h
-  aiPlayerZoraRide.cpp
-  aiPlayerZoraRide.h
   aiPointWindTagRoot.cpp
   aiPointWindTagRoot.h
   aiPracticeGuardianMiniNormal.cpp
@@ -1853,12 +1771,8 @@ target_sources(uking PRIVATE
   aiReturnFromReactionSelect.h
   aiReuseBulletPartsRoot.cpp
   aiReuseBulletPartsRoot.h
-  aiRideHorseAI.cpp
-  aiRideHorseAI.h
   aiRitoHeroSoulGiftRoot.cpp
   aiRitoHeroSoulGiftRoot.h
-  AirOcta/AirOctaDataMgr.cpp
-  AirOcta/AirOctaDataMgr.h
   aiRodEnemyFindPlayer.cpp
   aiRodEnemyFindPlayer.h
   aiRodRoot.cpp
@@ -2443,8 +2357,6 @@ target_sources(uking PRIVATE
   aiWetSelect.h
   aiWholeDungeonRotateTag.cpp
   aiWholeDungeonRotateTag.h
-  aiWildHorseDefWanderAI.cpp
-  aiWildHorseDefWanderAI.h
   aiWillBallAttackLevelSelect.cpp
   aiWillBallAttackLevelSelect.h
   aiWillBallFollowAttack.cpp

src/Game/Actor/AI/aiASWeaponRoot.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiASWeaponRoot.h"
+#include "Game/Actor/AI/aiASWeaponRoot.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiASWeaponRoot.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Game/AI/AI/aiWeaponRootAI.h"
+#include "Game/Actor/AI/aiWeaponRootAI.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {

src/Game/Actor/AI/aiActorWaterDepthSelect.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiActorWaterDepthSelect.h"
+#include "Game/Actor/AI/aiActorWaterDepthSelect.h"
 #include "KingSystem/ActorSystem/actActor.h"
 
 namespace uking::ai {

src/Game/Actor/AI/aiAddBasicLinkOn.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAddBasicLinkOn.h"
+#include "Game/Actor/AI/aiAddBasicLinkOn.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAddCarried.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAddCarried.h"
+#include "Game/Actor/AI/aiAddCarried.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAddCarried.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Game/AI/AI/aiAddCarriedBase.h"
+#include "Game/Actor/AI/aiAddCarriedBase.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {

src/Game/Actor/AI/aiAddCarriedBase.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAddCarriedBase.h"
+#include "Game/Actor/AI/aiAddCarriedBase.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAddDemoCall.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAddDemoCall.h"
+#include "Game/Actor/AI/aiAddDemoCall.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAddNodeNodeCarried.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAddNodeNodeCarried.h"
+#include "Game/Actor/AI/aiAddNodeNodeCarried.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAddNodeNodeCarried.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Game/AI/AI/aiAddCarriedBase.h"
+#include "Game/Actor/AI/aiAddCarriedBase.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {

src/Game/Actor/AI/aiAddNoiseToTargetPos.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAddNoiseToTargetPos.h"
+#include "Game/Actor/AI/aiAddNoiseToTargetPos.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAddPlayerLargeAttackJustGuard.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAddPlayerLargeAttackJustGuard.h"
+#include "Game/Actor/AI/aiAddPlayerLargeAttackJustGuard.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAddSwarmMove.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAddSwarmMove.h"
+#include "Game/Actor/AI/aiAddSwarmMove.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAddViewTargetPos.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAddViewTargetPos.h"
+#include "Game/Actor/AI/aiAddViewTargetPos.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAddViewTargetPos.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Game/AI/AI/aiAddViewTargetPosBase.h"
+#include "Game/Actor/AI/aiAddViewTargetPosBase.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {

src/Game/Actor/AI/aiAddViewTargetPosBase.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAddViewTargetPosBase.h"
+#include "Game/Actor/AI/aiAddViewTargetPosBase.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAirOctaBoardBurn.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAirOctaBoardBurn.h"
+#include "Game/Actor/AI/aiAirOctaBoardBurn.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAirOctaBoardBurn.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Game/AI/AI/aiSeqTwoAction.h"
+#include "Game/Actor/AI/aiSeqTwoAction.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {

src/Game/Actor/AI/aiAirOctaBurnReaction.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAirOctaBurnReaction.h"
+#include "Game/Actor/AI/aiAirOctaBurnReaction.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAirOctaDataMgr.cpp

@@ -1,8 +1,8 @@
-#include "Game/AI/AI/AirOcta/AirOctaDataMgr.h"
-namespace uking {
-
-void AirOctaDataMgr::changeOctasYheightMaybe() {
-    float result = vec_EC.y + unk_110 + unk_114 + unk_118 + unk_11c;
-    vec_F8.y = result;
-}
+#include "Game/Actor/AI/aiAirOctaDataMgr.h"
+namespace uking {
+
+void AirOctaDataMgr::changeOctasYheightMaybe() {
+    float result = vec_EC.y + unk_110 + unk_114 + unk_118 + unk_11c;
+    vec_F8.y = result;
+}
 }  // namespace uking

src/Game/Actor/AI/aiAirOctaFlyUp.cpp

@@ -1,6 +1,6 @@
-#include "Game/AI/AI/aiAirOctaFlyUp.h"
-#include "Game/AI/AI/AirOcta/AirOctaDataMgr.h"
-#include "Game/AI/AI/aiAirOctaRoot.h"
+#include "Game/Actor/AI/aiAirOctaFlyUp.h"
+#include "Game/Actor/AI/aiAirOctaDataMgr.h"
+#include "Game/Actor/AI/aiAirOctaRoot.h"
 #include "KingSystem/ActorSystem/AS/ASList.h"
 #include "KingSystem/ActorSystem/actActor.h"
 #include "KingSystem/ActorSystem/actActorConstDataAccess.h"

src/Game/Actor/AI/aiAirOctaFlyUp.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Game/AI/AI/AirOcta/AirOctaDataMgr.h"
+#include "Game/Actor/AI/aiAirOctaDataMgr.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 namespace uking {
 class AirOctaDataMgr;

src/Game/Actor/AI/aiAirOctaReaction.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAirOctaReaction.h"
+#include "Game/Actor/AI/aiAirOctaReaction.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAirOctaReaction.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Game/AI/AI/aiEnemyDefaultReaction.h"
+#include "Game/Actor/AI/aiEnemyDefaultReaction.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {

src/Game/Actor/AI/aiAirOctaRoot.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAirOctaRoot.h"
+#include "Game/Actor/AI/aiAirOctaRoot.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAirOctaRoot.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Game/AI/AI/aiFork2AI.h"
+#include "Game/Actor/AI/aiFork2AI.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {

src/Game/Actor/AI/aiAirOctaState.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAirOctaState.h"
+#include "Game/Actor/AI/aiAirOctaState.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAirOctaState.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Game/AI/AI/aiEnemyRoot.h"
+#include "Game/Actor/AI/aiEnemyRoot.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {

src/Game/Actor/AI/aiAirOctaWait.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAirOctaWait.h"
+#include "Game/Actor/AI/aiAirOctaWait.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAlertCreationNestOnTree.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAlertCreationNestOnTree.h"
+#include "Game/Actor/AI/aiAlertCreationNestOnTree.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAlertCreationNestOnTree.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Game/AI/AI/aiCreationNestOnTree.h"
+#include "Game/Actor/AI/aiCreationNestOnTree.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {

src/Game/Actor/AI/aiAmbushableWeaponShoot.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAmbushableWeaponShoot.h"
+#include "Game/Actor/AI/aiAmbushableWeaponShoot.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAnchorRangeSelectTwoAction.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAnchorRangeSelectTwoAction.h"
+#include "Game/Actor/AI/aiAnchorRangeSelectTwoAction.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAnchorRangeSelectTwoAction.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Game/AI/AI/aiRangeSelectTwoAction.h"
+#include "Game/Actor/AI/aiRangeSelectTwoAction.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {

src/Game/Actor/AI/aiAncientNecklaceBall.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAncientNecklaceBall.h"
+#include "Game/Actor/AI/aiAncientNecklaceBall.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAncientNecklaceBall.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Game/AI/AI/aiAncientNecklaceBallBase.h"
+#include "Game/Actor/AI/aiAncientNecklaceBallBase.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {

src/Game/Actor/AI/aiAncientNecklaceBallBase.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAncientNecklaceBallBase.h"
+#include "Game/Actor/AI/aiAncientNecklaceBallBase.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAncientNecklaceBallBase.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Game/AI/AI/aiSimpleLiftable.h"
+#include "Game/Actor/AI/aiSimpleLiftable.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {

src/Game/Actor/AI/aiAnimalAttackOtherTarget.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAnimalAttackOtherTarget.h"
+#include "Game/Actor/AI/aiAnimalAttackOtherTarget.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAnimalBattleAggressive.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAnimalBattleAggressive.h"
+#include "Game/Actor/AI/aiAnimalBattleAggressive.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAnimalBattleAggressive.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Game/AI/AI/aiEnemyBattle.h"
+#include "Game/Actor/AI/aiEnemyBattle.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {

src/Game/Actor/AI/aiAnimalBattleMoveLeave.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAnimalBattleMoveLeave.h"
+#include "Game/Actor/AI/aiAnimalBattleMoveLeave.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAnimalEscapeAI.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAnimalEscapeAI.h"
+#include "Game/Actor/AI/aiAnimalEscapeAI.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAnimalEscapeAI.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Game/AI/AI/aiAnimalRoamBase.h"
+#include "Game/Actor/AI/aiAnimalRoamBase.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {

src/Game/Actor/AI/aiAnimalEscapeAfterDamage.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAnimalEscapeAfterDamage.h"
+#include "Game/Actor/AI/aiAnimalEscapeAfterDamage.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAnimalEscapeAfterDamage.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Game/AI/AI/aiAnimalEscapeAI.h"
+#include "Game/Actor/AI/aiAnimalEscapeAI.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {

src/Game/Actor/AI/aiAnimalFollowTarget.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAnimalFollowTarget.h"
+#include "Game/Actor/AI/aiAnimalFollowTarget.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAnimalFollowTarget.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Game/AI/AI/aiHorseFollow.h"
+#include "Game/Actor/AI/aiHorseFollow.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {

src/Game/Actor/AI/aiAnimalLineOfSightSelector.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAnimalLineOfSightSelector.h"
+#include "Game/Actor/AI/aiAnimalLineOfSightSelector.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAnimalPreAttack.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAnimalPreAttack.h"
+#include "Game/Actor/AI/aiAnimalPreAttack.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAnimalRangeKeepMove.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAnimalRangeKeepMove.h"
+#include "Game/Actor/AI/aiAnimalRangeKeepMove.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAnimalRangeKeepMoveWithLOS.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAnimalRangeKeepMoveWithLOS.h"
+#include "Game/Actor/AI/aiAnimalRangeKeepMoveWithLOS.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAnimalRoam.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAnimalRoam.h"
+#include "Game/Actor/AI/aiAnimalRoam.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAnimalRoam.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Game/AI/AI/aiAnimalRoamBase.h"
+#include "Game/Actor/AI/aiAnimalRoamBase.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {

src/Game/Actor/AI/aiAnimalRoamBase.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAnimalRoamBase.h"
+#include "Game/Actor/AI/aiAnimalRoamBase.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAnimalRoamCheckWater.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAnimalRoamCheckWater.h"
+#include "Game/Actor/AI/aiAnimalRoamCheckWater.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAnimalRoamCheckWater.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Game/AI/AI/aiAnimalRoam.h"
+#include "Game/Actor/AI/aiAnimalRoam.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {

src/Game/Actor/AI/aiAnimalRushAttack.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAnimalRushAttack.h"
+#include "Game/Actor/AI/aiAnimalRushAttack.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAnimalTimelineAI.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAnimalTimelineAI.h"
+#include "Game/Actor/AI/aiAnimalTimelineAI.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAnimalTimelineAI.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Game/AI/AI/aiTimelineAI.h"
+#include "Game/Actor/AI/aiTimelineAI.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {

src/Game/Actor/AI/aiAppearFromTargetFrontAfterChase.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAppearFromTargetFrontAfterChase.h"
+#include "Game/Actor/AI/aiAppearFromTargetFrontAfterChase.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAppearFromTargetFrontAfterChase.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Game/AI/AI/aiAppearNearTarget.h"
+#include "Game/Actor/AI/aiAppearNearTarget.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {

src/Game/Actor/AI/aiAppearFromTargetFrontGround.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAppearFromTargetFrontGround.h"
+#include "Game/Actor/AI/aiAppearFromTargetFrontGround.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAppearFromTargetFrontGround.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Game/AI/AI/aiAppearNearTarget.h"
+#include "Game/Actor/AI/aiAppearNearTarget.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {

src/Game/Actor/AI/aiAppearNearTarget.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAppearNearTarget.h"
+#include "Game/Actor/AI/aiAppearNearTarget.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAppearNearTargetOutOfScrnGnd.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAppearNearTargetOutOfScrnGnd.h"
+#include "Game/Actor/AI/aiAppearNearTargetOutOfScrnGnd.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAppearNearTargetOutOfScrnGnd.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Game/AI/AI/aiAppearNearTarget.h"
+#include "Game/Actor/AI/aiAppearNearTarget.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {

src/Game/Actor/AI/aiArmorSearchKorokRoot.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiArmorSearchKorokRoot.h"
+#include "Game/Actor/AI/aiArmorSearchKorokRoot.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiAroundEnemyCheckSelect.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiAroundEnemyCheckSelect.h"
+#include "Game/Actor/AI/aiAroundEnemyCheckSelect.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiArrow.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiArrow.h"
+#include "Game/Actor/AI/aiArrow.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiArrowChargeAndShoot.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiArrowChargeAndShoot.h"
+#include "Game/Actor/AI/aiArrowChargeAndShoot.h"
 
 namespace uking::ai {
 

src/Game/Actor/AI/aiArrowChargeAndShoot.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Game/AI/AI/aiSeqTwoAction.h"
+#include "Game/Actor/AI/aiSeqTwoAction.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {

src/Game/Actor/AI/aiArrowDelete.cpp

@@ -1,4 +1,4 @@
-#include "Game/AI/AI/aiArrowDelete.h"
+#include "Game/Actor/AI/aiArrowDelete.h"
 
 namespace uking::ai {