From cd6716c3eda6b49ddb0fcedadd5191ff82ec84bb Mon Sep 17 00:00:00 2001 From: MonsterDruide1 <5958456@gmail.com> Date: Mon, 21 Jun 2021 17:27:34 +0200 Subject: [PATCH] uking/query: Add queryCheckCurseRRetryEverOnce --- data/uking_functions.csv | 2 +- src/Game/AI/Query/queryCheckCurseRRetryEverOnce.cpp | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/data/uking_functions.csv b/data/uking_functions.csv index d89c86f4..49d4f948 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -40628,7 +40628,7 @@ 0x000000710068851c,AI_Query_CheckCurseRRetryEverOnce::ctor,52,_ZN5uking5query24CheckCurseRRetryEverOnceC1ERKN4ksys3act2ai5Query7InitArgE 0x0000007100688550,AI_Query_CheckCurseRRetryEverOnce::dtor,20,_ZN5uking5query24CheckCurseRRetryEverOnceD1Ev 0x0000007100688564,AI_Query_CheckCurseRRetryEverOnce::dtorDelete,52,_ZN5uking5query24CheckCurseRRetryEverOnceD0Ev -0x0000007100688598,AI_Query_CheckCurseRRetryEverOnce::doQuery,76, +0x0000007100688598,AI_Query_CheckCurseRRetryEverOnce::doQuery,76,_ZN5uking5query24CheckCurseRRetryEverOnce7doQueryEv 0x00000071006885e4,AI_Query_CheckCurseRRetryEverOnce::m10,64,_ZN5uking5query24CheckCurseRRetryEverOnce10loadParamsERKN4evfl8QueryArgE 0x0000007100688624,AI_Query_CheckCurseRRetryEverOnce::loadParams,64,_ZN5uking5query24CheckCurseRRetryEverOnce10loadParamsEv 0x0000007100688664,AI_Query_CheckCurseRRetryEverOnce::rtti1,204,_ZNK5uking5query24CheckCurseRRetryEverOnce27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE diff --git a/src/Game/AI/Query/queryCheckCurseRRetryEverOnce.cpp b/src/Game/AI/Query/queryCheckCurseRRetryEverOnce.cpp index b1924e07..9dfa77a0 100644 --- a/src/Game/AI/Query/queryCheckCurseRRetryEverOnce.cpp +++ b/src/Game/AI/Query/queryCheckCurseRRetryEverOnce.cpp @@ -1,5 +1,6 @@ #include "Game/AI/Query/queryCheckCurseRRetryEverOnce.h" #include +#include "Game/DLC/aocChampionBalladManager.h" namespace uking::query { @@ -8,9 +9,15 @@ CheckCurseRRetryEverOnce::CheckCurseRRetryEverOnce(const InitArg& arg) CheckCurseRRetryEverOnce::~CheckCurseRRetryEverOnce() = default; -// FIXME: implement int CheckCurseRRetryEverOnce::doQuery() { - return -1; + auto* manager = ChampionBalladManager::instance(); + if (!manager) + return 0; + + auto blight = BlightType(*mCurseRType); + if (blight <= BlightType::Water) + return manager->getBlightRematchCount(blight) > 0; + return 0; } void CheckCurseRRetryEverOnce::loadParams(const evfl::QueryArg& arg) {