From 2dd52d903b55b682d687e19cdbd5cf4601e98913 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Wed, 23 Dec 2020 17:16:38 +0100 Subject: [PATCH] uking: Implement CheckGameDataFloat query --- data/uking_functions.csv | 2 +- src/Game/AI/Query/queryCheckGameDataFloat.cpp | 25 +++++++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 9dc8ecd6..146c7d7e 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -40803,7 +40803,7 @@ 0x000000710068cfc4,AI_Query_CheckGameDataFloat::ctor,80,_ZN5uking5query18CheckGameDataFloatC1ERKN4ksys3act2ai5Query7InitArgE 0x000000710068d014,AI_Query_CheckGameDataFloat::dtor,20,_ZN5uking5query18CheckGameDataFloatD1Ev 0x000000710068d028,AI_Query_CheckGameDataFloat::dtorDelete,52,_ZN5uking5query18CheckGameDataFloatD0Ev -0x000000710068d05c,AI_Query_CheckGameDataFloat::doQuery,1200, +0x000000710068d05c,AI_Query_CheckGameDataFloat::doQuery,1200,_ZN5uking5query18CheckGameDataFloat7doQueryEv 0x000000710068d50c,AI_Query_CheckGameDataFloat::m10,140,_ZN5uking5query18CheckGameDataFloat10loadParamsERKN4evfl8QueryArgE 0x000000710068d598,AI_Query_CheckGameDataFloat::loadParams,128,_ZN5uking5query18CheckGameDataFloat10loadParamsEv 0x000000710068d618,AI_Query_CheckGameDataFloat::rtti1,204,_ZNK5uking5query18CheckGameDataFloat27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE diff --git a/src/Game/AI/Query/queryCheckGameDataFloat.cpp b/src/Game/AI/Query/queryCheckGameDataFloat.cpp index 7fbd3c47..2b26dd4f 100644 --- a/src/Game/AI/Query/queryCheckGameDataFloat.cpp +++ b/src/Game/AI/Query/queryCheckGameDataFloat.cpp @@ -1,5 +1,6 @@ #include "Game/AI/Query/queryCheckGameDataFloat.h" #include +#include "KingSystem/GameData/gdtManager.h" namespace uking::query { @@ -7,9 +8,29 @@ CheckGameDataFloat::CheckGameDataFloat(const InitArg& arg) : ksys::act::ai::Quer CheckGameDataFloat::~CheckGameDataFloat() = default; -// FIXME: implement int CheckGameDataFloat::doQuery() { - return -1; + float flag_value = 0.0; + const auto value = *mValue; + + auto* gdt = ksys::gdt::Manager::instance(); + if (!gdt || !gdt->getParamBypassPerm().get().getF32(&flag_value, mGameDataFloatName)) + 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 CheckGameDataFloat::loadParams(const evfl::QueryArg& arg) {