AI: merge the duplicate DummyAction into ksys

The action factory uses the single ksys ctor for both entries and
DummyDropTable's ctor calls it too; deriving from it makes
DummyDropTable's five functions match.

(AI assisted using Claude Fable 5.1 and Claude Opus 5.5)

6 files changed, 10 insertions, 54 deletions

diff --git a/src/Game/Actor/Action/CMakeLists.txt b/src/Game/Actor/Action/CMakeLists.txt
index a1dcc114..efdca8d3 100644
--- a/src/Game/Actor/Action/CMakeLists.txt
+++ b/src/Game/Actor/Action/CMakeLists.txt
@@ -623,8 +623,6 @@ target_sources(uking PRIVATE
   actionDropWeapon.h
   actionDrowningDeath.cpp
   actionDrowningDeath.h
-  actionDummyAction.cpp
-  actionDummyAction.h
   actionDummyDropTable.cpp
   actionDummyDropTable.h
   actionDummyTriggerAction.cpp
diff --git a/src/Game/Actor/Action/actionDummyAction.cpp b/src/Game/Actor/Action/actionDummyAction.cpp
deleted file mode 100644
index d03c0486..00000000
--- a/src/Game/Actor/Action/actionDummyAction.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "Game/Actor/Action/actionDummyAction.h"
-
-namespace uking::action {
-
-DummyAction::DummyAction(const InitArg& arg) : ksys::act::ai::Action(arg) {}
-
-void DummyAction::enter_(ksys::act::ai::InlineParamPack* params) {
-    ksys::act::ai::Action::enter_(params);
-}
-
-void DummyAction::leave_() {
-    ksys::act::ai::Action::leave_();
-}
-
-void DummyAction::loadParams_() {}
-
-void DummyAction::calc_() {
-    ksys::act::ai::Action::calc_();
-}
-
-}  // namespace uking::action
diff --git a/src/Game/Actor/Action/actionDummyAction.h b/src/Game/Actor/Action/actionDummyAction.h
deleted file mode 100644
index f96609e4..00000000
--- a/src/Game/Actor/Action/actionDummyAction.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "KingSystem/ActorSystem/actAiAction.h"
-
-namespace uking::action {
-
-class DummyAction : public ksys::act::ai::Action {
-    SEAD_RTTI_OVERRIDE(DummyAction, ksys::act::ai::Action)
-public:
-    explicit DummyAction(const InitArg& arg);
-
-    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/actionDummyDropTable.cpp b/src/Game/Actor/Action/actionDummyDropTable.cpp
index e4e87cac..75290e7b 100644
--- a/src/Game/Actor/Action/actionDummyDropTable.cpp
+++ b/src/Game/Actor/Action/actionDummyDropTable.cpp
@@ -2,29 +2,29 @@
 
 namespace uking::action {
 
-DummyDropTable::DummyDropTable(const InitArg& arg) : DummyAction(arg) {}
+DummyDropTable::DummyDropTable(const InitArg& arg) : ksys::act::ai::DummyAction(arg) {}
 
 DummyDropTable::~DummyDropTable() = default;
 
 bool DummyDropTable::init_(sead::Heap* heap) {
-    return DummyAction::init_(heap);
+    return ksys::act::ai::DummyAction::init_(heap);
 }
 
 void DummyDropTable::enter_(ksys::act::ai::InlineParamPack* params) {
-    DummyAction::enter_(params);
+    ksys::act::ai::DummyAction::enter_(params);
 }
 
 void DummyDropTable::leave_() {
-    DummyAction::leave_();
+    ksys::act::ai::DummyAction::leave_();
 }
 
 void DummyDropTable::loadParams_() {
-    DummyAction::loadParams_();
+    ksys::act::ai::DummyAction::loadParams_();
     getMapUnitParam(&mDropTable_m, "DropTable");
 }
 
 void DummyDropTable::calc_() {
-    DummyAction::calc_();
+    ksys::act::ai::DummyAction::calc_();
 }
 
 }  // namespace uking::action
diff --git a/src/Game/Actor/Action/actionDummyDropTable.h b/src/Game/Actor/Action/actionDummyDropTable.h
index 2aebbdb5..8e07ff46 100644
--- a/src/Game/Actor/Action/actionDummyDropTable.h
+++ b/src/Game/Actor/Action/actionDummyDropTable.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/Action/actionDummyAction.h"
 #include "KingSystem/ActorSystem/actAiAction.h"
+#include "KingSystem/ActorSystem/actionDummyAction.h"
 
 namespace uking::action {
 
-class DummyDropTable : public DummyAction {
-    SEAD_RTTI_OVERRIDE(DummyDropTable, DummyAction)
+class DummyDropTable : public ksys::act::ai::DummyAction {
+    SEAD_RTTI_OVERRIDE(DummyDropTable, ksys::act::ai::DummyAction)
 public:
     explicit DummyDropTable(const InitArg& arg);
     ~DummyDropTable() override;
diff --git a/src/Game/Actor/aiActionFactories.cpp b/src/Game/Actor/aiActionFactories.cpp
index 260c7410..616aa807 100644
--- a/src/Game/Actor/aiActionFactories.cpp
+++ b/src/Game/Actor/aiActionFactories.cpp
@@ -283,7 +283,6 @@
 #include "Game/Actor/Action/actionDropCreateForReplace.h"
 #include "Game/Actor/Action/actionDropWeapon.h"
 #include "Game/Actor/Action/actionDrowningDeath.h"
-#include "Game/Actor/Action/actionDummyAction.h"
 #include "Game/Actor/Action/actionDummyDropTable.h"
 #include "Game/Actor/Action/actionDummyTriggerAction.h"
 #include "Game/Actor/Action/actionDunegonRotateWait.h"
@@ -2543,7 +2542,7 @@ static Factory sActionFactories[] = {
     {0x73664194, Factory::make<action::HorseEatAction>},
     {0x7380112a, Factory::make<action::MimicFreeze>},
     {0x73df6d4c, Factory::make<ksys::act::ai::DummyAction>},
-    {0x73e6fb3b, Factory::make<action::DummyAction>},
+    {0x73e6fb3b, Factory::make<ksys::act::ai::DummyAction>},
     {0x73fec15b, Factory::make<ksys::snd::SpotBgmTriggerAction>},
     {0x740366f6, Factory::make<action::LynelNavMeshMove>},
     {0x74137cda, Factory::make<action::TerrainHideCenter>},