diff options
| author | Pistonight <pistonknight@outlook.com> | 2024-12-30 21:38:59 -0800 |
|---|---|---|
| committer | Pistonight <pistonknight@outlook.com> | 2024-12-30 21:43:28 -0800 |
| commit | 2363fbfe206f1203e753b9aab90e990a13e91354 (patch) | |
| tree | d22aace0f36e7100a41c6a307ebff6cc37b546d7 /src/Game/AI/Query | |
| parent | d5128f8fb43c20a8de388d5a7a4bbb6a549bf1b4 (diff) | |
PlayerInfo stuff that doesn't require PlayerBase
Diffstat (limited to 'src/Game/AI/Query')
4 files changed, 5 insertions, 5 deletions
diff --git a/src/Game/AI/Query/queryComparePlayerHeart.cpp b/src/Game/AI/Query/queryComparePlayerHeart.cpp index b7742ad6..deed74e0 100644 --- a/src/Game/AI/Query/queryComparePlayerHeart.cpp +++ b/src/Game/AI/Query/queryComparePlayerHeart.cpp @@ -13,7 +13,7 @@ int ComparePlayerHeart::doQuery() { if (pi == nullptr) return 0; - return pi->getLife() >= *mThreshold; + return pi->getLifeFromPlayerActor() >= *mThreshold; } void ComparePlayerHeart::loadParams(const evfl::QueryArg& arg) { diff --git a/src/Game/AI/Query/queryComparePlayerMaxHeart.cpp b/src/Game/AI/Query/queryComparePlayerMaxHeart.cpp index 4482a6f7..3c0dade0 100644 --- a/src/Game/AI/Query/queryComparePlayerMaxHeart.cpp +++ b/src/Game/AI/Query/queryComparePlayerMaxHeart.cpp @@ -13,7 +13,7 @@ int ComparePlayerMaxHeart::doQuery() { if (pi == nullptr) return 0; - s32 full_hearts = pi->getMaxHearts() / 4; + s32 full_hearts = pi->getMaxHeartValue() / 4; return full_hearts >= *mThreshold; } diff --git a/src/Game/AI/Query/queryComparePlayerMaxStamina.cpp b/src/Game/AI/Query/queryComparePlayerMaxStamina.cpp index fa2c8c54..82a15bdd 100644 --- a/src/Game/AI/Query/queryComparePlayerMaxStamina.cpp +++ b/src/Game/AI/Query/queryComparePlayerMaxStamina.cpp @@ -13,7 +13,7 @@ int ComparePlayerMaxStamina::doQuery() { if (pi == nullptr) return 0; - s32 stamina = pi->getMaxStamina(); + s32 stamina = pi->getStaminaMax(); if (stamina % 200 <= 0) return stamina / 200 >= *mThreshold; else diff --git a/src/Game/AI/Query/queryComparePlayerOriginalHeart.cpp b/src/Game/AI/Query/queryComparePlayerOriginalHeart.cpp index a107699a..1b9d7a75 100644 --- a/src/Game/AI/Query/queryComparePlayerOriginalHeart.cpp +++ b/src/Game/AI/Query/queryComparePlayerOriginalHeart.cpp @@ -15,8 +15,8 @@ int ComparePlayerOriginalHeart::doQuery() { if (PlayerInfo::instance() == nullptr) return 0; - s32 life = PlayerInfo::instance()->getLife(); - s32 hearts = PlayerInfo::instance()->getMaxHearts(); + s32 life = PlayerInfo::instance()->getLifeFromPlayerActor(); + s32 hearts = PlayerInfo::instance()->getMaxHeartValue(); s32 compare; if (life <= hearts) compare = life; |