From a168b93bbcf603816bf718962fc4d706b5fc772d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Mon, 28 Sep 2026 03:39:30 +0200 Subject: snd: move sound actions and AIs to KingSystem/Sound They link with KingSystem/Sound (0x7100fe8b54-0x7101060ed4) as sorted Action/AI passes of their own. The three area tag actions keep their game base AreaTagAction, which links in the Game/Actor/Area block. (AI assisted using Claude Fable 5.1 and Claude Opus 5.5) --- src/Game/Actor/aiActionFactories.cpp | 124 +++++++++++++++++------------------ 1 file changed, 62 insertions(+), 62 deletions(-) (limited to 'src/Game/Actor/aiActionFactories.cpp') diff --git a/src/Game/Actor/aiActionFactories.cpp b/src/Game/Actor/aiActionFactories.cpp index a41c6ed0..260c7410 100644 --- a/src/Game/Actor/aiActionFactories.cpp +++ b/src/Game/Actor/aiActionFactories.cpp @@ -122,7 +122,6 @@ #include "Game/Actor/Action/actionBattleCloseMove.h" #include "Game/Actor/Action/actionBattleCloseSlippedWalk.h" #include "Game/Actor/Action/actionBattleCloseWalk.h" -#include "Game/Actor/Action/actionBattleDungeonBGMAction.h" #include "Game/Actor/Action/actionBattleHover.h" #include "Game/Actor/Action/actionBattleLevelFlyMove.h" #include "Game/Actor/Action/actionBattleWalk.h" @@ -213,8 +212,6 @@ #include "Game/Actor/Action/actionCreateGanonChemicalPillar.h" #include "Game/Actor/Action/actionCreateObjectsOfOwnedHorse.h" #include "Game/Actor/Action/actionCurseRRematchCount.h" -#include "Game/Actor/Action/actionCustomDuckingEndAction.h" -#include "Game/Actor/Action/actionCustomDuckingStartAction.h" #include "Game/Actor/Action/actionDRCAppNoUseTag.h" #include "Game/Actor/Action/actionDamageField.h" #include "Game/Actor/Action/actionDamageTurnByWeakPoint.h" @@ -327,8 +324,6 @@ #include "Game/Actor/Action/actionEnemyRigidBodyFreeFallDie.h" #include "Game/Actor/Action/actionEnemyRigidBodySpinDie.h" #include "Game/Actor/Action/actionEnemyRushAttack.h" -#include "Game/Actor/Action/actionEnvSeEmitPointBirdPlayAction.h" -#include "Game/Actor/Action/actionEnvSeEmitPointInsectPlayAction.h" #include "Game/Actor/Action/actionEquipDisplay.h" #include "Game/Actor/Action/actionEquipDisplayCreate.h" #include "Game/Actor/Action/actionEquipDisplayGet.h" @@ -351,10 +346,6 @@ #include "Game/Actor/Action/actionEventAppearGolfCount.h" #include "Game/Actor/Action/actionEventAppearRaceResult.h" #include "Game/Actor/Action/actionEventAutoSaveAtGameClear.h" -#include "Game/Actor/Action/actionEventBgmCtrlAction.h" -#include "Game/Actor/Action/actionEventBgmStartAction.h" -#include "Game/Actor/Action/actionEventBgmStartAndKeepAction.h" -#include "Game/Actor/Action/actionEventBgmStopAction.h" #include "Game/Actor/Action/actionEventBind.h" #include "Game/Actor/Action/actionEventCancelGet.h" #include "Game/Actor/Action/actionEventCancelSleepTargetActor.h" @@ -652,7 +643,6 @@ #include "Game/Actor/Action/actionFreezedInIce.h" #include "Game/Actor/Action/actionFreezedInIceWeapon.h" #include "Game/Actor/Action/actionFromCDungeonToMainField.h" -#include "Game/Actor/Action/actionFrontierSpotBgmTriggerAction.h" #include "Game/Actor/Action/actionGameDataAddFloat.h" #include "Game/Actor/Action/actionGameDataAddInt.h" #include "Game/Actor/Action/actionGameDataAddVec3.h" @@ -731,8 +721,6 @@ #include "Game/Actor/Action/actionGrabRightTurn.h" #include "Game/Actor/Action/actionGrabRightWalk.h" #include "Game/Actor/Action/actionGraveAttack.h" -#include "Game/Actor/Action/actionGroupAllowEmitAction.h" -#include "Game/Actor/Action/actionGroupDisallowEmitAction.h" #include "Game/Actor/Action/actionGuard.h" #include "Game/Actor/Action/actionGuardBackWalk.h" #include "Game/Actor/Action/actionGuardBreak.h" @@ -842,7 +830,6 @@ #include "Game/Actor/Action/actionKeepPosInWater.h" #include "Game/Actor/Action/actionKeepStandingPosture.h" #include "Game/Actor/Action/actionKick.h" -#include "Game/Actor/Action/actionKillAllDemoSoundAction.h" #include "Game/Actor/Action/actionKillSelectActor.h" #include "Game/Actor/Action/actionKillUIScreenAction.h" #include "Game/Actor/Action/actionKokkoCreateDrop.h" @@ -881,8 +868,6 @@ #include "Game/Actor/Action/actionLiftTurn.h" #include "Game/Actor/Action/actionLiftWalk.h" #include "Game/Actor/Action/actionLinearFlyAttack.h" -#include "Game/Actor/Action/actionListenerFixPositionAction.h" -#include "Game/Actor/Action/actionListenerSetModeAction.h" #include "Game/Actor/Action/actionLoadSaveDataFromGameOver.h" #include "Game/Actor/Action/actionLookAtObject.h" #include "Game/Actor/Action/actionLookAtObjectSeachAwareness.h" @@ -929,7 +914,6 @@ #include "Game/Actor/Action/actionMsg2CameraResetInterpolate.h" #include "Game/Actor/Action/actionMsg2CameraResetNoConnect.h" #include "Game/Actor/Action/actionMultiVacuumRotScaleTimeByDist.h" -#include "Game/Actor/Action/actionMusicianSpotBgmTriggerAction.h" #include "Game/Actor/Action/actionNPCAnchorWait.h" #include "Game/Actor/Action/actionNPCArmorProcessing.h" #include "Game/Actor/Action/actionNPCBuyHorse.h" @@ -1073,7 +1057,6 @@ #include "Game/Actor/Action/actionPlayerActionClimb.h" #include "Game/Actor/Action/actionPlayerAreaInOutSendMessage.h" #include "Game/Actor/Action/actionPlayerBeamMove.h" -#include "Game/Actor/Action/actionPlayerEmitEquipmentNoise.h" #include "Game/Actor/Action/actionPlayerInAreaAutoEnemyForbidTag.h" #include "Game/Actor/Action/actionPlayerLookAtObjectNow.h" #include "Game/Actor/Action/actionPlayerSlippingDown.h" @@ -1165,14 +1148,6 @@ #include "Game/Actor/Action/actionSandwormMove.h" #include "Game/Actor/Action/actionSandwormNavMove.h" #include "Game/Actor/Action/actionSandwormTackleMove.h" -#include "Game/Actor/Action/actionSceneBgmCtrlAction.h" -#include "Game/Actor/Action/actionSceneSoundCtrlAction.h" -#include "Game/Actor/Action/actionSceneSoundKillDuckingAction.h" -#include "Game/Actor/Action/actionSceneSoundNotifyTalkAction.h" -#include "Game/Actor/Action/actionSceneSoundSetEndProcAction.h" -#include "Game/Actor/Action/actionSceneSoundSetStartProcAction.h" -#include "Game/Actor/Action/actionSceneSoundStartDuckingAction.h" -#include "Game/Actor/Action/actionSceneSoundStopDuckingAction.h" #include "Game/Actor/Action/actionScrapEquip.h" #include "Game/Actor/Action/actionSearch.h" #include "Game/Actor/Action/actionSellPictureBookUIDemo.h" @@ -1297,15 +1272,10 @@ #include "Game/Actor/Action/actionSmallDamageBackward.h" #include "Game/Actor/Action/actionSmallDamageDirectPreTargetBack.h" #include "Game/Actor/Action/actionSmallDamageDirectPreTargetBone.h" -#include "Game/Actor/Action/actionSoundOcclusionTagAction.h" #include "Game/Actor/Action/actionSoundOcclusionTagRemainsWater.h" -#include "Game/Actor/Action/actionSoundProxyRootAction.h" -#include "Game/Actor/Action/actionSoundReverbAreaTagAction.h" -#include "Game/Actor/Action/actionSoundShieldingAreaTagAction.h" #include "Game/Actor/Action/actionSoundTrigger.h" #include "Game/Actor/Action/actionSoundTriggerFadeAction.h" #include "Game/Actor/Action/actionSpinFlyAttack.h" -#include "Game/Actor/Action/actionSpotBgmTriggerAction.h" #include "Game/Actor/Action/actionSpreadToEnemy.h" #include "Game/Actor/Action/actionStalEnemyBlownOff.h" #include "Game/Actor/Action/actionStalEnemyDie.h" @@ -1323,7 +1293,6 @@ #include "Game/Actor/Action/actionStick.h" #include "Game/Actor/Action/actionStopASIgnite.h" #include "Game/Actor/Action/actionStopASPlay.h" -#include "Game/Actor/Action/actionStopAllDemoSoundAction.h" #include "Game/Actor/Action/actionStopChargeChemicalWeaponPower.h" #include "Game/Actor/Action/actionStopCliffTongueAttack.h" #include "Game/Actor/Action/actionStopEventMiniGameTime.h" @@ -1764,6 +1733,37 @@ #include "Game/Actor/System/Action/actionSystemSetWindAction.h" #include "KingSystem/ActorSystem/actAiAction.h" #include "KingSystem/ActorSystem/actionDummyAction.h" +#include "KingSystem/Sound/Actor/Action/actionBattleDungeonBGMAction.h" +#include "KingSystem/Sound/Actor/Action/actionCustomDuckingEndAction.h" +#include "KingSystem/Sound/Actor/Action/actionCustomDuckingStartAction.h" +#include "KingSystem/Sound/Actor/Action/actionEnvSeEmitPointBirdPlayAction.h" +#include "KingSystem/Sound/Actor/Action/actionEnvSeEmitPointInsectPlayAction.h" +#include "KingSystem/Sound/Actor/Action/actionEventBgmCtrlAction.h" +#include "KingSystem/Sound/Actor/Action/actionEventBgmStartAction.h" +#include "KingSystem/Sound/Actor/Action/actionEventBgmStartAndKeepAction.h" +#include "KingSystem/Sound/Actor/Action/actionEventBgmStopAction.h" +#include "KingSystem/Sound/Actor/Action/actionFrontierSpotBgmTriggerAction.h" +#include "KingSystem/Sound/Actor/Action/actionGroupAllowEmitAction.h" +#include "KingSystem/Sound/Actor/Action/actionGroupDisallowEmitAction.h" +#include "KingSystem/Sound/Actor/Action/actionKillAllDemoSoundAction.h" +#include "KingSystem/Sound/Actor/Action/actionListenerFixPositionAction.h" +#include "KingSystem/Sound/Actor/Action/actionListenerSetModeAction.h" +#include "KingSystem/Sound/Actor/Action/actionMusicianSpotBgmTriggerAction.h" +#include "KingSystem/Sound/Actor/Action/actionPlayerEmitEquipmentNoise.h" +#include "KingSystem/Sound/Actor/Action/actionSceneBgmCtrlAction.h" +#include "KingSystem/Sound/Actor/Action/actionSceneSoundCtrlAction.h" +#include "KingSystem/Sound/Actor/Action/actionSceneSoundKillDuckingAction.h" +#include "KingSystem/Sound/Actor/Action/actionSceneSoundNotifyTalkAction.h" +#include "KingSystem/Sound/Actor/Action/actionSceneSoundSetEndProcAction.h" +#include "KingSystem/Sound/Actor/Action/actionSceneSoundSetStartProcAction.h" +#include "KingSystem/Sound/Actor/Action/actionSceneSoundStartDuckingAction.h" +#include "KingSystem/Sound/Actor/Action/actionSceneSoundStopDuckingAction.h" +#include "KingSystem/Sound/Actor/Action/actionSoundOcclusionTagAction.h" +#include "KingSystem/Sound/Actor/Action/actionSoundProxyRootAction.h" +#include "KingSystem/Sound/Actor/Action/actionSoundReverbAreaTagAction.h" +#include "KingSystem/Sound/Actor/Action/actionSoundShieldingAreaTagAction.h" +#include "KingSystem/Sound/Actor/Action/actionSpotBgmTriggerAction.h" +#include "KingSystem/Sound/Actor/Action/actionStopAllDemoSoundAction.h" namespace uking { @@ -1806,10 +1806,10 @@ static Factory sActionFactories[] = { {0x0496ceb8, Factory::make}, {0x04aa5460, Factory::make}, {0x04f447ef, Factory::make}, - {0x0587f020, Factory::make}, + {0x0587f020, Factory::make}, {0x05b6f645, Factory::make}, {0x05beac93, Factory::make}, - {0x05dfa8bf, Factory::make}, + {0x05dfa8bf, Factory::make}, {0x05fe1ad8, Factory::make}, {0x06205589, Factory::make}, {0x0625861d, Factory::make}, @@ -1837,7 +1837,7 @@ static Factory sActionFactories[] = { {0x09bfaea7, Factory::make}, {0x09f76511, Factory::make}, {0x0a020615, Factory::make}, - {0x0a353da3, Factory::make}, + {0x0a353da3, Factory::make}, {0x0a83f093, Factory::make}, {0x0aa8490d, Factory::make}, {0x0ac01bdd, Factory::make}, @@ -1903,8 +1903,8 @@ static Factory sActionFactories[] = { {0x140f2d8b, Factory::make}, {0x143eb340, Factory::make}, {0x14441f7e, Factory::make}, - {0x144c0919, Factory::make}, - {0x145bcbee, Factory::make}, + {0x144c0919, Factory::make}, + {0x145bcbee, Factory::make}, {0x1496a748, Factory::make}, {0x14aa3d51, Factory::make}, {0x14c3a774, Factory::make}, @@ -1951,7 +1951,7 @@ static Factory sActionFactories[] = { {0x1b5651e2, Factory::make}, {0x1b631a15, Factory::make}, {0x1b8c920d, Factory::make}, - {0x1ba29897, Factory::make}, + {0x1ba29897, Factory::make}, {0x1bac07a0, Factory::make}, {0x1bdde345, Factory::make}, {0x1c0e4aaf, Factory::make}, @@ -1990,7 +1990,7 @@ static Factory sActionFactories[] = { {0x2217f0d6, Factory::make}, {0x22260af6, Factory::make}, {0x2244b5b8, Factory::make}, - {0x2274dabb, Factory::make}, + {0x2274dabb, Factory::make}, {0x22a4aaa8, Factory::make}, {0x22aef28f, Factory::make}, {0x22af3f8e, Factory::make}, @@ -2127,7 +2127,7 @@ static Factory sActionFactories[] = { {0x35fc4c7a, Factory::make}, {0x36213813, Factory::make}, {0x36402174, Factory::make}, - {0x366e28f1, Factory::make}, + {0x366e28f1, Factory::make}, {0x367b5904, Factory::make}, {0x36a7844a, Factory::make}, {0x36bde4ac, Factory::make}, @@ -2271,13 +2271,13 @@ static Factory sActionFactories[] = { {0x4aa074c9, Factory::make}, {0x4b1e9262, Factory::make}, {0x4b2a2b49, Factory::make}, - {0x4b8a3c1f, Factory::make}, + {0x4b8a3c1f, Factory::make}, {0x4bac0b33, Factory::make}, {0x4bd47e4f, Factory::make}, {0x4bd9747c, Factory::make}, {0x4ca3103c, Factory::make}, {0x4cba267b, Factory::make}, - {0x4cbf12c7, Factory::make}, + {0x4cbf12c7, Factory::make}, {0x4ce37592, Factory::make}, {0x4ce7aebf, Factory::make}, {0x4cf1568b, Factory::make}, @@ -2349,7 +2349,7 @@ static Factory sActionFactories[] = { {0x55d396ba, Factory::make}, {0x55d66225, Factory::make}, {0x55f97c09, Factory::make}, - {0x56165495, Factory::make}, + {0x56165495, Factory::make}, {0x5655dcaa, Factory::make}, {0x5682c769, Factory::make}, {0x56e905e3, Factory::make}, @@ -2365,7 +2365,7 @@ static Factory sActionFactories[] = { {0x57bb8e4a, Factory::make}, {0x57bda5d7, Factory::make}, {0x5851f277, Factory::make}, - {0x58b4f58b, Factory::make}, + {0x58b4f58b, Factory::make}, {0x5910c586, Factory::make}, {0x5936d239, Factory::make}, {0x595bfb19, Factory::make}, @@ -2448,7 +2448,7 @@ static Factory sActionFactories[] = { {0x65f50488, Factory::make}, {0x661d08f3, Factory::make}, {0x6665fdef, Factory::make}, - {0x667efbac, Factory::make}, + {0x667efbac, Factory::make}, {0x66af42e4, Factory::make}, {0x66ba65df, Factory::make}, {0x66ba85e6, Factory::make}, @@ -2544,11 +2544,11 @@ static Factory sActionFactories[] = { {0x7380112a, Factory::make}, {0x73df6d4c, Factory::make}, {0x73e6fb3b, Factory::make}, - {0x73fec15b, Factory::make}, + {0x73fec15b, Factory::make}, {0x740366f6, Factory::make}, {0x74137cda, Factory::make}, {0x741491d4, Factory::make}, - {0x74225ab1, Factory::make}, + {0x74225ab1, Factory::make}, {0x7473cc6c, Factory::make}, {0x74c03a75, Factory::make}, {0x74e7f82e, Factory::make}, @@ -2561,7 +2561,7 @@ static Factory sActionFactories[] = { {0x7619bafa, Factory::make}, {0x762224d0, Factory::make}, {0x76377096, Factory::make}, - {0x7667f616, Factory::make}, + {0x7667f616, Factory::make}, {0x7697ced0, Factory::make}, {0x76a33ed1, Factory::make}, {0x76c0d33a, Factory::make}, @@ -2587,7 +2587,7 @@ static Factory sActionFactories[] = { {0x79239cd6, Factory::make}, {0x794048ff, Factory::make}, {0x79a1404a, Factory::make}, - {0x7a353b54, Factory::make}, + {0x7a353b54, Factory::make}, {0x7a3bf550, Factory::make}, {0x7ab032eb, Factory::make}, {0x7ad55f51, Factory::make}, @@ -2694,7 +2694,7 @@ static Factory sActionFactories[] = { {0x86423cc1, Factory::make}, {0x871e0bba, Factory::make}, {0x8733c282, Factory::make}, - {0x876b01f1, Factory::make}, + {0x876b01f1, Factory::make}, {0x877d9db7, Factory::make}, {0x87901d5a, Factory::make}, {0x87a2854c, Factory::make}, @@ -2793,7 +2793,7 @@ static Factory sActionFactories[] = { {0x948cb143, Factory::make}, {0x94db3eea, Factory::make}, {0x94f4c834, Factory::make}, - {0x9522b34c, Factory::make}, + {0x9522b34c, Factory::make}, {0x958bc9d2, Factory::make}, {0x95d8e6ab, Factory::make}, {0x9619d5e4, Factory::make}, @@ -2832,7 +2832,7 @@ static Factory sActionFactories[] = { {0x9a4989e7, Factory::make}, {0x9a58d886, Factory::make}, {0x9a655873, Factory::make}, - {0x9a82d73a, Factory::make}, + {0x9a82d73a, Factory::make}, {0x9a89689a, Factory::make}, {0x9a8b279b, Factory::make}, {0x9abdf2f3, Factory::make}, @@ -2849,7 +2849,7 @@ static Factory sActionFactories[] = { {0x9c5b2629, Factory::make}, {0x9c9f153f, Factory::make}, {0x9cc86685, Factory::make}, - {0x9cd7ef66, Factory::make}, + {0x9cd7ef66, Factory::make}, {0x9cef3132, Factory::make}, {0x9cf43e50, Factory::make}, {0x9cf4f88c, Factory::make}, @@ -2920,7 +2920,7 @@ static Factory sActionFactories[] = { {0xa575d17d, Factory::make}, {0xa582c186, Factory::make}, {0xa593ceca, Factory::make}, - {0xa596abfa, Factory::make}, + {0xa596abfa, Factory::make}, {0xa5abfd97, Factory::make}, {0xa5bc9062, Factory::make}, {0xa5d3cb30, Factory::make}, @@ -2955,7 +2955,7 @@ static Factory sActionFactories[] = { {0xa88570d2, Factory::make}, {0xa8bfb550, Factory::make}, {0xa8c6eafc, Factory::make}, - {0xa8c8d000, Factory::make}, + {0xa8c8d000, Factory::make}, {0xa8ec790d, Factory::make}, {0xa8f367e0, Factory::make}, {0xa90d9348, Factory::make}, @@ -3007,7 +3007,7 @@ static Factory sActionFactories[] = { {0xb07febbb, Factory::make}, {0xb0ada993, Factory::make}, {0xb0bf6bd0, Factory::make}, - {0xb0c6419a, Factory::make}, + {0xb0c6419a, Factory::make}, {0xb0ce7ce0, Factory::make}, {0xb0f8b5ac, Factory::make}, {0xb101ef3f, Factory::make}, @@ -3056,7 +3056,7 @@ static Factory sActionFactories[] = { {0xb6b75cbc, Factory::make}, {0xb6bc0561, Factory::make}, {0xb6dbc430, Factory::make}, - {0xb6fb6394, Factory::make}, + {0xb6fb6394, Factory::make}, {0xb7514257, Factory::make}, {0xb7556fdd, Factory::make}, {0xb770bbba, Factory::make}, @@ -3095,7 +3095,7 @@ static Factory sActionFactories[] = { {0xbc17628d, Factory::make}, {0xbc3bd3c5, Factory::make}, {0xbc540f22, Factory::make}, - {0xbc7dba7e, Factory::make}, + {0xbc7dba7e, Factory::make}, {0xbca66b70, Factory::make}, {0xbce5fcd0, Factory::make}, {0xbceeb5ee, Factory::make}, @@ -3243,7 +3243,7 @@ static Factory sActionFactories[] = { {0xd1905231, Factory::make}, {0xd1c07b1e, Factory::make}, {0xd218239d, Factory::make}, - {0xd219de59, Factory::make}, + {0xd219de59, Factory::make}, {0xd2229c44, Factory::make}, {0xd244efe7, Factory::make}, {0xd25249dc, Factory::make}, @@ -3262,7 +3262,7 @@ static Factory sActionFactories[] = { {0xd4bb707c, Factory::make}, {0xd507150f, Factory::make}, {0xd524bb07, Factory::make}, - {0xd560b356, Factory::make}, + {0xd560b356, Factory::make}, {0xd584dab3, Factory::make}, {0xd589a506, Factory::make}, {0xd595067c, Factory::make}, @@ -3328,7 +3328,7 @@ static Factory sActionFactories[] = { {0xdefdb460, Factory::make}, {0xdf2881b9, Factory::make}, {0xdf29f478, Factory::make}, - {0xdf2b7595, Factory::make}, + {0xdf2b7595, Factory::make}, {0xdf30f896, Factory::make}, {0xdf5d37c1, Factory::make}, {0xdf74c346, Factory::make}, @@ -3452,12 +3452,12 @@ static Factory sActionFactories[] = { {0xf260bb87, Factory::make}, {0xf26859f8, Factory::make}, {0xf275dd24, Factory::make}, - {0xf29cb14e, Factory::make}, + {0xf29cb14e, Factory::make}, {0xf2c71fbc, Factory::make}, {0xf31a1f15, Factory::make}, {0xf33ea367, Factory::make}, {0xf33ff597, Factory::make}, - {0xf359c28d, Factory::make}, + {0xf359c28d, Factory::make}, {0xf35a170b, Factory::make}, {0xf376500a, Factory::make}, {0xf3a384c0, Factory::make}, -- cgit v1.2.3