summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2026-09-28 03:39:31 +0200
committerLéo Lam <leo@leolam.fr>2026-10-06 03:19:39 +0200
commit6442a24670f69f73aaafb925b625e58aeac8e842 (patch)
tree54e9deededdb340fdc406edf8e3e32739e922209 /src
parent8002f122c8cbd92e8e934c26741d8097d01297f6 (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')
-rw-r--r--src/Game/Actor/Action/CMakeLists.txt6
-rw-r--r--src/Game/Actor/aiActionFactories.cpp12
-rw-r--r--src/KingSystem/Effect/Actor/Action/CMakeLists.txt8
-rw-r--r--src/KingSystem/Effect/Actor/Action/actionEmitEffectLoopAction.cpp (renamed from src/Game/Actor/Action/actionEmitEffectLoopAction.cpp)6
-rw-r--r--src/KingSystem/Effect/Actor/Action/actionEmitEffectLoopAction.h (renamed from src/Game/Actor/Action/actionEmitEffectLoopAction.h)4
-rw-r--r--src/KingSystem/Effect/Actor/Action/actionFootStepCalcOn.cpp (renamed from src/Game/Actor/Action/actionFootStepCalcOn.cpp)6
-rw-r--r--src/KingSystem/Effect/Actor/Action/actionFootStepCalcOn.h (renamed from src/Game/Actor/Action/actionFootStepCalcOn.h)4
-rw-r--r--src/KingSystem/Effect/Actor/Action/actionOneTimeEffectLocaterAction.cpp (renamed from src/Game/Actor/Action/actionOneTimeEffectLocaterAction.cpp)6
-rw-r--r--src/KingSystem/Effect/Actor/Action/actionOneTimeEffectLocaterAction.h (renamed from src/Game/Actor/Action/actionOneTimeEffectLocaterAction.h)4
-rw-r--r--src/KingSystem/Effect/Actor/CMakeLists.txt1
-rw-r--r--src/KingSystem/Effect/CMakeLists.txt2
11 files changed, 32 insertions, 27 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/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>},
diff --git a/src/KingSystem/Effect/Actor/Action/CMakeLists.txt b/src/KingSystem/Effect/Actor/Action/CMakeLists.txt
new file mode 100644
index 00000000..7619f861
--- /dev/null
+++ b/src/KingSystem/Effect/Actor/Action/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(uking PRIVATE
+ actionEmitEffectLoopAction.cpp
+ actionEmitEffectLoopAction.h
+ actionFootStepCalcOn.cpp
+ actionFootStepCalcOn.h
+ actionOneTimeEffectLocaterAction.cpp
+ actionOneTimeEffectLocaterAction.h
+)
diff --git a/src/Game/Actor/Action/actionEmitEffectLoopAction.cpp b/src/KingSystem/Effect/Actor/Action/actionEmitEffectLoopAction.cpp
index 06bfe2e5..7ce9e33f 100644
--- a/src/Game/Actor/Action/actionEmitEffectLoopAction.cpp
+++ b/src/KingSystem/Effect/Actor/Action/actionEmitEffectLoopAction.cpp
@@ -1,6 +1,6 @@
-#include "Game/Actor/Action/actionEmitEffectLoopAction.h"
+#include "KingSystem/Effect/Actor/Action/actionEmitEffectLoopAction.h"
-namespace uking::action {
+namespace ksys::eft {
EmitEffectLoopAction::EmitEffectLoopAction(const InitArg& arg) : ksys::act::ai::Action(arg) {}
@@ -43,4 +43,4 @@ void EmitEffectLoopAction::calc_() {
ksys::act::ai::Action::calc_();
}
-} // namespace uking::action
+} // namespace ksys::eft
diff --git a/src/Game/Actor/Action/actionEmitEffectLoopAction.h b/src/KingSystem/Effect/Actor/Action/actionEmitEffectLoopAction.h
index ceda0fa5..7892f76d 100644
--- a/src/Game/Actor/Action/actionEmitEffectLoopAction.h
+++ b/src/KingSystem/Effect/Actor/Action/actionEmitEffectLoopAction.h
@@ -2,7 +2,7 @@
#include "KingSystem/ActorSystem/actAiAction.h"
-namespace uking::action {
+namespace ksys::eft {
class EmitEffectLoopAction : public ksys::act::ai::Action {
SEAD_RTTI_OVERRIDE(EmitEffectLoopAction, ksys::act::ai::Action)
@@ -56,4 +56,4 @@ protected:
bool* mCutChangeReset_d{};
};
-} // namespace uking::action
+} // namespace ksys::eft
diff --git a/src/Game/Actor/Action/actionFootStepCalcOn.cpp b/src/KingSystem/Effect/Actor/Action/actionFootStepCalcOn.cpp
index c052ea33..c0f2c575 100644
--- a/src/Game/Actor/Action/actionFootStepCalcOn.cpp
+++ b/src/KingSystem/Effect/Actor/Action/actionFootStepCalcOn.cpp
@@ -1,6 +1,6 @@
-#include "Game/Actor/Action/actionFootStepCalcOn.h"
+#include "KingSystem/Effect/Actor/Action/actionFootStepCalcOn.h"
-namespace uking::action {
+namespace ksys::eft {
FootStepCalcOn::FootStepCalcOn(const InitArg& arg) : ksys::act::ai::Action(arg) {}
@@ -27,4 +27,4 @@ void FootStepCalcOn::calc_() {
ksys::act::ai::Action::calc_();
}
-} // namespace uking::action
+} // namespace ksys::eft
diff --git a/src/Game/Actor/Action/actionFootStepCalcOn.h b/src/KingSystem/Effect/Actor/Action/actionFootStepCalcOn.h
index 8ea347e6..55cbe2a7 100644
--- a/src/Game/Actor/Action/actionFootStepCalcOn.h
+++ b/src/KingSystem/Effect/Actor/Action/actionFootStepCalcOn.h
@@ -2,7 +2,7 @@
#include "KingSystem/ActorSystem/actAiAction.h"
-namespace uking::action {
+namespace ksys::eft {
class FootStepCalcOn : public ksys::act::ai::Action {
SEAD_RTTI_OVERRIDE(FootStepCalcOn, ksys::act::ai::Action)
@@ -24,4 +24,4 @@ protected:
sead::SafeString mInstanceName_d{};
};
-} // namespace uking::action
+} // namespace ksys::eft
diff --git a/src/Game/Actor/Action/actionOneTimeEffectLocaterAction.cpp b/src/KingSystem/Effect/Actor/Action/actionOneTimeEffectLocaterAction.cpp
index 3d585b81..c5fd7f61 100644
--- a/src/Game/Actor/Action/actionOneTimeEffectLocaterAction.cpp
+++ b/src/KingSystem/Effect/Actor/Action/actionOneTimeEffectLocaterAction.cpp
@@ -1,6 +1,6 @@
-#include "Game/Actor/Action/actionOneTimeEffectLocaterAction.h"
+#include "KingSystem/Effect/Actor/Action/actionOneTimeEffectLocaterAction.h"
-namespace uking::action {
+namespace ksys::eft {
OneTimeEffectLocaterAction::OneTimeEffectLocaterAction(const InitArg& arg)
: ksys::act::ai::Action(arg) {}
@@ -25,4 +25,4 @@ void OneTimeEffectLocaterAction::calc_() {
ksys::act::ai::Action::calc_();
}
-} // namespace uking::action
+} // namespace ksys::eft
diff --git a/src/Game/Actor/Action/actionOneTimeEffectLocaterAction.h b/src/KingSystem/Effect/Actor/Action/actionOneTimeEffectLocaterAction.h
index 3013e350..fa8869a8 100644
--- a/src/Game/Actor/Action/actionOneTimeEffectLocaterAction.h
+++ b/src/KingSystem/Effect/Actor/Action/actionOneTimeEffectLocaterAction.h
@@ -2,7 +2,7 @@
#include "KingSystem/ActorSystem/actAiAction.h"
-namespace uking::action {
+namespace ksys::eft {
class OneTimeEffectLocaterAction : public ksys::act::ai::Action {
SEAD_RTTI_OVERRIDE(OneTimeEffectLocaterAction, ksys::act::ai::Action)
@@ -19,4 +19,4 @@ protected:
void calc_() override;
};
-} // namespace uking::action
+} // namespace ksys::eft
diff --git a/src/KingSystem/Effect/Actor/CMakeLists.txt b/src/KingSystem/Effect/Actor/CMakeLists.txt
new file mode 100644
index 00000000..6d8235f1
--- /dev/null
+++ b/src/KingSystem/Effect/Actor/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(Action)
diff --git a/src/KingSystem/Effect/CMakeLists.txt b/src/KingSystem/Effect/CMakeLists.txt
index e64a5800..22c3121d 100644
--- a/src/KingSystem/Effect/CMakeLists.txt
+++ b/src/KingSystem/Effect/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_subdirectory(Actor)
+
target_sources(uking PRIVATE
eftInfoData.cpp
eftInfoData.h