diff --git a/data/uking_functions.csv b/data/uking_functions.csv index f045aa27..50bad449 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -73272,15 +73272,15 @@ 0x0000007100d2d87c,act::getWeaponCommonPoweredSharpAddRapidFireMin,20,_ZN4ksys3act42getWeaponCommonPoweredSharpAddRapidFireMinERKN2al9ByamlIterE 0x0000007100d2d890,act::getWeaponCommonPoweredSharpAddRapidFireMax,20,_ZN4ksys3act42getWeaponCommonPoweredSharpAddRapidFireMaxERKN2al9ByamlIterE 0x0000007100d2d8a4,act::getWeaponCommonPoweredSharpAddSurfMaster,20,_ZN4ksys3act40getWeaponCommonPoweredSharpAddSurfMasterERKN2al9ByamlIterE -0x0000007100d2d8b8,ActorInfoData::getBowArrowName,24, -0x0000007100d2d8d0,act::getBowIsLeadShot,20, -0x0000007100d2d8e4,act::getBowLeadShotNum,20, -0x0000007100d2d8f8,act::getBowIsRapidFire,20, -0x0000007100d2d90c,act::getRapidFireNum,20, -0x0000007100d2d920,ActorInfoData::getMasterSwordTrueFormAttackPower,20, -0x0000007100d2d934,ActorInfoData::getMasterSwordSearchEvilDist,20, -0x0000007100d2d948,ActorInfoData::getMasterSwordSleepActorName,24, -0x0000007100d2d960,ActorInfoData::getMasterSwordTrueFormActorName,24, +0x0000007100d2d8b8,ActorInfoData::getBowArrowName,24,_ZN4ksys3act15getBowArrowNameEPNS0_8InfoDataEPKc +0x0000007100d2d8d0,act::getBowIsLeadShot,20,_ZN4ksys3act16getBowIsLeadShotERKN2al9ByamlIterE +0x0000007100d2d8e4,act::getBowLeadShotNum,20,_ZN4ksys3act17getBowLeadShotNumERKN2al9ByamlIterE +0x0000007100d2d8f8,act::getBowIsRapidFire,20,_ZN4ksys3act17getBowIsRapidFireERKN2al9ByamlIterE +0x0000007100d2d90c,act::getRapidFireNum,20,_ZN4ksys3act18getBowRapidFireNumERKN2al9ByamlIterE +0x0000007100d2d920,ActorInfoData::getMasterSwordTrueFormAttackPower,20,_ZN4ksys3act33getMasterSwordTrueFormAttackPowerEPNS0_8InfoDataEPKc +0x0000007100d2d934,ActorInfoData::getMasterSwordSearchEvilDist,20,_ZN4ksys3act28getMasterSwordSearchEvilDistEPNS0_8InfoDataEPKc +0x0000007100d2d948,ActorInfoData::getMasterSwordSleepActorName,24,_ZN4ksys3act28getMasterSwordSleepActorNameEPNS0_8InfoDataEPKc +0x0000007100d2d960,ActorInfoData::getMasterSwordTrueFormActorName,24,_ZN4ksys3act31getMasterSwordTrueFormActorNameEPNS0_8InfoDataEPKc 0x0000007100d2d978,ActorInfoData::getArmorStarNum,20, 0x0000007100d2d98c,act::getArmorStarNum,20, 0x0000007100d2d9a0,ActorInfoData::getArmorDefenceAddLevel,20, 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