From a36463b339479c4f31c1650c144bcb9786ed9e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Fri, 26 Mar 2021 00:45:25 +0100 Subject: [PATCH] query: Implement CheckGameDataInt --- data/status_query.yml | 2 +- data/uking_functions.csv | 2 +- src/Game/AI/Query/queryCheckGameDataInt.cpp | 25 +++++++++++++++++++-- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/data/status_query.yml b/data/status_query.yml index b59b5ece..68b3bc02 100644 --- a/data/status_query.yml +++ b/data/status_query.yml @@ -79,7 +79,7 @@ query::CheckFlag: query::CheckGameDataFloat: status: done query::CheckGameDataInt: - status: pending + status: done query::CheckGetDemoTypeFromArg: status: pending query::CheckGiveReward: diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 78652f56..97778b2e 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -40811,7 +40811,7 @@ 0x000000710068d740,AI_Query_CheckGameDataInt::ctor,80,_ZN5uking5query16CheckGameDataIntC1ERKN4ksys3act2ai5Query7InitArgE 0x000000710068d790,AI_Query_CheckGameDataInt::dtor,20,_ZN5uking5query16CheckGameDataIntD1Ev 0x000000710068d7a4,AI_Query_CheckGameDataInt::dtorDelete,52,_ZN5uking5query16CheckGameDataIntD0Ev -0x000000710068d7d8,AI_Query_CheckGameDataInt::doQuery,1200, +0x000000710068d7d8,AI_Query_CheckGameDataInt::doQuery,1200,_ZN5uking5query16CheckGameDataInt7doQueryEv 0x000000710068dc88,AI_Query_CheckGameDataInt::m10,140,_ZN5uking5query16CheckGameDataInt10loadParamsERKN4evfl8QueryArgE 0x000000710068dd14,AI_Query_CheckGameDataInt::loadParams,128,_ZN5uking5query16CheckGameDataInt10loadParamsEv 0x000000710068dd94,AI_Query_CheckGameDataInt::rtti1,204,_ZNK5uking5query16CheckGameDataInt27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE diff --git a/src/Game/AI/Query/queryCheckGameDataInt.cpp b/src/Game/AI/Query/queryCheckGameDataInt.cpp index e7b4c8f5..080749a4 100644 --- a/src/Game/AI/Query/queryCheckGameDataInt.cpp +++ b/src/Game/AI/Query/queryCheckGameDataInt.cpp @@ -1,5 +1,6 @@ #include "Game/AI/Query/queryCheckGameDataInt.h" #include +#include "KingSystem/GameData/gdtManager.h" namespace uking::query { @@ -7,9 +8,29 @@ CheckGameDataInt::CheckGameDataInt(const InitArg& arg) : ksys::act::ai::Query(ar CheckGameDataInt::~CheckGameDataInt() = default; -// FIXME: implement int CheckGameDataInt::doQuery() { - return -1; + int flag_value = 0; + const auto value = *mValue; + + auto* gdt = ksys::gdt::Manager::instance(); + if (!gdt || !gdt->getParamBypassPerm().get().getS32(&flag_value, mGameDataIntName)) + return 0; + + sead::FixedSafeString<32> op = mOperator; + if (op == "Equal") + return value == flag_value; + if (op == "NotEqual") + return value != flag_value; + if (op == "GreaterThan") + return value < flag_value; + if (op == "GreaterThanOrEqualTo") + return value <= flag_value; + if (op == "LessThan") + return value > flag_value; + if (op == "LessThanOrEqualTo") + return value >= flag_value; + + return 0; } void CheckGameDataInt::loadParams(const evfl::QueryArg& arg) {