diff --git a/data/status_query.yml b/data/status_query.yml index 0f213d13..d39c2cb7 100644 --- a/data/status_query.yml +++ b/data/status_query.yml @@ -197,7 +197,7 @@ query::CheckWeather: query::CompareGameDataFloat: status: done query::CompareGameDataInt: - status: pending + status: done query::CompareGameDataTime: status: pending query::ComparePlayerFireResistantLevel: diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 5bf277eb..1a0c3db3 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -41239,7 +41239,7 @@ 0x0000007100697ca4,AI_Query_CompareGameDataInt::ctor,80,_ZN5uking5query18CompareGameDataIntC1ERKN4ksys3act2ai5Query7InitArgE 0x0000007100697cf4,AI_Query_CompareGameDataInt::dtor,20,_ZN5uking5query18CompareGameDataIntD1Ev 0x0000007100697d08,AI_Query_CompareGameDataInt::dtorDelete,52,_ZN5uking5query18CompareGameDataIntD0Ev -0x0000007100697d3c,AI_Query_CompareGameDataInt::doQuery,1216, +0x0000007100697d3c,AI_Query_CompareGameDataInt::doQuery,1216,_ZN5uking5query18CompareGameDataInt7doQueryEv 0x00000071006981fc,AI_Query_CompareGameDataInt::m10,140,_ZN5uking5query18CompareGameDataInt10loadParamsERKN4evfl8QueryArgE 0x0000007100698288,AI_Query_CompareGameDataInt::loadParams,128,_ZN5uking5query18CompareGameDataInt10loadParamsEv 0x0000007100698308,AI_Query_CompareGameDataInt::rtti1,204,_ZNK5uking5query18CompareGameDataInt27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE diff --git a/src/Game/AI/Query/queryCompareGameDataInt.cpp b/src/Game/AI/Query/queryCompareGameDataInt.cpp index ed30a99e..429f058e 100644 --- a/src/Game/AI/Query/queryCompareGameDataInt.cpp +++ b/src/Game/AI/Query/queryCompareGameDataInt.cpp @@ -1,5 +1,7 @@ #include "Game/AI/Query/queryCompareGameDataInt.h" #include +#include +#include "KingSystem/GameData/gdtManager.h" namespace uking::query { @@ -7,9 +9,35 @@ CompareGameDataInt::CompareGameDataInt(const InitArg& arg) : ksys::act::ai::Quer CompareGameDataInt::~CompareGameDataInt() = default; -// FIXME: implement int CompareGameDataInt::doQuery() { - return -1; + int flag_value_a = 0; + int flag_value_b = 0; + + auto* gdt = ksys::gdt::Manager::instance(); + if (!gdt) + return 0; + if (!gdt->getParamBypassPerm().get().getS32(&flag_value_a, mGameDataIntName_A)) + return 0; + if (!gdt->getParamBypassPerm().get().getS32(&flag_value_b, mGameDataIntName_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 CompareGameDataInt::loadParams(const evfl::QueryArg& arg) { diff --git a/src/Game/AI/Query/queryCompareGameDataInt.h b/src/Game/AI/Query/queryCompareGameDataInt.h index b0a70a03..6fafd875 100644 --- a/src/Game/AI/Query/queryCompareGameDataInt.h +++ b/src/Game/AI/Query/queryCompareGameDataInt.h @@ -16,8 +16,8 @@ public: protected: sead::SafeString mGameDataIntName_A{}; - sead::SafeString mGameDataIntName_B{}; sead::SafeString mOperator{}; + sead::SafeString mGameDataIntName_B{}; }; } // namespace uking::query