diff options
Diffstat (limited to 'src/Game/Actor')
| -rw-r--r-- | src/Game/Actor/AI/aiCookPotRoot.cpp | 2 | ||||
| -rw-r--r-- | src/Game/Actor/Action/actionCurseRRematchCount.cpp | 8 | ||||
| -rw-r--r-- | src/Game/Actor/Damage/dmgDamageManagerBase.cpp | 2 | ||||
| -rw-r--r-- | src/Game/Actor/Query/queryCheckCurseRRetryEverOnce.cpp | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/Game/Actor/AI/aiCookPotRoot.cpp b/src/Game/Actor/AI/aiCookPotRoot.cpp index da09eec4..0482daf6 100644 --- a/src/Game/Actor/AI/aiCookPotRoot.cpp +++ b/src/Game/Actor/AI/aiCookPotRoot.cpp @@ -1,5 +1,5 @@ #include "Game/Actor/AI/aiCookPotRoot.h" -#include "Game/DLC/aocHardModeManager.h" +#include "Game/AOC/aocHardModeManager.h" #include "Game/UI/uiPauseMenuDataMgr.h" #include "KingSystem/ActorSystem/Attention/actAttention.h" #include "KingSystem/ActorSystem/actActor.h" diff --git a/src/Game/Actor/Action/actionCurseRRematchCount.cpp b/src/Game/Actor/Action/actionCurseRRematchCount.cpp index 2838007a..a1d70ca1 100644 --- a/src/Game/Actor/Action/actionCurseRRematchCount.cpp +++ b/src/Game/Actor/Action/actionCurseRRematchCount.cpp @@ -1,5 +1,5 @@ #include "Game/Actor/Action/actionCurseRRematchCount.h" -#include "Game/DLC/aocChampionBalladManager.h" +#include "Game/AOC/aocChampionBalladManager.h" #include "KingSystem/GameData/gdtManager.h" namespace uking::action { @@ -19,12 +19,12 @@ void CurseRRematchCount::loadParams_() { } bool CurseRRematchCount::oneShot_() { - auto* manager = ChampionBalladManager::instance(); + auto* manager = aoc::ChampionBalladManager::instance(); if (!manager) return false; - auto blight = BlightType(*mCurseRType_d); - if (blight > BlightType::Water) + auto blight = aoc::BlightType(*mCurseRType_d); + if (blight > aoc::BlightType::Water) return false; if (*mRematchCount_d == 0) diff --git a/src/Game/Actor/Damage/dmgDamageManagerBase.cpp b/src/Game/Actor/Damage/dmgDamageManagerBase.cpp index b99cac50..08557ba6 100644 --- a/src/Game/Actor/Damage/dmgDamageManagerBase.cpp +++ b/src/Game/Actor/Damage/dmgDamageManagerBase.cpp @@ -1,6 +1,6 @@ #include "Game/Actor/Damage/dmgDamageManagerBase.h" +#include "Game/AOC/aocHardModeManager.h" #include "Game/Actor/Damage/dmgDamageCallback.h" -#include "Game/DLC/aocHardModeManager.h" #include "KingSystem/ActorSystem/actActor.h" #include "KingSystem/ActorSystem/actActorConstDataAccess.h" #include "KingSystem/ActorSystem/actActorParam.h" 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; } |
