falso
/
botw
mirror of https://github.com/zeldaret/botw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ksys/act: Add InfoCommon Bow and Master Sword functions

This commit is contained in:
Léo Lam 2021-01-22 12:34:38 +01:00
parent 73329896f9
commit 24bb3a679a
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
3 changed files with 56 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
data/uking_functions.csv
View File

@ -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,

Can't render this file because it is too large.

36
src/KingSystem/ActorSystem/actInfoCommon.cpp
View File

@ -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);
}

12
src/KingSystem/ActorSystem/actInfoCommon.h
View File

@ -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