diff options
Diffstat (limited to 'src/Game/Actor')
72 files changed, 68 insertions, 1704 deletions
diff --git a/src/Game/Actor/AI/CMakeLists.txt b/src/Game/Actor/AI/CMakeLists.txt index a3a25e45..6199be55 100644 --- a/src/Game/Actor/AI/CMakeLists.txt +++ b/src/Game/Actor/AI/CMakeLists.txt @@ -635,8 +635,6 @@ target_sources(uking PRIVATE aiEnemyWatchKeepingWait.h aiEnterFromResetSelect.cpp aiEnterFromResetSelect.h - aiEnvSeEmitPointRootAI.cpp - aiEnvSeEmitPointRootAI.h aiEquipConditionSelect.cpp aiEquipConditionSelect.h aiEquipHaveSelector.cpp @@ -1889,8 +1887,6 @@ target_sources(uking PRIVATE aiShootingStarRoot.h aiShutterFence.cpp aiShutterFence.h - aiSignaledSpotBgmTrigger.cpp - aiSignaledSpotBgmTrigger.h aiSignalFlowchartRootAI.cpp aiSignalFlowchartRootAI.h aiSignalSendingMagneStickAcceptor.cpp @@ -2001,8 +1997,6 @@ target_sources(uking PRIVATE aiSpearWeaponSelect.h aiSleepNormal.cpp aiSleepNormal.h - aiSpotBgmTrigger.cpp - aiSpotBgmTrigger.h aiStalEnemyBlownOff.cpp aiStalEnemyBlownOff.h aiStalEnemyChasePart.cpp diff --git a/src/Game/Actor/AI/aiEnvSeEmitPointRootAI.cpp b/src/Game/Actor/AI/aiEnvSeEmitPointRootAI.cpp deleted file mode 100644 index 9483dca4..00000000 --- a/src/Game/Actor/AI/aiEnvSeEmitPointRootAI.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include "Game/Actor/AI/aiEnvSeEmitPointRootAI.h" - -namespace uking::ai { - -EnvSeEmitPointRootAI::EnvSeEmitPointRootAI(const InitArg& arg) : ksys::act::ai::Ai(arg) {} - -EnvSeEmitPointRootAI::~EnvSeEmitPointRootAI() = default; - -bool EnvSeEmitPointRootAI::init_(sead::Heap* heap) { - return ksys::act::ai::Ai::init_(heap); -} - -void EnvSeEmitPointRootAI::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Ai::enter_(params); -} - -void EnvSeEmitPointRootAI::leave_() { - ksys::act::ai::Ai::leave_(); -} - -void EnvSeEmitPointRootAI::loadParams_() { - getStaticParam(&mInvalidatePlayDistance_s, "InvalidatePlayDistance"); - getStaticParam(&mPlayDistance_s, "PlayDistance"); -} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiEnvSeEmitPointRootAI.h b/src/Game/Actor/AI/aiEnvSeEmitPointRootAI.h deleted file mode 100644 index 78d51520..00000000 --- a/src/Game/Actor/AI/aiEnvSeEmitPointRootAI.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAi.h" - -namespace uking::ai { - -class EnvSeEmitPointRootAI : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(EnvSeEmitPointRootAI, ksys::act::ai::Ai) -public: - explicit EnvSeEmitPointRootAI(const InitArg& arg); - ~EnvSeEmitPointRootAI() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - -protected: - // static_param at offset 0x38 - const float* mInvalidatePlayDistance_s{}; - // static_param at offset 0x40 - const float* mPlayDistance_s{}; -}; - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiSignaledSpotBgmTrigger.cpp b/src/Game/Actor/AI/aiSignaledSpotBgmTrigger.cpp deleted file mode 100644 index b92c8445..00000000 --- a/src/Game/Actor/AI/aiSignaledSpotBgmTrigger.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include "Game/Actor/AI/aiSignaledSpotBgmTrigger.h" - -namespace uking::ai { - -SignaledSpotBgmTrigger::SignaledSpotBgmTrigger(const InitArg& arg) : ksys::act::ai::Ai(arg) {} - -SignaledSpotBgmTrigger::~SignaledSpotBgmTrigger() = default; - -bool SignaledSpotBgmTrigger::init_(sead::Heap* heap) { - return ksys::act::ai::Ai::init_(heap); -} - -void SignaledSpotBgmTrigger::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Ai::enter_(params); -} - -void SignaledSpotBgmTrigger::leave_() { - ksys::act::ai::Ai::leave_(); -} - -void SignaledSpotBgmTrigger::loadParams_() { - getMapUnitParam(&mIsStopWithoutReductionY_m, "IsStopWithoutReductionY"); - getMapUnitParam(&mSound_m, "Sound"); -} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiSignaledSpotBgmTrigger.h b/src/Game/Actor/AI/aiSignaledSpotBgmTrigger.h deleted file mode 100644 index fc628367..00000000 --- a/src/Game/Actor/AI/aiSignaledSpotBgmTrigger.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAi.h" - -namespace uking::ai { - -class SignaledSpotBgmTrigger : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(SignaledSpotBgmTrigger, ksys::act::ai::Ai) -public: - explicit SignaledSpotBgmTrigger(const InitArg& arg); - ~SignaledSpotBgmTrigger() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - -protected: - // map_unit_param at offset 0x38 - const bool* mIsStopWithoutReductionY_m{}; - // map_unit_param at offset 0x40 - sead::SafeString mSound_m{}; -}; - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiSpotBgmTrigger.cpp b/src/Game/Actor/AI/aiSpotBgmTrigger.cpp deleted file mode 100644 index 1bb34d47..00000000 --- a/src/Game/Actor/AI/aiSpotBgmTrigger.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include "Game/Actor/AI/aiSpotBgmTrigger.h" - -namespace uking::ai { - -SpotBgmTrigger::SpotBgmTrigger(const InitArg& arg) : ksys::act::ai::Ai(arg) {} - -SpotBgmTrigger::~SpotBgmTrigger() = default; - -bool SpotBgmTrigger::init_(sead::Heap* heap) { - return ksys::act::ai::Ai::init_(heap); -} - -void SpotBgmTrigger::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Ai::enter_(params); -} - -void SpotBgmTrigger::leave_() { - ksys::act::ai::Ai::leave_(); -} - -void SpotBgmTrigger::loadParams_() { - getMapUnitParam(&mIsStopWithoutReductionY_m, "IsStopWithoutReductionY"); - getMapUnitParam(&mSound_m, "Sound"); -} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiSpotBgmTrigger.h b/src/Game/Actor/AI/aiSpotBgmTrigger.h deleted file mode 100644 index 6e4f6301..00000000 --- a/src/Game/Actor/AI/aiSpotBgmTrigger.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAi.h" - -namespace uking::ai { - -class SpotBgmTrigger : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(SpotBgmTrigger, ksys::act::ai::Ai) -public: - explicit SpotBgmTrigger(const InitArg& arg); - ~SpotBgmTrigger() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - -protected: - // map_unit_param at offset 0x38 - const bool* mIsStopWithoutReductionY_m{}; - // map_unit_param at offset 0x40 - sead::SafeString mSound_m{}; -}; - -} // namespace uking::ai diff --git a/src/Game/Actor/Action/CMakeLists.txt b/src/Game/Actor/Action/CMakeLists.txt index 94d90a21..a1dcc114 100644 --- a/src/Game/Actor/Action/CMakeLists.txt +++ b/src/Game/Actor/Action/CMakeLists.txt @@ -285,8 +285,6 @@ target_sources(uking PRIVATE actionBattleCloseSlippedWalk.h actionBattleCloseWalk.cpp actionBattleCloseWalk.h - actionBattleDungeonBGMAction.cpp - actionBattleDungeonBGMAction.h actionBattleHover.cpp actionBattleHover.h actionBattleLevelFlyMoveBase.cpp @@ -483,10 +481,6 @@ target_sources(uking PRIVATE actionCreateObjectsOfOwnedHorse.h actionCurseRRematchCount.cpp actionCurseRRematchCount.h - actionCustomDuckingEndAction.cpp - actionCustomDuckingEndAction.h - actionCustomDuckingStartAction.cpp - actionCustomDuckingStartAction.h actionDamagedTurn.cpp actionDamagedTurn.h actionDamageField.cpp @@ -719,10 +713,6 @@ target_sources(uking PRIVATE actionEnemyRigidBodySpinDie.h actionEnemyRushAttack.cpp actionEnemyRushAttack.h - actionEnvSeEmitPointBirdPlayAction.cpp - actionEnvSeEmitPointBirdPlayAction.h - actionEnvSeEmitPointInsectPlayAction.cpp - actionEnvSeEmitPointInsectPlayAction.h actionEquipDisplay.cpp actionEquipDisplayCreate.cpp actionEquipDisplayCreate.h @@ -767,14 +757,6 @@ target_sources(uking PRIVATE actionEventAppearRaceResult.h actionEventAutoSaveAtGameClear.cpp actionEventAutoSaveAtGameClear.h - actionEventBgmCtrlAction.cpp - actionEventBgmCtrlAction.h - actionEventBgmStartAction.cpp - actionEventBgmStartAction.h - actionEventBgmStartAndKeepAction.cpp - actionEventBgmStartAndKeepAction.h - actionEventBgmStopAction.cpp - actionEventBgmStopAction.h actionEventBind.cpp actionEventBind.h actionEventCancelGet.cpp @@ -1433,8 +1415,6 @@ target_sources(uking PRIVATE actionFreeze.h actionFromCDungeonToMainField.cpp actionFromCDungeonToMainField.h - actionFrontierSpotBgmTriggerAction.cpp - actionFrontierSpotBgmTriggerAction.h actionGameDataAddFloat.cpp actionGameDataAddFloat.h actionGameDataAddInt.cpp @@ -1611,10 +1591,6 @@ target_sources(uking PRIVATE actionGrabRightWalk.h actionGraveAttack.cpp actionGraveAttack.h - actionGroupAllowEmitAction.cpp - actionGroupAllowEmitAction.h - actionGroupDisallowEmitAction.cpp - actionGroupDisallowEmitAction.h actionGuardBackWalk.cpp actionGuardBackWalk.h actionGuardBreak.cpp @@ -1851,8 +1827,6 @@ target_sources(uking PRIVATE actionKeepStandingPosture.h actionKick.cpp actionKick.h - actionKillAllDemoSoundAction.cpp - actionKillAllDemoSoundAction.h actionKillSelectActor.cpp actionKillSelectActor.h actionKillUIScreenAction.cpp @@ -1939,10 +1913,6 @@ target_sources(uking PRIVATE actionLinearFlyAttackBase.h actionLinearFlyAttack.cpp actionLinearFlyAttack.h - actionListenerFixPositionAction.cpp - actionListenerFixPositionAction.h - actionListenerSetModeAction.cpp - actionListenerSetModeAction.h actionLoadSaveDataFromGameOver.cpp actionLoadSaveDataFromGameOver.h actionLookAtObjectBase.cpp @@ -2049,8 +2019,6 @@ target_sources(uking PRIVATE actionMultiVacuumRotScaleTimeByDistWithTgtBase.h actionMultiVacuumRotScaleTimeByDistWithTgt.cpp actionMultiVacuumRotScaleTimeByDistWithTgt.h - actionMusicianSpotBgmTriggerAction.cpp - actionMusicianSpotBgmTriggerAction.h actionNavMeshAction.cpp actionNavMeshAction.h actionNavMeshBattleWalk.cpp @@ -2349,8 +2317,6 @@ target_sources(uking PRIVATE actionPlayerAreaInOutSendMessage.h actionPlayerBeamMove.cpp actionPlayerBeamMove.h - actionPlayerEmitEquipmentNoise.cpp - actionPlayerEmitEquipmentNoise.h actionPlayerInAreaAutoEnemyForbidTag.cpp actionPlayerInAreaAutoEnemyForbidTag.h actionPlayerLookAtObjectNow.cpp @@ -2549,22 +2515,6 @@ target_sources(uking PRIVATE actionSandwormNavMove.h actionSandwormTackleMove.cpp actionSandwormTackleMove.h - actionSceneBgmCtrlAction.cpp - actionSceneBgmCtrlAction.h - actionSceneSoundCtrlAction.cpp - actionSceneSoundCtrlAction.h - actionSceneSoundKillDuckingAction.cpp - actionSceneSoundKillDuckingAction.h - actionSceneSoundNotifyTalkAction.cpp - actionSceneSoundNotifyTalkAction.h - actionSceneSoundSetEndProcAction.cpp - actionSceneSoundSetEndProcAction.h - actionSceneSoundSetStartProcAction.cpp - actionSceneSoundSetStartProcAction.h - actionSceneSoundStartDuckingAction.cpp - actionSceneSoundStartDuckingAction.h - actionSceneSoundStopDuckingAction.cpp - actionSceneSoundStopDuckingAction.h actionScrapEquip.cpp actionScrapEquip.h actionSearch.cpp @@ -2843,24 +2793,14 @@ target_sources(uking PRIVATE actionSmallDamageDirectPreTargetBone.cpp actionSmallDamageDirectPreTargetBone.h actionSmallDamage.h - actionSoundOcclusionTagAction.cpp - actionSoundOcclusionTagAction.h actionSoundOcclusionTagRemainsWater.cpp actionSoundOcclusionTagRemainsWater.h - actionSoundProxyRootAction.cpp - actionSoundProxyRootAction.h - actionSoundReverbAreaTagAction.cpp - actionSoundReverbAreaTagAction.h - actionSoundShieldingAreaTagAction.cpp - actionSoundShieldingAreaTagAction.h actionSoundTrigger.cpp actionSoundTriggerFadeAction.cpp actionSoundTriggerFadeAction.h actionSoundTrigger.h actionSpinFlyAttack.cpp actionSpinFlyAttack.h - actionSpotBgmTriggerAction.cpp - actionSpotBgmTriggerAction.h actionSpreadToEnemy.cpp actionSpreadToEnemy.h actionSSMagneStickAcceptorAccept.cpp @@ -2895,8 +2835,6 @@ target_sources(uking PRIVATE actionStepDoubleLargeAttack.h actionStick.cpp actionStick.h - actionStopAllDemoSoundAction.cpp - actionStopAllDemoSoundAction.h actionStopASIgnite.cpp actionStopASIgnite.h actionStopASPlay.cpp diff --git a/src/Game/Actor/Action/actionBattleDungeonBGMAction.cpp b/src/Game/Actor/Action/actionBattleDungeonBGMAction.cpp deleted file mode 100644 index 326ce863..00000000 --- a/src/Game/Actor/Action/actionBattleDungeonBGMAction.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include "Game/Actor/Action/actionBattleDungeonBGMAction.h" - -namespace uking::action { - -BattleDungeonBGMAction::BattleDungeonBGMAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -BattleDungeonBGMAction::~BattleDungeonBGMAction() = default; - -bool BattleDungeonBGMAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void BattleDungeonBGMAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void BattleDungeonBGMAction::leave_() { - ksys::act::ai::Action::leave_(); -} - -void BattleDungeonBGMAction::loadParams_() {} - -void BattleDungeonBGMAction::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionBattleDungeonBGMAction.h b/src/Game/Actor/Action/actionBattleDungeonBGMAction.h deleted file mode 100644 index 3d41e5e7..00000000 --- a/src/Game/Actor/Action/actionBattleDungeonBGMAction.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class BattleDungeonBGMAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(BattleDungeonBGMAction, ksys::act::ai::Action) -public: - explicit BattleDungeonBGMAction(const InitArg& arg); - ~BattleDungeonBGMAction() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - -protected: - void calc_() override; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionCustomDuckingEndAction.cpp b/src/Game/Actor/Action/actionCustomDuckingEndAction.cpp deleted file mode 100644 index bed54f1f..00000000 --- a/src/Game/Actor/Action/actionCustomDuckingEndAction.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include "Game/Actor/Action/actionCustomDuckingEndAction.h" - -namespace uking::action { - -CustomDuckingEndAction::CustomDuckingEndAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -CustomDuckingEndAction::~CustomDuckingEndAction() = default; - -bool CustomDuckingEndAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void CustomDuckingEndAction::loadParams_() {} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionCustomDuckingEndAction.h b/src/Game/Actor/Action/actionCustomDuckingEndAction.h deleted file mode 100644 index 22212645..00000000 --- a/src/Game/Actor/Action/actionCustomDuckingEndAction.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class CustomDuckingEndAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(CustomDuckingEndAction, ksys::act::ai::Action) -public: - explicit CustomDuckingEndAction(const InitArg& arg); - ~CustomDuckingEndAction() override; - - bool init_(sead::Heap* heap) override; - void loadParams_() override; - -protected: -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionCustomDuckingStartAction.cpp b/src/Game/Actor/Action/actionCustomDuckingStartAction.cpp deleted file mode 100644 index d8089b7c..00000000 --- a/src/Game/Actor/Action/actionCustomDuckingStartAction.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include "Game/Actor/Action/actionCustomDuckingStartAction.h" - -namespace uking::action { - -CustomDuckingStartAction::CustomDuckingStartAction(const InitArg& arg) - : ksys::act::ai::Action(arg) {} - -CustomDuckingStartAction::~CustomDuckingStartAction() = default; - -bool CustomDuckingStartAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void CustomDuckingStartAction::loadParams_() { - getDynamicParam(&mVolume_d, "Volume"); - getDynamicParam(&mFadeOutSec_d, "FadeOutSec"); - getDynamicParam(&mFadeInSec_d, "FadeInSec"); - getDynamicParam(&mStartDelaySec_d, "StartDelaySec"); - getDynamicParam(&mTargetGroups_d, "TargetGroups"); - getDynamicParam(&mExceptGroups_d, "ExceptGroups"); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionCustomDuckingStartAction.h b/src/Game/Actor/Action/actionCustomDuckingStartAction.h deleted file mode 100644 index dee832ec..00000000 --- a/src/Game/Actor/Action/actionCustomDuckingStartAction.h +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class CustomDuckingStartAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(CustomDuckingStartAction, ksys::act::ai::Action) -public: - explicit CustomDuckingStartAction(const InitArg& arg); - ~CustomDuckingStartAction() override; - - bool init_(sead::Heap* heap) override; - void loadParams_() override; - -protected: - // dynamic_param at offset 0x20 - float* mVolume_d{}; - // dynamic_param at offset 0x28 - float* mFadeOutSec_d{}; - // dynamic_param at offset 0x30 - float* mFadeInSec_d{}; - // dynamic_param at offset 0x38 - float* mStartDelaySec_d{}; - // dynamic_param at offset 0x40 - sead::SafeString mTargetGroups_d{}; - // dynamic_param at offset 0x50 - sead::SafeString mExceptGroups_d{}; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionEnvSeEmitPointBirdPlayAction.cpp b/src/Game/Actor/Action/actionEnvSeEmitPointBirdPlayAction.cpp deleted file mode 100644 index c5b6ba03..00000000 --- a/src/Game/Actor/Action/actionEnvSeEmitPointBirdPlayAction.cpp +++ /dev/null @@ -1,28 +0,0 @@ -#include "Game/Actor/Action/actionEnvSeEmitPointBirdPlayAction.h" - -namespace uking::action { - -EnvSeEmitPointBirdPlayAction::EnvSeEmitPointBirdPlayAction(const InitArg& arg) - : ksys::act::ai::Action(arg) {} - -EnvSeEmitPointBirdPlayAction::~EnvSeEmitPointBirdPlayAction() = default; - -bool EnvSeEmitPointBirdPlayAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void EnvSeEmitPointBirdPlayAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EnvSeEmitPointBirdPlayAction::leave_() { - ksys::act::ai::Action::leave_(); -} - -void EnvSeEmitPointBirdPlayAction::loadParams_() {} - -void EnvSeEmitPointBirdPlayAction::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionEnvSeEmitPointBirdPlayAction.h b/src/Game/Actor/Action/actionEnvSeEmitPointBirdPlayAction.h deleted file mode 100644 index 5e33c995..00000000 --- a/src/Game/Actor/Action/actionEnvSeEmitPointBirdPlayAction.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class EnvSeEmitPointBirdPlayAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(EnvSeEmitPointBirdPlayAction, ksys::act::ai::Action) -public: - explicit EnvSeEmitPointBirdPlayAction(const InitArg& arg); - ~EnvSeEmitPointBirdPlayAction() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - -protected: - void calc_() override; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionEnvSeEmitPointInsectPlayAction.cpp b/src/Game/Actor/Action/actionEnvSeEmitPointInsectPlayAction.cpp deleted file mode 100644 index 28c0666b..00000000 --- a/src/Game/Actor/Action/actionEnvSeEmitPointInsectPlayAction.cpp +++ /dev/null @@ -1,28 +0,0 @@ -#include "Game/Actor/Action/actionEnvSeEmitPointInsectPlayAction.h" - -namespace uking::action { - -EnvSeEmitPointInsectPlayAction::EnvSeEmitPointInsectPlayAction(const InitArg& arg) - : ksys::act::ai::Action(arg) {} - -EnvSeEmitPointInsectPlayAction::~EnvSeEmitPointInsectPlayAction() = default; - -bool EnvSeEmitPointInsectPlayAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void EnvSeEmitPointInsectPlayAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EnvSeEmitPointInsectPlayAction::leave_() { - ksys::act::ai::Action::leave_(); -} - -void EnvSeEmitPointInsectPlayAction::loadParams_() {} - -void EnvSeEmitPointInsectPlayAction::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionEnvSeEmitPointInsectPlayAction.h b/src/Game/Actor/Action/actionEnvSeEmitPointInsectPlayAction.h deleted file mode 100644 index 8c1b0a6b..00000000 --- a/src/Game/Actor/Action/actionEnvSeEmitPointInsectPlayAction.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class EnvSeEmitPointInsectPlayAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(EnvSeEmitPointInsectPlayAction, ksys::act::ai::Action) -public: - explicit EnvSeEmitPointInsectPlayAction(const InitArg& arg); - ~EnvSeEmitPointInsectPlayAction() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - -protected: - void calc_() override; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionEventBgmCtrlAction.cpp b/src/Game/Actor/Action/actionEventBgmCtrlAction.cpp deleted file mode 100644 index 502b0718..00000000 --- a/src/Game/Actor/Action/actionEventBgmCtrlAction.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "Game/Actor/Action/actionEventBgmCtrlAction.h" - -namespace uking::action { - -EventBgmCtrlAction::EventBgmCtrlAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -EventBgmCtrlAction::~EventBgmCtrlAction() = default; - -bool EventBgmCtrlAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void EventBgmCtrlAction::loadParams_() { - getDynamicParam(&mCtrlType_d, "CtrlType"); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionEventBgmCtrlAction.h b/src/Game/Actor/Action/actionEventBgmCtrlAction.h deleted file mode 100644 index 07238a6c..00000000 --- a/src/Game/Actor/Action/actionEventBgmCtrlAction.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class EventBgmCtrlAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(EventBgmCtrlAction, ksys::act::ai::Action) -public: - explicit EventBgmCtrlAction(const InitArg& arg); - ~EventBgmCtrlAction() override; - - bool init_(sead::Heap* heap) override; - void loadParams_() override; - -protected: - // dynamic_param at offset 0x20 - sead::SafeString mCtrlType_d{}; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionEventBgmStartAction.cpp b/src/Game/Actor/Action/actionEventBgmStartAction.cpp deleted file mode 100644 index 262fd20d..00000000 --- a/src/Game/Actor/Action/actionEventBgmStartAction.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "Game/Actor/Action/actionEventBgmStartAction.h" - -namespace uking::action { - -EventBgmStartAction::EventBgmStartAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -EventBgmStartAction::~EventBgmStartAction() = default; - -bool EventBgmStartAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void EventBgmStartAction::loadParams_() { - getDynamicParam(&mBgmName_d, "BgmName"); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionEventBgmStartAction.h b/src/Game/Actor/Action/actionEventBgmStartAction.h deleted file mode 100644 index 1b086110..00000000 --- a/src/Game/Actor/Action/actionEventBgmStartAction.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class EventBgmStartAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(EventBgmStartAction, ksys::act::ai::Action) -public: - explicit EventBgmStartAction(const InitArg& arg); - ~EventBgmStartAction() override; - - bool init_(sead::Heap* heap) override; - void loadParams_() override; - -protected: - // dynamic_param at offset 0x20 - sead::SafeString mBgmName_d{}; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionEventBgmStartAndKeepAction.cpp b/src/Game/Actor/Action/actionEventBgmStartAndKeepAction.cpp deleted file mode 100644 index 23cee749..00000000 --- a/src/Game/Actor/Action/actionEventBgmStartAndKeepAction.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "Game/Actor/Action/actionEventBgmStartAndKeepAction.h" - -namespace uking::action { - -EventBgmStartAndKeepAction::EventBgmStartAndKeepAction(const InitArg& arg) - : ksys::act::ai::Action(arg) {} - -EventBgmStartAndKeepAction::~EventBgmStartAndKeepAction() = default; - -bool EventBgmStartAndKeepAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void EventBgmStartAndKeepAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventBgmStartAndKeepAction::leave_() { - ksys::act::ai::Action::leave_(); -} - -void EventBgmStartAndKeepAction::loadParams_() { - getDynamicParam(&mBgmName_d, "BgmName"); -} - -void EventBgmStartAndKeepAction::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionEventBgmStartAndKeepAction.h b/src/Game/Actor/Action/actionEventBgmStartAndKeepAction.h deleted file mode 100644 index 6f380505..00000000 --- a/src/Game/Actor/Action/actionEventBgmStartAndKeepAction.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class EventBgmStartAndKeepAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(EventBgmStartAndKeepAction, ksys::act::ai::Action) -public: - explicit EventBgmStartAndKeepAction(const InitArg& arg); - ~EventBgmStartAndKeepAction() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - -protected: - void calc_() override; - - // dynamic_param at offset 0x20 - sead::SafeString mBgmName_d{}; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionEventBgmStopAction.cpp b/src/Game/Actor/Action/actionEventBgmStopAction.cpp deleted file mode 100644 index 78f4987e..00000000 --- a/src/Game/Actor/Action/actionEventBgmStopAction.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "Game/Actor/Action/actionEventBgmStopAction.h" - -namespace uking::action { - -EventBgmStopAction::EventBgmStopAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -EventBgmStopAction::~EventBgmStopAction() = default; - -bool EventBgmStopAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void EventBgmStopAction::loadParams_() { - getDynamicParam(&mFadeSec_d, "FadeSec"); - getDynamicParam(&mBgmName_d, "BgmName"); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionEventBgmStopAction.h b/src/Game/Actor/Action/actionEventBgmStopAction.h deleted file mode 100644 index dd256c53..00000000 --- a/src/Game/Actor/Action/actionEventBgmStopAction.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class EventBgmStopAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(EventBgmStopAction, ksys::act::ai::Action) -public: - explicit EventBgmStopAction(const InitArg& arg); - ~EventBgmStopAction() override; - - bool init_(sead::Heap* heap) override; - void loadParams_() override; - -protected: - // dynamic_param at offset 0x20 - float* mFadeSec_d{}; - // dynamic_param at offset 0x28 - sead::SafeString mBgmName_d{}; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionFrontierSpotBgmTriggerAction.cpp b/src/Game/Actor/Action/actionFrontierSpotBgmTriggerAction.cpp deleted file mode 100644 index 749f5662..00000000 --- a/src/Game/Actor/Action/actionFrontierSpotBgmTriggerAction.cpp +++ /dev/null @@ -1,34 +0,0 @@ -#include "Game/Actor/Action/actionFrontierSpotBgmTriggerAction.h" - -namespace uking::action { - -FrontierSpotBgmTriggerAction::FrontierSpotBgmTriggerAction(const InitArg& arg) - : ksys::act::ai::Action(arg) {} - -FrontierSpotBgmTriggerAction::~FrontierSpotBgmTriggerAction() = default; - -bool FrontierSpotBgmTriggerAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void FrontierSpotBgmTriggerAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void FrontierSpotBgmTriggerAction::leave_() { - ksys::act::ai::Action::leave_(); -} - -void FrontierSpotBgmTriggerAction::loadParams_() { - getDynamicParam(&mSound_d, "Sound"); - getMapUnitParam(&mSpotBgmLifeScaleMargin_m, "SpotBgmLifeScaleMargin"); - getMapUnitParam(&mIsStopWithoutReductionY_m, "IsStopWithoutReductionY"); - getMapUnitParam(&mSound_m, "Sound"); - getMapUnitParam(&mShape_m, "Shape"); -} - -void FrontierSpotBgmTriggerAction::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionFrontierSpotBgmTriggerAction.h b/src/Game/Actor/Action/actionFrontierSpotBgmTriggerAction.h deleted file mode 100644 index 459eb561..00000000 --- a/src/Game/Actor/Action/actionFrontierSpotBgmTriggerAction.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class FrontierSpotBgmTriggerAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(FrontierSpotBgmTriggerAction, ksys::act::ai::Action) -public: - explicit FrontierSpotBgmTriggerAction(const InitArg& arg); - ~FrontierSpotBgmTriggerAction() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - -protected: - void calc_() override; - - // dynamic_param at offset 0x20 - sead::SafeString mSound_d{}; - // map_unit_param at offset 0x30 - const float* mSpotBgmLifeScaleMargin_m{}; - // map_unit_param at offset 0x38 - const bool* mIsStopWithoutReductionY_m{}; - // map_unit_param at offset 0x40 - sead::SafeString mSound_m{}; - // map_unit_param at offset 0x50 - sead::SafeString mShape_m{}; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionGroupAllowEmitAction.cpp b/src/Game/Actor/Action/actionGroupAllowEmitAction.cpp deleted file mode 100644 index 07868c30..00000000 --- a/src/Game/Actor/Action/actionGroupAllowEmitAction.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "Game/Actor/Action/actionGroupAllowEmitAction.h" - -namespace uking::action { - -GroupAllowEmitAction::GroupAllowEmitAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -GroupAllowEmitAction::~GroupAllowEmitAction() = default; - -bool GroupAllowEmitAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void GroupAllowEmitAction::loadParams_() { - getDynamicParam(&mGroupName_d, "GroupName"); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionGroupAllowEmitAction.h b/src/Game/Actor/Action/actionGroupAllowEmitAction.h deleted file mode 100644 index 79143cd7..00000000 --- a/src/Game/Actor/Action/actionGroupAllowEmitAction.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class GroupAllowEmitAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(GroupAllowEmitAction, ksys::act::ai::Action) -public: - explicit GroupAllowEmitAction(const InitArg& arg); - ~GroupAllowEmitAction() override; - - bool init_(sead::Heap* heap) override; - void loadParams_() override; - -protected: - // dynamic_param at offset 0x20 - sead::SafeString mGroupName_d{}; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionGroupDisallowEmitAction.cpp b/src/Game/Actor/Action/actionGroupDisallowEmitAction.cpp deleted file mode 100644 index ca5d6efb..00000000 --- a/src/Game/Actor/Action/actionGroupDisallowEmitAction.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "Game/Actor/Action/actionGroupDisallowEmitAction.h" - -namespace uking::action { - -GroupDisallowEmitAction::GroupDisallowEmitAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -GroupDisallowEmitAction::~GroupDisallowEmitAction() = default; - -bool GroupDisallowEmitAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void GroupDisallowEmitAction::loadParams_() { - getDynamicParam(&mGroupName_d, "GroupName"); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionGroupDisallowEmitAction.h b/src/Game/Actor/Action/actionGroupDisallowEmitAction.h deleted file mode 100644 index 90c7b35d..00000000 --- a/src/Game/Actor/Action/actionGroupDisallowEmitAction.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class GroupDisallowEmitAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(GroupDisallowEmitAction, ksys::act::ai::Action) -public: - explicit GroupDisallowEmitAction(const InitArg& arg); - ~GroupDisallowEmitAction() override; - - bool init_(sead::Heap* heap) override; - void loadParams_() override; - -protected: - // dynamic_param at offset 0x20 - sead::SafeString mGroupName_d{}; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionKillAllDemoSoundAction.cpp b/src/Game/Actor/Action/actionKillAllDemoSoundAction.cpp deleted file mode 100644 index 4f7f078f..00000000 --- a/src/Game/Actor/Action/actionKillAllDemoSoundAction.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include "Game/Actor/Action/actionKillAllDemoSoundAction.h" - -namespace uking::action { - -KillAllDemoSoundAction::KillAllDemoSoundAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -KillAllDemoSoundAction::~KillAllDemoSoundAction() = default; - -bool KillAllDemoSoundAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void KillAllDemoSoundAction::loadParams_() {} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionKillAllDemoSoundAction.h b/src/Game/Actor/Action/actionKillAllDemoSoundAction.h deleted file mode 100644 index e853348a..00000000 --- a/src/Game/Actor/Action/actionKillAllDemoSoundAction.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class KillAllDemoSoundAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(KillAllDemoSoundAction, ksys::act::ai::Action) -public: - explicit KillAllDemoSoundAction(const InitArg& arg); - ~KillAllDemoSoundAction() override; - - bool init_(sead::Heap* heap) override; - void loadParams_() override; - -protected: -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionListenerFixPositionAction.cpp b/src/Game/Actor/Action/actionListenerFixPositionAction.cpp deleted file mode 100644 index 9528ab76..00000000 --- a/src/Game/Actor/Action/actionListenerFixPositionAction.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "Game/Actor/Action/actionListenerFixPositionAction.h" - -namespace uking::action { - -ListenerFixPositionAction::ListenerFixPositionAction(const InitArg& arg) - : ksys::act::ai::Action(arg) {} - -ListenerFixPositionAction::~ListenerFixPositionAction() = default; - -bool ListenerFixPositionAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void ListenerFixPositionAction::loadParams_() { - getDynamicParam(&mFixType_d, "FixType"); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionListenerFixPositionAction.h b/src/Game/Actor/Action/actionListenerFixPositionAction.h deleted file mode 100644 index f3cbb07f..00000000 --- a/src/Game/Actor/Action/actionListenerFixPositionAction.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class ListenerFixPositionAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(ListenerFixPositionAction, ksys::act::ai::Action) -public: - explicit ListenerFixPositionAction(const InitArg& arg); - ~ListenerFixPositionAction() override; - - bool init_(sead::Heap* heap) override; - void loadParams_() override; - -protected: - // dynamic_param at offset 0x20 - sead::SafeString mFixType_d{}; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionListenerSetModeAction.cpp b/src/Game/Actor/Action/actionListenerSetModeAction.cpp deleted file mode 100644 index e242e4aa..00000000 --- a/src/Game/Actor/Action/actionListenerSetModeAction.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "Game/Actor/Action/actionListenerSetModeAction.h" - -namespace uking::action { - -ListenerSetModeAction::ListenerSetModeAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -ListenerSetModeAction::~ListenerSetModeAction() = default; - -bool ListenerSetModeAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void ListenerSetModeAction::loadParams_() { - getDynamicParam(&mMode_d, "Mode"); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionListenerSetModeAction.h b/src/Game/Actor/Action/actionListenerSetModeAction.h deleted file mode 100644 index cbc6fe33..00000000 --- a/src/Game/Actor/Action/actionListenerSetModeAction.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class ListenerSetModeAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(ListenerSetModeAction, ksys::act::ai::Action) -public: - explicit ListenerSetModeAction(const InitArg& arg); - ~ListenerSetModeAction() override; - - bool init_(sead::Heap* heap) override; - void loadParams_() override; - -protected: - // dynamic_param at offset 0x20 - sead::SafeString mMode_d{}; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionMusicianSpotBgmTriggerAction.cpp b/src/Game/Actor/Action/actionMusicianSpotBgmTriggerAction.cpp deleted file mode 100644 index afb4ea2a..00000000 --- a/src/Game/Actor/Action/actionMusicianSpotBgmTriggerAction.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "Game/Actor/Action/actionMusicianSpotBgmTriggerAction.h" - -namespace uking::action { - -MusicianSpotBgmTriggerAction::MusicianSpotBgmTriggerAction(const InitArg& arg) - : SpotBgmTriggerAction(arg) {} - -MusicianSpotBgmTriggerAction::~MusicianSpotBgmTriggerAction() = default; - -bool MusicianSpotBgmTriggerAction::init_(sead::Heap* heap) { - return SpotBgmTriggerAction::init_(heap); -} - -void MusicianSpotBgmTriggerAction::enter_(ksys::act::ai::InlineParamPack* params) { - SpotBgmTriggerAction::enter_(params); -} - -void MusicianSpotBgmTriggerAction::leave_() { - SpotBgmTriggerAction::leave_(); -} - -void MusicianSpotBgmTriggerAction::loadParams_() { - SpotBgmTriggerAction::loadParams_(); -} - -void MusicianSpotBgmTriggerAction::calc_() { - SpotBgmTriggerAction::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionMusicianSpotBgmTriggerAction.h b/src/Game/Actor/Action/actionMusicianSpotBgmTriggerAction.h deleted file mode 100644 index b6cf1050..00000000 --- a/src/Game/Actor/Action/actionMusicianSpotBgmTriggerAction.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "Game/Actor/Action/actionSpotBgmTriggerAction.h" -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class MusicianSpotBgmTriggerAction : public SpotBgmTriggerAction { - SEAD_RTTI_OVERRIDE(MusicianSpotBgmTriggerAction, SpotBgmTriggerAction) -public: - explicit MusicianSpotBgmTriggerAction(const InitArg& arg); - ~MusicianSpotBgmTriggerAction() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - -protected: - void calc_() override; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionPlayerEmitEquipmentNoise.cpp b/src/Game/Actor/Action/actionPlayerEmitEquipmentNoise.cpp deleted file mode 100644 index ddf5f9bc..00000000 --- a/src/Game/Actor/Action/actionPlayerEmitEquipmentNoise.cpp +++ /dev/null @@ -1,19 +0,0 @@ -#include "Game/Actor/Action/actionPlayerEmitEquipmentNoise.h" - -namespace uking::action { - -PlayerEmitEquipmentNoise::PlayerEmitEquipmentNoise(const InitArg& arg) - : ksys::act::ai::Action(arg) {} - -PlayerEmitEquipmentNoise::~PlayerEmitEquipmentNoise() = default; - -bool PlayerEmitEquipmentNoise::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void PlayerEmitEquipmentNoise::loadParams_() { - getDynamicParam(&mSteppingFoot_d, "SteppingFoot"); - getDynamicParam(&mSpeed_d, "Speed"); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionPlayerEmitEquipmentNoise.h b/src/Game/Actor/Action/actionPlayerEmitEquipmentNoise.h deleted file mode 100644 index ff7b5e02..00000000 --- a/src/Game/Actor/Action/actionPlayerEmitEquipmentNoise.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class PlayerEmitEquipmentNoise : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(PlayerEmitEquipmentNoise, ksys::act::ai::Action) -public: - explicit PlayerEmitEquipmentNoise(const InitArg& arg); - ~PlayerEmitEquipmentNoise() override; - - bool init_(sead::Heap* heap) override; - void loadParams_() override; - -protected: - // dynamic_param at offset 0x20 - sead::SafeString mSteppingFoot_d{}; - // dynamic_param at offset 0x30 - sead::SafeString mSpeed_d{}; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSceneBgmCtrlAction.cpp b/src/Game/Actor/Action/actionSceneBgmCtrlAction.cpp deleted file mode 100644 index 5686634c..00000000 --- a/src/Game/Actor/Action/actionSceneBgmCtrlAction.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "Game/Actor/Action/actionSceneBgmCtrlAction.h" - -namespace uking::action { - -SceneBgmCtrlAction::SceneBgmCtrlAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -SceneBgmCtrlAction::~SceneBgmCtrlAction() = default; - -bool SceneBgmCtrlAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void SceneBgmCtrlAction::loadParams_() { - getDynamicParam(&mCtrlType_d, "CtrlType"); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSceneBgmCtrlAction.h b/src/Game/Actor/Action/actionSceneBgmCtrlAction.h deleted file mode 100644 index 128e7639..00000000 --- a/src/Game/Actor/Action/actionSceneBgmCtrlAction.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class SceneBgmCtrlAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(SceneBgmCtrlAction, ksys::act::ai::Action) -public: - explicit SceneBgmCtrlAction(const InitArg& arg); - ~SceneBgmCtrlAction() override; - - bool init_(sead::Heap* heap) override; - void loadParams_() override; - -protected: - // dynamic_param at offset 0x20 - sead::SafeString mCtrlType_d{}; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSceneSoundCtrlAction.cpp b/src/Game/Actor/Action/actionSceneSoundCtrlAction.cpp deleted file mode 100644 index d064db40..00000000 --- a/src/Game/Actor/Action/actionSceneSoundCtrlAction.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "Game/Actor/Action/actionSceneSoundCtrlAction.h" - -namespace uking::action { - -SceneSoundCtrlAction::SceneSoundCtrlAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -SceneSoundCtrlAction::~SceneSoundCtrlAction() = default; - -bool SceneSoundCtrlAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void SceneSoundCtrlAction::loadParams_() { - getDynamicParam(&mBgmCtrlType_d, "BgmCtrlType"); - getDynamicParam(&mSeCtrlType_d, "SeCtrlType"); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSceneSoundCtrlAction.h b/src/Game/Actor/Action/actionSceneSoundCtrlAction.h deleted file mode 100644 index b65f4485..00000000 --- a/src/Game/Actor/Action/actionSceneSoundCtrlAction.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class SceneSoundCtrlAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(SceneSoundCtrlAction, ksys::act::ai::Action) -public: - explicit SceneSoundCtrlAction(const InitArg& arg); - ~SceneSoundCtrlAction() override; - - bool init_(sead::Heap* heap) override; - void loadParams_() override; - -protected: - // dynamic_param at offset 0x20 - sead::SafeString mBgmCtrlType_d{}; - // dynamic_param at offset 0x30 - sead::SafeString mSeCtrlType_d{}; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSceneSoundKillDuckingAction.cpp b/src/Game/Actor/Action/actionSceneSoundKillDuckingAction.cpp deleted file mode 100644 index c549ff48..00000000 --- a/src/Game/Actor/Action/actionSceneSoundKillDuckingAction.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "Game/Actor/Action/actionSceneSoundKillDuckingAction.h" - -namespace uking::action { - -SceneSoundKillDuckingAction::SceneSoundKillDuckingAction(const InitArg& arg) - : ksys::act::ai::Action(arg) {} - -SceneSoundKillDuckingAction::~SceneSoundKillDuckingAction() = default; - -bool SceneSoundKillDuckingAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void SceneSoundKillDuckingAction::loadParams_() { - getDynamicParam(&mDuckerType_d, "DuckerType"); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSceneSoundKillDuckingAction.h b/src/Game/Actor/Action/actionSceneSoundKillDuckingAction.h deleted file mode 100644 index cb1929a1..00000000 --- a/src/Game/Actor/Action/actionSceneSoundKillDuckingAction.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class SceneSoundKillDuckingAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(SceneSoundKillDuckingAction, ksys::act::ai::Action) -public: - explicit SceneSoundKillDuckingAction(const InitArg& arg); - ~SceneSoundKillDuckingAction() override; - - bool init_(sead::Heap* heap) override; - void loadParams_() override; - -protected: - // dynamic_param at offset 0x20 - sead::SafeString mDuckerType_d{}; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSceneSoundNotifyTalkAction.cpp b/src/Game/Actor/Action/actionSceneSoundNotifyTalkAction.cpp deleted file mode 100644 index 4cd3b6a4..00000000 --- a/src/Game/Actor/Action/actionSceneSoundNotifyTalkAction.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "Game/Actor/Action/actionSceneSoundNotifyTalkAction.h" - -namespace uking::action { - -SceneSoundNotifyTalkAction::SceneSoundNotifyTalkAction(const InitArg& arg) - : ksys::act::ai::Action(arg) {} - -SceneSoundNotifyTalkAction::~SceneSoundNotifyTalkAction() = default; - -bool SceneSoundNotifyTalkAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void SceneSoundNotifyTalkAction::loadParams_() { - getDynamicParam(&mCtrlType_d, "CtrlType"); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSceneSoundNotifyTalkAction.h b/src/Game/Actor/Action/actionSceneSoundNotifyTalkAction.h deleted file mode 100644 index 588a2b8f..00000000 --- a/src/Game/Actor/Action/actionSceneSoundNotifyTalkAction.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class SceneSoundNotifyTalkAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(SceneSoundNotifyTalkAction, ksys::act::ai::Action) -public: - explicit SceneSoundNotifyTalkAction(const InitArg& arg); - ~SceneSoundNotifyTalkAction() override; - - bool init_(sead::Heap* heap) override; - void loadParams_() override; - -protected: - // dynamic_param at offset 0x20 - sead::SafeString mCtrlType_d{}; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSceneSoundSetEndProcAction.cpp b/src/Game/Actor/Action/actionSceneSoundSetEndProcAction.cpp deleted file mode 100644 index 6ad8d6a9..00000000 --- a/src/Game/Actor/Action/actionSceneSoundSetEndProcAction.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "Game/Actor/Action/actionSceneSoundSetEndProcAction.h" - -namespace uking::action { - -SceneSoundSetEndProcAction::SceneSoundSetEndProcAction(const InitArg& arg) - : ksys::act::ai::Action(arg) {} - -SceneSoundSetEndProcAction::~SceneSoundSetEndProcAction() = default; - -bool SceneSoundSetEndProcAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void SceneSoundSetEndProcAction::loadParams_() { - getDynamicParam(&mCtrlType_d, "CtrlType"); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSceneSoundSetEndProcAction.h b/src/Game/Actor/Action/actionSceneSoundSetEndProcAction.h deleted file mode 100644 index 7034804b..00000000 --- a/src/Game/Actor/Action/actionSceneSoundSetEndProcAction.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class SceneSoundSetEndProcAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(SceneSoundSetEndProcAction, ksys::act::ai::Action) -public: - explicit SceneSoundSetEndProcAction(const InitArg& arg); - ~SceneSoundSetEndProcAction() override; - - bool init_(sead::Heap* heap) override; - void loadParams_() override; - -protected: - // dynamic_param at offset 0x20 - sead::SafeString mCtrlType_d{}; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSceneSoundSetStartProcAction.cpp b/src/Game/Actor/Action/actionSceneSoundSetStartProcAction.cpp deleted file mode 100644 index f0136ced..00000000 --- a/src/Game/Actor/Action/actionSceneSoundSetStartProcAction.cpp +++ /dev/null @@ -1,19 +0,0 @@ -#include "Game/Actor/Action/actionSceneSoundSetStartProcAction.h" - -namespace uking::action { - -SceneSoundSetStartProcAction::SceneSoundSetStartProcAction(const InitArg& arg) - : ksys::act::ai::Action(arg) {} - -SceneSoundSetStartProcAction::~SceneSoundSetStartProcAction() = default; - -bool SceneSoundSetStartProcAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void SceneSoundSetStartProcAction::loadParams_() { - getDynamicParam(&mBgmCtrlType_d, "BgmCtrlType"); - getDynamicParam(&mSeCtrlType_d, "SeCtrlType"); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSceneSoundSetStartProcAction.h b/src/Game/Actor/Action/actionSceneSoundSetStartProcAction.h deleted file mode 100644 index 1a052148..00000000 --- a/src/Game/Actor/Action/actionSceneSoundSetStartProcAction.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class SceneSoundSetStartProcAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(SceneSoundSetStartProcAction, ksys::act::ai::Action) -public: - explicit SceneSoundSetStartProcAction(const InitArg& arg); - ~SceneSoundSetStartProcAction() override; - - bool init_(sead::Heap* heap) override; - void loadParams_() override; - -protected: - // dynamic_param at offset 0x20 - sead::SafeString mBgmCtrlType_d{}; - // dynamic_param at offset 0x30 - sead::SafeString mSeCtrlType_d{}; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSceneSoundStartDuckingAction.cpp b/src/Game/Actor/Action/actionSceneSoundStartDuckingAction.cpp deleted file mode 100644 index 34574679..00000000 --- a/src/Game/Actor/Action/actionSceneSoundStartDuckingAction.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "Game/Actor/Action/actionSceneSoundStartDuckingAction.h" - -namespace uking::action { - -SceneSoundStartDuckingAction::SceneSoundStartDuckingAction(const InitArg& arg) - : ksys::act::ai::Action(arg) {} - -SceneSoundStartDuckingAction::~SceneSoundStartDuckingAction() = default; - -bool SceneSoundStartDuckingAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void SceneSoundStartDuckingAction::loadParams_() { - getDynamicParam(&mDuckerType_d, "DuckerType"); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSceneSoundStartDuckingAction.h b/src/Game/Actor/Action/actionSceneSoundStartDuckingAction.h deleted file mode 100644 index e1ef2ea7..00000000 --- a/src/Game/Actor/Action/actionSceneSoundStartDuckingAction.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class SceneSoundStartDuckingAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(SceneSoundStartDuckingAction, ksys::act::ai::Action) -public: - explicit SceneSoundStartDuckingAction(const InitArg& arg); - ~SceneSoundStartDuckingAction() override; - - bool init_(sead::Heap* heap) override; - void loadParams_() override; - -protected: - // dynamic_param at offset 0x20 - sead::SafeString mDuckerType_d{}; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSceneSoundStopDuckingAction.cpp b/src/Game/Actor/Action/actionSceneSoundStopDuckingAction.cpp deleted file mode 100644 index c03f936c..00000000 --- a/src/Game/Actor/Action/actionSceneSoundStopDuckingAction.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "Game/Actor/Action/actionSceneSoundStopDuckingAction.h" - -namespace uking::action { - -SceneSoundStopDuckingAction::SceneSoundStopDuckingAction(const InitArg& arg) - : ksys::act::ai::Action(arg) {} - -SceneSoundStopDuckingAction::~SceneSoundStopDuckingAction() = default; - -bool SceneSoundStopDuckingAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void SceneSoundStopDuckingAction::loadParams_() { - getDynamicParam(&mDuckerType_d, "DuckerType"); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSceneSoundStopDuckingAction.h b/src/Game/Actor/Action/actionSceneSoundStopDuckingAction.h deleted file mode 100644 index 043d1f4e..00000000 --- a/src/Game/Actor/Action/actionSceneSoundStopDuckingAction.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class SceneSoundStopDuckingAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(SceneSoundStopDuckingAction, ksys::act::ai::Action) -public: - explicit SceneSoundStopDuckingAction(const InitArg& arg); - ~SceneSoundStopDuckingAction() override; - - bool init_(sead::Heap* heap) override; - void loadParams_() override; - -protected: - // dynamic_param at offset 0x20 - sead::SafeString mDuckerType_d{}; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSoundOcclusionTagAction.cpp b/src/Game/Actor/Action/actionSoundOcclusionTagAction.cpp deleted file mode 100644 index 2c532c67..00000000 --- a/src/Game/Actor/Action/actionSoundOcclusionTagAction.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include "Game/Actor/Action/actionSoundOcclusionTagAction.h" - -namespace uking::action { - -SoundOcclusionTagAction::SoundOcclusionTagAction(const InitArg& arg) : AreaTagAction(arg) {} - -SoundOcclusionTagAction::~SoundOcclusionTagAction() = default; - -bool SoundOcclusionTagAction::init_(sead::Heap* heap) { - return AreaTagAction::init_(heap); -} - -void SoundOcclusionTagAction::enter_(ksys::act::ai::InlineParamPack* params) { - AreaTagAction::enter_(params); -} - -void SoundOcclusionTagAction::leave_() { - AreaTagAction::leave_(); -} - -void SoundOcclusionTagAction::loadParams_() { - getStaticParam(&mOcclusionLevel_s, "OcclusionLevel"); -} - -void SoundOcclusionTagAction::calc_() { - AreaTagAction::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSoundOcclusionTagAction.h b/src/Game/Actor/Action/actionSoundOcclusionTagAction.h deleted file mode 100644 index 8535eca5..00000000 --- a/src/Game/Actor/Action/actionSoundOcclusionTagAction.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -#include "Game/Actor/Area/Action/actionAreaTagAction.h" -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class SoundOcclusionTagAction : public AreaTagAction { - SEAD_RTTI_OVERRIDE(SoundOcclusionTagAction, AreaTagAction) -public: - explicit SoundOcclusionTagAction(const InitArg& arg); - ~SoundOcclusionTagAction() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - -protected: - void calc_() override; - - // static_param at offset 0x48 - const float* mOcclusionLevel_s{}; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSoundProxyRootAction.cpp b/src/Game/Actor/Action/actionSoundProxyRootAction.cpp deleted file mode 100644 index d2626cdf..00000000 --- a/src/Game/Actor/Action/actionSoundProxyRootAction.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include "Game/Actor/Action/actionSoundProxyRootAction.h" - -namespace uking::action { - -SoundProxyRootAction::SoundProxyRootAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -SoundProxyRootAction::~SoundProxyRootAction() = default; - -bool SoundProxyRootAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void SoundProxyRootAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SoundProxyRootAction::leave_() { - ksys::act::ai::Action::leave_(); -} - -void SoundProxyRootAction::loadParams_() {} - -void SoundProxyRootAction::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSoundProxyRootAction.h b/src/Game/Actor/Action/actionSoundProxyRootAction.h deleted file mode 100644 index f50389c9..00000000 --- a/src/Game/Actor/Action/actionSoundProxyRootAction.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class SoundProxyRootAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(SoundProxyRootAction, ksys::act::ai::Action) -public: - explicit SoundProxyRootAction(const InitArg& arg); - ~SoundProxyRootAction() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - -protected: - void calc_() override; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSoundReverbAreaTagAction.cpp b/src/Game/Actor/Action/actionSoundReverbAreaTagAction.cpp deleted file mode 100644 index b609ed70..00000000 --- a/src/Game/Actor/Action/actionSoundReverbAreaTagAction.cpp +++ /dev/null @@ -1,34 +0,0 @@ -#include "Game/Actor/Action/actionSoundReverbAreaTagAction.h" - -namespace uking::action { - -SoundReverbAreaTagAction::SoundReverbAreaTagAction(const InitArg& arg) : AreaTagAction(arg) {} - -SoundReverbAreaTagAction::~SoundReverbAreaTagAction() = default; - -bool SoundReverbAreaTagAction::init_(sead::Heap* heap) { - return AreaTagAction::init_(heap); -} - -void SoundReverbAreaTagAction::enter_(ksys::act::ai::InlineParamPack* params) { - AreaTagAction::enter_(params); -} - -void SoundReverbAreaTagAction::leave_() { - AreaTagAction::leave_(); -} - -void SoundReverbAreaTagAction::loadParams_() { - getMapUnitParam(&mReverbSendAdd_m, "ReverbSendAdd"); - getMapUnitParam(&mReverbTimeAdd_m, "ReverbTimeAdd"); - getMapUnitParam(&mEarlyReflectionFeedbackAdd_m, "EarlyReflectionFeedbackAdd"); - getMapUnitParam(&mRoomHfAdd_m, "RoomHfAdd"); - getMapUnitParam(&mReverbAdd_m, "ReverbAdd"); - getMapUnitParam(&mMerginDistance_m, "MerginDistance"); -} - -void SoundReverbAreaTagAction::calc_() { - AreaTagAction::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSoundReverbAreaTagAction.h b/src/Game/Actor/Action/actionSoundReverbAreaTagAction.h deleted file mode 100644 index 7f75afd4..00000000 --- a/src/Game/Actor/Action/actionSoundReverbAreaTagAction.h +++ /dev/null @@ -1,36 +0,0 @@ -#pragma once - -#include "Game/Actor/Area/Action/actionAreaTagAction.h" -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class SoundReverbAreaTagAction : public AreaTagAction { - SEAD_RTTI_OVERRIDE(SoundReverbAreaTagAction, AreaTagAction) -public: - explicit SoundReverbAreaTagAction(const InitArg& arg); - ~SoundReverbAreaTagAction() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - -protected: - void calc_() override; - - // map_unit_param at offset 0x70 - const float* mReverbSendAdd_m{}; - // map_unit_param at offset 0x78 - const float* mReverbTimeAdd_m{}; - // map_unit_param at offset 0x80 - const float* mEarlyReflectionFeedbackAdd_m{}; - // map_unit_param at offset 0x88 - const float* mRoomHfAdd_m{}; - // map_unit_param at offset 0x90 - const float* mReverbAdd_m{}; - // map_unit_param at offset 0x98 - const float* mMerginDistance_m{}; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSoundShieldingAreaTagAction.cpp b/src/Game/Actor/Action/actionSoundShieldingAreaTagAction.cpp deleted file mode 100644 index 550944d5..00000000 --- a/src/Game/Actor/Action/actionSoundShieldingAreaTagAction.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "Game/Actor/Action/actionSoundShieldingAreaTagAction.h" - -namespace uking::action { - -SoundShieldingAreaTagAction::SoundShieldingAreaTagAction(const InitArg& arg) : AreaTagAction(arg) {} - -SoundShieldingAreaTagAction::~SoundShieldingAreaTagAction() = default; - -bool SoundShieldingAreaTagAction::init_(sead::Heap* heap) { - return AreaTagAction::init_(heap); -} - -void SoundShieldingAreaTagAction::enter_(ksys::act::ai::InlineParamPack* params) { - AreaTagAction::enter_(params); -} - -void SoundShieldingAreaTagAction::leave_() { - AreaTagAction::leave_(); -} - -void SoundShieldingAreaTagAction::loadParams_() { - getMapUnitParam(&mMerginDistance_m, "MerginDistance"); - getMapUnitParam(&mIsShieldChemicalWind_m, "IsShieldChemicalWind"); -} - -void SoundShieldingAreaTagAction::calc_() { - AreaTagAction::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSoundShieldingAreaTagAction.h b/src/Game/Actor/Action/actionSoundShieldingAreaTagAction.h deleted file mode 100644 index 695c2ea5..00000000 --- a/src/Game/Actor/Action/actionSoundShieldingAreaTagAction.h +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once - -#include "Game/Actor/Area/Action/actionAreaTagAction.h" -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class SoundShieldingAreaTagAction : public AreaTagAction { - SEAD_RTTI_OVERRIDE(SoundShieldingAreaTagAction, AreaTagAction) -public: - explicit SoundShieldingAreaTagAction(const InitArg& arg); - ~SoundShieldingAreaTagAction() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - -protected: - void calc_() override; - - // map_unit_param at offset 0x38 - const float* mMerginDistance_m{}; - // map_unit_param at offset 0x40 - const bool* mIsShieldChemicalWind_m{}; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSpotBgmTriggerAction.cpp b/src/Game/Actor/Action/actionSpotBgmTriggerAction.cpp deleted file mode 100644 index c2898a7c..00000000 --- a/src/Game/Actor/Action/actionSpotBgmTriggerAction.cpp +++ /dev/null @@ -1,31 +0,0 @@ -#include "Game/Actor/Action/actionSpotBgmTriggerAction.h" - -namespace uking::action { - -SpotBgmTriggerAction::SpotBgmTriggerAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -SpotBgmTriggerAction::~SpotBgmTriggerAction() = default; - -bool SpotBgmTriggerAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void SpotBgmTriggerAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SpotBgmTriggerAction::leave_() { - ksys::act::ai::Action::leave_(); -} - -void SpotBgmTriggerAction::loadParams_() { - getDynamicParam(&mSound_d, "Sound"); - getMapUnitParam(&mIsStopWithoutReductionY_m, "IsStopWithoutReductionY"); - getMapUnitParam(&mSound_m, "Sound"); -} - -void SpotBgmTriggerAction::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSpotBgmTriggerAction.h b/src/Game/Actor/Action/actionSpotBgmTriggerAction.h deleted file mode 100644 index 0e957df1..00000000 --- a/src/Game/Actor/Action/actionSpotBgmTriggerAction.h +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class SpotBgmTriggerAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(SpotBgmTriggerAction, ksys::act::ai::Action) -public: - explicit SpotBgmTriggerAction(const InitArg& arg); - ~SpotBgmTriggerAction() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - -protected: - void calc_() override; - - // dynamic_param at offset 0x20 - sead::SafeString mSound_d{}; - // map_unit_param at offset 0x30 - const bool* mIsStopWithoutReductionY_m{}; - // map_unit_param at offset 0x38 - sead::SafeString mSound_m{}; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionStopAllDemoSoundAction.cpp b/src/Game/Actor/Action/actionStopAllDemoSoundAction.cpp deleted file mode 100644 index 89cc93ba..00000000 --- a/src/Game/Actor/Action/actionStopAllDemoSoundAction.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include "Game/Actor/Action/actionStopAllDemoSoundAction.h" - -namespace uking::action { - -StopAllDemoSoundAction::StopAllDemoSoundAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -StopAllDemoSoundAction::~StopAllDemoSoundAction() = default; - -bool StopAllDemoSoundAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void StopAllDemoSoundAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void StopAllDemoSoundAction::leave_() { - ksys::act::ai::Action::leave_(); -} - -void StopAllDemoSoundAction::loadParams_() {} - -void StopAllDemoSoundAction::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionStopAllDemoSoundAction.h b/src/Game/Actor/Action/actionStopAllDemoSoundAction.h deleted file mode 100644 index 4e8c9261..00000000 --- a/src/Game/Actor/Action/actionStopAllDemoSoundAction.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class StopAllDemoSoundAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(StopAllDemoSoundAction, ksys::act::ai::Action) -public: - explicit StopAllDemoSoundAction(const InitArg& arg); - ~StopAllDemoSoundAction() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - -protected: - void calc_() override; -}; - -} // namespace uking::action 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<action::OffMiss>}, {0x04aa5460, Factory::make<action::Catch>}, {0x04f447ef, Factory::make<action::DieAnm>}, - {0x0587f020, Factory::make<action::EnvSeEmitPointInsectPlayAction>}, + {0x0587f020, Factory::make<ksys::snd::EnvSeEmitPointInsectPlayAction>}, {0x05b6f645, Factory::make<action::ChuchuPreAttack>}, {0x05beac93, Factory::make<action::SendTargetActorRequestShareAwn>}, - {0x05dfa8bf, Factory::make<action::ListenerFixPositionAction>}, + {0x05dfa8bf, Factory::make<ksys::snd::ListenerFixPositionAction>}, {0x05fe1ad8, Factory::make<action::WaitCloseItemDownloadDemo>}, {0x06205589, Factory::make<action::PlayerCutReverse>}, {0x0625861d, Factory::make<action::SetBloodyMoonEnv>}, @@ -1837,7 +1837,7 @@ static Factory sActionFactories[] = { {0x09bfaea7, Factory::make<action::ChuchuCommonDownTimer>}, {0x09f76511, Factory::make<action::NavMeshSlippedWalk>}, {0x0a020615, Factory::make<action::SetGetFlag>}, - {0x0a353da3, Factory::make<action::KillAllDemoSoundAction>}, + {0x0a353da3, Factory::make<ksys::snd::KillAllDemoSoundAction>}, {0x0a83f093, Factory::make<action::RotatedWait>}, {0x0aa8490d, Factory::make<action::DemoEnemyReset>}, {0x0ac01bdd, Factory::make<action::AppearNumTargets>}, @@ -1903,8 +1903,8 @@ static Factory sActionFactories[] = { {0x140f2d8b, Factory::make<action::ImmediateStopOwnedHorse>}, {0x143eb340, Factory::make<action::EmitEffectLoopAction>}, {0x14441f7e, Factory::make<action::UseNavMeshConnectAction>}, - {0x144c0919, Factory::make<action::EventBgmStopAction>}, - {0x145bcbee, Factory::make<action::FrontierSpotBgmTriggerAction>}, + {0x144c0919, Factory::make<ksys::snd::EventBgmStopAction>}, + {0x145bcbee, Factory::make<ksys::snd::FrontierSpotBgmTriggerAction>}, {0x1496a748, Factory::make<action::AnmUpDownMove>}, {0x14aa3d51, Factory::make<action::PlayerWaterDivingJump>}, {0x14c3a774, Factory::make<action::Vanish>}, @@ -1951,7 +1951,7 @@ static Factory sActionFactories[] = { {0x1b5651e2, Factory::make<action::BeamMove>}, {0x1b631a15, Factory::make<action::PlayerStepGuardJust>}, {0x1b8c920d, Factory::make<action::WarpToActor>}, - {0x1ba29897, Factory::make<action::SceneSoundKillDuckingAction>}, + {0x1ba29897, Factory::make<ksys::snd::SceneSoundKillDuckingAction>}, {0x1bac07a0, Factory::make<action::MoonMove>}, {0x1bdde345, Factory::make<action::PlayerSwimDash>}, {0x1c0e4aaf, Factory::make<action::EnemyFortressChatTurn>}, @@ -1990,7 +1990,7 @@ static Factory sActionFactories[] = { {0x2217f0d6, Factory::make<action::GiantPunchAttack>}, {0x22260af6, Factory::make<action::FlyingCharacterDie>}, {0x2244b5b8, Factory::make<action::Escape>}, - {0x2274dabb, Factory::make<action::PlayerEmitEquipmentNoise>}, + {0x2274dabb, Factory::make<ksys::snd::PlayerEmitEquipmentNoise>}, {0x22a4aaa8, Factory::make<action::AppearDeathCounter>}, {0x22aef28f, Factory::make<action::DemoTurnToActor>}, {0x22af3f8e, Factory::make<action::DefeatedHugeEnemyCount>}, @@ -2127,7 +2127,7 @@ static Factory sActionFactories[] = { {0x35fc4c7a, Factory::make<action::EventUnregisterFromGetCounter>}, {0x36213813, Factory::make<action::ForkAnimReset>}, {0x36402174, Factory::make<action::SetTreasureBoxOpenAndClose>}, - {0x366e28f1, Factory::make<action::SceneSoundSetEndProcAction>}, + {0x366e28f1, Factory::make<ksys::snd::SceneSoundSetEndProcAction>}, {0x367b5904, Factory::make<action::ForkASTrgRemainsHowl>}, {0x36a7844a, Factory::make<action::SwimEnemyAnmBackBlownOffToPL>}, {0x36bde4ac, Factory::make<action::ForkTimer>}, @@ -2271,13 +2271,13 @@ static Factory sActionFactories[] = { {0x4aa074c9, Factory::make<action::WeaponDrawn>}, {0x4b1e9262, Factory::make<action::DownloadShiekSensorMoveIcon>}, {0x4b2a2b49, Factory::make<action::SetLinkTagBasic>}, - {0x4b8a3c1f, Factory::make<action::EventBgmStartAction>}, + {0x4b8a3c1f, Factory::make<ksys::snd::EventBgmStartAction>}, {0x4bac0b33, Factory::make<action::SideStepWait>}, {0x4bd47e4f, Factory::make<action::EventSetDiffuseAttenuate>}, {0x4bd9747c, Factory::make<action::ForkSeparateThreeASPart>}, {0x4ca3103c, Factory::make<action::PlayerParashawlGlide>}, {0x4cba267b, Factory::make<action::PlayerCutJump>}, - {0x4cbf12c7, Factory::make<action::SceneBgmCtrlAction>}, + {0x4cbf12c7, Factory::make<ksys::snd::SceneBgmCtrlAction>}, {0x4ce37592, Factory::make<action::BackSwim>}, {0x4ce7aebf, Factory::make<action::CreateObjectsOfOwnedHorse>}, {0x4cf1568b, Factory::make<action::NPCPurchase>}, @@ -2349,7 +2349,7 @@ static Factory sActionFactories[] = { {0x55d396ba, Factory::make<action::OpenItemCategory>}, {0x55d66225, Factory::make<action::PlayerGrabReady>}, {0x55f97c09, Factory::make<action::HorseRideCancelCommand>}, - {0x56165495, Factory::make<action::SceneSoundStartDuckingAction>}, + {0x56165495, Factory::make<ksys::snd::SceneSoundStartDuckingAction>}, {0x5655dcaa, Factory::make<action::ObservationPointAction>}, {0x5682c769, Factory::make<action::ForkLynelDrawWeaponASPlay>}, {0x56e905e3, Factory::make<action::PlayerDestinationTurnRefActor>}, @@ -2365,7 +2365,7 @@ static Factory sActionFactories[] = { {0x57bb8e4a, Factory::make<action::CameraEventTalkManualCtrlRet>}, {0x57bda5d7, Factory::make<action::ChuchuDissappearEscape>}, {0x5851f277, Factory::make<action::BackFlip>}, - {0x58b4f58b, Factory::make<action::SceneSoundStopDuckingAction>}, + {0x58b4f58b, Factory::make<ksys::snd::SceneSoundStopDuckingAction>}, {0x5910c586, Factory::make<action::ForkDrawWeapon>}, {0x5936d239, Factory::make<action::DemoTriggerToggleVisible>}, {0x595bfb19, Factory::make<action::BattleCloseWalk>}, @@ -2448,7 +2448,7 @@ static Factory sActionFactories[] = { {0x65f50488, Factory::make<action::EventSetGameDataIntAction>}, {0x661d08f3, Factory::make<action::NPCWait>}, {0x6665fdef, Factory::make<action::GanonThrowFireBall>}, - {0x667efbac, Factory::make<action::EventBgmStartAndKeepAction>}, + {0x667efbac, Factory::make<ksys::snd::EventBgmStartAndKeepAction>}, {0x66af42e4, Factory::make<action::ForkTimerForceResetCondition>}, {0x66ba65df, Factory::make<action::AssassinBossIronBallAppear>}, {0x66ba85e6, Factory::make<action::SandwichDetectionAreaTag>}, @@ -2544,11 +2544,11 @@ static Factory sActionFactories[] = { {0x7380112a, Factory::make<action::MimicFreeze>}, {0x73df6d4c, Factory::make<ksys::act::ai::DummyAction>}, {0x73e6fb3b, Factory::make<action::DummyAction>}, - {0x73fec15b, Factory::make<action::SpotBgmTriggerAction>}, + {0x73fec15b, Factory::make<ksys::snd::SpotBgmTriggerAction>}, {0x740366f6, Factory::make<action::LynelNavMeshMove>}, {0x74137cda, Factory::make<action::TerrainHideCenter>}, {0x741491d4, Factory::make<action::DragonPlayASForDemo>}, - {0x74225ab1, Factory::make<action::EventBgmCtrlAction>}, + {0x74225ab1, Factory::make<ksys::snd::EventBgmCtrlAction>}, {0x7473cc6c, Factory::make<action::HoverPredictVacuumShoot>}, {0x74c03a75, Factory::make<action::RemainElectricCannonBeamFire>}, {0x74e7f82e, Factory::make<action::OwnedHorseObserveAction>}, @@ -2561,7 +2561,7 @@ static Factory sActionFactories[] = { {0x7619bafa, Factory::make<action::SellPictureBookUIDemo>}, {0x762224d0, Factory::make<action::ChemicalElectricWaterBall>}, {0x76377096, Factory::make<action::GanonBoneControl>}, - {0x7667f616, Factory::make<action::ListenerSetModeAction>}, + {0x7667f616, Factory::make<ksys::snd::ListenerSetModeAction>}, {0x7697ced0, Factory::make<action::LiftTurn>}, {0x76a33ed1, Factory::make<action::HorseSwimToTargetActor>}, {0x76c0d33a, Factory::make<action::ForkJumpToTargetOnDownEnd>}, @@ -2587,7 +2587,7 @@ static Factory sActionFactories[] = { {0x79239cd6, Factory::make<action::BeeDamaged>}, {0x794048ff, Factory::make<action::CameraWaterRemainsHowling>}, {0x79a1404a, Factory::make<action::WaitForStaminaUpDemoEnd>}, - {0x7a353b54, Factory::make<action::SoundProxyRootAction>}, + {0x7a353b54, Factory::make<ksys::snd::SoundProxyRootAction>}, {0x7a3bf550, Factory::make<action::ForkGravityScaleChange>}, {0x7ab032eb, Factory::make<action::GrabRightWalk>}, {0x7ad55f51, Factory::make<action::LastBossChemicalPillarAttack>}, @@ -2694,7 +2694,7 @@ static Factory sActionFactories[] = { {0x86423cc1, Factory::make<action::ForkAlwaysRotDownGr>}, {0x871e0bba, Factory::make<action::TerrainCalcCenter>}, {0x8733c282, Factory::make<action::ForkWaitGroundHit>}, - {0x876b01f1, Factory::make<action::SceneSoundCtrlAction>}, + {0x876b01f1, Factory::make<ksys::snd::SceneSoundCtrlAction>}, {0x877d9db7, Factory::make<action::Msg2CameraResetInterpolate>}, {0x87901d5a, Factory::make<action::FirstRunelGrudgeDemo>}, {0x87a2854c, Factory::make<action::OpenEnduranceFloorNumber>}, @@ -2793,7 +2793,7 @@ static Factory sActionFactories[] = { {0x948cb143, Factory::make<action::RemoveSensor>}, {0x94db3eea, Factory::make<action::GolemDieFromRagdoll>}, {0x94f4c834, Factory::make<action::ForkSlipAndStop>}, - {0x9522b34c, Factory::make<action::GroupDisallowEmitAction>}, + {0x9522b34c, Factory::make<ksys::snd::GroupDisallowEmitAction>}, {0x958bc9d2, Factory::make<action::CollaboShootingStarAreaTag>}, {0x95d8e6ab, Factory::make<action::CalcVecLengthToGameData>}, {0x9619d5e4, Factory::make<action::SendPlayerNoticeMessage>}, @@ -2832,7 +2832,7 @@ static Factory sActionFactories[] = { {0x9a4989e7, Factory::make<action::PlayerRailMove>}, {0x9a58d886, Factory::make<action::ForceMasterSwordFakeMode>}, {0x9a655873, Factory::make<action::CameraEventLookDirect>}, - {0x9a82d73a, Factory::make<action::EnvSeEmitPointBirdPlayAction>}, + {0x9a82d73a, Factory::make<ksys::snd::EnvSeEmitPointBirdPlayAction>}, {0x9a89689a, Factory::make<action::TeleportForceApperPosition>}, {0x9a8b279b, Factory::make<action::EnemyAreaInOutSendMessage>}, {0x9abdf2f3, Factory::make<action::InWaterSelForkASPlay>}, @@ -2849,7 +2849,7 @@ static Factory sActionFactories[] = { {0x9c5b2629, Factory::make<action::MoveByAnimeDrivenCheckNavMesh>}, {0x9c9f153f, Factory::make<action::DemoGetWeapon>}, {0x9cc86685, Factory::make<action::FixedMagneStick>}, - {0x9cd7ef66, Factory::make<action::BattleDungeonBGMAction>}, + {0x9cd7ef66, Factory::make<ksys::snd::BattleDungeonBGMAction>}, {0x9cef3132, Factory::make<action::CollaboShootingStarBrightTower>}, {0x9cf43e50, Factory::make<action::SunMove>}, {0x9cf4f88c, Factory::make<action::MamonoShopStand>}, @@ -2920,7 +2920,7 @@ static Factory sActionFactories[] = { {0xa575d17d, Factory::make<action::OnetimeChangeableASPlay>}, {0xa582c186, Factory::make<action::EventOpenGetDemo>}, {0xa593ceca, Factory::make<action::SimpleLineBeam>}, - {0xa596abfa, Factory::make<action::StopAllDemoSoundAction>}, + {0xa596abfa, Factory::make<ksys::snd::StopAllDemoSoundAction>}, {0xa5abfd97, Factory::make<action::LargeAttack>}, {0xa5bc9062, Factory::make<action::SiteBossShootArrowRain>}, {0xa5d3cb30, Factory::make<action::SetInstEventFlag>}, @@ -2955,7 +2955,7 @@ static Factory sActionFactories[] = { {0xa88570d2, Factory::make<action::SmallDamageDirectPreTargetBone>}, {0xa8bfb550, Factory::make<action::PlayASForDemo>}, {0xa8c6eafc, Factory::make<action::CapturedActElectricParalyisis>}, - {0xa8c8d000, Factory::make<action::SoundOcclusionTagAction>}, + {0xa8c8d000, Factory::make<ksys::snd::SoundOcclusionTagAction>}, {0xa8ec790d, Factory::make<action::ForkBattleNodeForAttackGround>}, {0xa8f367e0, Factory::make<action::NoticeTurn>}, {0xa90d9348, Factory::make<action::OnetimeStopASPlay>}, @@ -3007,7 +3007,7 @@ static Factory sActionFactories[] = { {0xb07febbb, Factory::make<action::GrabAttack>}, {0xb0ada993, Factory::make<action::ForkFourFootActorLustGrass>}, {0xb0bf6bd0, Factory::make<action::StopASIgnite>}, - {0xb0c6419a, Factory::make<action::SceneSoundSetStartProcAction>}, + {0xb0c6419a, Factory::make<ksys::snd::SceneSoundSetStartProcAction>}, {0xb0ce7ce0, Factory::make<action::GanonThrowMultiTornado>}, {0xb0f8b5ac, Factory::make<action::ForkASTrgEmitChmFieldPos>}, {0xb101ef3f, Factory::make<action::FollowDungeonRotateASPlay>}, @@ -3056,7 +3056,7 @@ static Factory sActionFactories[] = { {0xb6b75cbc, Factory::make<action::ForkLodTimer>}, {0xb6bc0561, Factory::make<action::EventAddGameDataIntAction>}, {0xb6dbc430, Factory::make<action::BackToRailFromLava>}, - {0xb6fb6394, Factory::make<action::GroupAllowEmitAction>}, + {0xb6fb6394, Factory::make<ksys::snd::GroupAllowEmitAction>}, {0xb7514257, Factory::make<action::PlayerSleep>}, {0xb7556fdd, Factory::make<action::SwimMove>}, {0xb770bbba, Factory::make<action::ForkNoCountActionReservedTimer>}, @@ -3095,7 +3095,7 @@ static Factory sActionFactories[] = { {0xbc17628d, Factory::make<action::ExplodeReserved>}, {0xbc3bd3c5, Factory::make<action::MultiVacuumRotScaleTimeByDist>}, {0xbc540f22, Factory::make<action::GiantDownSwingAttack>}, - {0xbc7dba7e, Factory::make<action::MusicianSpotBgmTriggerAction>}, + {0xbc7dba7e, Factory::make<ksys::snd::MusicianSpotBgmTriggerAction>}, {0xbca66b70, Factory::make<action::AtOnWait>}, {0xbce5fcd0, Factory::make<action::SetDispStaminaGauge>}, {0xbceeb5ee, Factory::make<action::FlyingCharacterBlownOff>}, @@ -3243,7 +3243,7 @@ static Factory sActionFactories[] = { {0xd1905231, Factory::make<action::WaitMessageDialogEnd>}, {0xd1c07b1e, Factory::make<action::HorseRideShoot>}, {0xd218239d, Factory::make<action::GiantArmorEquip>}, - {0xd219de59, Factory::make<action::CustomDuckingStartAction>}, + {0xd219de59, Factory::make<ksys::snd::CustomDuckingStartAction>}, {0xd2229c44, Factory::make<action::HoldArrowWalk>}, {0xd244efe7, Factory::make<action::RodMagicPhysBall>}, {0xd25249dc, Factory::make<action::SiteBossSpearChangeWaterLevel>}, @@ -3262,7 +3262,7 @@ static Factory sActionFactories[] = { {0xd4bb707c, Factory::make<action::WaitForASTriggerEvent>}, {0xd507150f, Factory::make<action::AnmBlownOffBackward>}, {0xd524bb07, Factory::make<action::EventPlayMovieAction>}, - {0xd560b356, Factory::make<action::SceneSoundNotifyTalkAction>}, + {0xd560b356, Factory::make<ksys::snd::SceneSoundNotifyTalkAction>}, {0xd584dab3, Factory::make<action::GuardianMiniGuardWait>}, {0xd589a506, Factory::make<action::WolfLinkEvent>}, {0xd595067c, Factory::make<action::DemoGetItem>}, @@ -3328,7 +3328,7 @@ static Factory sActionFactories[] = { {0xdefdb460, Factory::make<action::NPCCloseHorseCustom>}, {0xdf2881b9, Factory::make<action::AreaBottomTag>}, {0xdf29f478, Factory::make<action::EnvSetLensFlare>}, - {0xdf2b7595, Factory::make<action::SoundShieldingAreaTagAction>}, + {0xdf2b7595, Factory::make<ksys::snd::SoundShieldingAreaTagAction>}, {0xdf30f896, Factory::make<action::WarpPlayer>}, {0xdf5d37c1, Factory::make<action::PlayerDestinationTurn>}, {0xdf74c346, Factory::make<action::DownloadShiekSensor>}, @@ -3452,12 +3452,12 @@ static Factory sActionFactories[] = { {0xf260bb87, Factory::make<action::RodMagicPhysBallDivision>}, {0xf26859f8, Factory::make<action::FadeInOutWithOptions>}, {0xf275dd24, Factory::make<action::DemoChangeEntityNoHit>}, - {0xf29cb14e, Factory::make<action::CustomDuckingEndAction>}, + {0xf29cb14e, Factory::make<ksys::snd::CustomDuckingEndAction>}, {0xf2c71fbc, Factory::make<action::AnimalFreeze>}, {0xf31a1f15, Factory::make<action::LynelRodeo>}, {0xf33ea367, Factory::make<action::IncreasePlayerMaxHeart>}, {0xf33ff597, Factory::make<action::PlayerWakeBoardGoal>}, - {0xf359c28d, Factory::make<action::SoundReverbAreaTagAction>}, + {0xf359c28d, Factory::make<ksys::snd::SoundReverbAreaTagAction>}, {0xf35a170b, Factory::make<action::SetWorldRotOffsetFromTransBone>}, {0xf376500a, Factory::make<action::ArrowShootMoveWithStickOffset>}, {0xf3a384c0, Factory::make<action::LargeDamage>}, diff --git a/src/Game/Actor/aiAiFactories.cpp b/src/Game/Actor/aiAiFactories.cpp index 530d71aa..0546b8f5 100644 --- a/src/Game/Actor/aiAiFactories.cpp +++ b/src/Game/Actor/aiAiFactories.cpp @@ -297,7 +297,6 @@ #include "Game/Actor/AI/aiEnemyWarnNoticeSelect.h" #include "Game/Actor/AI/aiEnemyWatchKeepingWait.h" #include "Game/Actor/AI/aiEnterFromResetSelect.h" -#include "Game/Actor/AI/aiEnvSeEmitPointRootAI.h" #include "Game/Actor/AI/aiEquipConditionSelect.h" #include "Game/Actor/AI/aiEquipHaveSelector.h" #include "Game/Actor/AI/aiEquipShieldEnemySearchWeapon.h" @@ -885,7 +884,6 @@ #include "Game/Actor/AI/aiShutterFence.h" #include "Game/Actor/AI/aiSignalFlowchartRootAI.h" #include "Game/Actor/AI/aiSignalSendingMagneStickAcceptor.h" -#include "Game/Actor/AI/aiSignaledSpotBgmTrigger.h" #include "Game/Actor/AI/aiSimpleASBridge.h" #include "Game/Actor/AI/aiSimpleEnemyNormal.h" #include "Game/Actor/AI/aiSimpleEscapeFromTarget.h" @@ -934,7 +932,6 @@ #include "Game/Actor/AI/aiSnowOctarockBattle.h" #include "Game/Actor/AI/aiSoundTriggerTag.h" #include "Game/Actor/AI/aiSpearWeaponSelect.h" -#include "Game/Actor/AI/aiSpotBgmTrigger.h" #include "Game/Actor/AI/aiStalEnemyBlownOff.h" #include "Game/Actor/AI/aiStalEnemyChasePart.h" #include "Game/Actor/AI/aiStalEnemyDoShootPartSelect.h" @@ -1177,6 +1174,9 @@ #include "Game/Actor/Player/AI/aiPlayerWaterFall.h" #include "Game/Actor/Player/AI/aiPlayerZoraRide.h" #include "KingSystem/ActorSystem/actAiAi.h" +#include "KingSystem/Sound/Actor/AI/aiEnvSeEmitPointRootAI.h" +#include "KingSystem/Sound/Actor/AI/aiSignaledSpotBgmTrigger.h" +#include "KingSystem/Sound/Actor/AI/aiSpotBgmTrigger.h" namespace uking { @@ -1395,7 +1395,7 @@ static Factory sAiFactories[] = { {0x2b6b3cc4, Factory::make<ai::DragonReturn>}, {0x2bb4c29b, Factory::make<ai::RodRoot>}, {0x2bd26ed8, Factory::make<ai::FriendCallAction>}, - {0x2bdc5bd3, Factory::make<ai::SignaledSpotBgmTrigger>}, + {0x2bdc5bd3, Factory::make<ksys::snd::SignaledSpotBgmTrigger>}, {0x2bf9275a, Factory::make<ai::SandfallWithSound>}, {0x2c179c6a, Factory::make<ai::AppearFromTargetFrontAfterChase>}, {0x2c303b83, Factory::make<ai::LifeChangeDemoCaller>}, @@ -1781,7 +1781,7 @@ static Factory sAiFactories[] = { {0x83954035, Factory::make<ai::CollaborationShootingStarRoot>}, {0x840ecf9b, Factory::make<ai::GolemNoticeWorry>}, {0x8420d2cd, Factory::make<ai::DefWanderAI>}, - {0x85015e28, Factory::make<ai::SpotBgmTrigger>}, + {0x85015e28, Factory::make<ksys::snd::SpotBgmTrigger>}, {0x851d52c6, Factory::make<ai::DungeonMoveTag>}, {0x852fec32, Factory::make<ai::SiteBossReflectArrowRoot>}, {0x85a5c9c2, Factory::make<ai::EnemyTreeWeaponSearchOrBattle>}, @@ -2242,7 +2242,7 @@ static Factory sAiFactories[] = { {0xe63a2601, Factory::make<ai::RemainElectricCannonBeamAttack>}, {0xe6467eac, Factory::make<ai::ChangeWindTagRoot>}, {0xe64b7b7b, Factory::make<ai::ForkActionAndJoin>}, - {0xe689f298, Factory::make<ai::EnvSeEmitPointRootAI>}, + {0xe689f298, Factory::make<ksys::snd::EnvSeEmitPointRootAI>}, {0xe698a93b, Factory::make<ai::DashAndAttack>}, {0xe757fa36, Factory::make<ai::SiteBossLswordRoot>}, {0xe75ced01, Factory::make<ai::AirOctaFlyUp>}, |