Merge pull request #217 from leoetlino/stack/03b-side-ownership

Move misplaced code between KingSystem and U-King

14 files changed, 18 insertions, 136 deletions

diff --git a/src/Game/Actor/Query/CMakeLists.txt b/src/Game/Actor/Query/CMakeLists.txt
index 1eb2ea5d..cffcfa98 100644
--- a/src/Game/Actor/Query/CMakeLists.txt
+++ b/src/Game/Actor/Query/CMakeLists.txt
@@ -61,8 +61,6 @@ target_sources(uking PRIVATE
   queryCheckEquipItemType.h
   queryCheckEquipment.cpp
   queryCheckEquipment.h
-  queryCheckEventCancel.cpp
-  queryCheckEventCancel.h
   queryCheckExistActor.cpp
   queryCheckExistActor.h
   queryCheckExistArrow.cpp
@@ -105,8 +103,6 @@ target_sources(uking PRIVATE
   queryCheckItemShopSelectBuy.h
   queryCheckItemShopSelect.cpp
   queryCheckItemShopSelect.h
-  queryCheckJustBeforeEventCancel.cpp
-  queryCheckJustBeforeEventCancel.h
   queryCheckLastDamageAttacker.cpp
   queryCheckLastDamageAttacker.h
   queryCheckManufactResult.cpp
@@ -303,8 +299,6 @@ target_sources(uking PRIVATE
   queryIsSuccessEndLastDemoAction.h
   queryIsTerrorDisappeared.cpp
   queryIsTerrorDisappeared.h
-  queryIsWaitRevival.cpp
-  queryIsWaitRevival.h
   queryIsWeaponDrawn.cpp
   queryIsWeaponDrawn.h
   queryKeyInputCheck.cpp
diff --git a/src/Game/Actor/Query/queryCheckCurseRRetryEverOnce.cpp b/src/Game/Actor/Query/queryCheckCurseRRetryEverOnce.cpp
index 57f4377d..c66c959a 100644
--- a/src/Game/Actor/Query/queryCheckCurseRRetryEverOnce.cpp
+++ b/src/Game/Actor/Query/queryCheckCurseRRetryEverOnce.cpp
@@ -1,6 +1,6 @@
 #include "Game/Actor/Query/queryCheckCurseRRetryEverOnce.h"
 #include <evfl/Query.h>
-#include "Game/DLC/aocChampionBalladManager.h"
+#include "Game/AOC/aocChampionBalladManager.h"
 
 namespace uking::query {
 
@@ -10,12 +10,12 @@ CheckCurseRRetryEverOnce::CheckCurseRRetryEverOnce(const InitArg& arg)
 CheckCurseRRetryEverOnce::~CheckCurseRRetryEverOnce() = default;
 
 int CheckCurseRRetryEverOnce::doQuery() {
-    auto* manager = ChampionBalladManager::instance();
+    auto* manager = aoc::ChampionBalladManager::instance();
     if (!manager)
         return 0;
 
-    auto blight = BlightType(*mCurseRType);
-    if (blight <= BlightType::Water)
+    auto blight = aoc::BlightType(*mCurseRType);
+    if (blight <= aoc::BlightType::Water)
         return manager->getBlightRematchCount(blight) > 0;
     return 0;
 }
diff --git a/src/Game/Actor/Query/queryCheckEventCancel.cpp b/src/Game/Actor/Query/queryCheckEventCancel.cpp
deleted file mode 100644
index ab065963..00000000
--- a/src/Game/Actor/Query/queryCheckEventCancel.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "Game/Actor/Query/queryCheckEventCancel.h"
-#include <evfl/Query.h>
-
-namespace uking::query {
-
-CheckEventCancel::CheckEventCancel(const InitArg& arg) : ksys::act::ai::Query(arg) {}
-
-CheckEventCancel::~CheckEventCancel() = default;
-
-// FIXME: implement
-int CheckEventCancel::doQuery() {
-    return -1;
-}
-
-void CheckEventCancel::loadParams(const evfl::QueryArg& arg) {}
-
-void CheckEventCancel::loadParams() {}
-
-}  // namespace uking::query
diff --git a/src/Game/Actor/Query/queryCheckEventCancel.h b/src/Game/Actor/Query/queryCheckEventCancel.h
deleted file mode 100644
index 382e1d6b..00000000
--- a/src/Game/Actor/Query/queryCheckEventCancel.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include "KingSystem/ActorSystem/actAiQuery.h"
-
-namespace uking::query {
-
-class CheckEventCancel : public ksys::act::ai::Query {
-    SEAD_RTTI_OVERRIDE(CheckEventCancel, Query)
-public:
-    explicit CheckEventCancel(const InitArg& arg);
-    ~CheckEventCancel() override;
-    int doQuery() override;
-
-    void loadParams() override;
-    void loadParams(const evfl::QueryArg& arg) override;
-};
-
-}  // namespace uking::query
diff --git a/src/Game/Actor/Query/queryCheckJustBeforeEventCancel.cpp b/src/Game/Actor/Query/queryCheckJustBeforeEventCancel.cpp
deleted file mode 100644
index 0b6c389c..00000000
--- a/src/Game/Actor/Query/queryCheckJustBeforeEventCancel.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "Game/Actor/Query/queryCheckJustBeforeEventCancel.h"
-#include <evfl/Query.h>
-
-namespace uking::query {
-
-CheckJustBeforeEventCancel::CheckJustBeforeEventCancel(const InitArg& arg)
-    : ksys::act::ai::Query(arg) {}
-
-CheckJustBeforeEventCancel::~CheckJustBeforeEventCancel() = default;
-
-// FIXME: implement
-int CheckJustBeforeEventCancel::doQuery() {
-    return -1;
-}
-
-void CheckJustBeforeEventCancel::loadParams(const evfl::QueryArg& arg) {}
-
-void CheckJustBeforeEventCancel::loadParams() {}
-
-}  // namespace uking::query
diff --git a/src/Game/Actor/Query/queryCheckJustBeforeEventCancel.h b/src/Game/Actor/Query/queryCheckJustBeforeEventCancel.h
deleted file mode 100644
index f339404c..00000000
--- a/src/Game/Actor/Query/queryCheckJustBeforeEventCancel.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include "KingSystem/ActorSystem/actAiQuery.h"
-
-namespace uking::query {
-
-class CheckJustBeforeEventCancel : public ksys::act::ai::Query {
-    SEAD_RTTI_OVERRIDE(CheckJustBeforeEventCancel, Query)
-public:
-    explicit CheckJustBeforeEventCancel(const InitArg& arg);
-    ~CheckJustBeforeEventCancel() override;
-    int doQuery() override;
-
-    void loadParams() override;
-    void loadParams(const evfl::QueryArg& arg) override;
-};
-
-}  // namespace uking::query
diff --git a/src/Game/Actor/Query/queryComparePlayerHeart.cpp b/src/Game/Actor/Query/queryComparePlayerHeart.cpp
index 9a195f3d..294a46a1 100644
--- a/src/Game/Actor/Query/queryComparePlayerHeart.cpp
+++ b/src/Game/Actor/Query/queryComparePlayerHeart.cpp
@@ -1,6 +1,6 @@
 #include "Game/Actor/Query/queryComparePlayerHeart.h"
 #include <evfl/Query.h>
-#include "KingSystem/ActorSystem/actPlayerInfo.h"
+#include "Game/Actor/Player/actPlayerInfo.h"
 
 namespace uking::query {
 
@@ -9,7 +9,7 @@ ComparePlayerHeart::ComparePlayerHeart(const InitArg& arg) : ksys::act::ai::Quer
 ComparePlayerHeart::~ComparePlayerHeart() = default;
 
 int ComparePlayerHeart::doQuery() {
-    auto* pi = ksys::act::PlayerInfo::instance();
+    auto* pi = uking::act::PlayerInfo::instance();
     if (pi == nullptr)
         return 0;
 
diff --git a/src/Game/Actor/Query/queryComparePlayerMaxHeart.cpp b/src/Game/Actor/Query/queryComparePlayerMaxHeart.cpp
index 8ea31370..d0efd0d3 100644
--- a/src/Game/Actor/Query/queryComparePlayerMaxHeart.cpp
+++ b/src/Game/Actor/Query/queryComparePlayerMaxHeart.cpp
@@ -1,6 +1,6 @@
 #include "Game/Actor/Query/queryComparePlayerMaxHeart.h"
 #include <evfl/Query.h>
-#include "KingSystem/ActorSystem/actPlayerInfo.h"
+#include "Game/Actor/Player/actPlayerInfo.h"
 
 namespace uking::query {
 
@@ -9,7 +9,7 @@ ComparePlayerMaxHeart::ComparePlayerMaxHeart(const InitArg& arg) : ksys::act::ai
 ComparePlayerMaxHeart::~ComparePlayerMaxHeart() = default;
 
 int ComparePlayerMaxHeart::doQuery() {
-    auto* pi = ksys::act::PlayerInfo::instance();
+    auto* pi = uking::act::PlayerInfo::instance();
     if (pi == nullptr)
         return 0;
 
diff --git a/src/Game/Actor/Query/queryComparePlayerMaxStamina.cpp b/src/Game/Actor/Query/queryComparePlayerMaxStamina.cpp
index e4be5a93..4b87abc9 100644
--- a/src/Game/Actor/Query/queryComparePlayerMaxStamina.cpp
+++ b/src/Game/Actor/Query/queryComparePlayerMaxStamina.cpp
@@ -1,6 +1,6 @@
 #include "Game/Actor/Query/queryComparePlayerMaxStamina.h"
 #include <evfl/Query.h>
-#include "KingSystem/ActorSystem/actPlayerInfo.h"
+#include "Game/Actor/Player/actPlayerInfo.h"
 
 namespace uking::query {
 
@@ -9,7 +9,7 @@ ComparePlayerMaxStamina::ComparePlayerMaxStamina(const InitArg& arg) : ksys::act
 ComparePlayerMaxStamina::~ComparePlayerMaxStamina() = default;
 
 int ComparePlayerMaxStamina::doQuery() {
-    auto* pi = ksys::act::PlayerInfo::instance();
+    auto* pi = uking::act::PlayerInfo::instance();
     if (pi == nullptr)
         return 0;
 
diff --git a/src/Game/Actor/Query/queryComparePlayerOriginalHeart.cpp b/src/Game/Actor/Query/queryComparePlayerOriginalHeart.cpp
index d10be8aa..4bd04ced 100644
--- a/src/Game/Actor/Query/queryComparePlayerOriginalHeart.cpp
+++ b/src/Game/Actor/Query/queryComparePlayerOriginalHeart.cpp
@@ -1,6 +1,6 @@
 #include "Game/Actor/Query/queryComparePlayerOriginalHeart.h"
 #include <evfl/Query.h>
-#include "KingSystem/ActorSystem/actPlayerInfo.h"
+#include "Game/Actor/Player/actPlayerInfo.h"
 
 namespace uking::query {
 
@@ -10,7 +10,7 @@ ComparePlayerOriginalHeart::ComparePlayerOriginalHeart(const InitArg& arg)
 ComparePlayerOriginalHeart::~ComparePlayerOriginalHeart() = default;
 
 int ComparePlayerOriginalHeart::doQuery() {
-    using PlayerInfo = ksys::act::PlayerInfo;
+    using PlayerInfo = uking::act::PlayerInfo;
 
     if (PlayerInfo::instance() == nullptr)
         return 0;
diff --git a/src/Game/Actor/Query/queryHasPorchArrow.cpp b/src/Game/Actor/Query/queryHasPorchArrow.cpp
index 7867b388..e0d53e32 100644
--- a/src/Game/Actor/Query/queryHasPorchArrow.cpp
+++ b/src/Game/Actor/Query/queryHasPorchArrow.cpp
@@ -1,6 +1,6 @@
 #include "Game/Actor/Query/queryHasPorchArrow.h"
 #include <evfl/Query.h>
-#include "Game/UI/uiUtils.h"
+#include "KingSystem/System/UIGlue.h"
 
 namespace uking::query {
 
@@ -9,9 +9,9 @@ HasPorchArrow::HasPorchArrow(const InitArg& arg) : ksys::act::ai::Query(arg) {}
 HasPorchArrow::~HasPorchArrow() = default;
 
 int HasPorchArrow::doQuery() {
-    s32 arrow_cnt = ui::getItemValue("NormalArrow") + ui::getItemValue("FireArrow") +
-                    ui::getItemValue("IceArrow") + ui::getItemValue("ElectricArrow") +
-                    ui::getItemValue("BombArrow_A") + ui::getItemValue("AncientArrow");
+    s32 arrow_cnt = ksys::ui::getItemValue("NormalArrow") + ksys::ui::getItemValue("FireArrow") +
+                    ksys::ui::getItemValue("IceArrow") + ksys::ui::getItemValue("ElectricArrow") +
+                    ksys::ui::getItemValue("BombArrow_A") + ksys::ui::getItemValue("AncientArrow");
     return arrow_cnt < *mCheckNum;
 }
 
diff --git a/src/Game/Actor/Query/queryHasPorchItem.cpp b/src/Game/Actor/Query/queryHasPorchItem.cpp
index f8ac4e74..e16d0ac3 100644
--- a/src/Game/Actor/Query/queryHasPorchItem.cpp
+++ b/src/Game/Actor/Query/queryHasPorchItem.cpp
@@ -1,6 +1,6 @@
 #include "Game/Actor/Query/queryHasPorchItem.h"
 #include <evfl/Query.h>
-#include "Game/UI/uiUtils.h"
+#include "KingSystem/System/UIGlue.h"
 
 namespace uking::query {
 
@@ -9,7 +9,7 @@ HasPorchItem::HasPorchItem(const InitArg& arg) : ksys::act::ai::Query(arg) {}
 HasPorchItem::~HasPorchItem() = default;
 
 int HasPorchItem::doQuery() {
-    return ui::getItemValue(mPorchItemName) >= *mCount;
+    return ksys::ui::getItemValue(mPorchItemName) >= *mCount;
 }
 
 void HasPorchItem::loadParams(const evfl::QueryArg& arg) {
diff --git a/src/Game/Actor/Query/queryIsWaitRevival.cpp b/src/Game/Actor/Query/queryIsWaitRevival.cpp
deleted file mode 100644
index 1417b69a..00000000
--- a/src/Game/Actor/Query/queryIsWaitRevival.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "Game/Actor/Query/queryIsWaitRevival.h"
-#include <evfl/Query.h>
-
-namespace uking::query {
-
-IsWaitRevival::IsWaitRevival(const InitArg& arg) : ksys::act::ai::Query(arg) {}
-
-IsWaitRevival::~IsWaitRevival() = default;
-
-// FIXME: implement
-int IsWaitRevival::doQuery() {
-    return -1;
-}
-
-void IsWaitRevival::loadParams(const evfl::QueryArg& arg) {}
-
-void IsWaitRevival::loadParams() {}
-
-}  // namespace uking::query
diff --git a/src/Game/Actor/Query/queryIsWaitRevival.h b/src/Game/Actor/Query/queryIsWaitRevival.h
deleted file mode 100644
index ddcaf6b5..00000000
--- a/src/Game/Actor/Query/queryIsWaitRevival.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include "KingSystem/ActorSystem/actAiQuery.h"
-
-namespace uking::query {
-
-class IsWaitRevival : public ksys::act::ai::Query {
-    SEAD_RTTI_OVERRIDE(IsWaitRevival, Query)
-public:
-    explicit IsWaitRevival(const InitArg& arg);
-    ~IsWaitRevival() override;
-    int doQuery() override;
-
-    void loadParams() override;
-    void loadParams(const evfl::QueryArg& arg) override;
-};
-
-}  // namespace uking::query