From 60dd80779a92120c74e7bda9e1ccf2695e2c7c19 Mon Sep 17 00:00:00 2001 From: theo3 Date: Thu, 1 Jul 2021 19:28:09 -0700 Subject: match some ai::Query --- src/Game/AI/Query/queryCountFlag4.cpp | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) (limited to 'src/Game/AI/Query/queryCountFlag4.cpp') diff --git a/src/Game/AI/Query/queryCountFlag4.cpp b/src/Game/AI/Query/queryCountFlag4.cpp index 0b7210b4..e3a163e3 100644 --- a/src/Game/AI/Query/queryCountFlag4.cpp +++ b/src/Game/AI/Query/queryCountFlag4.cpp @@ -1,5 +1,6 @@ #include "Game/AI/Query/queryCountFlag4.h" #include +#include "KingSystem/GameData/gdtManager.h" namespace uking::query { @@ -7,9 +8,30 @@ CountFlag4::CountFlag4(const InitArg& arg) : ksys::act::ai::Query(arg) {} CountFlag4::~CountFlag4() = default; -// FIXME: implement int CountFlag4::doQuery() { - return -1; + auto* gdm = ksys::gdt::Manager::instance(); + if (gdm == nullptr) + return 0; + + bool x = false; + int result = 0; + + auto isOn = [&](const sead::SafeString& s) { + return gdm->getParamBypassPerm().get().getBool(&x, s) && x; + }; + + if (!mGameDataFlagNo0.isEmpty()) + result += isOn(mGameDataFlagNo0); + if (!mGameDataFlagNo1.isEmpty()) + result += isOn(mGameDataFlagNo1); + if (!mGameDataFlagNo2.isEmpty()) + result += isOn(mGameDataFlagNo2); + if (!mGameDataFlagNo3.isEmpty()) + result += isOn(mGameDataFlagNo3); + if (!mGameDataFlagNo4.isEmpty()) + result += isOn(mGameDataFlagNo4); + + return result; } void CountFlag4::loadParams(const evfl::QueryArg& arg) { -- cgit v1.2.3