diff --git a/data/status_query.yml b/data/status_query.yml index 68b3bc02..0f213d13 100644 --- a/data/status_query.yml +++ b/data/status_query.yml @@ -195,7 +195,7 @@ query::CheckWeaponVacancyItem: query::CheckWeather: status: pending query::CompareGameDataFloat: - status: pending + status: done query::CompareGameDataInt: status: pending query::CompareGameDataTime: diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 97778b2e..5bf277eb 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -41231,7 +41231,7 @@ 0x0000007100697518,AI_Query_CompareGameDataFloat::ctor,80,_ZN5uking5query20CompareGameDataFloatC1ERKN4ksys3act2ai5Query7InitArgE 0x0000007100697568,AI_Query_CompareGameDataFloat::dtor,20,_ZN5uking5query20CompareGameDataFloatD1Ev 0x000000710069757c,AI_Query_CompareGameDataFloat::dtorDelete,52,_ZN5uking5query20CompareGameDataFloatD0Ev -0x00000071006975b0,AI_Query_CompareGameDataFloat::doQuery,1216, +0x00000071006975b0,AI_Query_CompareGameDataFloat::doQuery,1216,_ZN5uking5query20CompareGameDataFloat7doQueryEv 0x0000007100697a70,AI_Query_CompareGameDataFloat::m10,140,_ZN5uking5query20CompareGameDataFloat10loadParamsERKN4evfl8QueryArgE 0x0000007100697afc,AI_Query_CompareGameDataFloat::loadParams,128,_ZN5uking5query20CompareGameDataFloat10loadParamsEv 0x0000007100697b7c,AI_Query_CompareGameDataFloat::rtti1,204,_ZNK5uking5query20CompareGameDataFloat27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE diff --git a/src/Game/AI/Query/queryCompareGameDataFloat.cpp b/src/Game/AI/Query/queryCompareGameDataFloat.cpp index 2cf01e62..55055b46 100644 --- a/src/Game/AI/Query/queryCompareGameDataFloat.cpp +++ b/src/Game/AI/Query/queryCompareGameDataFloat.cpp @@ -1,5 +1,7 @@ #include "Game/AI/Query/queryCompareGameDataFloat.h" #include +#include +#include "KingSystem/GameData/gdtManager.h" namespace uking::query { @@ -7,9 +9,35 @@ CompareGameDataFloat::CompareGameDataFloat(const InitArg& arg) : ksys::act::ai:: CompareGameDataFloat::~CompareGameDataFloat() = default; -// FIXME: implement int CompareGameDataFloat::doQuery() { - return -1; + float flag_value_a = 0.0; + float flag_value_b = 0.0; + + auto* gdt = ksys::gdt::Manager::instance(); + if (!gdt) + return 0; + if (!gdt->getParamBypassPerm().get().getF32(&flag_value_a, mGameDataFloatName_A)) + return 0; + if (!gdt->getParamBypassPerm().get().getF32(&flag_value_b, mGameDataFloatName_B)) + return 0; + + const auto invert = std::logical_not<>(); + + sead::FixedSafeString<32> op = mOperator; + if (op == "Equal") + return invert(flag_value_a == flag_value_b); + if (op == "NotEqual") + return invert(flag_value_a != flag_value_b); + if (op == "GreaterThan") + return invert(flag_value_a > flag_value_b); + if (op == "GreaterThanOrEqualTo") + return invert(flag_value_a >= flag_value_b); + if (op == "LessThan") + return invert(flag_value_a < flag_value_b); + if (op == "LessThanOrEqualTo") + return invert(flag_value_a <= flag_value_b); + + return 0; } void CompareGameDataFloat::loadParams(const evfl::QueryArg& arg) { diff --git a/src/Game/AI/Query/queryCompareGameDataFloat.h b/src/Game/AI/Query/queryCompareGameDataFloat.h index 35f7ed46..3dfb9124 100644 --- a/src/Game/AI/Query/queryCompareGameDataFloat.h +++ b/src/Game/AI/Query/queryCompareGameDataFloat.h @@ -16,8 +16,8 @@ public: protected: sead::SafeString mGameDataFloatName_A{}; - sead::SafeString mGameDataFloatName_B{}; sead::SafeString mOperator{}; + sead::SafeString mGameDataFloatName_B{}; }; } // namespace uking::query