From 24bb3a679aa2ff52ddede3682282c31e78157e2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Fri, 22 Jan 2021 12:34:38 +0100 Subject: ksys/act: Add InfoCommon Bow and Master Sword functions --- src/KingSystem/ActorSystem/actInfoCommon.cpp | 36 ++++++++++++++++++++++++++++ src/KingSystem/ActorSystem/actInfoCommon.h | 12 +++++++++- 2 files changed, 47 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/KingSystem/ActorSystem/actInfoCommon.cpp b/src/KingSystem/ActorSystem/actInfoCommon.cpp index cf1c189a..18994c55 100644 --- a/src/KingSystem/ActorSystem/actInfoCommon.cpp +++ b/src/KingSystem/ActorSystem/actInfoCommon.cpp @@ -115,6 +115,42 @@ bool getWeaponCommonPoweredSharpAddSurfMaster(const al::ByamlIter& iter) { return InfoData::getBoolByKey(iter, "weaponCommonPoweredSharpAddSurfMaster"); } +const char* getBowArrowName(InfoData* data, const char* actor) { + return data->getString(actor, "bowArrowName"); +} + +bool getBowIsLeadShot(const al::ByamlIter& iter) { + return InfoData::getBoolByKey(iter, "bowIsLeadShot"); +} + +int getBowLeadShotNum(const al::ByamlIter& iter) { + return InfoData::getIntByKey(iter, "bowLeadShotNum"); +} + +bool getBowIsRapidFire(const al::ByamlIter& iter) { + return InfoData::getBoolByKey(iter, "bowIsRapidFire"); +} + +int getBowRapidFireNum(const al::ByamlIter& iter) { + return InfoData::getIntByKey(iter, "bowRapidFireNum"); +} + +int getMasterSwordTrueFormAttackPower(InfoData* data, const char* actor) { + return data->getInt(actor, "masterSwordTrueFormAttackPower", -1); +} + +float getMasterSwordSearchEvilDist(InfoData* data, const char* actor) { + return data->getFloat(actor, "masterSwordSearchEvilDist", -1.0); +} + +const char* getMasterSwordSleepActorName(InfoData* data, const char* actor) { + return data->getString(actor, "masterSwordSleepActorName"); +} + +const char* getMasterSwordTrueFormActorName(InfoData* data, const char* actor) { + return data->getString(actor, "masterSwordTrueFormActorName"); +} + const char* getArmorNextRankName(InfoData* data, const char* actor) { return data->getString(actor, "armorNextRankName", sead::SafeString::cEmptyString); } diff --git a/src/KingSystem/ActorSystem/actInfoCommon.h b/src/KingSystem/ActorSystem/actInfoCommon.h index 3b0d68a7..8b6b2425 100644 --- a/src/KingSystem/ActorSystem/actInfoCommon.h +++ b/src/KingSystem/ActorSystem/actInfoCommon.h @@ -42,6 +42,17 @@ float getWeaponCommonPoweredSharpAddRapidFireMin(const al::ByamlIter& iter); float getWeaponCommonPoweredSharpAddRapidFireMax(const al::ByamlIter& iter); bool getWeaponCommonPoweredSharpAddSurfMaster(const al::ByamlIter& iter); +const char* getBowArrowName(InfoData* data, const char* actor); +bool getBowIsLeadShot(const al::ByamlIter& iter); +int getBowLeadShotNum(const al::ByamlIter& iter); +bool getBowIsRapidFire(const al::ByamlIter& iter); +int getBowRapidFireNum(const al::ByamlIter& iter); + +int getMasterSwordTrueFormAttackPower(InfoData* data, const char* actor); +float getMasterSwordSearchEvilDist(InfoData* data, const char* actor); +const char* getMasterSwordSleepActorName(InfoData* data, const char* actor); +const char* getMasterSwordTrueFormActorName(InfoData* data, const char* actor); + const char* getArmorNextRankName(InfoData* data, const char* actor); int getItemStainColor(InfoData* data, const char* actor); @@ -49,7 +60,6 @@ int getItemStainColor(InfoData* data, const char* actor); int getCureItemHitPointRecover(InfoData* data, const char* actor); int getCureItemHitPointRecover(const al::ByamlIter& iter); - int getMonsterShopSellMamo(const al::ByamlIter& iter); } // namespace ksys::act -- cgit v1.2.3