diff --git a/data/status_query.yml b/data/status_query.yml index 6268ac7b..649dfde4 100644 --- a/data/status_query.yml +++ b/data/status_query.yml @@ -95,7 +95,7 @@ query::CheckHorseRegistered: query::CheckHorseTakenOut: status: pending query::CheckIsOpenItemCategory: - status: pending + status: done query::CheckItemShopDecide: status: pending query::CheckItemShopPorchVacancy: diff --git a/data/uking_functions.csv b/data/uking_functions.csv index af66c012..1454ced7 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -40865,7 +40865,7 @@ 0x000000710068ee50,AI_Query_CheckIsOpenItemCategory::ctor,52,_ZN5uking5query23CheckIsOpenItemCategoryC1ERKN4ksys3act2ai5Query7InitArgE 0x000000710068ee84,AI_Query_CheckIsOpenItemCategory::dtor,20,_ZN5uking5query23CheckIsOpenItemCategoryD1Ev 0x000000710068ee98,AI_Query_CheckIsOpenItemCategory::dtorDelete,52,_ZN5uking5query23CheckIsOpenItemCategoryD0Ev -0x000000710068eecc,AI_Query_CheckIsOpenItemCategory::doQuery,40, +0x000000710068eecc,AI_Query_CheckIsOpenItemCategory::doQuery,40,_ZN5uking5query23CheckIsOpenItemCategory7doQueryEv 0x000000710068eef4,AI_Query_CheckIsOpenItemCategory::m10,64,_ZN5uking5query23CheckIsOpenItemCategory10loadParamsERKN4evfl8QueryArgE 0x000000710068ef34,AI_Query_CheckIsOpenItemCategory::loadParams,64,_ZN5uking5query23CheckIsOpenItemCategory10loadParamsEv 0x000000710068ef74,AI_Query_CheckIsOpenItemCategory::rtti1,204,_ZNK5uking5query23CheckIsOpenItemCategory27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE diff --git a/src/Game/AI/Query/queryCheckIsOpenItemCategory.cpp b/src/Game/AI/Query/queryCheckIsOpenItemCategory.cpp index 714e561c..c4ec4659 100644 --- a/src/Game/AI/Query/queryCheckIsOpenItemCategory.cpp +++ b/src/Game/AI/Query/queryCheckIsOpenItemCategory.cpp @@ -1,5 +1,6 @@ #include "Game/AI/Query/queryCheckIsOpenItemCategory.h" #include +#include "KingSystem/GameData/gdtCommonFlagsUtils.h" namespace uking::query { @@ -7,9 +8,8 @@ CheckIsOpenItemCategory::CheckIsOpenItemCategory(const InitArg& arg) : ksys::act CheckIsOpenItemCategory::~CheckIsOpenItemCategory() = default; -// FIXME: implement int CheckIsOpenItemCategory::doQuery() { - return -1; + return !ksys::gdt::getFlag_IsOpenItemCategory(*mCategory); } void CheckIsOpenItemCategory::loadParams(const evfl::QueryArg& arg) {