uking: Implement RandomChoice{2,3,4,8} queries

data/uking_functions.csv

@@ -41650,13 +41650,13 @@
 0x00000071006a1430,AI_Query_RandomChoice2::ctor,48,_ZN5uking5query13RandomChoice2C1ERKN4ksys3act2ai5Query7InitArgE
 0x00000071006a1460,AI_Query_RandomChoice2::dtor,20,_ZN5uking5query13RandomChoice2D1Ev
 0x00000071006a1474,AI_Query_RandomChoice2::dtorDelete,52,_ZN5uking5query13RandomChoice2D0Ev
-0x00000071006a14a8,AI_Query_RandomChoice2::doQuery,36,
+0x00000071006a14a8,AI_Query_RandomChoice2::doQuery,36,_ZN5uking5query13RandomChoice27doQueryEv
 0x00000071006a14cc,AI_Query_RandomChoice2::rtti1,204,_ZNK5uking5query13RandomChoice227checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE
 0x00000071006a1598,AI_Query_RandomChoice2::rtti2,92,_ZNK5uking5query13RandomChoice218getRuntimeTypeInfoEv
 0x00000071006a15f4,AI_Query_RandomChoice3::ctor,48,_ZN5uking5query13RandomChoice3C1ERKN4ksys3act2ai5Query7InitArgE
 0x00000071006a1624,AI_Query_RandomChoice3::dtor,20,_ZN5uking5query13RandomChoice3D1Ev
 0x00000071006a1638,AI_Query_RandomChoice3::dtorDelete,52,_ZN5uking5query13RandomChoice3D0Ev
-0x00000071006a166c,AI_Query_RandomChoice3::doQuery,44,
+0x00000071006a166c,AI_Query_RandomChoice3::doQuery,44,_ZN5uking5query13RandomChoice37doQueryEv
 0x00000071006a1698,AI_Query_RandomChoice3::m10,4,_ZN5uking5query13RandomChoice310loadParamsERKN4evfl8QueryArgE
 0x00000071006a169c,AI_Query_RandomChoice3::loadParams,4,_ZN5uking5query13RandomChoice310loadParamsEv
 0x00000071006a16a0,AI_Query_RandomChoice3::rtti1,204,_ZNK5uking5query13RandomChoice327checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE
@@ -41664,13 +41664,13 @@
 0x00000071006a17c8,AI_Query_RandomChoice4::ctor,48,_ZN5uking5query13RandomChoice4C1ERKN4ksys3act2ai5Query7InitArgE
 0x00000071006a17f8,AI_Query_RandomChoice4::dtor,20,_ZN5uking5query13RandomChoice4D1Ev
 0x00000071006a180c,AI_Query_RandomChoice4::dtorDelete,52,_ZN5uking5query13RandomChoice4D0Ev
-0x00000071006a1840,AI_Query_RandomChoice4::doQuery,36,
+0x00000071006a1840,AI_Query_RandomChoice4::doQuery,36,_ZN5uking5query13RandomChoice47doQueryEv
 0x00000071006a1864,AI_Query_RandomChoice4::rtti1,204,_ZNK5uking5query13RandomChoice427checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE
 0x00000071006a1930,AI_Query_RandomChoice4::rtti2,92,_ZNK5uking5query13RandomChoice418getRuntimeTypeInfoEv
 0x00000071006a198c,AI_Query_RandomChoice8::ctor,48,_ZN5uking5query13RandomChoice8C1ERKN4ksys3act2ai5Query7InitArgE
 0x00000071006a19bc,AI_Query_RandomChoice8::dtor,20,_ZN5uking5query13RandomChoice8D1Ev
 0x00000071006a19d0,AI_Query_RandomChoice8::dtorDelete,52,_ZN5uking5query13RandomChoice8D0Ev
-0x00000071006a1a04,AI_Query_RandomChoice8::doQuery,36,
+0x00000071006a1a04,AI_Query_RandomChoice8::doQuery,36,_ZN5uking5query13RandomChoice87doQueryEv
 0x00000071006a1a28,AI_Query_RandomChoice8::rtti1,204,_ZNK5uking5query13RandomChoice827checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE
 0x00000071006a1af4,AI_Query_RandomChoice8::rtti2,92,_ZNK5uking5query13RandomChoice818getRuntimeTypeInfoEv
 0x00000071006a1b50,AI_Query_RandomChoiceExceptOnFlag::ctor,108,_ZN5uking5query24RandomChoiceExceptOnFlagC1ERKN4ksys3act2ai5Query7InitArgE

lib/sead

@@ -1 +1 @@
-Subproject commit faf27ce52f15de1a445d8ad3c20d2724941853c0
+Subproject commit be07bdf3a2053cc22d353793d0875564180b1997

src/Game/AI/Query/queryRandomChoice2.cpp

@@ -1,5 +1,6 @@
 #include "Game/AI/Query/queryRandomChoice2.h"
 #include <evfl/query.h>
+#include <random/seadGlobalRandom.h>
 
 namespace uking::query {
 
@@ -7,13 +8,8 @@ RandomChoice2::RandomChoice2(const InitArg& arg) : ksys::act::ai::Query(arg) {}
 
 RandomChoice2::~RandomChoice2() = default;
 
-// FIXME: implement
 int RandomChoice2::doQuery() {
-    return -1;
+    return sead::GlobalRandom::instance()->getU32(2);
 }
 
-void RandomChoice2::loadParams(const evfl::QueryArg& arg) {}
-
-void RandomChoice2::loadParams() {}
-
 }  // namespace uking::query

src/Game/AI/Query/queryRandomChoice2.h

@@ -10,9 +10,6 @@ public:
     explicit RandomChoice2(const InitArg& arg);
     ~RandomChoice2() override;
     int doQuery() override;
-
-    void loadParams() override;
-    void loadParams(const evfl::QueryArg& arg) override;
 };
 
 }  // namespace uking::query

src/Game/AI/Query/queryRandomChoice3.cpp

@@ -1,5 +1,6 @@
 #include "Game/AI/Query/queryRandomChoice3.h"
 #include <evfl/query.h>
+#include <random/seadGlobalRandom.h>
 
 namespace uking::query {
 
@@ -7,9 +8,8 @@ RandomChoice3::RandomChoice3(const InitArg& arg) : ksys::act::ai::Query(arg) {}
 
 RandomChoice3::~RandomChoice3() = default;
 
-// FIXME: implement
 int RandomChoice3::doQuery() {
-    return -1;
+    return sead::GlobalRandom::instance()->getU32(3);
 }
 
 void RandomChoice3::loadParams(const evfl::QueryArg& arg) {}

src/Game/AI/Query/queryRandomChoice4.cpp

@@ -1,5 +1,6 @@
 #include "Game/AI/Query/queryRandomChoice4.h"
 #include <evfl/query.h>
+#include <random/seadGlobalRandom.h>
 
 namespace uking::query {
 
@@ -7,13 +8,8 @@ RandomChoice4::RandomChoice4(const InitArg& arg) : ksys::act::ai::Query(arg) {}
 
 RandomChoice4::~RandomChoice4() = default;
 
-// FIXME: implement
 int RandomChoice4::doQuery() {
-    return -1;
+    return sead::GlobalRandom::instance()->getU32(4);
 }
 
-void RandomChoice4::loadParams(const evfl::QueryArg& arg) {}
-
-void RandomChoice4::loadParams() {}
-
 }  // namespace uking::query

src/Game/AI/Query/queryRandomChoice4.h

@@ -10,9 +10,6 @@ public:
     explicit RandomChoice4(const InitArg& arg);
     ~RandomChoice4() override;
     int doQuery() override;
-
-    void loadParams() override;
-    void loadParams(const evfl::QueryArg& arg) override;
 };
 
 }  // namespace uking::query

src/Game/AI/Query/queryRandomChoice8.cpp

@@ -1,5 +1,6 @@
 #include "Game/AI/Query/queryRandomChoice8.h"
 #include <evfl/query.h>
+#include <random/seadGlobalRandom.h>
 
 namespace uking::query {
 
@@ -9,11 +10,7 @@ RandomChoice8::~RandomChoice8() = default;
 
 // FIXME: implement
 int RandomChoice8::doQuery() {
-    return -1;
+    return sead::GlobalRandom::instance()->getU32(8);
 }
 
-void RandomChoice8::loadParams(const evfl::QueryArg& arg) {}
-
-void RandomChoice8::loadParams() {}
-
 }  // namespace uking::query

src/Game/AI/Query/queryRandomChoice8.h

@@ -10,9 +10,6 @@ public:
     explicit RandomChoice8(const InitArg& arg);
     ~RandomChoice8() override;
     int doQuery() override;
-
-    void loadParams() override;
-    void loadParams(const evfl::QueryArg& arg) override;
 };
 
 }  // namespace uking::query