From 6442a24670f69f73aaafb925b625e58aeac8e842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Mon, 28 Sep 2026 03:39:31 +0200 Subject: [PATCH] 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) --- data/uking_functions.csv | 62 +++++++++---------- src/Game/Actor/Action/CMakeLists.txt | 6 -- src/Game/Actor/aiActionFactories.cpp | 12 ++-- .../Effect/Actor/Action/CMakeLists.txt | 8 +++ .../Action/actionEmitEffectLoopAction.cpp | 6 +- .../Actor/Action/actionEmitEffectLoopAction.h | 4 +- .../Actor/Action/actionFootStepCalcOn.cpp | 6 +- .../Actor/Action/actionFootStepCalcOn.h | 4 +- .../actionOneTimeEffectLocaterAction.cpp | 6 +- .../Action/actionOneTimeEffectLocaterAction.h | 4 +- src/KingSystem/Effect/Actor/CMakeLists.txt | 1 + src/KingSystem/Effect/CMakeLists.txt | 2 + 12 files changed, 63 insertions(+), 58 deletions(-) create mode 100644 src/KingSystem/Effect/Actor/Action/CMakeLists.txt rename src/{Game => KingSystem/Effect}/Actor/Action/actionEmitEffectLoopAction.cpp (91%) rename src/{Game => KingSystem/Effect}/Actor/Action/actionEmitEffectLoopAction.h (96%) rename src/{Game => KingSystem/Effect}/Actor/Action/actionFootStepCalcOn.cpp (84%) rename src/{Game => KingSystem/Effect}/Actor/Action/actionFootStepCalcOn.h (91%) rename src/{Game => KingSystem/Effect}/Actor/Action/actionOneTimeEffectLocaterAction.cpp (83%) rename src/{Game => KingSystem/Effect}/Actor/Action/actionOneTimeEffectLocaterAction.h (90%) create mode 100644 src/KingSystem/Effect/Actor/CMakeLists.txt diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 4e5979a5..bb90268e 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -42043,7 +42043,7 @@ Address,Quality,Size,Name 0x00000071006a4be4,U,000056,AI_F_Action_Unknown_13f11ba3 0x00000071006a4c1c,O,000056,_ZN4ksys3act2ai13ActionFactory4makeIN5uking6action16GameDataSubFloatEEEPNS1_6ActionERKNS1_10ActionBase7InitArgEPN4sead4HeapE 0x00000071006a4c54,O,000056,_ZN4ksys3act2ai13ActionFactory4makeIN5uking6action23ImmediateStopOwnedHorseEEEPNS1_6ActionERKNS1_10ActionBase7InitArgEPN4sead4HeapE -0x00000071006a4c8c,U,000056,AI_F_Action_EmitEffectLoopAction +0x00000071006a4c8c,M,000056,_ZN4ksys3act2ai13ActionFactory4makeINS_3eft20EmitEffectLoopActionEEEPNS1_6ActionERKNS1_10ActionBase7InitArgEPN4sead4HeapE 0x00000071006a4cc4,O,000056,_ZN4ksys3act2ai13ActionFactory4makeIN5uking6action23UseNavMeshConnectActionEEEPNS1_6ActionERKNS1_10ActionBase7InitArgEPN4sead4HeapE 0x00000071006a4cfc,O,000056,_ZN4ksys3act2ai13ActionFactory4makeINS_3snd18EventBgmStopActionEEEPNS1_6ActionERKNS1_10ActionBase7InitArgEPN4sead4HeapE 0x00000071006a4d34,M,000056,_ZN4ksys3act2ai13ActionFactory4makeINS_3snd28FrontierSpotBgmTriggerActionEEEPNS1_6ActionERKNS1_10ActionBase7InitArgEPN4sead4HeapE @@ -42053,7 +42053,7 @@ Address,Quality,Size,Name 0x00000071006a4e14,U,000056,AI_F_Action_PlayerLookAtObjectNow 0x00000071006a4e4c,U,000056,AI_F_Action_LookAtObjectSeachAwareness 0x00000071006a4e84,O,000056,_ZN4ksys3act2ai13ActionFactory4makeIN5uking6action14SweepCollisionEEEPNS1_6ActionERKNS1_10ActionBase7InitArgEPN4sead4HeapE -0x00000071006a4ebc,O,000056,_ZN4ksys3act2ai13ActionFactory4makeIN5uking6action14FootStepCalcOnEEEPNS1_6ActionERKNS1_10ActionBase7InitArgEPN4sead4HeapE +0x00000071006a4ebc,O,000056,_ZN4ksys3act2ai13ActionFactory4makeINS_3eft14FootStepCalcOnEEEPNS1_6ActionERKNS1_10ActionBase7InitArgEPN4sead4HeapE 0x00000071006a4ef4,U,000056,AI_F_Action_SandwormDamageJumpReaction 0x00000071006a4f2c,U,000056,AI_F_Action_AnimMatrixDriven 0x00000071006a4f64,O,000056,_ZN4ksys3act2ai13ActionFactory4makeIN5uking6action23ChangeFreeMovingForDemoEEEPNS1_6ActionERKNS1_10ActionBase7InitArgEPN4sead4HeapE @@ -42150,7 +42150,7 @@ Address,Quality,Size,Name 0x00000071006a634c,U,000056,AI_F_Action_ForkStalEnemyGrabOwnPart 0x00000071006a6384,U,000056,AI_F_Action_TargetCircleMoveKeepDist 0x00000071006a63bc,U,000056,AI_F_Action_EnemyRushAttack -0x00000071006a63f4,U,000056,AI_F_Action_OneTimeEffectLocaterAction +0x00000071006a63f4,M,000056,_ZN4ksys3act2ai13ActionFactory4makeINS_3eft26OneTimeEffectLocaterActionEEEPNS1_6ActionERKNS1_10ActionBase7InitArgEPN4sead4HeapE 0x00000071006a642c,O,000056,_ZN4ksys3act2ai13ActionFactory4makeIN5uking6action21OnetimeStopASSyncPlayEEEPNS1_6ActionERKNS1_10ActionBase7InitArgEPN4sead4HeapE 0x00000071006a6464,O,000056,_ZN4ksys3act2ai13ActionFactory4makeIN5uking6action23SystemApplyEnvSetActionEEEPNS1_6ActionERKNS1_10ActionBase7InitArgEPN4sead4HeapE 0x00000071006a649c,U,000056,AI_F_Action_EventOpenMessageTips @@ -75792,37 +75792,37 @@ Address,Quality,Size,Name 0x0000007100da0b00,U,000452,emitItemKirakira_Plus 0x0000007100da0cc4,U,000080, 0x0000007100da0d14,U,000116,AI_Action_EmitEffectLoopAction::ctor -0x0000007100da0d88,O,000008,_ZN5uking6action20EmitEffectLoopAction5init_EPN4sead4HeapE -0x0000007100da0d90,W,000004,_ZN5uking6action20EmitEffectLoopAction6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100da0d88,O,000008,_ZN4ksys3eft20EmitEffectLoopAction5init_EPN4sead4HeapE +0x0000007100da0d90,W,000004,_ZN4ksys3eft20EmitEffectLoopAction6enter_EPNS_3act2ai15InlineParamPackE 0x0000007100da0d94,U,001024,AI_Action_EmitEffectLoopAction::doStuff -0x0000007100da1194,W,000316,_ZN5uking6action20EmitEffectLoopAction5calc_Ev -0x0000007100da12d0,W,000228,_ZN5uking6action20EmitEffectLoopAction6leave_Ev -0x0000007100da13b4,O,001008,_ZN5uking6action20EmitEffectLoopAction11loadParams_Ev -0x0000007100da17a4,O,000288,_ZNK5uking6action20EmitEffectLoopAction27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100da18c4,O,000092,_ZNK5uking6action20EmitEffectLoopAction18getRuntimeTypeInfoEv -0x0000007100da1920,O,000020,_ZN5uking6action20EmitEffectLoopActionD1Ev -0x0000007100da1934,O,000052,_ZN5uking6action20EmitEffectLoopActionD0Ev -0x0000007100da1968,O,000076,_ZN5uking6action14FootStepCalcOnC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x0000007100da19b4,O,000020,_ZN5uking6action14FootStepCalcOnD1Ev -0x0000007100da19c8,O,000052,_ZN5uking6action14FootStepCalcOnD0Ev -0x0000007100da19fc,O,000008,_ZN5uking6action14FootStepCalcOn5init_EPN4sead4HeapE -0x0000007100da1a04,W,000008,_ZN5uking6action14FootStepCalcOn6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100da1194,W,000316,_ZN4ksys3eft20EmitEffectLoopAction5calc_Ev +0x0000007100da12d0,W,000228,_ZN4ksys3eft20EmitEffectLoopAction6leave_Ev +0x0000007100da13b4,O,001008,_ZN4ksys3eft20EmitEffectLoopAction11loadParams_Ev +0x0000007100da17a4,O,000288,_ZNK4ksys3eft20EmitEffectLoopAction27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100da18c4,O,000092,_ZNK4ksys3eft20EmitEffectLoopAction18getRuntimeTypeInfoEv +0x0000007100da1920,O,000020,_ZN4ksys3eft20EmitEffectLoopActionD1Ev +0x0000007100da1934,O,000052,_ZN4ksys3eft20EmitEffectLoopActionD0Ev +0x0000007100da1968,O,000076,_ZN4ksys3eft14FootStepCalcOnC1ERKNS_3act2ai10ActionBase7InitArgE +0x0000007100da19b4,O,000020,_ZN4ksys3eft14FootStepCalcOnD1Ev +0x0000007100da19c8,O,000052,_ZN4ksys3eft14FootStepCalcOnD0Ev +0x0000007100da19fc,O,000008,_ZN4ksys3eft14FootStepCalcOn5init_EPN4sead4HeapE +0x0000007100da1a04,W,000008,_ZN4ksys3eft14FootStepCalcOn6enter_EPNS_3act2ai15InlineParamPackE 0x0000007100da1a0c,U,000388, -0x0000007100da1b90,O,000004,_ZN5uking6action14FootStepCalcOn5calc_Ev -0x0000007100da1b94,W,000008,_ZN5uking6action14FootStepCalcOn6leave_Ev -0x0000007100da1b9c,O,000160,_ZN5uking6action14FootStepCalcOn11loadParams_Ev -0x0000007100da1c3c,O,000288,_ZNK5uking6action14FootStepCalcOn27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100da1d5c,O,000092,_ZNK5uking6action14FootStepCalcOn18getRuntimeTypeInfoEv +0x0000007100da1b90,O,000004,_ZN4ksys3eft14FootStepCalcOn5calc_Ev +0x0000007100da1b94,W,000008,_ZN4ksys3eft14FootStepCalcOn6leave_Ev +0x0000007100da1b9c,O,000160,_ZN4ksys3eft14FootStepCalcOn11loadParams_Ev +0x0000007100da1c3c,O,000288,_ZNK4ksys3eft14FootStepCalcOn27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100da1d5c,O,000092,_ZNK4ksys3eft14FootStepCalcOn18getRuntimeTypeInfoEv 0x0000007100da1db8,U,000068,AI_Action_OneTimeEffectLocaterAction::ctor -0x0000007100da1dfc,O,000020,_ZN5uking6action26OneTimeEffectLocaterActionD1Ev -0x0000007100da1e10,O,000052,_ZN5uking6action26OneTimeEffectLocaterActionD0Ev -0x0000007100da1e44,W,000012,_ZN5uking6action26OneTimeEffectLocaterAction5init_EPN4sead4HeapE -0x0000007100da1e50,O,000004,_ZN5uking6action26OneTimeEffectLocaterAction6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100da1e54,W,000320,_ZN5uking6action26OneTimeEffectLocaterAction5calc_Ev -0x0000007100da1f94,O,000004,_ZN5uking6action26OneTimeEffectLocaterAction6leave_Ev -0x0000007100da1f98,O,000004,_ZN5uking6action26OneTimeEffectLocaterAction11loadParams_Ev -0x0000007100da1f9c,O,000288,_ZNK5uking6action26OneTimeEffectLocaterAction27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100da20bc,O,000092,_ZNK5uking6action26OneTimeEffectLocaterAction18getRuntimeTypeInfoEv +0x0000007100da1dfc,O,000020,_ZN4ksys3eft26OneTimeEffectLocaterActionD1Ev +0x0000007100da1e10,O,000052,_ZN4ksys3eft26OneTimeEffectLocaterActionD0Ev +0x0000007100da1e44,W,000012,_ZN4ksys3eft26OneTimeEffectLocaterAction5init_EPN4sead4HeapE +0x0000007100da1e50,O,000004,_ZN4ksys3eft26OneTimeEffectLocaterAction6enter_EPNS_3act2ai15InlineParamPackE +0x0000007100da1e54,W,000320,_ZN4ksys3eft26OneTimeEffectLocaterAction5calc_Ev +0x0000007100da1f94,O,000004,_ZN4ksys3eft26OneTimeEffectLocaterAction6leave_Ev +0x0000007100da1f98,O,000004,_ZN4ksys3eft26OneTimeEffectLocaterAction11loadParams_Ev +0x0000007100da1f9c,O,000288,_ZNK4ksys3eft26OneTimeEffectLocaterAction27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100da20bc,O,000092,_ZNK4ksys3eft26OneTimeEffectLocaterAction18getRuntimeTypeInfoEv 0x0000007100da2118,U,000084, 0x0000007100da216c,U,000452, 0x0000007100da2330,U,000148, 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}, {0x14041be8, Factory::make}, {0x140f2d8b, Factory::make}, - {0x143eb340, Factory::make}, + {0x143eb340, Factory::make}, {0x14441f7e, Factory::make}, {0x144c0919, Factory::make}, {0x145bcbee, Factory::make}, @@ -1910,7 +1910,7 @@ static Factory sActionFactories[] = { {0x150ece86, Factory::make}, {0x1527f16a, Factory::make}, {0x1558fc14, Factory::make}, - {0x1565cded, Factory::make}, + {0x1565cded, Factory::make}, {0x15e680b2, Factory::make}, {0x15ff2b69, Factory::make}, {0x16308239, Factory::make}, @@ -2008,7 +2008,7 @@ static Factory sActionFactories[] = { {0x24c7daed, Factory::make}, {0x254e484f, Factory::make}, {0x255ab9d5, Factory::make}, - {0x25817612, Factory::make}, + {0x25817612, Factory::make}, {0x2585eb82, Factory::make}, {0x25dd4bc2, Factory::make}, {0x25ea26f5, Factory::make}, 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 similarity index 91% rename from src/Game/Actor/Action/actionEmitEffectLoopAction.cpp rename to 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 similarity index 96% rename from src/Game/Actor/Action/actionEmitEffectLoopAction.h rename to 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 similarity index 84% rename from src/Game/Actor/Action/actionFootStepCalcOn.cpp rename to 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 similarity index 91% rename from src/Game/Actor/Action/actionFootStepCalcOn.h rename to 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 similarity index 83% rename from src/Game/Actor/Action/actionOneTimeEffectLocaterAction.cpp rename to 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 similarity index 90% rename from src/Game/Actor/Action/actionOneTimeEffectLocaterAction.h rename to 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