match some ai::Query

5 files changed, 11 insertions, 1 deletions

diff --git a/src/KingSystem/ActorSystem/actActor.h b/src/KingSystem/ActorSystem/actActor.h
index 3c109432..6b077653 100644
--- a/src/KingSystem/ActorSystem/actActor.h
+++ b/src/KingSystem/ActorSystem/actActor.h
@@ -40,7 +40,9 @@ public:
     };
 
     enum class ActorFlag2 {
+        InstEvent = 0x8,
         NoDistanceCheck = 0x80,
+        Alive = 0x4000000,
     };
 
     enum class DeleteType {
@@ -70,7 +72,7 @@ public:
                        bool is_life_infinite, int i, int life) const;
 
     virtual s32 getMaxLife();
-
+    virtual s32* getLife();
     virtual LifeRecoverInfo* getLifeRecoverInfo();
 
     void emitBasicSigOn();
diff --git a/src/KingSystem/ActorSystem/actActorUtil.h b/src/KingSystem/ActorSystem/actActorUtil.h
index b8ec6b79..cc642e99 100644
--- a/src/KingSystem/ActorSystem/actActorUtil.h
+++ b/src/KingSystem/ActorSystem/actActorUtil.h
@@ -165,4 +165,6 @@ bool getSameGroupActorName(sead::SafeString* name, const sead::SafeString& defau
                            al::ByamlIter* actor_info);
 bool getSameGroupActorName(sead::SafeString* name, const sead::SafeString& actor_name);
 
+s32 getSelectedChoiceIdx(s32 max, const char* query_name);
+
 }  // namespace ksys::act
diff --git a/src/KingSystem/ActorSystem/actPlayerInfo.h b/src/KingSystem/ActorSystem/actPlayerInfo.h
index 9ceb53b2..c356c3f9 100644
--- a/src/KingSystem/ActorSystem/actPlayerInfo.h
+++ b/src/KingSystem/ActorSystem/actPlayerInfo.h
@@ -14,6 +14,9 @@ class PlayerInfo {
 
 public:
     PlayerBase* getPlayer() const;
+    s32 getLife() const;
+    u32 getMaxHearts() const;
+    f32 getMaxStamina() const;
 };
 
 }  // namespace ksys::act
diff --git a/src/KingSystem/World/worldEnvMgr.h b/src/KingSystem/World/worldEnvMgr.h
index 3c861f3f..6956a18d 100644
--- a/src/KingSystem/World/worldEnvMgr.h
+++ b/src/KingSystem/World/worldEnvMgr.h
@@ -207,6 +207,8 @@ public:
 
     void allowPaletteOverride();
 
+    float getWarpMistIntensity() const { return mWarpMistIntensity; }
+
 protected:
     void init_(sead::Heap* heap) override;
     void calc_() override;
diff --git a/src/KingSystem/World/worldTimeMgr.h b/src/KingSystem/World/worldTimeMgr.h
index 4320ead0..107b5836 100644
--- a/src/KingSystem/World/worldTimeMgr.h
+++ b/src/KingSystem/World/worldTimeMgr.h
@@ -98,6 +98,7 @@ public:
     BloodMoonForceMode getBloodMoonForceMode() const { return mBloodMoonForceMode; }
     bool isPlayedDemo103Or997() const { return mPlayedDemo103Or997; }
     bool isFindDungeonActivated() const { return mFindDungeonActivated; }
+    bool wasBloodyDayAndDayPassed() const { return mWasBloodyDayAndDayPassed; }
     bool isResetGdtOnNextSceneUnloadForBloodMoon() const {
         return mResetGdtOnNextSceneUnloadForBloodMoon;
     }