diff options
| author | Léo Lam <leo@leolam.fr> | 2026-09-28 03:39:31 +0200 |
|---|---|---|
| committer | Léo Lam <leo@leolam.fr> | 2026-10-06 03:19:39 +0200 |
| commit | 6442a24670f69f73aaafb925b625e58aeac8e842 (patch) | |
| tree | 54e9deededdb340fdc406edf8e3e32739e922209 /src/Game/Actor | |
| parent | 8002f122c8cbd92e8e934c26741d8097d01297f6 (diff) | |
eft: move the effect actions to KingSystem/Effect
Link order: FootStepCalcOn (0x7100da1968) lies in the KingSystem/Effect
block.
(AI assisted using Claude Fable 5.1 and Claude Opus 5.5)
Diffstat (limited to 'src/Game/Actor')
| -rw-r--r-- | src/Game/Actor/Action/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/Game/Actor/Action/actionEmitEffectLoopAction.cpp | 46 | ||||
| -rw-r--r-- | src/Game/Actor/Action/actionEmitEffectLoopAction.h | 59 | ||||
| -rw-r--r-- | src/Game/Actor/Action/actionFootStepCalcOn.cpp | 30 | ||||
| -rw-r--r-- | src/Game/Actor/Action/actionFootStepCalcOn.h | 27 | ||||
| -rw-r--r-- | src/Game/Actor/Action/actionOneTimeEffectLocaterAction.cpp | 28 | ||||
| -rw-r--r-- | src/Game/Actor/Action/actionOneTimeEffectLocaterAction.h | 22 | ||||
| -rw-r--r-- | src/Game/Actor/aiActionFactories.cpp | 12 |
8 files changed, 6 insertions, 224 deletions
diff --git a/src/Game/Actor/Action/CMakeLists.txt b/src/Game/Actor/Action/CMakeLists.txt index efdca8d3..bd494ba6 100644 --- a/src/Game/Actor/Action/CMakeLists.txt +++ b/src/Game/Actor/Action/CMakeLists.txt @@ -679,8 +679,6 @@ target_sources(uking PRIVATE actionElectricDie.h actionElectricParalysis.cpp actionElectricParalysis.h - actionEmitEffectLoopAction.cpp - actionEmitEffectLoopAction.h actionEmitElectricWaterBall.cpp actionEmitElectricWaterBall.h actionEndChangeableASPlay.cpp @@ -1003,8 +1001,6 @@ target_sources(uking PRIVATE actionFollowIgniteToBonePos.h actionFollowIgniteToSelfPos.cpp actionFollowIgniteToSelfPos.h - actionFootStepCalcOn.cpp - actionFootStepCalcOn.h actionForbidComeback.cpp actionForbidComeback.h actionForbidSettingInstEventFlag.cpp @@ -2230,8 +2226,6 @@ target_sources(uking PRIVATE actionOnEnterSwapDropTableActor.h actionOnetimeChangeableASPlay.cpp actionOnetimeChangeableASPlay.h - actionOneTimeEffectLocaterAction.cpp - actionOneTimeEffectLocaterAction.h actionOnetimeHoverASPlay.cpp actionOnetimeHoverASPlay.h actionOnetimeMoveASPlay.cpp diff --git a/src/Game/Actor/Action/actionEmitEffectLoopAction.cpp b/src/Game/Actor/Action/actionEmitEffectLoopAction.cpp deleted file mode 100644 index 06bfe2e5..00000000 --- a/src/Game/Actor/Action/actionEmitEffectLoopAction.cpp +++ /dev/null @@ -1,46 +0,0 @@ -#include "Game/Actor/Action/actionEmitEffectLoopAction.h" - -namespace uking::action { - -EmitEffectLoopAction::EmitEffectLoopAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -EmitEffectLoopAction::~EmitEffectLoopAction() = default; - -bool EmitEffectLoopAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void EmitEffectLoopAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EmitEffectLoopAction::leave_() { - ksys::act::ai::Action::leave_(); -} - -void EmitEffectLoopAction::loadParams_() { - getDynamicParam(&mScale_d, "Scale"); - getDynamicParam(&mX_d, "X"); - getDynamicParam(&mY_d, "Y"); - getDynamicParam(&mZ_d, "Z"); - getDynamicParam(&mRX_d, "RX"); - getDynamicParam(&mRY_d, "RY"); - getDynamicParam(&mRZ_d, "RZ"); - getDynamicParam(&mR_d, "R"); - getDynamicParam(&mG_d, "G"); - getDynamicParam(&mB_d, "B"); - getDynamicParam(&mA_d, "A"); - getDynamicParam(&mOverWrite_d, "OverWrite"); - getDynamicParam(&mNoFade_d, "NoFade"); - getDynamicParam(&mActor_d, "Actor"); - getDynamicParam(&mInstanceName_d, "InstanceName"); - getDynamicParam(&mELinkKey_d, "ELinkKey"); - getDynamicParam(&mOption_d, "Option"); - getDynamicParam(&mCutChangeReset_d, "CutChangeReset"); -} - -void EmitEffectLoopAction::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionEmitEffectLoopAction.h b/src/Game/Actor/Action/actionEmitEffectLoopAction.h deleted file mode 100644 index ceda0fa5..00000000 --- a/src/Game/Actor/Action/actionEmitEffectLoopAction.h +++ /dev/null @@ -1,59 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class EmitEffectLoopAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(EmitEffectLoopAction, ksys::act::ai::Action) -public: - explicit EmitEffectLoopAction(const InitArg& arg); - ~EmitEffectLoopAction() 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 - float* mScale_d{}; - // dynamic_param at offset 0x28 - float* mX_d{}; - // dynamic_param at offset 0x30 - float* mY_d{}; - // dynamic_param at offset 0x38 - float* mZ_d{}; - // dynamic_param at offset 0x40 - float* mRX_d{}; - // dynamic_param at offset 0x48 - float* mRY_d{}; - // dynamic_param at offset 0x50 - float* mRZ_d{}; - // dynamic_param at offset 0x58 - float* mR_d{}; - // dynamic_param at offset 0x60 - float* mG_d{}; - // dynamic_param at offset 0x68 - float* mB_d{}; - // dynamic_param at offset 0x70 - float* mA_d{}; - // dynamic_param at offset 0x78 - bool* mOverWrite_d{}; - // dynamic_param at offset 0x80 - bool* mNoFade_d{}; - // dynamic_param at offset 0x88 - sead::SafeString mActor_d{}; - // dynamic_param at offset 0x98 - sead::SafeString mInstanceName_d{}; - // dynamic_param at offset 0xa8 - sead::SafeString mELinkKey_d{}; - // dynamic_param at offset 0xb8 - sead::SafeString mOption_d{}; - // dynamic_param at offset 0xc8 - bool* mCutChangeReset_d{}; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionFootStepCalcOn.cpp b/src/Game/Actor/Action/actionFootStepCalcOn.cpp deleted file mode 100644 index c052ea33..00000000 --- a/src/Game/Actor/Action/actionFootStepCalcOn.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "Game/Actor/Action/actionFootStepCalcOn.h" - -namespace uking::action { - -FootStepCalcOn::FootStepCalcOn(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -FootStepCalcOn::~FootStepCalcOn() = default; - -bool FootStepCalcOn::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void FootStepCalcOn::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void FootStepCalcOn::leave_() { - ksys::act::ai::Action::leave_(); -} - -void FootStepCalcOn::loadParams_() { - getDynamicParam(&mActor_d, "Actor"); - getDynamicParam(&mInstanceName_d, "InstanceName"); -} - -void FootStepCalcOn::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionFootStepCalcOn.h b/src/Game/Actor/Action/actionFootStepCalcOn.h deleted file mode 100644 index 8ea347e6..00000000 --- a/src/Game/Actor/Action/actionFootStepCalcOn.h +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class FootStepCalcOn : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(FootStepCalcOn, ksys::act::ai::Action) -public: - explicit FootStepCalcOn(const InitArg& arg); - ~FootStepCalcOn() 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 mActor_d{}; - // dynamic_param at offset 0x30 - sead::SafeString mInstanceName_d{}; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionOneTimeEffectLocaterAction.cpp b/src/Game/Actor/Action/actionOneTimeEffectLocaterAction.cpp deleted file mode 100644 index 3d585b81..00000000 --- a/src/Game/Actor/Action/actionOneTimeEffectLocaterAction.cpp +++ /dev/null @@ -1,28 +0,0 @@ -#include "Game/Actor/Action/actionOneTimeEffectLocaterAction.h" - -namespace uking::action { - -OneTimeEffectLocaterAction::OneTimeEffectLocaterAction(const InitArg& arg) - : ksys::act::ai::Action(arg) {} - -OneTimeEffectLocaterAction::~OneTimeEffectLocaterAction() = default; - -bool OneTimeEffectLocaterAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void OneTimeEffectLocaterAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void OneTimeEffectLocaterAction::leave_() { - ksys::act::ai::Action::leave_(); -} - -void OneTimeEffectLocaterAction::loadParams_() {} - -void OneTimeEffectLocaterAction::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionOneTimeEffectLocaterAction.h b/src/Game/Actor/Action/actionOneTimeEffectLocaterAction.h deleted file mode 100644 index 3013e350..00000000 --- a/src/Game/Actor/Action/actionOneTimeEffectLocaterAction.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class OneTimeEffectLocaterAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(OneTimeEffectLocaterAction, ksys::act::ai::Action) -public: - explicit OneTimeEffectLocaterAction(const InitArg& arg); - ~OneTimeEffectLocaterAction() 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 616aa807..2f7112b3 100644 --- a/src/Game/Actor/aiActionFactories.cpp +++ b/src/Game/Actor/aiActionFactories.cpp @@ -310,7 +310,6 @@ #include "Game/Actor/Action/actionElectricCableEnergized.h" #include "Game/Actor/Action/actionElectricDie.h" #include "Game/Actor/Action/actionElectricParalysis.h" -#include "Game/Actor/Action/actionEmitEffectLoopAction.h" #include "Game/Actor/Action/actionEmitElectricWaterBall.h" #include "Game/Actor/Action/actionEndChangeableASPlay.h" #include "Game/Actor/Action/actionEnemyAreaInOutSendMessage.h" @@ -460,7 +459,6 @@ #include "Game/Actor/Action/actionFollowDungeonRotateASPlay.h" #include "Game/Actor/Action/actionFollowIgniteToBonePos.h" #include "Game/Actor/Action/actionFollowIgniteToSelfPos.h" -#include "Game/Actor/Action/actionFootStepCalcOn.h" #include "Game/Actor/Action/actionForbidComeback.h" #include "Game/Actor/Action/actionForbidSettingInstEventFlag.h" #include "Game/Actor/Action/actionForceChangeAction.h" @@ -1016,7 +1014,6 @@ #include "Game/Actor/Action/actionOnEnterSwapDropTableActor.h" #include "Game/Actor/Action/actionOnLeaveAttackInterval.h" #include "Game/Actor/Action/actionOnMUAssignSaveForUsed.h" -#include "Game/Actor/Action/actionOneTimeEffectLocaterAction.h" #include "Game/Actor/Action/actionOneTimeStopASPlayerNoEnd.h" #include "Game/Actor/Action/actionOneTimeWaterFloatStopASPlay.h" #include "Game/Actor/Action/actionOnetimeChangeableASPlay.h" @@ -1732,6 +1729,9 @@ #include "Game/Actor/System/Action/actionSystemSetWindAction.h" #include "KingSystem/ActorSystem/actAiAction.h" #include "KingSystem/ActorSystem/actionDummyAction.h" +#include "KingSystem/Effect/Actor/Action/actionEmitEffectLoopAction.h" +#include "KingSystem/Effect/Actor/Action/actionFootStepCalcOn.h" +#include "KingSystem/Effect/Actor/Action/actionOneTimeEffectLocaterAction.h" #include "KingSystem/Sound/Actor/Action/actionBattleDungeonBGMAction.h" #include "KingSystem/Sound/Actor/Action/actionCustomDuckingEndAction.h" #include "KingSystem/Sound/Actor/Action/actionCustomDuckingStartAction.h" @@ -1900,7 +1900,7 @@ static Factory sActionFactories[] = { {0x13f11ba3, Factory::make<action::Off>}, {0x14041be8, Factory::make<action::GameDataSubFloat>}, {0x140f2d8b, Factory::make<action::ImmediateStopOwnedHorse>}, - {0x143eb340, Factory::make<action::EmitEffectLoopAction>}, + {0x143eb340, Factory::make<ksys::eft::EmitEffectLoopAction>}, {0x14441f7e, Factory::make<action::UseNavMeshConnectAction>}, {0x144c0919, Factory::make<ksys::snd::EventBgmStopAction>}, {0x145bcbee, Factory::make<ksys::snd::FrontierSpotBgmTriggerAction>}, @@ -1910,7 +1910,7 @@ static Factory sActionFactories[] = { {0x150ece86, Factory::make<action::PlayerLookAtObjectNow>}, {0x1527f16a, Factory::make<action::LookAtObjectSeachAwareness>}, {0x1558fc14, Factory::make<action::SweepCollision>}, - {0x1565cded, Factory::make<action::FootStepCalcOn>}, + {0x1565cded, Factory::make<ksys::eft::FootStepCalcOn>}, {0x15e680b2, Factory::make<action::SandwormDamageJumpReaction>}, {0x15ff2b69, Factory::make<action::AnimMatrixDriven>}, {0x16308239, Factory::make<action::ChangeFreeMovingForDemo>}, @@ -2008,7 +2008,7 @@ static Factory sActionFactories[] = { {0x24c7daed, Factory::make<action::ForkStalEnemyGrabOwnPart>}, {0x254e484f, Factory::make<action::TargetCircleMoveKeepDist>}, {0x255ab9d5, Factory::make<action::EnemyRushAttack>}, - {0x25817612, Factory::make<action::OneTimeEffectLocaterAction>}, + {0x25817612, Factory::make<ksys::eft::OneTimeEffectLocaterAction>}, {0x2585eb82, Factory::make<action::OnetimeStopASSyncPlay>}, {0x25dd4bc2, Factory::make<action::SystemApplyEnvSetAction>}, {0x25ea26f5, Factory::make<action::EventOpenMessageTips>}, |
